Commit Graph

1202 Commits

Author SHA1 Message Date
Cayo Puigdefabregas d20bd63cae precommit 2022-03-15 10:02:30 +01:00
Cayo Puigdefabregas 71926f01c0 new list of device for filter 2022-03-15 09:16:01 +01:00
Cayo Puigdefabregas 40abcd6b67 pre commit 2022-03-09 10:30:28 +01:00
Santiago L aa9d3bb5a5
Drop pdb statement 2022-03-08 22:09:03 +01:00
Cayo Puigdefabregas 2f84aac7ef change the title of list when there are a select data in the filter 2022-03-08 17:59:33 +01:00
Cayo Puigdefabregas be2fda3d8c precommit 2022-03-08 17:49:56 +01:00
Cayo Puigdefabregas 0bef1dee2a adding a new device in a lot if it is created from a lot 2022-03-08 17:43:15 +01:00
Cayo Puigdefabregas b16fdd59f9 precommit 2022-03-08 11:01:10 +01:00
Cayo Puigdefabregas ea66c31a07 fix bug 2022-03-08 10:30:53 +01:00
Cayo Puigdefabregas 70f093e1a1 resolve conflict 2022-03-08 10:30:31 +01:00
Cayo Puigdefabregas a983ebd6cf add all devices as option in the select of filter 2022-03-08 10:15:53 +01:00
Cayo Puigdefabregas 62f42e9e05 fix bug 2022-03-08 10:15:21 +01:00
Santiago L c67bd93ef6 Fix flake8 unused import 2022-03-08 10:05:32 +01:00
Santiago L 46a3fc57dd Replace add supplier & add receiver pictograms
Create visual relation between:
a) Supplier and incoming lot
b) Receiver and outgoing lot
2022-03-07 18:30:32 +01:00
Santiago L bb588b10d2 Refactor HTML: use d-flex 2022-03-07 18:28:45 +01:00
Cayo Puigdefabregas bd716e2ef8 add more devices to the filter 2022-03-07 15:17:03 +01:00
Cayo Puigdefabregas 34aab019b9 fix computer option 2022-03-07 13:09:11 +01:00
Cayo Puigdefabregas 598b91e22b filter search in lists 2022-03-07 13:07:26 +01:00
Cayo Puigdefabregas e90ac224c1 use commit=True for default as django pattern, when we save or remove one model 2022-03-07 11:37:32 +01:00
Cayo Puigdefabregas 54a938071b fix bug when add or delete one device of a lot. For fix this we use the pattern of flask doing the commit in the view 2022-03-07 11:31:38 +01:00
Cayo Puigdefabregas 5df74d7742 extra message confirm when you want delete one lot with devices 2022-03-07 11:24:02 +01:00
Cayo Puigdefabregas 9d43299592 now is possible delete a temporary lot when this lot have one or more devices 2022-03-07 10:20:18 +01:00
Cayo Puigdefabregas 4fbed3c5ef drop class col in forms when is not neccesary 2022-03-04 18:50:47 +01:00
Cayo Puigdefabregas 496763473e always show the button to delete a lot and show an error message if you try to delete a lot with devices 2022-03-04 18:30:14 +01:00
Cayo Puigdefabregas 6b3ccee58f #2890
Go back to lot detail when cancel lot edit
2022-03-04 13:51:05 +01:00
Cayo Puigdefabregas d98d09cc7d propagate error of connection with the tag server to the view 2022-03-04 13:32:37 +01:00
Cayo Puigdefabregas b737aaf50a add verbose_name in device.model instead of use template system 2022-03-04 13:31:33 +01:00
Cayo Puigdefabregas 95a8b13a6b form select type of device in the list of device. Step 1 2022-03-04 13:00:51 +01:00
Cayo Puigdefabregas 075135c191 Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements 2022-03-03 11:18:57 +01:00
Cayo Puigdefabregas d25c9faf25 fix change #2825, tags only for Computers 2022-03-03 10:43:34 +01:00
Santiago L 473a7a02de
Update ereuse_devicehub/inventory/forms.py 2022-03-02 18:51:04 +01:00
Cayo Puigdefabregas fc4ba2041e remove imported but unused 2022-03-02 13:45:52 +01:00
Cayo Puigdefabregas 7f0167f688 remove imported but unused 2022-03-02 13:39:15 +01:00
Cayo Puigdefabregas eb84884db4 remove imported but unused 2022-03-02 13:38:22 +01:00
Cayo Puigdefabregas 56b8e0886c ignoring warnings of too complex functions 2022-03-02 13:36:06 +01:00
Cayo Puigdefabregas e45a4982c6 ignoring warnings of too complex function 2022-03-02 13:31:21 +01:00
Cayo Puigdefabregas c52480231b add error msg when there are more than one device selected for add or remove one tag 2022-03-02 13:08:23 +01:00
Cayo Puigdefabregas ad09d298a0 add order by code in tags lists and select 2022-03-02 13:07:04 +01:00
Cayo Puigdefabregas 806e9ad8d0 fix bug #2840 about trade without confirm and with code 2022-03-02 10:56:31 +01:00
Cayo Puigdefabregas 15d913efea add message with result when a devices is add or remove of a lot 2022-03-02 10:36:26 +01:00
Cayo Puigdefabregas 6389956adc fix bug #2841. Show lot and devices for all users involved in a trade 2022-03-01 14:29:25 +01:00
Cayo Puigdefabregas ab89b7eff0 #2736 Move simple-datatables to base 2022-03-01 10:30:47 +01:00
Cayo Puigdefabregas 3886076f50 #2736 Move jquery to base 2022-03-01 10:07:05 +01:00
Cayo Puigdefabregas f9840e9f2b fix buttons of form of upload trade document 2022-02-28 13:33:03 +01:00
Cayo Puigdefabregas 823594dce4 add tab documents 2022-02-28 13:27:12 +01:00
Cayo Puigdefabregas b6cf1f1e3e Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements 2022-02-28 13:06:04 +01:00
Cayo Puigdefabregas 9a95587cf3 remove lot in top 2022-02-28 13:05:36 +01:00
Cayo Puigdefabregas 560d9fae05 task #2740 add tag code in name of pdf file 2022-02-28 12:16:33 +01:00
Cayo Puigdefabregas c6538333f7 task #2739 Manufacter and Model empty instead of None 2022-02-28 12:02:56 +01:00
Cayo Puigdefabregas a45fd815a2 task #2741 fix Handle error message, provider connection when we are creating an unnamed tag 2022-02-28 11:46:31 +01:00
Cayo Puigdefabregas 692358c343 add alert when no there are any device selected 2022-02-28 11:19:22 +01:00
Cayo Puigdefabregas f655bfb895 pre-commit 2022-02-25 12:57:13 +01:00
Cayo Puigdefabregas 71d30548cc resolve conflict 2022-02-25 12:56:01 +01:00
Cayo Puigdefabregas 826584450a resolve conflict 2022-02-25 12:34:02 +01:00
Cayo Puigdefabregas b85f4f298c pre-commit 2022-02-25 12:27:14 +01:00
Cayo Puigdefabregas 26f3a64b46 there are views than doesn't have any lot on sidebar because lots are missing as template context 2022-02-25 12:25:00 +01:00
Cayo Puigdefabregas 37f50624fa change redirect to unansigned lot next to do login instead of go to profile page 2022-02-25 11:49:05 +01:00
Cayo Puigdefabregas 1772b4090c close div tag in trade template 2022-02-25 10:16:59 +01:00
Cayo Puigdefabregas e614908c73 resolve conflict 2022-02-25 10:15:23 +01:00
Cayo Puigdefabregas 04cc244f2d resolve conflict 2022-02-25 10:07:44 +01:00
Cayo Puigdefabregas c54d9a902c fix bug in trade template 2022-02-25 09:49:15 +01:00
Cayo Puigdefabregas 179feaba44 add exports in front end 2022-02-24 14:15:58 +01:00
Santiago L fbedbc8f7f Drop Additional keyword arguments
[Deprecated since version 0.9](https://docs.sqlalchemy.org/en/12/core/type_basics.html#sqlalchemy.types.Float.params.**kwargs)
2022-02-22 12:22:23 +01:00
Santiago L d4e61d992b Raise error if trying to save when validation has failed 2022-02-22 12:04:26 +01:00
Santiago L bacf14ece8 Fix method call to `get_or_create_user()` 2022-02-22 11:55:01 +01:00
Cayo Puigdefabregas bfbd7c02b7 . 2022-02-22 11:40:05 +01:00
Cayo Puigdefabregas 90eb279008 fix get_or_create_user 2022-02-22 11:31:11 +01:00
Cayo Puigdefabregas 88deb71a26 changes of review 2022-02-22 11:24:11 +01:00
Cayo Puigdefabregas eed2849af3 Merge branch 'feature/server-side-render-actions-trade' of github.com:eReuse/devicehub-teal into feature/server-side-render-actions-trade 2022-02-22 11:17:39 +01:00
Cayo Puigdefabregas 96a240b3cd drop enconded as unicode 2022-02-22 11:15:37 +01:00
Santiago L 2cff0499cb
Apply suggestions from code review 2022-02-22 11:13:00 +01:00
Santiago L 6eb3c62b83
Update ereuse_devicehub/inventory/forms.py 2022-02-22 11:12:15 +01:00
Cayo Puigdefabregas 60d9c04e2d view of export 2022-02-22 11:11:53 +01:00
Cayo Puigdefabregas 4ce359fec4 Merge branch 'feature/server-side-render' into feature/server-side-render-actions-trade 2022-02-21 13:05:38 +01:00
Cayo Puigdefabregas 83a9c66a46 show documents in list device of trade lot 2022-02-21 13:04:56 +01:00
Cayo Puigdefabregas bda39d0fc9 add trade document template 2022-02-21 13:04:13 +01:00
Cayo Puigdefabregas d056d1867b fix template trade 2022-02-21 13:03:35 +01:00
Cayo Puigdefabregas c18532f265 new view and endpoint for trade document 2022-02-21 13:03:03 +01:00
Cayo Puigdefabregas 4a2cd7adfe new form for trade documents 2022-02-21 13:02:28 +01:00
Cayo Puigdefabregas 791d2a5894 manager better the error messages in trade form 2022-02-18 13:37:45 +01:00
Cayo Puigdefabregas b72f9f37c6 add trade action iun devices when this device is insert in a lot with a trade 2022-02-18 11:29:12 +01:00
Cayo Puigdefabregas a2b074e707 problem display none for adding tag form 2022-02-18 11:18:54 +01:00
Cayo Puigdefabregas 8b27b18fc1 change supplier for user_from and receiver for user_to 2022-02-18 09:30:20 +01:00
Cayo Puigdefabregas 538e355026 add save instance correctly, create phantom accounts and change the owner for devices 2022-02-17 13:52:55 +01:00
Cayo Puigdefabregas 37779ca05c fix trade form for unassigned list 2022-02-17 13:51:59 +01:00
Cayo Puigdefabregas 403717ccf2 fix readonly and deviceslist 2022-02-17 13:51:27 +01:00
Cayo Puigdefabregas 5e46141622 fix save trade action 2022-02-16 14:03:01 +01:00
Cayo Puigdefabregas 86f3c3f483 fix validate trade form 2022-02-10 13:53:52 +01:00
Cayo Puigdefabregas adad689acd type to message from form.type.data instead of instance 2022-02-10 13:31:49 +01:00
Cayo Puigdefabregas f3ffcd89ca fixing js form for trade 2022-02-10 13:22:47 +01:00
Santiago L df4c6f7407 flake8: remove unused imports & sort them 2022-02-10 11:29:47 +01:00
Cayo Puigdefabregas cd16baaadb skeleton for trade action 2022-02-09 14:06:28 +01:00
Cayo Puigdefabregas f2d6c198cc fix css for form documents into data_wipe html 2022-02-09 11:28:57 +01:00
Cayo Puigdefabregas 1ed5d394c5 fix the new version of dispatch for NewDataWipeView 2022-02-09 11:27:08 +01:00
Cayo Puigdefabregas d102eaed9c resolve conflict 2022-02-09 10:18:56 +01:00
Cayo Puigdefabregas 764d749db0 datawipe form example as 2 forms in one 2022-02-08 13:59:50 +01:00
Santiago L b103a1a51d Rename attribute `_form` --> `form_class` 2022-02-08 11:52:30 +01:00
Santiago L e15e457481 Refactor: create method `get_next_url()` 2022-02-08 11:49:13 +01:00
Santiago L f1a78e23f6 Include action type on message 2022-02-08 11:39:27 +01:00
Santiago L aeb765dcd7 Use built-in flask.flash to implement messages 2022-02-08 11:39:08 +01:00
Santiago L 574ac41239 Render messages on base_site.html & add new action message 2022-02-07 14:52:17 +01:00
Santiago L 0d27800948 Create module to store user messages using sessions
Module ereuse_devicehub.messages inspired by django.contrib.messages
2022-02-07 14:50:19 +01:00
Cayo Puigdefabregas 2542719378 fix insert hash for force not to do a commit 2022-02-07 14:03:01 +01:00
Cayo Puigdefabregas 2a92b1f747 add form for data wipe 2022-02-07 14:02:28 +01:00
Cayo Puigdefabregas 94604dd029 view for data wipe 2022-02-07 14:01:56 +01:00
Cayo Puigdefabregas 8b467b95c3 template for data wipe 2022-02-07 14:01:38 +01:00
Cayo Puigdefabregas 579e0e35f0 Merge branch 'feature/server-side-render-actions' into feature/server-side-render-actions-documents 2022-02-04 13:23:33 +01:00
Cayo Puigdefabregas c340122d87 check the checkbox in a devices list when one form is invalid 2 2022-02-04 13:22:47 +01:00
Cayo Puigdefabregas a55944e379 check the checkbox in a devices list when one form is invalid 2022-02-04 13:16:27 +01:00
Cayo Puigdefabregas 662f75bb7b refactoring and put again the lot in form of actions 2022-02-04 12:10:27 +01:00
Cayo Puigdefabregas f011e29ce9 add description of device in actions 2022-02-04 11:30:29 +01:00
Cayo Puigdefabregas c10a5f24b4 add count to allocate action 2022-02-03 14:05:15 +01:00
Cayo Puigdefabregas 7f9a6784e9 add count of devices in action form 2022-02-03 13:58:54 +01:00
Cayo Puigdefabregas aeef04b92c change modal-fullscreen by modal-lg 2022-02-03 11:53:18 +01:00
Cayo Puigdefabregas 820078dd3f UX: inform user about the type action thas is going to be created --> show type of action 2022-02-03 11:44:51 +01:00
Cayo Puigdefabregas 4ebb312e59 first step for datawipe form 2022-02-03 11:27:16 +01:00
Cayo Puigdefabregas e8b5c1e310 deactive dataWipe action 2022-02-03 10:51:48 +01:00
Cayo Puigdefabregas f79abb05cd isort 2022-02-03 10:50:36 +01:00
Cayo Puigdefabregas 4107d67832 fix css bug for dropdown menu action 2022-02-03 10:28:15 +01:00
Cayo Puigdefabregas 87faee3444 fix the return correct page when the submit is false 2022-02-03 10:14:10 +01:00
Cayo Puigdefabregas c0918e7b57 fix error message in form 2022-02-02 14:17:42 +01:00
Cayo Puigdefabregas 71f5a8a98b fix doble query 2022-02-02 13:51:54 +01:00
Cayo Puigdefabregas 8149d0ed7c reversed actions for see the better the traceability log 2022-02-02 13:27:53 +01:00
Cayo Puigdefabregas 9a68ad7ab8 fix dictionary style 2022-02-02 13:09:11 +01:00
Cayo Puigdefabregas bd5ab802cd resolve conflict 2022-02-02 13:05:55 +01:00
Cayo Puigdefabregas fedc85668a drop lot in actions in views and forms 2022-02-02 12:52:16 +01:00
Cayo Puigdefabregas 11df33060f drop pdb 2022-02-02 12:51:15 +01:00
Cayo Puigdefabregas a0bc745893 drop lot in template of actions 2022-02-02 12:50:59 +01:00
Cayo Puigdefabregas 450cef168b solve a bug of validate 2022-02-02 12:49:03 +01:00
Santiago L f22fd4ebcb Fix button links of device_list & page titles 2022-02-02 12:21:30 +01:00
Santiago L c9a46128df Set page_title & fix breadcrumb 2022-02-02 11:41:29 +01:00
Santiago L 44a38d4dec Fix printerType select style 2022-02-02 11:18:16 +01:00
Cayo Puigdefabregas 10c756a884 show error msg for forms with errors of validations 2022-02-01 13:40:06 +01:00
Santiago L 60bca7b733 Rename Labels --> Tags on side bar menu 2022-01-31 12:14:27 +01:00
Cayo Puigdefabregas 65a774550e resolv conflicts 2022-01-31 10:41:40 +01:00
Cayo Puigdefabregas 05b4353cc4 add label code in tag 2022-01-31 10:12:44 +01:00
Cayo Puigdefabregas 999cd3e26c try printpdf 2022-01-28 12:29:49 +01:00
Cayo Puigdefabregas 2840c5c21e manager control over form of print tag 2022-01-28 11:03:57 +01:00
Cayo Puigdefabregas c8eea3f072 template of unamed, template of tag details, qr print 2022-01-27 14:13:20 +01:00
Cayo Puigdefabregas 93901e0ec8 add TagDetailsView 2022-01-26 13:59:56 +01:00
Cayo Puigdefabregas eb3e7e8a95 add link to tag details 2022-01-26 13:59:10 +01:00
Cayo Puigdefabregas 0d99aa4984 fix tags in use 2022-01-26 13:50:43 +01:00
Cayo Puigdefabregas 0f30bbda35 Merge branch 'feature/server-side-render' into feature/server-side-render-tags 2022-01-26 13:16:56 +01:00
Cayo Puigdefabregas 2327fa5a89 add an unnamed tag 2022-01-26 13:16:18 +01:00
Santiago L 15161e505f Merge branch 'feature/server-side-render' into feature/server-side-render-devices 2022-01-26 12:50:54 +01:00
Cayo Puigdefabregas 96a62e7072 fix redirect when remove one tag 2022-01-26 12:29:03 +01:00
Cayo Puigdefabregas 0018034fcd fix referrer path for redirect pages 2022-01-26 11:48:37 +01:00
Cayo Puigdefabregas 6fca974f04 bool refactor in lot module 2022-01-26 11:34:35 +01:00
Cayo Puigdefabregas 0d166b2b0c refactor responses bool and fix name is_incoming 2022-01-26 11:31:00 +01:00
Cayo Puigdefabregas 2e613265a6 refactor return bool 2022-01-26 11:25:50 +01:00