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
50ba0be170
adds in dummy new lots of diferents users
2019-12-21 17:51:29 +01:00
b649bf7ac4
Adds new action TransferOwnership
2019-12-21 16:41:23 +01:00
259285c59c
Makes deposit writable and applies range check from
...
0-100
2019-12-19 12:27:02 +01:00
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
73937e0545
Updates dummy users
2019-12-19 01:25:29 +01:00
b31f315a76
Adds 'author_id' in /lot PATCH
2019-12-18 16:37:45 +01:00
c119c951f5
Propagates PATCH /lot updates to the involved devices
2019-12-18 14:29:25 +01:00
cabcfaa830
adds new attributes on Computer model
2019-12-17 23:57:55 +01:00
4bdf9502d6
Minor updates
2019-12-17 17:16:13 +01:00
552c2a4166
adds to dummy more users with ethereum address
2019-12-16 20:38:41 +01:00
fa99283389
add new attributes in Lot and User models
2019-12-16 19:17:30 +01:00
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
0f81be6878
Adds TransferStateEnum and makes it a Lot field
2019-12-12 01:25:11 +01:00
856745ef91
Adds deposit and author is lot resources
2019-12-11 02:49:47 +01:00
31357276ae
Adds author_id to Computer resource
2019-12-11 02:19:13 +01:00
bdd996a132
Adds deposit field in Computer
2019-12-11 00:35:17 +01:00
14d5379edb
fix footer logo on public link report
2019-11-05 15:43:09 +01:00
38bd39dd9a
minor changes on public link report
2019-10-22 17:53:26 +02:00
b99a332cd8
change erasure report and public link html templates
2019-10-22 15:54:39 +02:00
83d9d12afb
delete visual test to compute rate (v1)
2019-10-22 15:53:44 +02:00
7bdc68ce8b
Add lot template
2019-07-09 17:01:40 +02:00
ce961a1bed
Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT
2019-07-07 21:36:09 +02:00
f8ec8fc882
Change ReadyToUse for Available
2019-07-06 15:06:22 +02:00
922a8c743a
Fix last commit changes
2019-07-02 10:42:56 +02:00
f40f7187de
Add Camera, LOTS project temporal devices
2019-07-01 20:39:32 +02:00
c92d6b3282
Merge branch 'rate' into devel
2019-07-01 11:31:18 +02:00
ad1781b9ec
Set version, variant, sku as CIText
2019-07-01 11:30:48 +02:00
7e8c36ab3e
Snyc with new Workbench models; fix SSL bug
2019-06-29 16:26:14 +02:00
3d6fef9927
change comments to comply with the standard PEP 257
2019-06-19 13:35:26 +02:00
928863bfdf
Update comments in actions; remove workbench folder in rate
2019-06-12 16:49:55 +02:00
c19783954e
adding comments about rate algorithm
2019-05-14 20:31:43 +02:00
61f4c127d4
Change event to action complying with schema.org
2019-05-11 16:27:22 +02:00
0dc8ced255
Sort events by default using end_time
2019-05-10 18:00:38 +02:00
58be2162f7
Fix imprecisions in rate algorithms and small bugfixes
2019-05-10 11:58:38 +02:00
16d00256df
Review rate changes
2019-05-08 19:12:05 +02:00
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
92be9c1aa1
Add fields in display and device; add battery, measureBattery
2019-05-03 14:31:49 +02:00
252f995ac7
add order to snapshot events
2019-05-02 18:04:14 +02:00
7bb514d23c
rewrite some tests to rate v2 structure
2019-05-02 17:49:15 +02:00
2108526cec
fix some snapshots errors
2019-04-30 10:26:06 +02:00
1ca7df4969
refactor score fixtures files (snapshots) to new rate v2 structure
2019-04-30 02:03:09 +02:00
7b6a2cd1db
refactor score code to new rate v2 structure
2019-04-30 02:02:23 +02:00
880b5e706e
refactor score to new rate version structure
2019-04-23 21:27:31 +02:00
75e1817e9c
pass rate workbench test v1
2019-04-16 17:47:28 +02:00
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
825c07c5f9
first commit refactor score
2019-04-11 18:29:51 +02:00
8f4231dc1c
Merge branch 'master' into rate
...
# Conflicts:
# ereuse_devicehub/resources/event/models.py
2019-04-10 11:20:54 +02:00
17705e459e
adding more functionality test rate v2
2019-04-10 10:46:43 +02:00
e47748563e
Update docs
2019-03-26 10:55:38 +01:00
39c930f6ae
adding provisional rate class (device type) in models
2019-03-20 00:08:05 +01:00
d0eb5cd9c5
first iteration tests ratev2
2019-03-13 16:32:59 +01:00
40a2ed3916
first iteration new rate v2
2019-03-13 13:06:58 +01:00
a7b2c056ac
Adding more mobile characteristics [Ratev2]
2019-03-10 20:44:10 +01:00
147b86f889
Adding benchmarks and test [Ratev2]
2019-03-10 20:41:10 +01:00
0f508a1d59
first iteration models ratev2
2019-03-07 17:07:59 +01:00
f1f285eb1d
Add new Events DataStorage fields in export
2019-03-06 18:42:50 +01:00
13ffab7022
Move export to Documents
2019-02-28 18:21:24 +01:00
208814ecf2
Merge branch 'master' into reports
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
# tests/test_rate_workbench_v1.py
# tests/test_workbench.py
2019-02-28 17:31:18 +01:00
ddb1877133
first commit rate v2; adding Quality, Functionality Rates class
2019-02-27 23:36:26 +01:00
e813fb02c7
Do not return tag token provider from Inventory
2019-02-27 10:33:37 +01:00
07e8be829e
Unify Snapshot's POST view with Devicehub's; bugfixes
2019-02-18 12:43:50 +01:00
32e696c57c
Fix rate related issues
2019-02-13 18:59:14 +01:00
15f705dd50
Add Tests managing inventories; small bugfixes
2019-02-11 21:34:45 +01:00
6c4c89ac48
Use Postgres 11; enhance search query with websearch; really use indexes, add hash index; fix partially patching lots
2019-02-07 13:47:42 +01:00
04358a5506
Fix incorrect rate query
2019-02-05 17:59:15 +01:00
d6ca5e2922
Fix incorrect dates; add final_flush, move committing after serializing
2019-02-04 18:20:50 +01:00
2cbaf14c45
Only optionally drop common db
2019-02-04 13:38:46 +01:00
a89f557c41
Update dependencies
2019-02-04 13:01:36 +01:00
198a89a0b1
Add sphinx extension dhclass; generate better API docs; remove cache for lots
2019-02-03 17:12:53 +01:00
bf8a943883
Remove re-setting ordered_components hotfix; bump ereuse-utils
2019-01-29 19:01:20 +01:00
d2160b9db5
Add cache; bugfixing
2019-01-29 16:29:08 +01:00
74860be347
Add things_response; create tags through ereuse Tag
2019-01-26 12:49:31 +01:00
ca7033f6df
Fix sqlalchemy warnings; improve CLI
2019-01-23 17:59:29 +01:00
f570e9d3d0
Add inventories with dispatcher
2019-01-23 16:55:04 +01:00
9272674760
Add inventories
2019-01-21 16:08:55 +01:00
f0f1376b7d
Small bugfixes
2019-01-19 19:19:35 +01:00
b1aa79fd0a
Small bugfixes
2019-01-16 20:40:27 +01:00
5fb1471d9b
Use type for HID
2019-01-02 17:52:43 +01:00
710432ef12
Making API more uniform
2018-12-30 12:43:29 +01:00
4c4133c347
debug rate workbench tests
2018-11-27 19:06:28 +01:00
33f6ee540b
Add Install.address; fix asus test
2018-11-26 13:11:07 +01:00
7a0629cf06
Add real TIS tag
2018-11-22 19:01:21 +01:00
Cayo Puigdefabregas
nad
Jordi Nadeu
cayop
fedjo
yiorgos marinellis
Big Lebowski
emmdim
jordi.nadeu
Xavier Bustamante Talavera