From 3dae7e3a584dacd102a48afa745e1e664af035a5 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 29 Jun 2022 17:31:54 +0200 Subject: [PATCH] ux menu --- ereuse_devicehub/inventory/forms.py | 39 ++++++++++--------- ereuse_devicehub/static/js/create_device.js | 10 +++++ .../templates/inventory/device_create.html | 6 +-- .../templates/inventory/device_list.html | 16 ++++++-- tests/test_render_2_0.py | 12 +++--- 5 files changed, 53 insertions(+), 30 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index f5420e73..0eafb9b0 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -388,12 +388,12 @@ class NewDeviceForm(FlaskForm): self.depth.errors = error is_valid = False - if self.imei.data: + if self.imei.data and self.amount.data == 1: if not 13 < len(str(self.imei.data)) < 17: self.imei.errors = error is_valid = False - if self.meid.data: + if self.meid.data and self.amount.data == 1: meid = self.meid.data if not 13 < len(meid) < 17: is_valid = False @@ -407,7 +407,7 @@ class NewDeviceForm(FlaskForm): dev = Device.query.filter_by( hid=self.phid.data, owner=g.user, active=True ).first() - if dev and not dev.placeholder: + if dev: msg = "Sorry, exist one snapshot device with this HID" self.phid.errors = [msg] is_valid = False @@ -424,12 +424,26 @@ class NewDeviceForm(FlaskForm): if self.serial_number.data: self.serial_number.data = self.serial_number.data.lower() + if not self.phid.data: + _hid = Placeholder.query.order_by(Placeholder.id.desc()).first() + if _hid: + _hid = str(_hid.id + 1) + else: + _hid = '1' + self.phid.data = _hid.lower() + self.phid.data = self.phid.data.lower() + + if self.amount.data > 1: + self.phid.data = None + self.id_device_supplier.data = None + self.serial_number.data = None + self.sku.data = None + self.imei.data = None + self.meid.data = None + return True def save(self, commit=True): - if self.amount.data > 1: - self.phid.data = None - for n in range(self.amount.data): self.create_device() @@ -486,20 +500,9 @@ class NewDeviceForm(FlaskForm): snapshot_json['device'].meid = self.meid.data snapshot_json['device'].placeholder = self.get_placeholder() - - _hid = self.phid.data - if not _hid: - _hid = Placeholder.query.order_by(Placeholder.id.desc()).first() - if _hid: - _hid = str(_hid.id + 1) - else: - _hid = '1' - - snapshot_json['device'].hid = _hid.lower() - snapshot = upload_form.build(snapshot_json) - move_json(self.tmp_snapshots, path_snapshot, g.user.email) + if self.type.data == 'ComputerMonitor': snapshot.device.resolution = self.resolution.data snapshot.device.screen = self.screen.data diff --git a/ereuse_devicehub/static/js/create_device.js b/ereuse_devicehub/static/js/create_device.js index 54bd1d0c..a6b22022 100644 --- a/ereuse_devicehub/static/js/create_device.js +++ b/ereuse_devicehub/static/js/create_device.js @@ -28,7 +28,17 @@ function deviceInputs() { function amountInputs() { if ($("#amount").val() > 1) { $("#Phid").hide(); + $("#Id_device_supplier").hide(); + $("#Serial_number").hide(); + $("#Sku").hide(); + $("#imei").hide(); + $("#meid").hide(); } else { $("#Phid").show(); + $("#Id_device_supplier").show(); + $("#Serial_number").show(); + $("#Sku").show(); + $("#imei").show(); + $("#meid").show(); }; } diff --git a/ereuse_devicehub/templates/inventory/device_create.html b/ereuse_devicehub/templates/inventory/device_create.html index abd45cdb..433d42ef 100644 --- a/ereuse_devicehub/templates/inventory/device_create.html +++ b/ereuse_devicehub/templates/inventory/device_create.html @@ -103,7 +103,7 @@ {% endif %} -
+
{{ form.id_device_supplier(class_="form-control") }} Identity of device for the Supplier @@ -142,7 +142,7 @@ {% endif %}
-
+
{{ form.serial_number(class_="form-control") }} Serial number of this device @@ -349,7 +349,7 @@ {% endif %}
-
+
{{ form.sku(class_="form-control") }} The Stock Keeping Unit (SKU), i.e. a merchant-specific identifier for a product or service. diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index f7f53add..9888dd08 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -315,7 +315,7 @@
diff --git a/tests/test_render_2_0.py b/tests/test_render_2_0.py index fb613ee3..4c4d2182 100644 --- a/tests/test_render_2_0.py +++ b/tests/test_render_2_0.py @@ -504,14 +504,14 @@ def test_update_monitor(user3: UserClientFlask): } body, status = user3.post(uri, data=data) assert status == '200 OK' - assert 'Device "Monitor" created successfully!' in body + assert 'Sorry, exist one snapshot device with this HID' in body dev = Device.query.one() assert dev.type == 'Monitor' - assert dev.placeholder.id_device_supplier == "b3" + assert dev.placeholder.id_device_supplier == "b2" assert dev.hid == '1' - assert dev.model == 'lcd 43 b' - assert dev.depth == 0.2 - assert dev.placeholder.pallet == "l20" + assert dev.model == 'lc27t55' + assert dev.depth == 0.1 + assert dev.placeholder.pallet == "l34" @pytest.mark.mvp @@ -628,7 +628,7 @@ def test_add_with_ammount_laptops(user3: UserClientFlask): for dev in Device.query.all(): assert dev.type == 'Laptop' assert dev.placeholder.id_device_supplier == "b2" - assert dev.hid in [str(x) for x in range(1, num+1)] + assert dev.hid in [str(x) for x in range(1, num + 1)] assert Device.query.count() == num