Commit Graph

202 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 8e47af8e27 refactoring trading and trading for web 2021-11-12 10:00:43 +01:00
Cayo Puigdefabregas 872a0be866 rebuild trading function 2021-11-11 22:08:28 +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 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 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +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 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 5ec005e63b resolve conflict 2021-10-18 11:47:55 +02:00
Cayo Puigdefabregas 0eed8330ce adding metrics for documents 2021-10-15 15:04:58 +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 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +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 bfe56a8626 DataWipe instead of ToErased 2021-07-29 12:45:43 +02:00
Cayo Puigdefabregas bb3145f3d8 fixing test_basic 2021-07-28 15:59:11 +02:00
Cayo Puigdefabregas 4b4c0a1480 fixing owner_id in computer 2021-07-05 12:29:21 +02:00
Cayo Puigdefabregas 8a797f079b fixing models and build views for revokeDocument 2021-06-24 19:09:12 +02:00
Cayo Puigdefabregas 21cdcb5350 simplify the algorithm for to manager the confirms flow 2021-06-07 10:50:08 +02:00
Cayo Puigdefabregas 80e74b6d3d fixing supplier and receiver 2021-06-04 19:27:01 +02:00
Cayo Puigdefabregas a0824f986b not allow than other users can insert devices, show better the status of trade for devices 2021-06-03 19:05:57 +02:00
Cayo Puigdefabregas 6142b89f41 adding confirm_status in devices 2021-05-27 15:56:10 +02:00
Cayo Puigdefabregas 2b60af8b08 fixing tests and property url of device 2021-03-09 12:54:57 +01:00
Cayo Puigdefabregas b83563e0ea swap SystemID for DevicehubID 2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas 840674e83b devicehubID instead of code 2021-03-08 19:09:12 +01:00
Cayo Puigdefabregas ff964bfe0a fixing path to hashcode 2021-03-08 13:22:37 +01:00
Cayo Puigdefabregas 06dfb9e31e adding hashcode 2021-03-08 13:06:07 +01:00
Cayo Puigdefabregas 083ce4e660 show code in web 2021-03-04 19:24:05 +01:00
Cayo Puigdefabregas bf5cae5f96 adding the create code function from ids of devices 2021-03-04 13:27:29 +01:00
Cayo Puigdefabregas 41cadcc0b3 try execute create_code 2021-03-04 10:19:31 +01:00
Cayo Puigdefabregas 269550270f add code in device and add listener 2021-03-03 20:05:48 +01:00
Cayo Puigdefabregas 8899b40408 fixed live report 2021-02-15 10:24:22 +01:00
Cayo Puigdefabregas 30246d6be5 fixing metrics 2021-02-12 20:22:04 +01:00
Cayo Puigdefabregas 7ef2a68d39 fixed 2021-02-12 20:06:20 +01:00
Cayo Puigdefabregas df42c27f20 remove EreusePrice of public info of devices 2021-02-12 10:29:23 +01:00
Cayo Puigdefabregas 1fff5cd32e add format to numbers and remove some datas 2021-02-11 20:00:57 +01:00
Cayo Puigdefabregas 72466003d0 drop all ethereum_address in the system 2021-02-10 13:05:43 +01:00
Cayo Puigdefabregas cb3f07eb5a change deposit for amount 2021-02-05 13:21:20 +01:00
Cayo Puigdefabregas fe824cc4fa drop deliverynote_address 2021-02-04 13:06:51 +01:00
Cayo Puigdefabregas 5ae61d30bc adding systemId in metrics csv 2021-01-20 10:39:02 +01:00
Cayo Puigdefabregas f140c48359 fixing bug of lifetime 2021-01-19 16:06:46 +01:00
Cayo Puigdefabregas 8b8ff2d2c1 refixed bug 2021-01-14 18:18:59 +01:00
Cayo Puigdefabregas ae596e2a49 fixing bug 2021-01-14 18:10:50 +01:00
Cayo Puigdefabregas d974d3d78f ereuse_devicehub/resources/action/models.py 2021-01-14 17:32:03 +01:00
Cayo Puigdefabregas 12f28ba76f metrics in csv 2021-01-13 18:11:41 +01:00
Cayo Puigdefabregas af1cb704d5 fixing aspect_ratio 2020-12-17 16:52:42 +01:00
Cayo Puigdefabregas 882da7b9b1 . 2020-12-17 16:03:10 +01:00
Cayo Puigdefabregas b8812f0b82 change required for display, functionality and apparence 2020-12-17 13:08:06 +01:00
Cayo Puigdefabregas 5241c73a98 not required chassis in all system 2020-12-17 10:45:01 +01:00
Cayo Puigdefabregas 349170aa99 nullable chassis 2020-12-16 11:57:51 +01:00
Cayo Puigdefabregas 729281383e resolve conflicts 2020-12-10 10:30:50 +01:00
Cayo Puigdefabregas 2c67e3be93 resolve conflict 2020-12-09 12:32:00 +01:00
Cayo Puigdefabregas eaa20b4302 fixing conflict merge with testing 2020-12-09 11:12:47 +01:00
Cayo Puigdefabregas 05c81382f2 change comment of allocated 2020-12-01 15:55:21 +01:00
Cayo Puigdefabregas 4172711c93 change the endpoints for allocate and deallocate 2020-11-27 18:10:51 +01:00
Cayo Puigdefabregas 73716a7331 fixing tests 2020-11-23 11:43:30 +01:00
Cayo Puigdefabregas ee70288432 validate errors of allocate in scheme instead of signal 2020-11-22 18:47:58 +01:00
Cayo Puigdefabregas 32a17decd7 remove receives 2020-11-20 18:16:56 +01:00
Cayo Puigdefabregas cf3d44a5e3 adding receives 2020-11-19 15:25:56 +01:00
Cayo Puigdefabregas 0ab8a36832 bugfix with none in the mac serial 2020-11-13 11:05:00 +01:00
Cayo Puigdefabregas 82a3344965 centralized in one point the hid 2020-11-12 20:57:33 +01:00
Cayo Puigdefabregas 0a7e805f3e clean events from device models 2020-11-11 16:52:02 +01:00
Cayo Puigdefabregas cbe6bb7e90 adding mac of networkadapter to hid 2020-11-10 20:45:03 +01:00
Cayo Puigdefabregas 52bd6d5271 fixed similar_one for get only from your devices 2020-11-06 17:09:39 +01:00
Cayo Puigdefabregas 50a7b59957 fixed bug: owner_id is not a physical property 2020-11-03 20:26:03 +01:00
Cayo Puigdefabregas 5ac1e8efba adding manually migrate and change model of device 2020-10-30 21:08:55 +01:00
Cayo Puigdefabregas 1400d292ce refactoring 2020-10-27 21:29:38 +01:00
Cayo Puigdefabregas 9a488887f5 modify devices models for add listeners 2020-10-16 16:25:46 +02:00
nad a2a24f20cc Reformat code following PEP8 2020-08-17 16:45:18 +02:00
Jordi Nadeu 75150437b6
Adding severity to incomplete HID when POST an action Snapshot (#32)
* Adding severity to incomplete HID snapshot

* Minor fixes when HID are null
2020-07-07 17:17:19 +02:00
Big Lebowski 315f5b793a Merge branch 'mvp_deliverynote' into devel 2020-04-13 22:45:25 +02:00
yiorgos marinellis e78b1c5db3 Change FOREIGN keys to User.ethereum_address to User.id, resolves #14 2020-04-06 13:08:07 +02:00
nad 713452e4e1 Fixing HID field to accepts null values 2020-03-25 16:47:57 +01:00
emmdim dfb518068d Adds ethereum address to device, and adds PATCH 2020-03-19 01:55:26 +01:00
emmdim 225e018cdc Adds deposit field in Computer 2020-03-11 13:07:01 +01:00
jordi.nadeu d1cff3e44e first iteration integration with blockchain 2020-03-11 13:04:18 +01:00
nad dc8aea9b9b Adds display size to mobile device schema 2020-03-11 13:04:18 +01:00
nad 024a9a7d24 first iteration with mobile schema/model 2020-03-11 13:04:18 +01:00
emmdim 8a0957f512 Changes author_id (uid) to owner_address (ethereum)
and receiver_id to receiver_address (just the name)
+ minor impvrovements
2019-12-19 01:38:03 +01:00
JNadeu cabcfaa830 adds new attributes on Computer model 2019-12-17 23:57:55 +01:00
emmdim 31357276ae Adds author_id to Computer resource 2019-12-11 02:19:13 +01:00
emmdim bdd996a132 Adds deposit field in Computer 2019-12-11 00:35:17 +01:00
Xavier Bustamante Talavera ce961a1bed Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT 2019-07-07 21:36:09 +02:00
Xavier Bustamante Talavera f40f7187de Add Camera, LOTS project temporal devices 2019-07-01 20:39:32 +02:00
Xavier Bustamante Talavera c92d6b3282 Merge branch 'rate' into devel 2019-07-01 11:31:18 +02:00
Xavier Bustamante Talavera ad1781b9ec Set version, variant, sku as CIText 2019-07-01 11:30:48 +02:00
Xavier Bustamante Talavera 7e8c36ab3e Snyc with new Workbench models; fix SSL bug 2019-06-29 16:26:14 +02:00
nad 3d6fef9927 change comments to comply with the standard PEP 257 2019-06-19 13:35:26 +02:00