f9281fbdc0
Merge branch 'testing' into feature/#126-named-system-tags
2021-03-16 20:01:55 +01:00
4d01e7f05d
fixing bug unamed in csv
2021-03-16 15:43:42 +01:00
d7e50be052
models of new trade
2021-03-16 14:31:38 +01:00
2b60af8b08
fixing tests and property url of device
2021-03-09 12:54:57 +01:00
b83563e0ea
swap SystemID for DevicehubID
2021-03-08 22:43:24 +01:00
840674e83b
devicehubID instead of code
2021-03-08 19:09:12 +01:00
ff964bfe0a
fixing path to hashcode
2021-03-08 13:22:37 +01:00
b902ab24f8
accept all type of docs
2021-03-08 13:19:35 +01:00
2175987c85
hashcode insted of hascode
2021-03-08 13:09:01 +01:00
06dfb9e31e
adding hashcode
2021-03-08 13:06:07 +01:00
f331128741
adding TagCode to tag named system
2021-03-08 12:39:17 +01:00
0d7a098ac5
adding sequence internal_id
2021-03-05 11:31:47 +01:00
3a4410a4ce
upgrade actual datas in migration
2021-03-04 20:42:50 +01:00
083ce4e660
show code in web
2021-03-04 19:24:05 +01:00
bf5cae5f96
adding the create code function from ids of devices
2021-03-04 13:27:29 +01:00
6bb608b1a6
resolve confict
2021-03-04 10:51:20 +01:00
372427375d
correct response for every stamp check
2021-03-04 10:38:04 +01:00
41cadcc0b3
try execute create_code
2021-03-04 10:19:31 +01:00
269550270f
add code in device and add listener
2021-03-03 20:05:48 +01:00
e58b08e12c
add code in migrations
2021-03-03 20:04:57 +01:00
f148a42da1
base of migration
2021-03-03 10:39:40 +01:00
7e541f13a1
change env file name
2021-03-02 21:27:14 +01:00
8f3c9c33cb
adding the correct vars to env
2021-03-02 17:11:34 +01:00
0d0005b315
adding file env for download
2021-03-02 11:42:07 +01:00
adb9a8e25a
basic endpoint for wbconf
2021-03-01 19:21:57 +01:00
b811e0572c
delete tags named
2021-03-01 17:56:55 +01:00
adcb330b87
fixing same tag 2 users get with a validate user
2021-02-26 18:59:32 +01:00
8d6e50ece9
fixing unique secondary and owner
2021-02-26 18:58:10 +01:00
ac032c7902
fixing primary keys
2021-02-26 13:25:21 +01:00
159eab29c2
restrict to named tags
2021-02-26 13:23:50 +01:00
3931d2456f
add endpoint for deassociate tags of devices
2021-02-26 11:29:17 +01:00
689d0c48c8
change the model of tags from org to user
2021-02-26 11:28:32 +01:00
aa33688382
fixed 2 bugs
2021-02-24 23:22:36 +01:00
929ad8e2e9
.
2021-02-24 20:18:13 +01:00
4c08f65218
fixing internal stats
2021-02-23 17:40:36 +01:00
79902ee26d
adding lives action to the document of internal stats
2021-02-23 12:23:07 +01:00
2a38070ae0
prepare auth for internal stats
2021-02-22 21:18:25 +01:00
181b7da69f
adding EMAIL_ADMIN to config
2021-02-22 21:14:56 +01:00
d1b50cc212
simple internal stats
2021-02-22 15:49:13 +01:00
ce4dce055d
basic endpoint for internal stats
2021-02-19 12:53:42 +01:00
24669631ce
adding hash for all documents than you download
2021-02-18 11:36:55 +01:00
b9bd367487
verify one document
2021-02-17 17:38:54 +01:00
817dc9a8f3
up the version
2021-02-17 17:38:10 +01:00
8899b40408
fixed live report
2021-02-15 10:24:22 +01:00
30246d6be5
fixing metrics
2021-02-12 20:22:04 +01:00
7ef2a68d39
fixed
2021-02-12 20:06:20 +01:00
df42c27f20
remove EreusePrice of public info of devices
2021-02-12 10:29:23 +01:00
91848a548c
deactivate manual merge
2021-02-11 20:38:18 +01:00
1fff5cd32e
add format to numbers and remove some datas
2021-02-11 20:00:57 +01:00
0535a1f310
resolve conflict
2021-02-11 13:03:21 +01:00
deff20afae
fixing migrations
2021-02-11 12:51:50 +01:00
afa4f9ce45
fixing tests
2021-02-10 13:40:24 +01:00
72466003d0
drop all ethereum_address in the system
2021-02-10 13:05:43 +01:00
e34371bbc5
Drop Transferred action
2021-02-10 10:41:24 +01:00
1a0287f8f9
adding documentId in csv of devices report
2021-02-07 18:16:43 +01:00
f80db15506
change name of automatic lot of deliverynote
2021-02-05 15:58:39 +01:00
6b7571fe86
change deposit for amount
2021-02-05 15:35:52 +01:00
cb3f07eb5a
change deposit for amount
2021-02-05 13:21:20 +01:00
a0546e284e
fixed a litle bug of documentId representation
2021-02-04 20:42:50 +01:00
2619f88a9f
drop all proof
2021-02-04 13:50:00 +01:00
fe824cc4fa
drop deliverynote_address
2021-02-04 13:06:51 +01:00
ee4bf45c72
restart name of lot
2021-02-04 11:13:55 +01:00
b9f3d5976b
drop ethereum_address of deliverynote
2021-02-03 22:28:04 +01:00
7a88d9d730
change the name of lot with documentId
2021-02-03 22:06:27 +01:00
6ca37e348c
change erasure.html template
2021-01-26 13:52:23 +01:00
9cc82e7a82
return to previus state
2021-01-26 12:24:02 +01:00
1e50386b93
fixed test
2021-01-25 16:10:23 +01:00
47b7b4224c
test and fixed bug 1860
2021-01-22 13:19:29 +01:00
14a27a3d85
bug fix change smallint for integer
2021-01-21 17:13:36 +01:00
5ae61d30bc
adding systemId in metrics csv
2021-01-20 10:39:02 +01:00
f140c48359
fixing bug of lifetime
2021-01-19 16:06:46 +01:00
a7d51655b6
fixing url of link
2021-01-18 17:18:47 +01:00
0273021d50
fixing title page
2021-01-18 12:48:54 +01:00
1ec1eb39bf
fixing test base
2021-01-18 12:40:31 +01:00
3b2f09a37c
static page for stamps
2021-01-18 10:54:50 +01:00
b5e64bf0aa
fixing definitly total_seconds
2021-01-14 18:31:33 +01:00
8b8ff2d2c1
refixed bug
2021-01-14 18:18:59 +01:00
ae596e2a49
fixing bug
2021-01-14 18:10:50 +01:00
652273db90
fixinfg bufgs and tests
2021-01-14 17:32:46 +01:00
d974d3d78f
ereuse_devicehub/resources/action/models.py
2021-01-14 17:32:03 +01:00
12f28ba76f
metrics in csv
2021-01-13 18:11:41 +01:00
810a9b360c
adding new endpoit for download csv of metrics
2021-01-08 17:37:52 +01:00
245549336a
fixing bug of 2 users with the same device and launch one live
2021-01-08 10:46:34 +01:00
e9a5cfe2f1
fixing bug for live snapshot
2021-01-04 15:53:58 +01:00
e10985ed44
bugfix path licences
2020-12-29 21:14:07 +01:00
1c34ea0074
fixing migrations
2020-12-29 20:55:11 +01:00
dbbab28844
adding migration
2020-12-29 20:39:04 +01:00
2d4c4d4c89
adding endpoint licences
2020-12-29 17:37:13 +01:00
fdd5b9bb77
fixing live
2020-12-29 17:36:28 +01:00
676cfe96d8
new endpoint live
2020-12-28 18:02:47 +01:00
4ffd95c158
search bug
2020-12-28 17:45:50 +01:00
9ca23a51a2
search bug
2020-12-28 17:45:21 +01:00
b3573f31eb
change endpoint live
2020-12-28 15:31:57 +01:00
b1f45e10a5
fixedbug created field in model
2020-12-22 13:04:16 +01:00
2deb861fc7
update version
2020-12-22 12:59:16 +01:00
96540d701c
fixing lineterminator in csv
2020-12-21 16:09:30 +01:00
3c12d1f75c
add endpoint
2020-12-21 13:40:07 +01:00
db610d2853
insert hash3 when document is download
2020-12-21 11:34:03 +01:00
db19f90009
clean
2020-12-18 20:11:50 +01:00
db92c390d9
fixed migration and insert_hash function
2020-12-18 20:10:58 +01:00
d8c7d55366
alembic for define the hash table
2020-12-18 16:45:08 +01:00
af1cb704d5
fixing aspect_ratio
2020-12-17 16:52:42 +01:00
882da7b9b1
.
2020-12-17 16:03:10 +01:00
c480e96f79
drop required in monitor too
2020-12-17 15:09:21 +01:00
b8812f0b82
change required for display, functionality and apparence
2020-12-17 13:08:06 +01:00
36cd61c0bd
simplify token in search
2020-12-17 11:35:55 +01:00
5241c73a98
not required chassis in all system
2020-12-17 10:45:01 +01:00
aef220a5dc
chassis not required
2020-12-16 22:05:33 +01:00
b1c141e02b
migration nullable chassis
2020-12-16 12:06:19 +01:00
349170aa99
nullable chassis
2020-12-16 11:57:51 +01:00
48d866b2d5
allembic for upgrade datas for actual hid's computers
2020-12-15 20:52:41 +01:00
de2539091c
allembic for upgrade datas for actual hid's computers
2020-12-15 20:45:47 +01:00
b23b4d9e2a
change version in this branch
2020-12-10 11:15:12 +01:00
2e11a9f28f
resolve conflict CHANGELOG
2020-12-10 11:13:12 +01:00
51d0bd0cc0
Merge branch 'testing' into bugfix/88-action-end_time
2020-12-10 10:54:11 +01:00
729281383e
resolve conflicts
2020-12-10 10:30:50 +01:00
14e974781e
fixing bugs
2020-12-09 19:54:24 +01:00
09d92e818c
fixed the TODO of live action
2020-12-09 13:28:50 +01:00
16132414e6
fixing bug in query
2020-12-09 12:49:56 +01:00
634806ec1c
fixing security query in live action
2020-12-09 12:37:20 +01:00
2c67e3be93
resolve conflict
2020-12-09 12:32:00 +01:00
68a8f70de4
resolve conflict
2020-12-09 11:29:10 +01:00
eaa20b4302
fixing conflict merge with testing
2020-12-09 11:12:47 +01:00
2daee4ddd8
update version
2020-12-09 10:23:58 +01:00
e2446c5001
Merge branch 'testing' into bugfix/89-snapshots-in-hdd
2020-12-09 10:11:45 +01:00
835f875e2e
fixed comments
2020-12-04 19:33:05 +01:00
7e41c66073
implementing the warnings and unnormal cases
2020-12-04 16:58:53 +01:00
c03d872d91
fixed bug hid == None
2020-12-02 13:15:21 +01:00
8a508ebc0e
modify live action
2020-12-02 12:53:15 +01:00
4d9420d1e9
adding final user and timings as property instead of insert this datas in the database
2020-12-01 22:03:15 +01:00
783265ad65
adding finale user to live action
2020-12-01 17:27:43 +01:00
05c81382f2
change comment of allocated
2020-12-01 15:55:21 +01:00
567a575e36
Merge branch 'feature/renting' of https://github.com/eReuse/devicehub-teal into feature/renting
2020-12-01 15:53:51 +01:00
1e597cdb93
clean code
2020-12-01 15:48:49 +01:00
70733db95d
fixing bugs
2020-12-01 15:45:19 +01:00
92c403579b
ading finalUserCode to allocate action
2020-12-01 15:33:49 +01:00
0fa7930d88
fixing bug
2020-11-30 21:18:10 +01:00
4a217634c7
change code for transaction
2020-11-30 18:47:17 +01:00
23abf3e08d
change code for transaction
2020-11-30 18:17:47 +01:00
c140a58ca2
Update models.pyi of actions Allocate and Deallocate
2020-11-30 17:42:02 +01:00
dd42b10ba5
search the bug
2020-11-30 16:37:52 +01:00
a9f6e9ccaa
fixing bug
2020-11-28 18:47:35 +01:00
4172711c93
change the endpoints for allocate and deallocate
2020-11-27 18:10:51 +01:00
daeae1b4b4
fixed deallocate code bug
2020-11-26 19:08:07 +01:00
988f5c1751
fixed dates
2020-11-26 18:51:36 +01:00
b072bc3b57
change allocate and deallocate
2020-11-26 18:44:08 +01:00
ef563e3595
resolve confict
2020-11-25 19:09:24 +01:00
0c1e5b8307
changes from review
2020-11-25 18:42:36 +01:00
ab7bf75bd7
new version of fixed with suppress
2020-11-25 17:57:43 +01:00
2ed3e3f77f
fixing LookupError of metrics
2020-11-25 17:46:58 +01:00
4421db3858
clean metrics with views
2020-11-25 13:58:53 +01:00
4657a3bcf9
clean metrics
2020-11-25 13:58:32 +01:00
413ce7d76c
adding metrics
2020-11-24 21:15:49 +01:00
87704db271
adding live into snapshot and adding test
2020-11-24 13:44:49 +01:00
8999b6e9a5
adding migration for live
2020-11-23 18:42:31 +01:00
8b4c27dfe2
modify live model
2020-11-23 18:35:50 +01:00
6334120237
Adding endpoint of metrics
2020-11-23 18:03:06 +01:00
60579437bb
resolve conflict
2020-11-23 16:32:06 +01:00
3e8eb03b58
fixing bug
2020-11-23 15:53:56 +01:00
78c1f13260
clean code
2020-11-23 15:53:25 +01:00
73716a7331
fixing tests
2020-11-23 11:43:30 +01:00
ee70288432
validate errors of allocate in scheme instead of signal
2020-11-22 18:47:58 +01:00
0e53919607
listener
2020-11-21 19:10:31 +01:00
775cd9a215
fixing bugs
2020-11-21 15:52:29 +01:00
0415b7efb9
deallocate
2020-11-21 13:17:23 +01:00
32a17decd7
remove receives
2020-11-20 18:16:56 +01:00
67d7e27cf9
adding view of receives
2020-11-19 21:04:14 +01:00
a1eb0f4c90
end point receive
2020-11-19 17:00:30 +01:00
c75cdb2c60
fixed model receive
2020-11-19 17:00:04 +01:00
13ee6d09e6
adding acctions into receives
2020-11-19 15:50:21 +01:00
cf3d44a5e3
adding receives
2020-11-19 15:25:56 +01:00
11d766d2a4
remove deallocate view
2020-11-19 11:38:41 +01:00
200974e8f6
remove deallocate
2020-11-19 11:36:09 +01:00
9f1564a533
add column inuse to device table
2020-11-18 19:15:30 +01:00
5adfad8a5e
adding deallocate
2020-11-18 19:00:43 +01:00
cc6f16934d
fixing migrations
2020-11-18 18:21:22 +01:00
16735d0199
change assigned for allocate
2020-11-18 18:13:13 +01:00
64fe93491c
change name rent resource for assigned
2020-11-18 11:31:23 +01:00
69368a8ca3
rent with assigned concept
2020-11-17 19:21:32 +01:00
e0b338b414
add migration file for assigned action
2020-11-17 13:36:26 +01:00
820e253a12
new version of rent as asigned
2020-11-17 13:19:50 +01:00
b6f2dedaeb
adding changelog
2020-11-16 20:37:35 +01:00
8acca4d2cf
definition rent endpoint
2020-11-16 20:32:28 +01:00
2f761f338a
drop facilities in a shell
2020-11-13 13:25:51 +01:00
0ab8a36832
bugfix with none in the mac serial
2020-11-13 11:05:00 +01:00
791308d8e8
modify hid when create the snapshot
2020-11-12 21:00:07 +01:00
a122753e34
when add or remove components check again the hid
2020-11-12 20:58:38 +01:00
82a3344965
centralized in one point the hid
2020-11-12 20:57:33 +01:00
554ec254d8
identation problem
2020-11-11 16:59:30 +01:00
0fb81bea78
adding history to shell cli
2020-11-11 16:54:13 +01:00
17f1ff98e7
adding update hid when insert one manual or automatic snapshot
2020-11-11 16:53:41 +01:00
0a7e805f3e
clean events from device models
2020-11-11 16:52:02 +01:00
cbe6bb7e90
adding mac of networkadapter to hid
2020-11-10 20:45:03 +01:00
725e586e85
Merge branch 'testing' into bugfix/79-manual-merge
2020-11-09 16:11:12 +01:00
fb899b558f
Merge branch 'testing' into feature/77-add-owner-device
2020-11-06 21:26:43 +01:00
3eecdb4a1e
filter from owners in get private device or redirect to public and filter devices from owner the manual merge
2020-11-06 17:13:37 +01:00
8a471c98c0
todo an automatic merge with sync only of your devices
2020-11-06 17:10:32 +01:00
52bd6d5271
fixed similar_one for get only from your devices
2020-11-06 17:09:39 +01:00
dac0d1d32f
adding migration of datas in migrate file
2020-11-04 20:22:31 +01:00
ed93fa7b29
update the datas in the migration process
2020-11-04 17:30:46 +01:00
9b25132c29
fixed bug for use filters from the website
2020-11-04 17:30:12 +01:00
50a7b59957
fixed bug: owner_id is not a physical property
2020-11-03 20:26:03 +01:00
f043d66591
migration file for add owner into device tables
2020-11-03 19:34:58 +01:00
5ac1e8efba
adding manually migrate and change model of device
2020-10-30 21:08:55 +01:00
19eca48db0
resolve conflict
2020-10-29 19:19:33 +01:00
f7f7432c4e
Merge pull request #81 from eReuse/bugfix/74-json-backup-time-in-name
...
Bugfix/74 json backup time in name
2020-10-29 19:08:31 +01:00
5f68803d9f
adding the directory structure for save all jsons
2020-10-29 16:09:02 +01:00
6d4a7e7abb
Merge pull request #72 from eReuse/bugfix/64-bug-updated-date
...
Bugfix/64 bug updated date
2020-10-29 13:23:58 +01:00
b2c258b699
fixed mark time correctly in the name file of json
2020-10-29 12:10:12 +01:00
73d9db3a88
fixing bug moving tags
2020-10-28 22:15:28 +01:00
25f3cdb172
Merge pull request #71 from eReuse/bugfix/69-ereuseprice-computer-type
...
Bugfix/69 ereuseprice computer type
2020-10-28 17:59:37 +01:00
fe3f038218
refactoring and fixing some problems of manual merge
2020-10-28 13:30:22 +01:00
1400d292ce
refactoring
2020-10-27 21:29:38 +01:00
19279acaeb
clean view of merge
2020-10-27 19:13:31 +01:00
ab1d268f14
rebuild the query for more post structured
2020-10-27 19:12:46 +01:00
b10ed84836
adding columns rate when no there are rate
2020-10-23 10:27:16 +02:00
20f2300ce1
modify the pull requirements
2020-10-22 15:54:01 +02:00
1f4d30df32
rebuild rows with all new collumns
2020-10-21 22:11:55 +02:00
ed2f71c150
add delimeter as ; in csv
2020-10-21 22:09:15 +02:00
2f7c34af2e
graphic card
2020-10-21 13:17:32 +02:00
e6401fff3c
cpus, rams, disks
2020-10-21 13:06:47 +02:00
195c5265e4
document new function
2020-10-16 16:30:53 +02:00
9a488887f5
modify devices models for add listeners
2020-10-16 16:25:46 +02:00
ae1ecb59e2
add listener a event
2020-10-16 16:25:13 +02:00
c7abf29706
clean all previus modifications
2020-10-16 16:24:48 +02:00
14d4d0aed0
fixed view
2020-10-16 15:26:12 +02:00
139c1e290a
resolve conflict
2020-10-16 15:12:21 +02:00
76806299cd
update devices when there are a new action
2020-10-16 15:08:54 +02:00
75b5a4a710
Adding test and fix for Issue 69 EreusePrice Computer type
2020-10-15 13:19:47 +02:00
79b4c738e9
change the name of the file
2020-10-15 11:00:11 +02:00
a702f2f9b3
Merge branch 'testing' into feature/61-Json-Backup
2020-10-14 11:41:02 +02:00
d3ef6cc65d
add user to the name file of json and more readable date
2020-10-13 15:59:39 +02:00
ae98d3154c
TMP_SNAPSHOTS defined in config file
2020-10-13 15:37:21 +02:00
c1595aa305
clean imports unused
2020-10-13 14:44:44 +02:00
49668a4f4f
open files using with statement
2020-10-09 20:54:12 +02:00
99a12b2b22
bugfix
2020-10-09 20:40:22 +02:00
2a53e1672c
using os.path.join instead of format
2020-10-09 20:29:02 +02:00
f257f192e6
fixed bug
2020-10-09 11:35:16 +02:00
382dd3373f
change response header html for json
2020-10-09 11:00:49 +02:00
258c3b4efd
more simple patch in post view
2020-10-08 14:47:11 +02:00
0e89af1215
catch all exceptions and save de snapshot
2020-10-07 19:58:09 +02:00
56907e7055
fixed bug
2020-10-07 18:37:23 +02:00
aed9e8c2d6
change name
2020-10-07 18:29:18 +02:00
9a24eb5fd5
save snapshot in a temporal file
2020-10-07 18:28:57 +02:00
9f13d36524
pass to beta version
2020-10-05 18:42:37 +02:00
ec671312db
add decouple to config the system
2020-09-29 09:42:05 +02:00
fed6b57bbe
import __version__ instead of open file __init__
2020-09-22 11:57:39 +02:00
6c45754710
fixing the default version
2020-09-22 11:36:01 +02:00
ea6691247a
change pkg_resources for open __init__
2020-09-21 11:34:55 +02:00
3d171626f3
adding logger info when the connection is fail
2020-09-18 11:05:42 +02:00
c21d54dcb5
adding version in __init__.py instead of setup.py
2020-09-17 21:48:57 +02:00
51f51b1e92
get version of ereuse-tag
2020-09-17 21:09:22 +02:00
255701467a
fixing name of VersionView
2020-09-16 17:40:16 +02:00
5cb0dad77d
add VersionView as view
2020-09-15 17:44:12 +02:00
f8e6020be6
endpoint versions
2020-09-15 13:22:28 +02:00
9fa96c3d3b
Revert "Changing devices transfer_states on delivery note PATCH"
...
This reverts commit 5c562752
2020-08-25 15:57:17 +02:00
5c56275228
Changing devices transfer_states on delivery note PATCH
2020-08-25 15:31:15 +02:00
927594f7a7
Merge pull request #50 from eReuse/feature/endpoints
...
Adding basic tests endpoints
2020-08-25 10:25:04 +02:00
306bad966b
Adding lot permissions to LotsDocumentView
2020-08-18 21:02:54 +02:00
1fccea2bcc
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
...
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# tests/test_documents.py
2020-08-18 19:31:43 +02:00
6087044a5e
Fixing test_get_multiple_lots and test_api_docs
2020-08-18 19:19:18 +02:00
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
5c7444dc4d
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
...
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# ereuse_devicehub/resources/lot/views.py
# tests/test_documents.py
2020-08-18 11:23:50 +02:00
24578e7188
Merge pull request #48 from eReuse/feature/46-device-stock-control
...
Feature/46-device-stock-control
2020-08-17 18:11:48 +02:00
a2a24f20cc
Reformat code following PEP8
2020-08-17 16:45:18 +02:00
0bfc08f81f
Check snapshot permissions only when it comes from Workbench
2020-08-17 16:30:11 +02:00
8c493da370
Merge remote-tracking branch 'origin/testing' into feature/27-permission-posting-action
2020-08-17 16:05:06 +02:00
65ba42ada8
Fixing test_documents.py::test_export_basic_snapshot and test_documents.py::test_export_full_snapshot
2020-08-17 15:57:27 +02:00
b6138f9108
Merge branch 'testing' into feature/46-device-stock-control
2020-08-17 11:33:27 +02:00
59932ba00d
Adding exceptions to device_row.py file
2020-08-17 11:18:52 +02:00
801a8a6c4a
add filter as user owner
2020-08-06 16:51:49 +02:00
d973b479cf
return to put anonymous access to erasures documents
2020-08-06 15:55:14 +02:00
cdf36583a9
bug fixed: there is no point in having self.AUTH for view DocumentDef
2020-08-05 17:51:13 +02:00
cc17a32e12
Merge branch 'feature/15-update-test-suite' into feature/22-device-lot-visibility
2020-08-05 13:09:03 +02:00
e372811d6e
Merge branch 'testing' into feature/22-device-lot-visibility
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
2020-08-05 13:00:22 +02:00
a052abc72d
Minor fix indentation error
2020-08-05 11:56:59 +02:00
04557905c8
Merge branch 'testing' into feature/46-device-stock-control
2020-08-05 11:49:18 +02:00
6017476822
Adding query to Lot views
2020-08-03 18:25:55 +02:00
a2303498cd
Minors comments changes and new test_get_all_lots was added
2020-07-28 16:22:17 +02:00
c0fcfcfdbf
Creating 'documents/lots/' endpoint
2020-07-28 16:16:17 +02:00
c90fa4e84e
Adding stock row class for new document endpoint
2020-07-27 13:56:56 +02:00
936c042c62
Creating document stock endpoint
2020-07-23 20:55:27 +02:00
1a6afe29d3
bugfix tag test with cli
2020-07-23 19:20:53 +02:00
9e57b0aee7
new feature for shell. Create_client
2020-07-23 17:44:24 +02:00
114613ddf7
document stock
2020-07-23 15:56:51 +02:00
8fd2e06f0a
Merge branch 'testing' into feature/27-permission-posting-action
2020-07-20 15:42:11 +02:00
d041ef6a54
First iteration test suite mvp ( #37 )
...
* First commit marking mvp decorator
* Minor code style enhancements
* Fixing some mvp test
* Fixing some mvp test
* Fixing test_sync_execute_register_no_hid_tag_not_linked
* First iteration with almost all mvp tests working correctly
* Rollback models.pyi of lot and device resources
* Changing Github action to execute tests with tag mvp
2020-07-07 17:17:41 +02:00
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
d172a0e756
Tag-User relationship ( #43 )
...
* Add owner_id reference in tag model and related migration
* Add owner param to views and cli commands and schema
* Create tag which belong to an owner from dummy script
2020-07-07 14:58:55 +02:00
d2d48280cb
Merge two devices ( #40 )
...
* Add authenticated view to merge two devices
* Assign actions of argument device to device
* Merge device components
* Sloppy implementation to test
* Correctly update base device
* Correctly append actions
2020-07-07 14:58:37 +02:00
8d112c1360
Abort snapshot action if current user is not owner of the
...
(non-component) device
2020-06-01 20:43:10 +03:00
c3cffbeaa7
Add callable to get inventory from command line
2020-05-22 18:43:01 +02:00
77e29e0475
Update README
2020-05-15 20:14:00 +02:00
f9858f50ab
Create schema with SQLAlchemy and stamp as head migration
2020-05-11 10:07:23 +02:00
0849d39d5d
Add initial db schema from autogenerated alembic
2020-05-04 21:40:17 +02:00
e021702e0c
Update nesting level to depth 2 when returning lots not UiTree
2020-04-29 20:41:32 +02:00
2851d4112f
Fix typo
2020-04-28 22:55:17 +02:00
bd0621884b
Filter lots with owner id or deliverynote receiver or supplier
2020-04-28 22:33:33 +02:00
59d6d69bda
Add user filtering which is evaluate whether or not lot is specified
2020-04-28 21:20:40 +02:00
252c60ea89
Filter cumputer devices on current user and lot's deliverynote receiver
2020-04-22 17:53:06 +02:00
1beb5964ba
Create alembic environment
2020-04-17 14:33:50 +02:00
315f5b793a
Merge branch 'mvp_deliverynote' into devel
2020-04-13 22:45:25 +02:00
23b5afe1d8
Merge branch 'feature/rm-ethereum-constraint' into mvp_deliverynote
2020-04-13 13:21:51 +02:00
61fd9de477
Remove caching when returning lots, devices, fixes UI issue 18
2020-04-06 13:10:39 +02:00
e78b1c5db3
Change FOREIGN keys to User.ethereum_address to User.id, resolves #14
2020-04-06 13:08:07 +02:00
bc69d194f4
Make supplier_id, receiver_id optional for ProofReuse, fixes #21
2020-03-27 11:48:25 +01:00
713452e4e1
Fixing HID field to accepts null values
2020-03-25 16:47:57 +01:00
edf2e39fc7
Change proofAuthor to proofAuthorID and resolves #18
2020-03-25 15:38:29 +01:00
bd2d72ad69
Replace ethereum_address for User with id
2020-03-24 22:34:53 +01:00
e78d62602b
Align ProofTransfer to Chapter 6 on specs, fixes #12
2020-03-23 18:52:05 +01:00
8a818bdc00
Add schemas for all proofs, redefince and 1-1 relation to device
2020-03-23 18:52:05 +01:00
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
bd396f0642
Adds new PATCH properties for device
2020-03-20 15:47:42 +01:00
b70c229485
Implements #13 , but currently can be applied only
...
to transferred devices
2020-03-20 15:20:22 +01:00
dfb518068d
Adds ethereum address to device, and adds PATCH
2020-03-19 01:55:26 +01:00
f6af58ef51
Update ProofTransfer
2020-03-17 23:47:02 +01:00
390fb30d4f
Update ProofRecycle
2020-03-17 23:45:23 +01:00
e3f960aa8b
Add ProofFunction view except author field
2020-03-17 23:36:27 +01:00
16560462fa
Minor fixes to generate documentation correctly
2020-03-17 18:42:53 +01:00
640cc9910f
Changing dummy, adding new user and lot owners
2020-03-17 12:14:56 +01:00
e437476110
Merge remote-tracking branch 'origin/mvp_proof' into devel
2020-03-17 11:54:22 +01:00
3ce32f2dd4
Add Proof N:M Device relation and support deviceIDs on POST
2020-03-17 02:03:48 +01:00
621e172e55
Add required field result and ethereumHash on POST
2020-03-17 00:57:14 +01:00
0d9dccda47
First implementation of batch POST of ProofDataWipe
2020-03-16 00:26:20 +01:00
c9f6217e42
Implement batch view
2020-03-12 17:07:35 +01:00
ac8375c98f
Add view and schemas
2020-03-12 15:11:38 +01:00
994dce4349
Add base proof models
2020-03-12 00:40:41 +01:00
2aa527c0c3
Resolves minor naming issue
2020-03-11 19:28:15 +01:00
7f5dcb3679
Fixing export csv fields (first iteration)
2020-03-11 18:47:27 +01:00
2810990fda
Convertes expected_devices into a JSON Array,
...
closes #10
2020-03-11 18:39:58 +01:00
c172a8ca4b
add change in Lot and Actions views
2020-03-11 13:19:41 +01:00
480afb3b12
first iteration integration with blockchain
2020-03-11 13:19:40 +01:00
8389ffeb54
add change in Lot and Actions views
2020-03-11 13:10:55 +01:00
225e018cdc
Adds deposit field in Computer
2020-03-11 13:07:01 +01:00
d1cff3e44e
first iteration integration with blockchain
2020-03-11 13:04:18 +01:00
dc8aea9b9b
Adds display size to mobile device schema
2020-03-11 13:04:18 +01:00
024a9a7d24
first iteration with mobile schema/model
2020-03-11 13:04:18 +01:00
81618a9e1b
Adds transfer_state in deliveryNote init
2020-03-10 15:51:16 +01:00
98bd4dd897
Set camelCase fields, correct fields in PATCH, fix typo in GET deliverynote
2020-03-04 18:52:07 +01:00
de8af45065
Apply 0 Lot : 0-1 Deliverynote relationship
2020-03-04 18:49:55 +01:00
f5b2f3c2f6
Add GET a deliverynote by id
2020-03-04 17:44:58 +01:00
fdd93b0941
Make nested depth deeper to include neccessary info for delivery note within a lot
2020-03-03 20:33:37 +01:00
22e3469129
Embed deliverynote to lot schema
2020-03-03 20:32:34 +01:00
8e5511b587
Receiver, creator, deposit, expected/transferred devices constraints, remove GET, PATCH delivery note
2020-03-03 20:32:04 +01:00
3d96e8190d
Add ethereum_address, receiver_address to deliverynote and PATCH it
2020-03-03 13:10:42 +01:00
d9315c2a25
Create, get, list collection for Deliverynote
2020-02-29 22:58:49 +01:00
48f7201e3f
Rename Deliverynote and add more fields, no tests
2020-02-27 18:29:26 +01:00
46fcfa6d6d
Add a dummny DeliveryNote entity
2020-02-26 20:21:59 +01:00
fe238be6b6
adds in dummy more lots and devices
2019-12-23 17:36:20 +01:00
64a43e63d7
Adds Transferred event
2019-12-23 13:31:54 +01:00
Cayo Puigdefabregas
Jordi Nadeu
cayop
nad
fedjo
yiorgos marinellis
Big Lebowski
emmdim
jordi.nadeu