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

248 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 83bdf79514 add render views for delivery and receiver notes 2022-06-06 13:37:58 +02:00
Cayo Puigdefabregas e635abdbbc views of delivery note and receiver note 2022-06-03 20:01:13 +02:00
Cayo Puigdefabregas 88a0bdd44d resolv conflicts 2022-06-03 11:34:49 +02:00
Cayo Puigdefabregas cce7dbfdf1 add view for advanced search 2022-06-02 13:46:10 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
Cayo Puigdefabregas f6d4c48487 drop pdbs 2022-05-31 10:22:01 +02:00
Cayo Puigdefabregas a1728810d1 fixed bugs 2022-05-30 17:35:27 +02:00
Cayo Puigdefabregas b0c58595c1 add EditTransfer 2022-05-30 16:33:01 +02:00
Cayo Puigdefabregas a8368e92b8 add html and form for transfers 2022-05-27 16:32:22 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
Cayo Puigdefabregas 9590cff193 bugfix parse errors messages 2022-05-20 13:44:11 +02:00
Cayo Puigdefabregas f2a7a15851 drop pdbs 2022-05-18 18:25:21 +02:00
Cayo Puigdefabregas b8c97780be add snapshotslog Ok result 2022-05-18 18:02:08 +02:00
Cayo Puigdefabregas a7ceab2cde change SnapshotErrors for SnapshotsLog 2022-05-18 11:03:58 +02:00
Cayo Puigdefabregas edeae562d6 resolve conflict 2022-05-16 18:33:34 +02:00
Cayo Puigdefabregas 68fc1cb2bb resolv conflicts 2022-05-16 18:23:03 +02:00
Cayo Puigdefabregas 960c971197 Change workbench_lite for schema_workbench 2022-05-16 17:57:09 +02:00
Cayo Puigdefabregas b309cc4410 change Mixin clases 2022-05-16 17:52:31 +02:00
Cayo Puigdefabregas d935c987b3 comiter monitor instead of monitor 2022-05-16 12:40:14 +02:00
Cayo Puigdefabregas 3bd2dd79b1 remove all components in the filter of the inventory 2022-05-16 11:01:52 +02:00
Santiago L a444579c05
Merge pull request #271 from eReuse/feature/all-device-list 
Feature: 3196 all device list
 2022-05-13 10:26:49 +02:00
Santiago L d54f2166dc Keep unassigned as default option on device list 
Unassigned devices are the ones that require user attention and
also all devices view will generate larger responses and more
server load.
 2022-05-13 10:22:32 +02:00
Santiago L 9e779d279c Allow retrieving all devices of a user 2022-05-12 14:42:55 +02:00
Cayo Puigdefabregas b6966328fb fixed bug #3383 2022-05-12 10:09:03 +02:00
Cayo Puigdefabregas eac90d32cf fixed bug #3386 2022-05-12 10:05:37 +02:00
Cayo Puigdefabregas 37c43fe3d1 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-10 11:00:40 +02:00
Cayo Puigdefabregas a54d57f4ab fix the All devices option 2022-05-10 10:22:22 +02:00
Cayo Puigdefabregas b10a8c9e35 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-09 17:07:07 +02:00
Cayo Puigdefabregas d800c6950c fixed bug 2022-05-09 16:48:34 +02:00
Cayo Puigdefabregas 1d51629796 resolve conflict 2022-05-09 16:35:44 +02:00
Cayo Puigdefabregas 04e4f4ff74 add generics filters 2022-05-09 13:43:02 +02:00
Cayo Puigdefabregas 252c5285d8 refactorice 2022-05-09 11:12:34 +02:00
Cayo Puigdefabregas e34b591690 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 13:32:32 +02:00
Cayo Puigdefabregas af30453c12 fix message of allocate bug 2022-05-05 13:10:02 +02:00
Cayo Puigdefabregas 9eda5c0466 add checks of device.allocated 2022-05-05 11:31:13 +02:00
Cayo Puigdefabregas 67ee1cdde8 resolve conflict 2022-04-29 19:26:44 +02:00
Cayo Puigdefabregas be53827c02 sid in parser and inventory 2022-04-25 11:45:25 +02:00
Cayo Puigdefabregas bb62798ffe Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-22 09:55:59 +02:00
Cayo Puigdefabregas e37fa49c3e fix bug in validation actions 2022-04-21 14:01:33 +02:00
Cayo Puigdefabregas 5595d0ddcf fix Computer device in the list 2022-04-18 17:20:07 +02:00
Santiago L cdc3417c74 Remove unused code (part 2) 2022-04-12 13:49:00 +02:00
Cayo Puigdefabregas c8b11cf505 fix wbid bug 2022-04-12 11:13:08 +02:00
Cayo Puigdefabregas 089dc92d62 fix bug upload snapshot from web 2022-04-12 10:25:45 +02:00
Cayo Puigdefabregas f6c332cdbf fix bug 2022-04-08 17:05:50 +02:00
Cayo Puigdefabregas 09738478ae change schema_version for schema_api 2022-04-08 16:46:57 +02:00
Cayo Puigdefabregas 59e8db205d clean build2 from form uploadSnapshot 2022-04-08 11:17:58 +02:00
Cayo Puigdefabregas a8e05d76ae refactor build in form snapshot 2022-04-08 11:12:17 +02:00
Cayo Puigdefabregas 0150b88e6e Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-05 12:49:53 +02:00
Cayo Puigdefabregas b13c3347b9 add SnapshotErrors in inventory form 2022-04-05 09:22:02 +02:00
Cayo Puigdefabregas aa5d93cf48 modularize labels instead of tags into inventory 2022-03-31 14:04:16 +02:00
Cayo Puigdefabregas 90ad7afdc8 review pr 212 mv schemas, refactor forms and clean code 2022-03-30 18:29:15 +02:00
Cayo Puigdefabregas d70810e88b drop pdb 2022-03-30 10:21:33 +02:00
Cayo Puigdefabregas 7e9a78428a flake8 fixes 2022-03-29 17:20:58 +02:00
Cayo Puigdefabregas e41ee5a987 add snapshot lite to new fornt end 2022-03-29 13:36:18 +02:00
Santiago L 358c569eea Rewrite comment to be more clear 2022-03-22 11:37:46 +01:00
Cayo Puigdefabregas 6bad17013d save snapshot 2022-03-17 18:52:58 +01:00
Cayo Puigdefabregas 3ac3802719 Filter for show only dhid tags 2022-03-17 18:09:08 +01:00
Cayo Puigdefabregas a8df3f5e5a Render a template for get a labels of multiple devices 2022-03-16 13:06:42 +01:00
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
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 62f42e9e05 fix bug 2022-03-08 10:15:21 +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 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 d98d09cc7d propagate error of connection with the tag server to the view 2022-03-04 13:32:37 +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
Santiago L 473a7a02de
Update ereuse_devicehub/inventory/forms.py 2022-03-02 18:51:04 +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 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 b6cf1f1e3e Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements 2022-02-28 13:06:04 +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 04cc244f2d resolve conflict 2022-02-25 10:07:44 +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 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 4ce359fec4 Merge branch 'feature/server-side-render' into feature/server-side-render-actions-trade 2022-02-21 13:05:38 +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 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 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 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 764d749db0 datawipe form example as 2 forms in one 2022-02-08 13:59:50 +01:00
Cayo Puigdefabregas 2a92b1f747 add form for data wipe 2022-02-07 14:02:28 +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 662f75bb7b refactoring and put again the lot in form of actions 2022-02-04 12:10:27 +01:00
Cayo Puigdefabregas 4ebb312e59 first step for datawipe form 2022-02-03 11:27:16 +01:00
Cayo Puigdefabregas f79abb05cd isort 2022-02-03 10:50:36 +01:00
Cayo Puigdefabregas 71f5a8a98b fix doble query 2022-02-02 13:51:54 +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 10c756a884 show error msg for forms with errors of validations 2022-02-01 13:40:06 +01:00
Cayo Puigdefabregas 65a774550e resolv conflicts 2022-01-31 10:41:40 +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
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 5eb2b0ee5f link a tag with one device 2022-01-25 12:53:36 +01:00
Cayo Puigdefabregas 55ce612b2a resolv conflict 2022-01-25 10:37:30 +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 5566e7adb7 save snapshot and try to make exception with duplicates 2022-01-18 11:45:28 +01:00
Cayo Puigdefabregas 9d6d95bbc3 add snapshot of devicehub teal in formulary of snapshot 2022-01-17 14:17:26 +01:00
Cayo Puigdefabregas bdc518b949 fixing create lot id 2022-01-12 20:26:37 +01:00
Cayo Puigdefabregas 849e482d62 add named tags 2022-01-11 13:42:01 +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 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 a518e4ebf8 fixing bug when create a new lot 2022-01-04 12:45:13 +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 d3dc5c8986 view for create an edit the a lot 2021-12-30 21:35:54 +01:00
Cayo Puigdefabregas e1c46e4725 adding form class for addinglot 2021-12-30 13:52:06 +01:00