trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,920 Commits 19 Branches 14 Tags 7.2 MiB
Commit Graph

1305 Commits

Author SHA1 Message Date
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
Cayo Puigdefabregas 36199a7ee1 distinct instead of set 2022-01-26 11:22:47 +01:00
Cayo Puigdefabregas fd4fc71bf5 fix id devices in form of add tag in device 2022-01-26 10:59:13 +01:00
Cayo Puigdefabregas 9b87a7415e remove tag from device 2022-01-25 14:39:15 +01:00
Cayo Puigdefabregas 9d3f288213 template for link a tag with a device 2022-01-25 12:54:11 +01:00
Cayo Puigdefabregas 5eb2b0ee5f link a tag with one device 2022-01-25 12:53:36 +01:00
Cayo Puigdefabregas 01b355d955 add links to devices 2022-01-25 10:54:33 +01:00
Cayo Puigdefabregas 55ce612b2a resolv conflict 2022-01-25 10:37:30 +01:00
Cayo Puigdefabregas e3f917a3ce minor chages 2022-01-25 10:30:46 +01:00
Cayo Puigdefabregas 959ee18f59 fix error messages and imei meid fields 2022-01-24 13:48:16 +01:00
Cayo Puigdefabregas bd2f261dc3 add device for form using the snapshot form 2022-01-21 14:19:39 +01:00
Cayo Puigdefabregas 2fde6e5cf5 drop pdbs 2022-01-21 11:30:17 +01:00
Cayo Puigdefabregas 31b1806912 fix lower datas and image 2022-01-21 11:07:15 +01:00
Cayo Puigdefabregas f497cc03e5 save a new device and validations 2022-01-20 13:13:20 +01:00
Cayo Puigdefabregas 6e0f627aca add more clear error message, add a check if exist this snapshot and put the commit at the end of the loop 2022-01-20 10:33:14 +01:00
Cayo Puigdefabregas f35dab8983 render the correct form in a new page 2022-01-19 13:40:40 +01:00
Cayo Puigdefabregas 6be11e3ee9 add base form for Device 2022-01-18 14:09:01 +01:00
Cayo Puigdefabregas c300e44eab add a link for a new device, and snapshot 2022-01-18 13:47:17 +01:00
Cayo Puigdefabregas 5566e7adb7 save snapshot and try to make exception with duplicates 2022-01-18 11:45:28 +01:00
Cayo Puigdefabregas afb2a45220 fixing the order of the device list and force the list of the lots instead of use a generator 2022-01-18 11:24:27 +01:00
Cayo Puigdefabregas f738abfab0 put more space in the card 2022-01-18 11:23:18 +01:00
Cayo Puigdefabregas 7b357ec2fc fix template with results 2022-01-17 14:18:16 +01:00
Cayo Puigdefabregas 11ca75fc8b add view for upload snapshot 2022-01-17 14:17:52 +01:00
Cayo Puigdefabregas 9d6d95bbc3 add snapshot of devicehub teal in formulary of snapshot 2022-01-17 14:17:26 +01:00
Santiago L 7096056f37 Enable CSRF by blueprint (exclude API views) 2022-01-17 12:55:42 +01:00
Cayo Puigdefabregas 22623a4602 snapshot template 2022-01-14 11:12:07 +01:00
Cayo Puigdefabregas 68269c4b21 device details 2022-01-13 16:08:55 +01:00
Cayo Puigdefabregas 3463d63f31 changes redirect static for reffered 2022-01-12 21:02:47 +01:00
Cayo Puigdefabregas 2cfe8a44c6 fix order of tags and change code for id 2022-01-12 20:45:49 +01:00
Cayo Puigdefabregas 97f450a07c ordered list of devices 2022-01-12 20:40:57 +01:00
Cayo Puigdefabregas bdc518b949 fixing create lot id 2022-01-12 20:26:37 +01:00
Cayo Puigdefabregas aba5b9dc3b confirmation dialog when deleting a lot 2022-01-12 20:26:14 +01:00
Cayo Puigdefabregas 18fc0e6e5b add lots in create or update lot views 2022-01-12 19:44:10 +01:00
Cayo Puigdefabregas d6dd740142 split LotView in LotCreateView and LotUpdateView 2022-01-12 17:09:20 +01:00
Cayo Puigdefabregas e0e4ecfd2d replace Temporal for Temporary 2022-01-12 16:52:55 +01:00
Cayo Puigdefabregas 387a37ecfe add template allocate 2022-01-11 13:42:38 +01:00
Cayo Puigdefabregas 849e482d62 add named tags 2022-01-11 13:42:01 +01:00
Cayo Puigdefabregas 4e43076c04 add tag list 2022-01-11 13:13:57 +01:00
Cayo Puigdefabregas 062eed3d98 unassigned have only the devices than not exist in any lot 2022-01-11 11:46:47 +01:00
Cayo Puigdefabregas c213bddb8c fix a main_inventory 2022-01-11 11:21:17 +01:00
Cayo Puigdefabregas 8303054706 adding deltatime in allocate form 2022-01-11 10:32:04 +01:00
Cayo Puigdefabregas 5eb8a5a4b9 allocate formulary 2022-01-10 15:53:11 +01:00
Cayo Puigdefabregas 86d607800a allocate form 2022-01-10 13:27:27 +01:00
Cayo Puigdefabregas b191b155fd action form standart 2022-01-10 13:07:05 +01:00
Cayo Puigdefabregas a2c3741002 fix click in modal action page 2022-01-10 10:33:41 +01:00
Cayo Puigdefabregas fd00a3ec34 add view, lot and type in formulary new action 2022-01-05 16:00:13 +01:00
Cayo Puigdefabregas 7d341c7d64 adding rendering template for new action 2022-01-05 12:13:44 +01:00
Cayo Puigdefabregas 483f674957 adding edit lot and fix bug of session.commit 2022-01-05 11:10:32 +01:00
Cayo Puigdefabregas 18fead559c first step for render actions view 2022-01-04 12:56:28 +01:00
Cayo Puigdefabregas 8333d6804c Merge branch 'feature/server-side-render-devices' of github.com:eReuse/devicehub-teal into feature/server-side-render-devices 2022-01-04 12:45:36 +01:00
Cayo Puigdefabregas a518e4ebf8 fixing bug when create a new lot 2022-01-04 12:45:13 +01:00
Santiago L c2a058bf51 Merge branch 'feature/server-side-render' into feature/server-side-render-devices 2022-01-04 12:00:15 +01:00
Santiago L e1786ddcb2 Refactor: store current user on `before_request()` 2022-01-04 11:59:03 +01:00
Cayo Puigdefabregas 5b9a9d482d template necessary for create a new lot 2022-01-03 13:41:24 +01:00
Cayo Puigdefabregas 1acd3c4929 refactoring actions of javascript 2022-01-03 13:40:30 +01:00
Cayo Puigdefabregas 5bfe1584b9 add actions in menu New actions 2022-01-03 13:25:35 +01:00
Cayo Puigdefabregas d994cd2f10 remove lot 2022-01-03 12:28:42 +01:00
Cayo Puigdefabregas d17114a0b0 remove device from a lot 2022-01-03 11:32:12 +01:00
Cayo Puigdefabregas 9413e7b3c7 add as global g.user current_user 2022-01-03 11:31:40 +01:00
Cayo Puigdefabregas b730537cde add lot name in the breadcrumb 2021-12-30 22:39:56 +01:00
Cayo Puigdefabregas 0f5ab17a3f refactoring DeviceListView 2021-12-30 21:40:44 +01:00
Cayo Puigdefabregas d3dc5c8986 view for create an edit the a lot 2021-12-30 21:35:54 +01:00
Cayo Puigdefabregas a0ef40328a fix url of redirect when add one device in a lot 2021-12-30 19:57:18 +01:00
Cayo Puigdefabregas 715702658f adding the lots in the correct section 2021-12-30 19:46:34 +01:00
Cayo Puigdefabregas b7a723866b adding lot view 2021-12-30 17:23:34 +01:00
Cayo Puigdefabregas d2701de62b moving selectpicker to main_inventory 2021-12-30 13:55:11 +01:00
Cayo Puigdefabregas 8411a005df adding csrf_token to addinglot.html 2021-12-30 13:54:14 +01:00
Cayo Puigdefabregas ae4dd59f07 adding new viewLotDeviceAddView 2021-12-30 13:53:28 +01:00
Cayo Puigdefabregas e1c46e4725 adding form class for addinglot 2021-12-30 13:52:06 +01:00
Cayo Puigdefabregas 94bf3aaf87 management of the form of adding a device in a batch from the frontend 2021-12-30 12:41:37 +01:00
Cayo Puigdefabregas a5a08a162c adding lots in to modal addinglot form 2021-12-29 13:44:28 +01:00
Cayo Puigdefabregas f0dd2fb4ec adding modal menu in for lots 2021-12-29 13:02:39 +01:00
Cayo Puigdefabregas 8591af5abd adding buttons of lots actions exports and tags with dropdown menu 2021-12-29 12:14:29 +01:00
Cayo Puigdefabregas 2ea5c875c1 table with search and ordering fields 2021-12-29 10:57:39 +01:00
Cayo Puigdefabregas 5b07c274ef drop submoduls in inventory module 2021-12-29 10:13:34 +01:00
Cayo Puigdefabregas e0de5c018c changes order the input checkbox in the devices table 2021-12-29 10:13:03 +01:00
Santiago L 74ae8ce559 Replace favicon with USOdy logo 2021-12-29 08:30:46 +01:00
Santiago L b1d7eb12b7 Set page title 2021-12-29 08:17:42 +01:00
Santiago L 9f31c2cad8 Implement 'remember me' feature 2021-12-29 08:10:26 +01:00
Cayo Puigdefabregas 1da6484f26 adding table 2021-12-28 14:14:02 +01:00
Cayo Puigdefabregas c8be2bb640 adding rendering list 2021-12-28 13:55:56 +01:00
Cayo Puigdefabregas 9e042125a3 clean configs 2021-12-28 13:55:26 +01:00
Santiago L f4e2689f82 Add USOdy logo to login & navbar 2021-12-28 13:41:45 +01:00
Santiago L e97ee61c36 Define Stamps link to StampsView 2021-12-28 13:31:24 +01:00
Santiago L a9515dce13 Print current_user info & drop topbar unused elements 2021-12-28 13:26:56 +01:00
Santiago L 43b5a67cab Create logout view 2021-12-28 13:05:41 +01:00
Cayo Puigdefabregas a23d3427fb Merge branch 'feature/server-side-render' into feature/server-side-render-devices 2021-12-28 12:36:46 +01:00
Cayo Puigdefabregas ed48df70db adding templates for inventory1 2021-12-28 12:36:02 +01:00
Santiago L c226844a43 Encapsulate required app config on Devicehub 2021-12-28 12:32:38 +01:00
Cayo Puigdefabregas 8aa997a2f6 comment decorators 2021-12-28 11:46:17 +01:00
Cayo Puigdefabregas fb81edf799 insert LoginManager in devicehub app 2021-12-28 11:45:53 +01:00
Cayo Puigdefabregas 1feb287ca0 SECRET_KEY in config 2021-12-28 11:13:30 +01:00
Santiago L 338afcc556 Secure UserProfileView with login_required 2021-12-28 09:44:04 +01:00
Santiago L 3af67fee01 Implement user login based on sessions 
Use Flask-Login & Flask-WTF libraries
 2021-12-28 09:39:12 +01:00
Santiago L 95cc6f5e94 Update links on sidebar menu 2021-12-27 09:58:27 +01:00
Santiago L a0509a23a4 Create user login view 2021-12-27 09:15:06 +01:00
Santiago L bf5c76cd04 Create base_site.html 2021-12-27 09:14:10 +01:00
Santiago L 093e1d415d Refactor: use Flask class based views 2021-12-27 08:54:55 +01:00
Santiago L d5b972e9e3 Create base template based on NiceAdmin Template 
Only minimal dependencies are loaded:
- bootstrap
- bootstrap-icons
 2021-12-23 00:41:59 +01:00
Santiago L 339d7f7d7f Create core Blueprint skeleton 2021-12-23 00:29:44 +01:00
Cayo Puigdefabregas 47dcb5efe8 fixing tests 2021-12-21 10:32:04 +01:00
Cayo Puigdefabregas 4acd03e714 fixing ereuse pdf 2021-12-21 09:55:06 +01:00
Cayo Puigdefabregas 46dd173a12 fixing tests 2021-12-16 14:00:54 +01:00
Cayo Puigdefabregas a670a01c5e fixing bug us2524 2021-12-16 13:21:35 +01:00
Cayo Puigdefabregas 10a1e23a5d Metrics only lot 2021-12-07 13:20:16 +01:00
Cayo Puigdefabregas daed1bdafb . 2021-12-03 09:54:59 +01:00
Cayo Puigdefabregas ba858aff89 fixing permitions for excel 2021-11-29 12:15:37 +01:00
Cayo Puigdefabregas f0d9ead977 deactivate removes for RAMs slots 2021-11-26 14:08:11 +01:00
Cayo Puigdefabregas 596b54f818 up of version 2021-11-25 10:29:32 +01:00
Cayo Puigdefabregas 03ee4fba34 changes some values of headers 2021-11-24 12:20:40 +01:00
Cayo Puigdefabregas 0543fb64a5 Merge branch 'testing' into feature/power_on_hours 2021-11-24 11:17:26 +01:00
Cayo Puigdefabregas e8ccbedf40 change of version 2021-11-24 10:15:18 +01:00
Cayo Puigdefabregas c4a2b720ef adding property power_on_hours 2021-11-23 15:27:16 +01:00
Cayo Puigdefabregas 56dcdf2897 get_status docuemnts in metrics 2021-11-23 11:08:48 +01:00
cayop b117a4b267
Merge pull request #170 from eReuse/feature/delete-devices 
Feature/delete devices
 2021-11-22 12:38:00 +01:00
Cayo Puigdefabregas 2d5ead7c1b checking permitions of actions 2021-11-22 12:01:12 +01:00
Cayo Puigdefabregas e09073216c fixing migration 2021-11-22 11:34:03 +01:00
Cayo Puigdefabregas bef5df414b fixing bug in sync 2021-11-22 11:14:27 +01:00
Cayo Puigdefabregas 40bf280c75 Fixing name of document container in metrics 2021-11-22 10:31:20 +01:00
Cayo Puigdefabregas 9d4df05831 litle bugfix taiga 2357 2021-11-22 10:16:39 +01:00
Cayo Puigdefabregas 818e3ad0cc new tests 2021-11-19 12:44:52 +01:00
Cayo Puigdefabregas 3b41ddb66a Merge branch 'testing' into feature/delete-devices 2021-11-19 12:07:14 +01:00
Cayo Puigdefabregas aa17d4b492 clean code test 2021-11-19 11:34:13 +01:00
Cayo Puigdefabregas d8382f8331 drop assert for lot[devices] in dummy 2021-11-18 11:52:59 +01:00
Cayo Puigdefabregas 63f7adf69c try to use only_fields for devices but not used 2021-11-18 11:50:29 +01:00
Cayo Puigdefabregas 5510417125 reduce latency for timeout for lots 2021-11-18 11:48:57 +01:00
Cayo Puigdefabregas e447e15aeb fixing update of migration 2021-11-12 22:26:08 +01:00
Cayo Puigdefabregas fb5286648d fixing update of migration 2021-11-12 22:24:23 +01:00
Cayo Puigdefabregas 287ac8d741 fixing migration of olds confirmRevokes datas 2021-11-12 22:16:02 +01:00
Cayo Puigdefabregas 8e47af8e27 refactoring trading and trading for web 2021-11-12 10:00:43 +01:00
Cayo Puigdefabregas 1279180700 fixing confirms 2021-11-11 22:50:07 +01:00
Cayo Puigdefabregas e326e8ccdf fixing revoke when the device is in one future trade 2021-11-11 22:21:58 +01:00
Cayo Puigdefabregas 872a0be866 rebuild trading function 2021-11-11 22:08:28 +01:00
Cayo Puigdefabregas cef22f01ce fixing deletr_from_trade 2021-11-11 17:23:45 +01:00
Cayo Puigdefabregas 54977d432d refactory in delete_from_trade function 2021-11-11 17:06:26 +01:00
Cayo Puigdefabregas 9dc79a59dc fixing revokeView and reset_owner 2021-11-10 18:59:44 +01:00
Cayo Puigdefabregas f06007e199 fixing conflict 2021-11-08 18:07:07 +01:00
Cayo Puigdefabregas c7ced04e9d fixing bug for documents 2021-11-08 17:33:22 +01:00
Cayo Puigdefabregas f8be48d524 fixing schema 2021-11-05 13:10:23 +01:00
Cayo Puigdefabregas 6bf1354109 fixing change status next trade 2021-11-05 13:00:01 +01:00
Cayo Puigdefabregas 5ebf4f48b5 adding trade in status actions 2021-11-05 12:35:10 +01:00
Cayo Puigdefabregas 56df40c81a fixing actions for computer 2021-11-04 13:27:25 +01:00
Cayo Puigdefabregas 6de83ce4d2 Fixing order of actions_multiple devices 2021-11-04 11:58:15 +01:00
Cayo Puigdefabregas b233b7bb75 fixed 2021-11-03 10:37:15 +01:00
Cayo Puigdefabregas 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +01:00
Cayo Puigdefabregas c34cbb5c26 fixing metrics 2021-11-02 12:47:23 +01:00
Cayo Puigdefabregas 283f869b4d drop remove 2021-10-28 12:19:49 +02:00
Cayo Puigdefabregas 03238acb9f fixing session in listener 2021-10-26 16:35:41 +02:00
Cayo Puigdefabregas 5861d2fd6f fixing session in listener 2021-10-26 16:21:05 +02:00
Cayo Puigdefabregas 5cce2f4efb change some sintaxis 2021-10-25 13:24:22 +02:00
Cayo Puigdefabregas 15fa4546d1 fixing general case for devices 2021-10-25 12:20:16 +02:00
Cayo Puigdefabregas 1c2f6ba92c fixing tests 2021-10-23 13:02:10 +02:00
Cayo Puigdefabregas 9faa1697a7 fixing event device 2021-10-22 21:14:10 +02:00
Cayo Puigdefabregas 6091f31c17 adding event instead of reuse create_code function 2021-10-22 19:26:27 +02:00
Cayo Puigdefabregas 2ade5a14d4 adding tag when there are a new device 2021-10-22 14:19:42 +02:00
Cayo Puigdefabregas 7c6b20597b fixing supplier permitions 2021-10-20 14:53:33 +02:00
Cayo Puigdefabregas f099a579fb fixing rows 2021-10-19 19:25:17 +02:00
Cayo Puigdefabregas 87f30a1391 adding metrics for tradeDocuments 2021-10-19 18:19:25 +02:00
Cayo Puigdefabregas 31de27769d Merge branch 'testing' into feature/new-metrix 2021-10-18 11:53:05 +02:00
Cayo Puigdefabregas 5ec005e63b resolve conflict 2021-10-18 11:47:55 +02:00
Cayo Puigdefabregas 2d37baca8d fixing minor changes of review 2021-10-18 11:20:05 +02:00
Cayo Puigdefabregas 0eed8330ce adding metrics for documents 2021-10-15 15:04:58 +02:00
Cayo Puigdefabregas 17f8aebb94 fixing rows 2021-10-14 18:13:20 +02:00
Cayo Puigdefabregas 5e9b9bf08d new metrics 2021-10-14 12:56:33 +02:00
Cayo Puigdefabregas aa7a3ffe12 Merge branch 'feature/new-recycling-action' into feature/new-metrix 2021-10-11 14:11:59 +02:00
Cayo Puigdefabregas 35e891bf5d trace in metrics 2021-10-11 14:11:56 +02:00
Cayo Puigdefabregas 007e9a96c6 Merge branch 'testing' into feature/new-recycling-action 2021-10-06 12:49:42 +02:00
Cayo Puigdefabregas fbf74643e9 resolve conflict 2021-10-06 12:11:05 +02:00
Cayo Puigdefabregas 2e564862e8 excluding when it is in one trade action 2021-10-06 11:53:41 +02:00
Cayo Puigdefabregas 03cfbfaa35 fixing model action device 2021-10-06 10:51:53 +02:00
Cayo Puigdefabregas aa4ebeb504 fixing, vanish deactivate devices 2021-10-05 14:33:28 +02:00
Cayo Puigdefabregas 9ea0a05de6 migration file 2021-10-05 14:00:55 +02:00
Cayo Puigdefabregas 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas ec2d286ed3 adding action delete 2021-10-05 11:56:19 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +02:00
Cayo Puigdefabregas 920937a51f fixing bug of trade without devices 2021-10-01 13:30:39 +02:00
Cayo Puigdefabregas 6599f4b66c fixing bug 2021-10-01 10:46:08 +02:00
Cayo Puigdefabregas eeb6db7bc2 test for recycling documents 2021-09-29 21:12:46 +02:00
Cayo Puigdefabregas 7e4af161d3 solve conflict 2021-09-29 14:13:42 +02:00
Cayo Puigdefabregas aff86a8f94 using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices 2021-09-29 12:59:44 +02:00
cayop baa5fccda0
Merge pull request #163 from eReuse/feature/container 
Feature/container
 2021-09-29 12:58:01 +02:00
Cayo Puigdefabregas 84da94430e fixing bug 2021-09-28 15:44:25 +02:00
Cayo Puigdefabregas f10f2b848f get the status and history status of one devices 2021-09-28 13:05:58 +02:00
Cayo Puigdefabregas 38db59b150 put the correct user un rol_user 2021-09-27 14:58:25 +02:00
Cayo Puigdefabregas c2b0e6341f adding new models for Use, Recycling, Refurbish and Management actions 2021-09-24 12:37:33 +02:00
Cayo Puigdefabregas b195e380a9 adding basic action reuse and recycling 2021-09-22 14:01:49 +02:00
Cayo Puigdefabregas 4eb4c1a480 downgrade of version 2021-09-22 11:35:06 +02:00
Cayo Puigdefabregas 328facab50 adding dhid 2021-09-22 11:30:37 +02:00
Cayo Puigdefabregas 9df5872a44 upgrade version 2021-09-21 12:45:58 +02:00
Cayo Puigdefabregas 1466cbc4f4 fixing bug of csv 2021-09-21 12:44:07 +02:00
Cayo Puigdefabregas 3559b98535 fixing bug 2021-09-20 16:16:53 +02:00
Cayo Puigdefabregas bcaf907255 adding total weight in lots 2021-09-10 14:07:35 +02:00
Cayo Puigdefabregas b7396b4f23 adding action moveOn inside of tradeDocuments 2021-09-09 13:34:24 +02:00
Cayo Puigdefabregas 6cd28a3e3a Adding MoveOnDocument in migration and fixing schema 2021-09-08 13:54:10 +02:00
Cayo Puigdefabregas 74af5add3c adding action moveOn endpoint 2021-09-06 12:45:47 +02:00
Cayo Puigdefabregas f398c50288 clean old code as documents 2021-09-06 12:44:57 +02:00
Cayo Puigdefabregas 0d73bb1f63 Build action moveOn 2021-09-03 16:06:53 +02:00
Cayo Puigdefabregas 1d73a8f0c1 Merge branch 'testing' into feature/container 2021-09-03 11:05:47 +02:00