Commit Graph

793 Commits

Author SHA1 Message Date
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 81618a9e1b Adds transfer_state in deliveryNote init 2020-03-10 15:51:16 +01:00
yiorgos marinellis 98bd4dd897 Set camelCase fields, correct fields in PATCH, fix typo in GET deliverynote 2020-03-04 18:52:07 +01:00
yiorgos marinellis de8af45065 Apply 0 Lot : 0-1 Deliverynote relationship 2020-03-04 18:49:55 +01:00
yiorgos marinellis f5b2f3c2f6 Add GET a deliverynote by id 2020-03-04 17:44:58 +01:00
yiorgos marinellis fdd93b0941 Make nested depth deeper to include neccessary info for delivery note within a lot 2020-03-03 20:33:37 +01:00
yiorgos marinellis 22e3469129 Embed deliverynote to lot schema 2020-03-03 20:32:34 +01:00
yiorgos marinellis 8e5511b587 Receiver, creator, deposit, expected/transferred devices constraints, remove GET, PATCH delivery note 2020-03-03 20:32:04 +01:00
yiorgos marinellis 3d96e8190d Add ethereum_address, receiver_address to deliverynote and PATCH it 2020-03-03 13:10:42 +01:00
nad 5dd4092e53 Merge remote-tracking branch 'origin/mvp' into devel 2020-03-03 12:59:31 +01:00
Big Lebowski 886271c99f Create, get, list collection for Deliverynote 2020-03-03 12:55:56 +01:00
yiorgos marinellis a387e7590c Rename Deliverynote and add more fields, no tests 2020-03-03 12:55:56 +01:00
yiorgos marinellis b831a48b60 Add a dummny DeliveryNote entity 2020-03-03 12:55:56 +01:00
JNadeu 01c385c350 adds in dummy more lots and devices 2020-03-03 12:55:56 +01:00
emmdim 769fb5cce3 Adds Transferred event 2020-03-03 12:55:56 +01:00
JNadeu 726c520440 adds in dummy new lots of diferents users 2020-03-03 12:55:56 +01:00
JNadeu 862706e2c1 Adds new action TransferOwnership 2020-03-03 12:55:56 +01:00
emmdim 2175cd5efa Makes deposit writable and applies range check from
0-100
2020-03-03 12:55:56 +01:00
emmdim dd82f0e2d9 Changes author_id (uid) to owner_address (ethereum)
and receiver_id to receiver_address (just the name)
+ minor impvrovements
2020-03-03 12:55:56 +01:00
emmdim 6ef3e8dded Updates dummy users 2020-03-03 12:55:56 +01:00
emmdim c9d4ae9646 Adds 'author_id' in /lot PATCH 2020-03-03 12:55:56 +01:00
emmdim 5748a45d2c Propagates PATCH /lot updates to the involved devices 2020-03-03 12:55:56 +01:00
JNadeu 8be56c93f9 adds new attributes on Computer model 2020-03-03 12:55:14 +01:00
JNadeu ede36eabd6 minor fixes 2020-03-03 12:54:57 +01:00
emmdim 619e7f27e9 Minor updates 2020-03-03 12:54:21 +01:00
jordi.nadeu 80e9badbee adds to dummy more users with ethereum address 2020-03-03 12:54:21 +01:00
jordi.nadeu a85ebf0a8b add new attributes in Lot and User models 2020-03-03 12:54:21 +01:00
emmdim 0898a41e62 Adds receiver column in Lot model and updates
Lot views PATCH to be able to modify the needed values
2020-03-03 12:54:21 +01:00
jordi.nadeu 047bac9096 add change in Lot and Actions views 2020-03-03 12:54:21 +01:00
emmdim c90d72708f Adds TransferStateEnum and makes it a Lot field 2020-03-03 12:54:21 +01:00
emmdim 087acfd180 Adds deposit and author is lot resources 2020-03-03 12:54:21 +01:00
emmdim 06071f7001 Adds author_id to Computer resource 2020-03-03 12:54:21 +01:00
emmdim 91f5fa4e75 Adds deposit field in Computer 2020-03-03 12:54:21 +01:00
jordi.nadeu 4fc6378258 first iteration integration with blockchain 2020-03-03 12:54:21 +01:00
nad 4c8a876f97 Merge remote-tracking branch 'origin/mvp_deliverynote' into mvp 2020-03-03 12:52:28 +01:00
nad f9d73653c7 Merge remote-tracking branch 'origin/deliverynote' into mvp
# Conflicts:
#	ereuse_devicehub/resources/lot/views.py
2020-03-03 12:26:24 +01:00
nad 1497f91684 Adds display size to mobile device schema 2020-03-03 12:03:09 +01:00
Big Lebowski d9315c2a25 Create, get, list collection for Deliverynote 2020-02-29 22:58:49 +01:00
yiorgos marinellis 48f7201e3f Rename Deliverynote and add more fields, no tests 2020-02-27 18:29:26 +01:00
yiorgos marinellis 46fcfa6d6d Add a dummny DeliveryNote entity 2020-02-26 20:21:59 +01:00
nad a93c2737f6 first iteration with mobile schema/model 2020-02-18 13:50:48 +01:00
nad 7d9c737d49 minores fixes, adds tqdm requirements and add vscode folder to gitignore 2020-02-18 13:38:29 +01:00
JNadeu fe238be6b6 adds in dummy more lots and devices 2019-12-23 17:36:20 +01:00
emmdim 64a43e63d7 Adds Transferred event 2019-12-23 13:31:54 +01:00
JNadeu 50ba0be170 adds in dummy new lots of diferents users 2019-12-21 17:51:29 +01:00
JNadeu b649bf7ac4 Adds new action TransferOwnership 2019-12-21 16:41:23 +01:00
emmdim 259285c59c Makes deposit writable and applies range check from
0-100
2019-12-19 12:27:02 +01:00