From eac90d32cfb88a0ecac920cbb48c866ad09875c6 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 12 May 2022 10:05:37 +0200 Subject: [PATCH 1/4] fixed bug #3386 --- ereuse_devicehub/inventory/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index 062d185c..bce5ba43 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -692,7 +692,7 @@ class AllocateForm(ActionFormMix): transaction = StringField( 'Transaction', [validators.Optional(), validators.length(max=50)] ) - end_users = IntegerField('End users', [validators.Optional()]) + end_users = IntegerField('Number of end users', [validators.Optional()]) def validate(self, extra_validators=None): if not super().validate(extra_validators): From b6966328fbb0ca70db17118e0c741e85e025e9d0 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 12 May 2022 10:09:03 +0200 Subject: [PATCH 2/4] fixed bug #3383 --- ereuse_devicehub/inventory/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index bce5ba43..0357e19f 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -684,6 +684,7 @@ class NewActionForm(ActionFormMix): class AllocateForm(ActionFormMix): + date = HiddenField('') start_time = DateField('Start time') end_time = DateField('End time', [validators.Optional()]) final_user_code = StringField( From 515f31c5626f7308ddb8d76094598d9ef73cf457 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 12 May 2022 10:15:46 +0200 Subject: [PATCH 3/4] fixed bug #3387 --- ereuse_devicehub/templates/inventory/allocate.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ereuse_devicehub/templates/inventory/allocate.html b/ereuse_devicehub/templates/inventory/allocate.html index f611a763..2f036795 100644 --- a/ereuse_devicehub/templates/inventory/allocate.html +++ b/ereuse_devicehub/templates/inventory/allocate.html @@ -29,6 +29,9 @@ {% else %}
{{ field.label(class_="form-label") }} + {% if field == form_new_allocate.start_time %} + * + {% endif %} {{ field(class_="form-control") }} {% if field.errors %}

From 9b6d77573f6f59ecd93bcf34b57d12078238883a Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 12 May 2022 10:33:04 +0200 Subject: [PATCH 4/4] fixed Enhancement #3384 --- ereuse_devicehub/inventory/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index a09f4f5b..70c058a4 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -326,7 +326,8 @@ class NewAllocateView(NewActionView, DeviceListMix): messages.error('Action {} error!'.format(self.form.type.data)) for k, v in self.form.errors.items(): value = ';'.join(v) - messages.error('Action Error {key}: {value}!'.format(key=k, value=value)) + key = self.form[k].label.text + messages.error('Action Error {key}: {value}!'.format(key=key, value=value)) next_url = self.get_next_url() return flask.redirect(next_url)