Commit Graph

784 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 1e597cdb93 clean code 2020-12-01 15:48:49 +01:00
Cayo Puigdefabregas 70733db95d fixing bugs 2020-12-01 15:45:19 +01:00
Cayo Puigdefabregas 92c403579b ading finalUserCode to allocate action 2020-12-01 15:33:49 +01:00
Cayo Puigdefabregas 0fa7930d88 fixing bug 2020-11-30 21:18:10 +01:00
Cayo Puigdefabregas 4a217634c7 change code for transaction 2020-11-30 18:47:17 +01:00
Cayo Puigdefabregas 23abf3e08d change code for transaction 2020-11-30 18:17:47 +01:00
Jordi Nadeu c140a58ca2
Update models.pyi of actions Allocate and Deallocate 2020-11-30 17:42:02 +01:00
Cayo Puigdefabregas dd42b10ba5 search the bug 2020-11-30 16:37:52 +01:00
Cayo Puigdefabregas a9f6e9ccaa fixing bug 2020-11-28 18:47:35 +01:00
Cayo Puigdefabregas 4172711c93 change the endpoints for allocate and deallocate 2020-11-27 18:10:51 +01:00
Cayo Puigdefabregas daeae1b4b4 fixed deallocate code bug 2020-11-26 19:08:07 +01:00
Cayo Puigdefabregas 988f5c1751 fixed dates 2020-11-26 18:51:36 +01:00
Cayo Puigdefabregas b072bc3b57 change allocate and deallocate 2020-11-26 18:44:08 +01:00
Cayo Puigdefabregas ef563e3595 resolve confict 2020-11-25 19:09:24 +01:00
Cayo Puigdefabregas 0c1e5b8307 changes from review 2020-11-25 18:42:36 +01:00
Cayo Puigdefabregas ab7bf75bd7 new version of fixed with suppress 2020-11-25 17:57:43 +01:00
Cayo Puigdefabregas 2ed3e3f77f fixing LookupError of metrics 2020-11-25 17:46:58 +01:00
Cayo Puigdefabregas 4421db3858 clean metrics with views 2020-11-25 13:58:53 +01:00
Cayo Puigdefabregas 4657a3bcf9 clean metrics 2020-11-25 13:58:32 +01:00
Cayo Puigdefabregas 413ce7d76c adding metrics 2020-11-24 21:15:49 +01:00
Cayo Puigdefabregas 87704db271 adding live into snapshot and adding test 2020-11-24 13:44:49 +01:00
Cayo Puigdefabregas 8999b6e9a5 adding migration for live 2020-11-23 18:42:31 +01:00
Cayo Puigdefabregas 8b4c27dfe2 modify live model 2020-11-23 18:35:50 +01:00
Cayo Puigdefabregas 6334120237 Adding endpoint of metrics 2020-11-23 18:03:06 +01:00
Cayo Puigdefabregas 60579437bb resolve conflict 2020-11-23 16:32:06 +01:00
Cayo Puigdefabregas 3e8eb03b58 fixing bug 2020-11-23 15:53:56 +01:00
Cayo Puigdefabregas 78c1f13260 clean code 2020-11-23 15:53:25 +01:00
Cayo Puigdefabregas 73716a7331 fixing tests 2020-11-23 11:43:30 +01:00
Cayo Puigdefabregas ee70288432 validate errors of allocate in scheme instead of signal 2020-11-22 18:47:58 +01:00
Cayo Puigdefabregas 0e53919607 listener 2020-11-21 19:10:31 +01:00
Cayo Puigdefabregas 775cd9a215 fixing bugs 2020-11-21 15:52:29 +01:00
Cayo Puigdefabregas 0415b7efb9 deallocate 2020-11-21 13:17:23 +01:00
Cayo Puigdefabregas 32a17decd7 remove receives 2020-11-20 18:16:56 +01:00
Cayo Puigdefabregas 67d7e27cf9 adding view of receives 2020-11-19 21:04:14 +01:00
Cayo Puigdefabregas a1eb0f4c90 end point receive 2020-11-19 17:00:30 +01:00
Cayo Puigdefabregas c75cdb2c60 fixed model receive 2020-11-19 17:00:04 +01:00
Cayo Puigdefabregas 13ee6d09e6 adding acctions into receives 2020-11-19 15:50:21 +01:00
Cayo Puigdefabregas cf3d44a5e3 adding receives 2020-11-19 15:25:56 +01:00
Cayo Puigdefabregas 11d766d2a4 remove deallocate view 2020-11-19 11:38:41 +01:00
Cayo Puigdefabregas 200974e8f6 remove deallocate 2020-11-19 11:36:09 +01:00
Cayo Puigdefabregas 5adfad8a5e adding deallocate 2020-11-18 19:00:43 +01:00
Cayo Puigdefabregas 16735d0199 change assigned for allocate 2020-11-18 18:13:13 +01:00
Cayo Puigdefabregas 64fe93491c change name rent resource for assigned 2020-11-18 11:31:23 +01:00
Cayo Puigdefabregas 69368a8ca3 rent with assigned concept 2020-11-17 19:21:32 +01:00
Cayo Puigdefabregas 820e253a12 new version of rent as asigned 2020-11-17 13:19:50 +01:00
Cayo Puigdefabregas b6f2dedaeb adding changelog 2020-11-16 20:37:35 +01:00
Cayo Puigdefabregas 8acca4d2cf definition rent endpoint 2020-11-16 20:32:28 +01:00
Cayo Puigdefabregas 0ab8a36832 bugfix with none in the mac serial 2020-11-13 11:05:00 +01:00
Cayo Puigdefabregas 791308d8e8 modify hid when create the snapshot 2020-11-12 21:00:07 +01:00
Cayo Puigdefabregas a122753e34 when add or remove components check again the hid 2020-11-12 20:58:38 +01:00
Cayo Puigdefabregas 82a3344965 centralized in one point the hid 2020-11-12 20:57:33 +01:00
Cayo Puigdefabregas 554ec254d8 identation problem 2020-11-11 16:59:30 +01:00
Cayo Puigdefabregas 17f1ff98e7 adding update hid when insert one manual or automatic snapshot 2020-11-11 16:53:41 +01:00
Cayo Puigdefabregas 0a7e805f3e clean events from device models 2020-11-11 16:52:02 +01:00
Cayo Puigdefabregas cbe6bb7e90 adding mac of networkadapter to hid 2020-11-10 20:45:03 +01:00
Cayo Puigdefabregas 725e586e85 Merge branch 'testing' into bugfix/79-manual-merge 2020-11-09 16:11:12 +01:00
Cayo Puigdefabregas fb899b558f Merge branch 'testing' into feature/77-add-owner-device 2020-11-06 21:26:43 +01:00
Cayo Puigdefabregas 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
Cayo Puigdefabregas 8a471c98c0 todo an automatic merge with sync only of your devices 2020-11-06 17:10:32 +01:00
Cayo Puigdefabregas 52bd6d5271 fixed similar_one for get only from your devices 2020-11-06 17:09:39 +01:00
Cayo Puigdefabregas 9b25132c29 fixed bug for use filters from the website 2020-11-04 17:30:12 +01:00
Cayo Puigdefabregas 50a7b59957 fixed bug: owner_id is not a physical property 2020-11-03 20:26:03 +01:00
Cayo Puigdefabregas 5ac1e8efba adding manually migrate and change model of device 2020-10-30 21:08:55 +01:00
Cayo Puigdefabregas 19eca48db0 resolve conflict 2020-10-29 19:19:33 +01:00
cayop 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
Cayo Puigdefabregas 5f68803d9f adding the directory structure for save all jsons 2020-10-29 16:09:02 +01:00
cayop 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
Cayo Puigdefabregas b2c258b699 fixed mark time correctly in the name file of json 2020-10-29 12:10:12 +01:00
Cayo Puigdefabregas 73d9db3a88 fixing bug moving tags 2020-10-28 22:15:28 +01:00
Jordi Nadeu 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
Cayo Puigdefabregas fe3f038218 refactoring and fixing some problems of manual merge 2020-10-28 13:30:22 +01:00
Cayo Puigdefabregas 1400d292ce refactoring 2020-10-27 21:29:38 +01:00
Cayo Puigdefabregas 19279acaeb clean view of merge 2020-10-27 19:13:31 +01:00
Cayo Puigdefabregas ab1d268f14 rebuild the query for more post structured 2020-10-27 19:12:46 +01:00
Cayo Puigdefabregas b10ed84836 adding columns rate when no there are rate 2020-10-23 10:27:16 +02:00
Cayo Puigdefabregas 20f2300ce1 modify the pull requirements 2020-10-22 15:54:01 +02:00
Cayo Puigdefabregas 1f4d30df32 rebuild rows with all new collumns 2020-10-21 22:11:55 +02:00
Cayo Puigdefabregas ed2f71c150 add delimeter as ; in csv 2020-10-21 22:09:15 +02:00
Cayo Puigdefabregas 2f7c34af2e graphic card 2020-10-21 13:17:32 +02:00
Cayo Puigdefabregas e6401fff3c cpus, rams, disks 2020-10-21 13:06:47 +02:00
Cayo Puigdefabregas 195c5265e4 document new function 2020-10-16 16:30:53 +02:00
Cayo Puigdefabregas 9a488887f5 modify devices models for add listeners 2020-10-16 16:25:46 +02:00
Cayo Puigdefabregas ae1ecb59e2 add listener a event 2020-10-16 16:25:13 +02:00
Cayo Puigdefabregas c7abf29706 clean all previus modifications 2020-10-16 16:24:48 +02:00
Cayo Puigdefabregas 14d4d0aed0 fixed view 2020-10-16 15:26:12 +02:00
Cayo Puigdefabregas 139c1e290a resolve conflict 2020-10-16 15:12:21 +02:00
Cayo Puigdefabregas 76806299cd update devices when there are a new action 2020-10-16 15:08:54 +02:00
nad 75b5a4a710 Adding test and fix for Issue 69 EreusePrice Computer type 2020-10-15 13:19:47 +02:00
Cayo Puigdefabregas 79b4c738e9 change the name of the file 2020-10-15 11:00:11 +02:00
Cayo Puigdefabregas a702f2f9b3 Merge branch 'testing' into feature/61-Json-Backup 2020-10-14 11:41:02 +02:00
Cayo Puigdefabregas d3ef6cc65d add user to the name file of json and more readable date 2020-10-13 15:59:39 +02:00
Cayo Puigdefabregas ae98d3154c TMP_SNAPSHOTS defined in config file 2020-10-13 15:37:21 +02:00
Cayo Puigdefabregas c1595aa305 clean imports unused 2020-10-13 14:44:44 +02:00
Cayo Puigdefabregas 49668a4f4f open files using with statement 2020-10-09 20:54:12 +02:00
Cayo Puigdefabregas 99a12b2b22 bugfix 2020-10-09 20:40:22 +02:00
Cayo Puigdefabregas 2a53e1672c using os.path.join instead of format 2020-10-09 20:29:02 +02:00
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
yiorgos marinellis 46fcfa6d6d Add a dummny DeliveryNote entity 2020-02-26 20:21:59 +01:00
emmdim 64a43e63d7 Adds Transferred event 2019-12-23 13:31:54 +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 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 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
Xavier Bustamante Talavera 8f4231dc1c Merge branch 'master' into rate
# Conflicts:
#	ereuse_devicehub/resources/event/models.py
2019-04-10 11:20:54 +02:00
nad 17705e459e adding more functionality test rate v2 2019-04-10 10:46:43 +02:00
Xavier Bustamante Talavera e47748563e Update docs 2019-03-26 10:55:38 +01:00
nad 39c930f6ae adding provisional rate class (device type) in models 2019-03-20 00:08:05 +01:00
nad d0eb5cd9c5 first iteration tests ratev2 2019-03-13 16:32:59 +01:00
nad 40a2ed3916 first iteration new rate v2 2019-03-13 13:06:58 +01:00
nad a7b2c056ac Adding more mobile characteristics [Ratev2] 2019-03-10 20:44:10 +01:00
nad 147b86f889 Adding benchmarks and test [Ratev2] 2019-03-10 20:41:10 +01:00
nad 0f508a1d59 first iteration models ratev2 2019-03-07 17:07:59 +01:00
nad f1f285eb1d Add new Events DataStorage fields in export 2019-03-06 18:42:50 +01:00
Xavier Bustamante Talavera 13ffab7022 Move export to Documents 2019-02-28 18:21:24 +01:00
Xavier Bustamante Talavera 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
nad ddb1877133 first commit rate v2; adding Quality, Functionality Rates class 2019-02-27 23:36:26 +01:00
Xavier Bustamante Talavera e813fb02c7 Do not return tag token provider from Inventory 2019-02-27 10:33:37 +01:00
Xavier Bustamante Talavera 07e8be829e Unify Snapshot's POST view with Devicehub's; bugfixes 2019-02-18 12:43:50 +01:00
Xavier Bustamante Talavera 32e696c57c Fix rate related issues 2019-02-13 18:59:14 +01:00
Xavier Bustamante Talavera 15f705dd50 Add Tests managing inventories; small bugfixes 2019-02-11 21:34:45 +01:00
Xavier Bustamante Talavera 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
Xavier Bustamante Talavera 04358a5506 Fix incorrect rate query 2019-02-05 17:59:15 +01:00
Xavier Bustamante Talavera d6ca5e2922 Fix incorrect dates; add final_flush, move committing after serializing 2019-02-04 18:20:50 +01:00
Xavier Bustamante Talavera 198a89a0b1 Add sphinx extension dhclass; generate better API docs; remove cache for lots 2019-02-03 17:12:53 +01:00
Xavier Bustamante Talavera bf8a943883 Remove re-setting ordered_components hotfix; bump ereuse-utils 2019-01-29 19:01:20 +01:00
Xavier Bustamante Talavera d2160b9db5 Add cache; bugfixing 2019-01-29 16:29:08 +01:00
Xavier Bustamante Talavera 74860be347 Add things_response; create tags through ereuse Tag 2019-01-26 12:49:31 +01:00
Xavier Bustamante Talavera ca7033f6df Fix sqlalchemy warnings; improve CLI 2019-01-23 17:59:29 +01:00
Xavier Bustamante Talavera f570e9d3d0 Add inventories with dispatcher 2019-01-23 16:55:04 +01:00
Xavier Bustamante Talavera 9272674760 Add inventories 2019-01-21 16:08:55 +01:00
Xavier Bustamante Talavera f0f1376b7d Small bugfixes 2019-01-19 19:19:35 +01:00
Xavier Bustamante Talavera b1aa79fd0a Small bugfixes 2019-01-16 20:40:27 +01:00
Xavier Bustamante Talavera 5fb1471d9b Use type for HID 2019-01-02 17:52:43 +01:00
Xavier Bustamante Talavera 710432ef12 Making API more uniform 2018-12-30 12:43:29 +01:00
nad 4c4133c347 debug rate workbench tests 2018-11-27 19:06:28 +01:00
Xavier Bustamante Talavera 33f6ee540b Add Install.address; fix asus test 2018-11-26 13:11:07 +01:00
Xavier Bustamante Talavera 1bc290dc21 Add soundcard to .pyi 2018-11-21 16:09:56 +01:00
Xavier Bustamante Talavera d5a71a7678 Add document resource and erase certificate 2018-11-21 14:26:56 +01:00
Xavier Bustamante Talavera b59721707d Fix test_snapshot_different_properties_same_tags 2018-11-17 20:21:11 +01:00
Xavier Bustamante Talavera 91beed87ee Working Price; working test mobile with imei; update manual rate test 2018-11-17 19:22:41 +01:00
Xavier Bustamante Talavera 9c3de1c258 Complete ErasePhysical and EraseBasic.standards; remove EraseBasic.zeros 2018-11-17 18:24:34 +01:00
Xavier Bustamante Talavera 955fb4a33d Add processes and empty tests 2018-11-17 17:03:03 +01:00
Xavier Bustamante Talavera 0cc2bdba4d Add skeleton for computing erasure standards 2018-11-15 13:35:19 +01:00
JNadeu 3e636ea2c9 fix reports test and fixtures 2018-11-13 17:58:26 +01:00
JNadeu ee231aecb9 Merge remote-tracking branch 'origin/master' into reports
# Conflicts:
#	ereuse_devicehub/resources/device/views.py
2018-11-13 16:58:47 +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 560e0ed8dc Add docstrings to event models; remove redundant generic test 2018-11-12 18:15:24 +01:00
Xavier Bustamante Talavera 0ec06808ce Add Mixer 2018-11-12 11:59:49 +01:00
Xavier Bustamante Talavera 048a03801b Nicely fix search query being always a string 2018-11-11 22:18:10 +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 bd0eb3aad3 Add Device problems, privacy, working; Add event ErasePhysical 2018-11-09 11:22:13 +01:00
Xavier Bustamante Talavera e009bf4bc1 Change Event.error/incidence for Event.severity 2018-11-08 17:37:14 +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 55a210bced Add many indexes on FK and very used properties 2018-11-04 23:00:51 +01:00
Xavier Bustamante Talavera 5bc72fbe8b Fix inconsistencies in filtering devices inside lots 2018-11-04 22:40:14 +01:00
Xavier Bustamante Talavera afb2815883 Add regenerate-search 2018-10-31 12:27:16 +01:00
Xavier Bustamante Talavera 3962dfe3b8 Fix searching for IDs, numbers, HP, and Asus 2018-10-31 11:59:12 +01:00
Xavier Bustamante Talavera 2d525231c3 Fix searching for IDs, numbers, HP, and Asus 2018-10-31 11:40:45 +01:00
Xavier Bustamante Talavera b43e6f9e14 Fix TestDataStorage command_timeout smallint out of range 2018-10-27 09:52:11 +02:00
Xavier Bustamante Talavera 42c5bee947 Fix benchmark rates not using floats; add oreo and david's pc 2018-10-27 08:56:58 +02:00
JNadeu 9b265d27e8 Clean code export csv 2018-10-25 12:44:24 +02:00
Xavier Bustamante Talavera 8567c629cb Add new fixtures and dummy 2018-10-25 12:36:25 +02:00
JNadeu e17352879a Add generic export computer 2018-10-24 21:11:32 +02:00
JNadeu c299656f05 Add fixtures csv files and exports tests 2018-10-24 21:09:54 +02:00
JNadeu 97289cdfea Merge remote-tracking branch 'origin/master' into reports 2018-10-24 11:01:55 +02:00
Xavier Bustamante Talavera fa7c4d10cf Check for html version of device in dummy; add TestDataStorage incidence from SMART 2018-10-23 22:54:27 +02:00
JNadeu cfc5c33f39 add erase reports fields 2018-10-23 18:59:58 +02:00
JNadeu cad0b64125 Merge remote-tracking branch 'origin/master' into reports 2018-10-23 17:37:43 +02:00
Xavier Bustamante Talavera 10c73a4e75 Add ComputerAccessory, Networking, Printer, Sound, Video devices 2018-10-23 15:37:37 +02:00
Xavier Bustamante Talavera 7ad7ab1d8a PATCH lot name 2018-10-19 10:35:23 +02:00
JNadeu 654edf35a1 Add if in find 'text/csv' 2018-10-18 18:16:49 +02:00
Xavier Bustamante Talavera 6751f0db16 Change manufacturer endpoint query name for search 2018-10-18 13:08:42 +02:00
Xavier Bustamante Talavera 03871b4462 Fix tags not added to device search 2018-10-18 10:09:10 +02:00
JNadeu c4129a2a1a Merge remote-tracking branch 'origin/master' into reports 2018-10-17 12:31:31 +02:00
Xavier Bustamante Talavera 4b763ed1e8 Bigfixes for tag demo 2018-10-16 16:30:10 +02:00
Xavier Bustamante Talavera 84dd154cbe Update layout 2018-10-16 11:13:21 +02:00
Xavier Bustamante Talavera b391950d97 Add str() to many events; small bugfixes 2018-10-16 08:46:55 +02:00
JNadeu 79f41f3501 Merge remote-tracking branch 'origin/master' into reports 2018-10-15 14:50:59 +02:00
JNadeu 06d6e31c99 Merge remote-tracking branch 'origin/master' into reports 2018-10-15 14:43:46 +02:00
Xavier Bustamante Talavera 47f5bf69ae Return ranges in AggregateRate 2018-10-15 14:20:26 +02:00
Xavier Bustamante Talavera 5301242dbd Fix not adding tag.secondary to search 2018-10-15 13:12:13 +02:00
Xavier Bustamante Talavera 8889496a34 Fix Price not always using Decimal 2018-10-15 11:21:21 +02:00
Xavier Bustamante Talavera 97536c5ce1 Fix bug when device rate is low 2018-10-14 23:56:54 +02:00
Xavier Bustamante Talavera 2aaa79e8b4 Fix one tag id per organization 2018-10-14 22:31:32 +02:00
Xavier Bustamante Talavera 9cffa92125 Update description of Rate and Device; remove PhotoboxRate schemas 2018-10-14 20:10:52 +02:00
Xavier Bustamante Talavera 10c1a3f37d Bugfixes with rate 2018-10-14 11:37:10 +02:00
Xavier Bustamante Talavera 3cc510831c Add states and quick-access properties on Device; merge in ereuse-rate 2018-10-13 14:53:46 +02:00
JNadeu f4418fc72a Add reports files, init report commit 2018-10-11 17:51:58 +02:00
Xavier Bustamante Talavera 319e041ebc Small improvements in lots and related testing 2018-10-11 11:22:59 +02:00
Xavier Bustamante Talavera 923ed8af68 Change lot view's filter for search 2018-10-08 17:51:51 +02:00
Xavier Bustamante Talavera df31074775 Toggle formats when finding lots; add device.lots when GETting devices 2018-10-08 17:32:45 +02:00
Xavier Bustamante Talavera a3f6d7877a Change name to title when returning lots 2018-10-08 12:25:28 +02:00
Xavier Bustamante Talavera a76560d253 Better printing in Dummy; change naming of TestHardDriveLength; bump utils to 0.4b9 2018-10-08 10:37:32 +02:00
Xavier Bustamante Talavera 863578559c Filter devices by being inside lots 2018-10-06 12:45:56 +02:00
Xavier Bustamante Talavera 7e4a0981a1 Add /lots/ find method returning nested lots 2018-10-05 18:57:35 +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 d1a23cbf9d Fix failing click dummy execution; speed-up testing 2018-10-05 14:35:51 +02:00
Xavier Bustamante Talavera 94c44e3480 Add Smartphone; remove Inventory and use DeviceView 2018-10-04 10:59:31 +02:00
Xavier Bustamante Talavera 3bd4168174 Add macros 2018-10-03 15:30:34 +02:00
Xavier Bustamante Talavera 77c96c5956 Add public device view 2018-10-03 14:51:22 +02:00
Xavier Bustamante Talavera 38060d47ec Add Manufacturer 2018-09-30 19:40:28 +02:00
Xavier Bustamante Talavera 042b7718ec Use SanitizedStr and CITText, lowering many strings 2018-09-30 12:29:33 +02:00
Xavier Bustamante Talavera 517c21789d Fix not creating tags with providers; check if default org is created 2018-09-29 19:39:38 +02:00
Xavier Bustamante Talavera f80e6a0764 Use __name__ instead of __package__ as recommended by flask 2018-09-29 15:55:29 +02:00
Xavier Bustamante Talavera c0073e9212 Add DeviceSearch 2018-09-29 12:24:22 +02:00
Xavier Bustamante Talavera 863d3b5639 Fix getting wrong lots from inventory 2018-09-21 11:25:22 +02:00
Xavier Bustamante Talavera bc95fa98b1 Ensure only computers can have components 2018-09-21 10:43:15 +02:00
Xavier Bustamante Talavera 7cfae43c7a Add / remove devices from lots with POST / DELETE 2018-09-20 18:25:47 +02:00
Xavier Bustamante Talavera f56ca473e8 Create eTags, lots, and events in dummy 2018-09-20 16:40:41 +02:00
Xavier Bustamante Talavera 32837f5f59 Link tags to devices through PUT; update client 2018-09-20 11:51:25 +02:00
Xavier Bustamante Talavera 3b0f483a90 Add secondary id to tags 2018-09-20 09:28:52 +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 8f53f15f27 Test snapshot eee 1000h and workbench fixtures 2018-09-08 16:46:39 +02:00
Xavier Bustamante Talavera 804a696390 Correctly place teal imports 2018-09-07 12:38:02 +02:00
Xavier Bustamante Talavera ca7c89633b Correctly handle unique constraints 2018-09-07 12:35:32 +02:00
Xavier Bustamante Talavera d54609543e Explicitly inherit ids from EventWithOneDevice's subclasses 2018-09-06 19:43:59 +02:00
Xavier Bustamante Talavera abad0fa392 Small cleanup; update teal and bump to 0.2.0a13 2018-09-03 08:55:15 +02:00
Xavier Bustamante Talavera 08a250f162 Change name Edge for Path and use py interface 2018-08-27 16:32:45 +02:00
Xavier Bustamante Talavera 1b66888bd7 Add roots() method in lots 2018-08-10 00:52:01 +02:00
Xavier Bustamante Talavera 2ed558ac2b Enhance Lot; use timezone aware datetime 2018-08-09 21:46:54 +02:00
Xavier Bustamante Talavera f5d69070e6 Draft on lot 2018-08-08 21:25:53 +02:00
Xavier Bustamante Talavera 42b0b0ebbc Complete events and agents. Bump to 0.2.0a11. 2018-08-03 18:15:08 +02:00
Xavier Bustamante Talavera 8efca0d589 Use teal.test_import_resource; reformat imports; add generic events 2018-07-22 22:42:49 +02:00
Xavier Bustamante Talavera 6d85f314ef Add cpu.threads and network.wireless; add snapshots to testing / dummy 2018-07-19 21:25:06 +02:00
Xavier Bustamante Talavera 6f3ea001fe Fix inventory not nesting devices 2018-07-17 19:00:07 +02:00
Xavier Bustamante Talavera c1a3b23d8b Integrate with rate 2018-07-14 16:41:22 +02:00
Xavier Bustamante Talavera af885c2aec First real snapshots :-) 2018-07-02 12:52:54 +02:00
Xavier Bustamante Talavera cd8928e1cd Remove passed_lifetime; add virtual chassis; bump to 0.2.0a9 2018-06-27 10:40:21 +02:00
Xavier Bustamante Talavera 1c5b4e0b16 Update device structure 2018-06-26 15:36:21 +02:00
Xavier Bustamante Talavera b0b455d4f0 Update device structure 2018-06-26 15:35:13 +02:00
Xavier Bustamante Talavera 10f3aa7d35 Improve api generation; remove unneeded views 2018-06-24 16:57:49 +02:00
Xavier Bustamante Talavera 21d1a96aff Add computer monitor; dummy; fix 2018-06-20 23:18:15 +02:00
Xavier Bustamante Talavera ef132098cb Pass test_workbench_server_condensed 2018-06-19 18:38:42 +02:00
Xavier Bustamante Talavera f00c6f2f49 Fix syncing for Add/remove 2018-06-16 15:33:56 +02:00
Xavier Bustamante Talavera d2af894174 Sync snapshot; add event listeners to auto-update device relationships 2018-06-16 12:41:12 +02:00
Xavier Bustamante Talavera 5538e5ac69 Fix UUID in events 2018-06-15 15:31:03 +02:00
Xavier Bustamante Talavera e3a887d9fa Update inventory; pass many tests 2018-06-14 15:14:23 +02:00
Xavier Bustamante Talavera b56fbeeca7 Add inventory and missing fields 2018-06-12 16:50:05 +02:00
Xavier Bustamante Talavera b9f989270d Polish db class diagram 2018-06-10 18:47:49 +02:00
Xavier Bustamante Talavera aa45d1b904 Add Tag support; sync with tags; use SQLAlchemy's collection_class; set autoflush to false 2018-05-30 12:49:40 +02:00
Xavier Bustamante Talavera 4ab7d421a4 Simplify Snapshot; improve error-handling in tests 2018-05-16 15:23:48 +02:00
Xavier Bustamante Talavera 439f7b9d58 Simplify dump; first simple snapshot-components passing 2018-05-13 15:13:12 +02:00
Xavier Bustamante Talavera ac26d8d610 Get resources correctly with polymorphic 2018-05-11 18:58:48 +02:00
Xavier Bustamante Talavera 78b5a230d4 First Snapshot attempt 2018-04-30 19:58:19 +02:00
Xavier Bustamante Talavera 8723b379b0 Update to functional endpoint 2018-04-27 19:16:43 +02:00
Xavier Bustamante Talavera c4b6553c8c Prototyping 2018-04-10 17:06:39 +02:00