Commit Graph

20 Commits

Author SHA1 Message Date
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
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
jordi.nadeu 552c2a4166 adds to dummy more users with ethereum address 2019-12-16 20:38:41 +01:00
jordi.nadeu fa99283389 add new attributes in Lot and User models 2019-12-16 19:17:30 +01:00
emmdim 58ff2e69e2 Adds receiver column in Lot model and updates
Lot views PATCH to be able to modify the needed values
2019-12-14 22:11:28 +01:00
jordi.nadeu 9b22bcd8f6 Merge remote-tracking branch 'origin/mvp' into deliverynote 2019-12-12 15:50:09 +01:00
jordi.nadeu 778db58272 Merge branch 'mvp' into deliverynote 2019-12-12 11:23:58 +01:00
emmdim 0f81be6878 Adds TransferStateEnum and makes it a Lot field 2019-12-12 01:25:11 +01:00
emmdim 856745ef91 Adds deposit and author is lot resources 2019-12-11 02:49:47 +01:00
jordi.nadeu f600a6edde first iteration integration with blockchain 2019-12-09 17:24:24 +01:00
Xavier Bustamante Talavera 0a9fbb0226 Delete lots; add LotParent view; use parents, all_devices relationships; return uiTree with list of lots and parents 2018-11-13 15:52:27 +01:00
Xavier Bustamante Talavera bcf59de383 Delete lots; add LotDeviceDescendants view really fixing querying devices in lots 2018-11-11 21:52:55 +01:00
Xavier Bustamante Talavera b5e3d0c6ec Add description in lot, xfail test for lot delete 2018-11-06 18:08:57 +01:00
Xavier Bustamante Talavera 863578559c Filter devices by being inside lots 2018-10-06 12:45:56 +02:00
Xavier Bustamante Talavera 4f0493c464 Update pagination and return URL for Lot, Device, Event resources 2018-10-05 17:13:23 +02:00
Xavier Bustamante Talavera f7112d7fe1 Add Lot.parents 2018-09-12 14:53:14 +02:00
Xavier Bustamante Talavera aa52367f03 Iterate over SQLA Result / Query instead of .all() 2018-09-11 22:51:13 +02:00
Xavier Bustamante Talavera 39c79aef04 View for adding / removing lots / devices from lots 2018-09-11 21:50:40 +02:00
Xavier Bustamante Talavera 804a696390 Correctly place teal imports 2018-09-07 12:38:02 +02:00
Xavier Bustamante Talavera 08a250f162 Change name Edge for Path and use py interface 2018-08-27 16:32:45 +02:00