Commit graph

925 commits

Author SHA1 Message Date
Cayo Puigdefabregas 01f2996c48 fixed query lots 2022-05-31 15:14:56 +02:00
Cayo Puigdefabregas b8819b7a4a change is_temporary, is_outgoing, is_incoming 2022-05-27 16:48:40 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
Cayo Puigdefabregas a486486995 fix circular imports 2022-05-20 18:30:43 +02:00
Cayo Puigdefabregas 6bf419f59a try to fix bug 2022-05-20 11:45:53 +02:00
Cayo Puigdefabregas bf455c40c9 try to fix bug 2022-05-20 11:42:39 +02:00
Cayo Puigdefabregas cea143dcbe fix lot render 2022-05-19 10:58:07 +02:00
Cayo Puigdefabregas f2a7a15851 drop pdbs 2022-05-18 18:25:21 +02:00
Cayo Puigdefabregas a7ceab2cde change SnapshotErrors for SnapshotsLog 2022-05-18 11:03:58 +02:00
Cayo Puigdefabregas 68fc1cb2bb resolv conflicts 2022-05-16 18:23:03 +02:00
Cayo Puigdefabregas b309cc4410 change Mixin clases 2022-05-16 17:52:31 +02:00
Cayo Puigdefabregas 0b78178ff4 fixed device public page 2022-05-16 10:29:07 +02:00
Cayo Puigdefabregas dd081532ba #3402 change public page of device 2022-05-13 17:17:57 +02:00
Cayo Puigdefabregas df44849ad3 add allocate status in devices export 2022-05-13 12:51:31 +02:00
Cayo Puigdefabregas 1b5f6412f0 #3397 add columns of status in the devices list 2022-05-13 12:17:14 +02:00
Cayo Puigdefabregas 1d51629796 resolve conflict 2022-05-09 16:35:44 +02:00
Santiago L 7177b0fbfd
Merge pull request #233 from RubenPX/filter-in-out-trades
Filter in out trades from lots selector
2022-05-06 07:58:11 +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 1023f3fdca add public link in model 2022-05-05 12:00:02 +02:00
Cayo Puigdefabregas d8a44c661a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-28 18:45:51 +02:00
Cayo Puigdefabregas 7362eb4492 add computer monitor 2022-04-28 17:56:00 +02:00
Cayo Puigdefabregas 3a5e806104 add icons types of devices in list of devices 2022-04-28 17:46:12 +02:00
Santiago L d0e033197c Drop Agent.get_full_name because is unused 2022-04-28 12:06:43 +02:00
Santiago L 9afe6bf9e6 Revert all changes related to ProfileForm
We need to talk about the concepts of Agent and User and their
relationship before allowing the user to update their data.
2022-04-28 12:03:12 +02:00
RubenPX c8dc1b11e2 Add trade type on api options 2022-04-28 11:22:53 +02:00
Cayo Puigdefabregas a362c8644b add sid instead of wbid in schema action snapshot 2022-04-25 11:53:27 +02:00
Cayo Puigdefabregas 7b784b6174 sid in snapshot action 2022-04-25 11:45:50 +02:00
Cayo Puigdefabregas 04cdb8181f drop settings and last_name of agent 2022-04-13 18:41:05 +02:00
Cayo Puigdefabregas 0b5d8d46d1 fixing bug 2022-04-13 13:27:58 +02:00
Cayo Puigdefabregas 89bb4770d9 fix individual call 2022-04-12 16:59:45 +02:00
Cayo Puigdefabregas 21c5cbce9f drop imports unused 2022-04-08 12:33:20 +02:00
Cayo Puigdefabregas 028f3c8e74 precommit 2022-04-08 12:26:36 +02:00
Cayo Puigdefabregas 2471fa90cf use the common enum DataStorageInterface 2022-04-08 11:40:39 +02:00
Cayo Puigdefabregas a8e05d76ae refactor build in form snapshot 2022-04-08 11:12:17 +02:00
Cayo Puigdefabregas 128140d4a8 refactoring build snapshot for reuse code 2022-04-07 21:00:45 +02:00
Cayo Puigdefabregas 9f84659026 clean white space 2022-04-06 13:49:15 +02:00
Cayo Puigdefabregas 3114c678a4 add user model fields #3017 2022-04-06 12:35:08 +02:00
Cayo Puigdefabregas cb5fb14c92 add model for save errors of parse snapshots 2022-04-04 13:27:04 +02:00
Cayo Puigdefabregas 026a88acb8 fix comparation datas put both in utc time 2022-03-31 19:40:05 +02:00
Cayo Puigdefabregas 3be389c23f review pr 212 about refactor and schemas 2022-03-30 18:27:57 +02:00
Cayo Puigdefabregas ca71494e2b add wbid in the snapshots 2022-03-30 13:48:55 +02:00
Cayo Puigdefabregas d39644716e fix bug 2022-03-29 16:59:33 +02:00
Cayo Puigdefabregas 34096b13eb clean 2022-03-29 13:36:31 +02:00
Cayo Puigdefabregas 2c71d69a9a return to the origin of firewire 2022-03-29 13:34:01 +02:00
Cayo Puigdefabregas 90dea5492e change integer for string in firewire bios 2022-03-29 12:23:51 +02:00
Cayo Puigdefabregas f4a657052a . 2022-03-29 11:20:28 +02:00
Cayo Puigdefabregas 7a09127de9 add parsing from lshw and reuse code of worbench computer for parse 2022-03-28 19:14:19 +02:00
Cayo Puigdefabregas 883c01053f fix a lot of bugs and add storage and disk to the snapshot 2022-03-25 13:55:05 +01:00
Cayo Puigdefabregas 01ceeb1be1 links parsing with snapshot view 2022-03-24 13:30:53 +01:00
Cayo Puigdefabregas 3c27d3d421 display 2022-03-22 11:06:46 +01:00
Cayo Puigdefabregas 8052618d55 parsed for network geting of lshw 2022-03-21 19:22:47 +01:00
Cayo Puigdefabregas 649e456feb Parsing cpu and chassis of computer 2022-03-18 18:19:06 +01:00
Cayo Puigdefabregas 18883b2b8d validate fields for the new snapshot 2022-03-18 12:07:22 +01:00
Santiago L beb26ca232
Merge pull request #191 from eReuse/feature/server-side-render
Server side render - devicehub v2.0.0-alpha
2022-03-15 14:59:01 +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 d25c9faf25 fix change #2825, tags only for Computers 2022-03-03 10:43:34 +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
Cayo Puigdefabregas 2542719378 fix insert hash for force not to do a commit 2022-02-07 14:03:01 +01:00
Cayo Puigdefabregas 8149d0ed7c reversed actions for see the better the traceability log 2022-02-02 13:27:53 +01:00
Cayo Puigdefabregas bd5ab802cd resolve conflict 2022-02-02 13:05:55 +01:00
Cayo Puigdefabregas 11df33060f drop pdb 2022-02-02 12:51:15 +01:00
Cayo Puigdefabregas 450cef168b solve a bug of validate 2022-02-02 12:49:03 +01:00
Cayo Puigdefabregas 10c756a884 show error msg for forms with errors of validations 2022-02-01 13:40:06 +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 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 4e43076c04 add tag list 2022-01-11 13:13:57 +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
Cayo Puigdefabregas 715702658f adding the lots in the correct section 2021-12-30 19:46:34 +01:00
Santiago L a9515dce13 Print current_user info & drop topbar unused elements 2021-12-28 13:26:56 +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
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 03ee4fba34 changes some values of headers 2021-11-24 12:20:40 +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 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 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 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 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 328facab50 adding dhid 2021-09-22 11:30:37 +02:00
Cayo Puigdefabregas 1466cbc4f4 fixing bug of csv 2021-09-21 12:44:07 +02:00