Cayo Puigdefabregas
f257f192e6
fixed bug
2020-10-09 11:35:16 +02:00
Cayo Puigdefabregas
382dd3373f
change response header html for json
2020-10-09 11:00:49 +02:00
Cayo Puigdefabregas
258c3b4efd
more simple patch in post view
2020-10-08 14:47:11 +02:00
Cayo Puigdefabregas
0e89af1215
catch all exceptions and save de snapshot
2020-10-07 19:58:09 +02:00
Cayo Puigdefabregas
56907e7055
fixed bug
2020-10-07 18:37:23 +02:00
Cayo Puigdefabregas
aed9e8c2d6
change name
2020-10-07 18:29:18 +02:00
Cayo Puigdefabregas
9a24eb5fd5
save snapshot in a temporal file
2020-10-07 18:28:57 +02:00
Cayo Puigdefabregas
fed6b57bbe
import __version__ instead of open file __init__
2020-09-22 11:57:39 +02:00
Cayo Puigdefabregas
6c45754710
fixing the default version
2020-09-22 11:36:01 +02:00
Cayo Puigdefabregas
ea6691247a
change pkg_resources for open __init__
2020-09-21 11:34:55 +02:00
Cayo Puigdefabregas
3d171626f3
adding logger info when the connection is fail
2020-09-18 11:05:42 +02:00
Cayo Puigdefabregas
51f51b1e92
get version of ereuse-tag
2020-09-17 21:09:22 +02:00
Cayo Puigdefabregas
255701467a
fixing name of VersionView
2020-09-16 17:40:16 +02:00
Cayo Puigdefabregas
5cb0dad77d
add VersionView as view
2020-09-15 17:44:12 +02:00
Cayo Puigdefabregas
f8e6020be6
endpoint versions
2020-09-15 13:22:28 +02:00
nad
9fa96c3d3b
Revert "Changing devices transfer_states on delivery note PATCH"
...
This reverts commit 5c562752
2020-08-25 15:57:17 +02:00
nad
5c56275228
Changing devices transfer_states on delivery note PATCH
2020-08-25 15:31:15 +02:00
Jordi Nadeu
927594f7a7
Merge pull request #50 from eReuse/feature/endpoints
...
Adding basic tests endpoints
2020-08-25 10:25:04 +02:00
nad
306bad966b
Adding lot permissions to LotsDocumentView
2020-08-18 21:02:54 +02:00
nad
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
nad
6087044a5e
Fixing test_get_multiple_lots and test_api_docs
2020-08-18 19:19:18 +02:00
Cayo Puigdefabregas
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
nad
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
cayop
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
nad
a2a24f20cc
Reformat code following PEP8
2020-08-17 16:45:18 +02:00
nad
0bfc08f81f
Check snapshot permissions only when it comes from Workbench
2020-08-17 16:30:11 +02:00
nad
8c493da370
Merge remote-tracking branch 'origin/testing' into feature/27-permission-posting-action
2020-08-17 16:05:06 +02:00
nad
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
Jordi Nadeu
b6138f9108
Merge branch 'testing' into feature/46-device-stock-control
2020-08-17 11:33:27 +02:00
nad
59932ba00d
Adding exceptions to device_row.py file
2020-08-17 11:18:52 +02:00
Cayo Puigdefabregas
801a8a6c4a
add filter as user owner
2020-08-06 16:51:49 +02:00
Cayo Puigdefabregas
d973b479cf
return to put anonymous access to erasures documents
2020-08-06 15:55:14 +02:00
Cayo Puigdefabregas
cdf36583a9
bug fixed: there is no point in having self.AUTH for view DocumentDef
2020-08-05 17:51:13 +02:00
nad
cc17a32e12
Merge branch 'feature/15-update-test-suite' into feature/22-device-lot-visibility
2020-08-05 13:09:03 +02:00
nad
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
Jordi Nadeu
a052abc72d
Minor fix indentation error
2020-08-05 11:56:59 +02:00
Jordi Nadeu
04557905c8
Merge branch 'testing' into feature/46-device-stock-control
2020-08-05 11:49:18 +02:00
nad
6017476822
Adding query to Lot views
2020-08-03 18:25:55 +02:00
nad
a2303498cd
Minors comments changes and new test_get_all_lots was added
2020-07-28 16:22:17 +02:00
nad
c0fcfcfdbf
Creating 'documents/lots/' endpoint
2020-07-28 16:16:17 +02:00
nad
c90fa4e84e
Adding stock row class for new document endpoint
2020-07-27 13:56:56 +02:00
nad
936c042c62
Creating document stock endpoint
2020-07-23 20:55:27 +02:00
Cayo Puigdefabregas
1a6afe29d3
bugfix tag test with cli
2020-07-23 19:20:53 +02:00
Cayo Puigdefabregas
114613ddf7
document stock
2020-07-23 15:56:51 +02:00
Jordi Nadeu
8fd2e06f0a
Merge branch 'testing' into feature/27-permission-posting-action
2020-07-20 15:42:11 +02:00
Jordi Nadeu
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
Jordi Nadeu
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
fedjo
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
fedjo
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
yiorgos marinellis
8d112c1360
Abort snapshot action if current user is not owner of the
...
(non-component) device
2020-06-01 20:43:10 +03:00
yiorgos marinellis
e021702e0c
Update nesting level to depth 2 when returning lots not UiTree
2020-04-29 20:41:32 +02:00
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
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
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