yiorgos marinellis
|
2851d4112f
|
Fix typo
|
2020-04-28 22:55:17 +02:00 |
|
|
yiorgos marinellis
|
bd0621884b
|
Filter lots with owner id or deliverynote receiver or supplier
|
2020-04-28 22:33:33 +02:00 |
|
|
yiorgos marinellis
|
59d6d69bda
|
Add user filtering which is evaluate whether or not lot is specified
|
2020-04-28 21:20:40 +02:00 |
|
|
yiorgos marinellis
|
252c60ea89
|
Filter cumputer devices on current user and lot's deliverynote receiver
|
2020-04-22 17:53:06 +02:00 |
|
|
yiorgos marinellis
|
1beb5964ba
|
Create alembic environment
|
2020-04-17 14:33:50 +02:00 |
|
Big Lebowski
|
315f5b793a
|
Merge branch 'mvp_deliverynote' into devel
|
2020-04-13 22:45:25 +02:00 |
|
|
Big Lebowski
|
23b5afe1d8
|
Merge branch 'feature/rm-ethereum-constraint' into mvp_deliverynote
|
2020-04-13 13:21:51 +02:00 |
|
|
yiorgos marinellis
|
61fd9de477
|
Remove caching when returning lots, devices, fixes UI issue 18
|
2020-04-06 13:10:39 +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 |
|
|
yiorgos marinellis
|
bc69d194f4
|
Make supplier_id, receiver_id optional for ProofReuse, fixes #21
|
2020-03-27 11:48:25 +01:00 |
|
nad
|
713452e4e1
|
Fixing HID field to accepts null values
|
2020-03-25 16:47:57 +01:00 |
|
|
yiorgos marinellis
|
edf2e39fc7
|
Change proofAuthor to proofAuthorID and resolves #18
|
2020-03-25 15:38:29 +01:00 |
|
|
yiorgos marinellis
|
bd2d72ad69
|
Replace ethereum_address for User with id
|
2020-03-24 22:34:53 +01:00 |
|
|
yiorgos marinellis
|
e78d62602b
|
Align ProofTransfer to Chapter 6 on specs, fixes #12
|
2020-03-23 18:52:05 +01:00 |
|
|
yiorgos marinellis
|
8a818bdc00
|
Add schemas for all proofs, redefince and 1-1 relation to device
|
2020-03-23 18:52:05 +01:00 |
|
emmdim
|
4f6eb00d3a
|
Reverts temporarilty the propagation of values for
devices until a clear Device registration strategy takes place
|
2020-03-20 15:48:40 +01:00 |
|
|
emmdim
|
bd396f0642
|
Adds new PATCH properties for device
|
2020-03-20 15:47:42 +01:00 |
|
|
emmdim
|
b70c229485
|
Implements #13, but currently can be applied only
to transferred devices
|
2020-03-20 15:20:22 +01:00 |
|
|
emmdim
|
dfb518068d
|
Adds ethereum address to device, and adds PATCH
|
2020-03-19 01:55:26 +01:00 |
|
|
yiorgos marinellis
|
f6af58ef51
|
Update ProofTransfer
|
2020-03-17 23:47:02 +01:00 |
|
|
yiorgos marinellis
|
390fb30d4f
|
Update ProofRecycle
|
2020-03-17 23:45:23 +01:00 |
|
|
yiorgos marinellis
|
e3f960aa8b
|
Add ProofFunction view except author field
|
2020-03-17 23:36:27 +01:00 |
|
|
nad
|
16560462fa
|
Minor fixes to generate documentation correctly
|
2020-03-17 18:42:53 +01:00 |
|
|
nad
|
640cc9910f
|
Changing dummy, adding new user and lot owners
|
2020-03-17 12:14:56 +01:00 |
|
|
nad
|
e437476110
|
Merge remote-tracking branch 'origin/mvp_proof' into devel
|
2020-03-17 11:54:22 +01:00 |
|
|
Big Lebowski
|
3ce32f2dd4
|
Add Proof N:M Device relation and support deviceIDs on POST
|
2020-03-17 02:03:48 +01:00 |
|
|
Big Lebowski
|
621e172e55
|
Add required field result and ethereumHash on POST
|
2020-03-17 00:57:14 +01:00 |
|
|
yiorgos marinellis
|
0d9dccda47
|
First implementation of batch POST of ProofDataWipe
|
2020-03-16 00:26:20 +01:00 |
|
|
yiorgos marinellis
|
c9f6217e42
|
Implement batch view
|
2020-03-12 17:07:35 +01:00 |
|
|
yiorgos marinellis
|
ac8375c98f
|
Add view and schemas
|
2020-03-12 15:11:38 +01:00 |
|
|
Big Lebowski
|
994dce4349
|
Add base proof models
|
2020-03-12 00:40:41 +01:00 |
|
|
emmdim
|
2aa527c0c3
|
Resolves minor naming issue
|
2020-03-11 19:28:15 +01:00 |
|
|
nad
|
7f5dcb3679
|
Fixing export csv fields (first iteration)
|
2020-03-11 18:47:27 +01:00 |
|
|
emmdim
|
2810990fda
|
Convertes expected_devices into a JSON Array,
closes #10
|
2020-03-11 18:39:58 +01:00 |
|
jordi.nadeu
|
c172a8ca4b
|
add change in Lot and Actions views
|
2020-03-11 13:19:41 +01:00 |
|
|
jordi.nadeu
|
480afb3b12
|
first iteration integration with blockchain
|
2020-03-11 13:19:40 +01:00 |
|
|
jordi.nadeu
|
8389ffeb54
|
add change in Lot and Actions views
|
2020-03-11 13:10:55 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
emmdim
|
73937e0545
|
Updates dummy users
|
2019-12-19 01:25:29 +01:00 |
|
|
emmdim
|
b31f315a76
|
Adds 'author_id' in /lot PATCH
|
2019-12-18 16:37:45 +01:00 |
|
|
emmdim
|
c119c951f5
|
Propagates PATCH /lot updates to the involved devices
|
2019-12-18 14:29:25 +01:00 |
|
|
JNadeu
|
cabcfaa830
|
adds new attributes on Computer model
|
2019-12-17 23:57:55 +01:00 |
|
|
emmdim
|
4bdf9502d6
|
Minor updates
|
2019-12-17 17:16:13 +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 |
|
|
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 |
|
|
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 |
|
|
jordi.nadeu
|
14d5379edb
|
fix footer logo on public link report
|
2019-11-05 15:43:09 +01:00 |
|
|
jordi.nadeu
|
38bd39dd9a
|
minor changes on public link report
|
2019-10-22 17:53:26 +02:00 |
|
|
jordi.nadeu
|
b99a332cd8
|
change erasure report and public link html templates
|
2019-10-22 15:54:39 +02:00 |
|
|
jordi.nadeu
|
83d9d12afb
|
delete visual test to compute rate (v1)
|
2019-10-22 15:53:44 +02:00 |
|
Xavier Bustamante Talavera
|
7bdc68ce8b
|
Add lot template
|
2019-07-09 17:01:40 +02: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
|
f8ec8fc882
|
Change ReadyToUse for Available
|
2019-07-06 15:06:22 +02:00 |
|
|
Xavier Bustamante Talavera
|
922a8c743a
|
Fix last commit changes
|
2019-07-02 10:42:56 +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 |
|
|
Xavier Bustamante Talavera
|
928863bfdf
|
Update comments in actions; remove workbench folder in rate
|
2019-06-12 16:49:55 +02:00 |
|
|
nad
|
c19783954e
|
adding comments about rate algorithm
|
2019-05-14 20:31:43 +02:00 |
|
|
Xavier Bustamante Talavera
|
61f4c127d4
|
Change event to action complying with schema.org
|
2019-05-11 16:27:22 +02:00 |
|
|
Xavier Bustamante Talavera
|
0dc8ced255
|
Sort events by default using end_time
|
2019-05-10 18:00:38 +02:00 |
|
|
Xavier Bustamante Talavera
|
58be2162f7
|
Fix imprecisions in rate algorithms and small bugfixes
|
2019-05-10 11:58:38 +02:00 |
|
|
Xavier Bustamante Talavera
|
16d00256df
|
Review rate changes
|
2019-05-08 19:12:05 +02:00 |
|
|
Xavier Bustamante Talavera
|
e6d496872c
|
Merge branch 'master' into rate
# Conflicts:
# ereuse_devicehub/resources/event/models.py
# ereuse_devicehub/resources/event/models.pyi
# ereuse_devicehub/resources/event/schemas.py
|
2019-05-03 15:02:09 +02:00 |
|
|
Xavier Bustamante Talavera
|
92be9c1aa1
|
Add fields in display and device; add battery, measureBattery
|
2019-05-03 14:31:49 +02:00 |
|
|
nad
|
252f995ac7
|
add order to snapshot events
|
2019-05-02 18:04:14 +02:00 |
|
|
nad
|
7bb514d23c
|
rewrite some tests to rate v2 structure
|
2019-05-02 17:49:15 +02:00 |
|
|
nad
|
2108526cec
|
fix some snapshots errors
|
2019-04-30 10:26:06 +02:00 |
|
|
nad
|
1ca7df4969
|
refactor score fixtures files (snapshots) to new rate v2 structure
|
2019-04-30 02:03:09 +02:00 |
|
|
nad
|
7b6a2cd1db
|
refactor score code to new rate v2 structure
|
2019-04-30 02:02:23 +02:00 |
|
|
nad
|
880b5e706e
|
refactor score to new rate version structure
|
2019-04-23 21:27:31 +02:00 |
|
|
nad
|
75e1817e9c
|
pass rate workbench test v1
|
2019-04-16 17:47:28 +02:00 |
|
|
nad
|
0c5fa197d7
|
Merge remote-tracking branch 'origin/rate' into rate
# Conflicts:
# ereuse_devicehub/resources/event/models.py
# ereuse_devicehub/resources/event/rate/main.py
|
2019-04-11 18:30:53 +02:00 |
|
|
nad
|
825c07c5f9
|
first commit refactor score
|
2019-04-11 18:29:51 +02:00 |
|