05b4353cc4
add label code in tag
2022-01-31 10:12:44 +01:00
999cd3e26c
try printpdf
2022-01-28 12:29:49 +01:00
2840c5c21e
manager control over form of print tag
2022-01-28 11:03:57 +01:00
c8eea3f072
template of unamed, template of tag details, qr print
2022-01-27 14:13:20 +01:00
93901e0ec8
add TagDetailsView
2022-01-26 13:59:56 +01:00
eb3e7e8a95
add link to tag details
2022-01-26 13:59:10 +01:00
0d99aa4984
fix tags in use
2022-01-26 13:50:43 +01:00
0f30bbda35
Merge branch 'feature/server-side-render' into feature/server-side-render-tags
2022-01-26 13:16:56 +01:00
2327fa5a89
add an unnamed tag
2022-01-26 13:16:18 +01:00
Santiago L
15161e505f
Merge branch 'feature/server-side-render' into feature/server-side-render-devices
2022-01-26 12:50:54 +01:00
96a62e7072
fix redirect when remove one tag
2022-01-26 12:29:03 +01:00
0018034fcd
fix referrer path for redirect pages
2022-01-26 11:48:37 +01:00
6fca974f04
bool refactor in lot module
2022-01-26 11:34:35 +01:00
0d166b2b0c
refactor responses bool and fix name is_incoming
2022-01-26 11:31:00 +01:00
2e613265a6
refactor return bool
2022-01-26 11:25:50 +01:00
36199a7ee1
distinct instead of set
2022-01-26 11:22:47 +01:00
fd4fc71bf5
fix id devices in form of add tag in device
2022-01-26 10:59:13 +01:00
9b87a7415e
remove tag from device
2022-01-25 14:39:15 +01:00
9d3f288213
template for link a tag with a device
2022-01-25 12:54:11 +01:00
5eb2b0ee5f
link a tag with one device
2022-01-25 12:53:36 +01:00
01b355d955
add links to devices
2022-01-25 10:54:33 +01:00
55ce612b2a
resolv conflict
2022-01-25 10:37:30 +01:00
e3f917a3ce
minor chages
2022-01-25 10:30:46 +01:00
959ee18f59
fix error messages and imei meid fields
2022-01-24 13:48:16 +01:00
bd2f261dc3
add device for form using the snapshot form
2022-01-21 14:19:39 +01:00
2fde6e5cf5
drop pdbs
2022-01-21 11:30:17 +01:00
31b1806912
fix lower datas and image
2022-01-21 11:07:15 +01:00
f497cc03e5
save a new device and validations
2022-01-20 13:13:20 +01:00
6e0f627aca
add more clear error message, add a check if exist this snapshot and put the commit at the end of the loop
2022-01-20 10:33:14 +01:00
f35dab8983
render the correct form in a new page
2022-01-19 13:40:40 +01:00
6be11e3ee9
add base form for Device
2022-01-18 14:09:01 +01:00
c300e44eab
add a link for a new device, and snapshot
2022-01-18 13:47:17 +01:00
5566e7adb7
save snapshot and try to make exception with duplicates
2022-01-18 11:45:28 +01:00
afb2a45220
fixing the order of the device list and force the list of the lots instead of use a generator
2022-01-18 11:24:27 +01:00
f738abfab0
put more space in the card
2022-01-18 11:23:18 +01:00
7b357ec2fc
fix template with results
2022-01-17 14:18:16 +01:00
11ca75fc8b
add view for upload snapshot
2022-01-17 14:17:52 +01:00
9d6d95bbc3
add snapshot of devicehub teal in formulary of snapshot
2022-01-17 14:17:26 +01:00
Santiago L
7096056f37
Enable CSRF by blueprint (exclude API views)
2022-01-17 12:55:42 +01:00
22623a4602
snapshot template
2022-01-14 11:12:07 +01:00
68269c4b21
device details
2022-01-13 16:08:55 +01:00
3463d63f31
changes redirect static for reffered
2022-01-12 21:02:47 +01:00
2cfe8a44c6
fix order of tags and change code for id
2022-01-12 20:45:49 +01:00
97f450a07c
ordered list of devices
2022-01-12 20:40:57 +01:00
bdc518b949
fixing create lot id
2022-01-12 20:26:37 +01:00
aba5b9dc3b
confirmation dialog when deleting a lot
2022-01-12 20:26:14 +01:00
18fc0e6e5b
add lots in create or update lot views
2022-01-12 19:44:10 +01:00
d6dd740142
split LotView in LotCreateView and LotUpdateView
2022-01-12 17:09:20 +01:00
e0e4ecfd2d
replace Temporal for Temporary
2022-01-12 16:52:55 +01:00
387a37ecfe
add template allocate
2022-01-11 13:42:38 +01:00
849e482d62
add named tags
2022-01-11 13:42:01 +01:00
4e43076c04
add tag list
2022-01-11 13:13:57 +01:00
062eed3d98
unassigned have only the devices than not exist in any lot
2022-01-11 11:46:47 +01:00
c213bddb8c
fix a main_inventory
2022-01-11 11:21:17 +01:00
8303054706
adding deltatime in allocate form
2022-01-11 10:32:04 +01:00
5eb8a5a4b9
allocate formulary
2022-01-10 15:53:11 +01:00
86d607800a
allocate form
2022-01-10 13:27:27 +01:00
b191b155fd
action form standart
2022-01-10 13:07:05 +01:00
a2c3741002
fix click in modal action page
2022-01-10 10:33:41 +01:00
fd00a3ec34
add view, lot and type in formulary new action
2022-01-05 16:00:13 +01:00
7d341c7d64
adding rendering template for new action
2022-01-05 12:13:44 +01:00
483f674957
adding edit lot and fix bug of session.commit
2022-01-05 11:10:32 +01:00
18fead559c
first step for render actions view
2022-01-04 12:56:28 +01:00
8333d6804c
Merge branch 'feature/server-side-render-devices' of github.com:eReuse/devicehub-teal into feature/server-side-render-devices
2022-01-04 12:45:36 +01:00
a518e4ebf8
fixing bug when create a new lot
2022-01-04 12:45:13 +01:00
Santiago L
c2a058bf51
Merge branch 'feature/server-side-render' into feature/server-side-render-devices
2022-01-04 12:00:15 +01:00
Santiago L
e1786ddcb2
Refactor: store current user on `before_request()`
2022-01-04 11:59:03 +01:00
5b9a9d482d
template necessary for create a new lot
2022-01-03 13:41:24 +01:00
1acd3c4929
refactoring actions of javascript
2022-01-03 13:40:30 +01:00
5bfe1584b9
add actions in menu New actions
2022-01-03 13:25:35 +01:00
d994cd2f10
remove lot
2022-01-03 12:28:42 +01:00
d17114a0b0
remove device from a lot
2022-01-03 11:32:12 +01:00
9413e7b3c7
add as global g.user current_user
2022-01-03 11:31:40 +01:00
b730537cde
add lot name in the breadcrumb
2021-12-30 22:39:56 +01:00
0f5ab17a3f
refactoring DeviceListView
2021-12-30 21:40:44 +01:00
d3dc5c8986
view for create an edit the a lot
2021-12-30 21:35:54 +01:00
a0ef40328a
fix url of redirect when add one device in a lot
2021-12-30 19:57:18 +01:00
715702658f
adding the lots in the correct section
2021-12-30 19:46:34 +01:00
b7a723866b
adding lot view
2021-12-30 17:23:34 +01:00
d2701de62b
moving selectpicker to main_inventory
2021-12-30 13:55:11 +01:00
8411a005df
adding csrf_token to addinglot.html
2021-12-30 13:54:14 +01:00
ae4dd59f07
adding new viewLotDeviceAddView
2021-12-30 13:53:28 +01:00
e1c46e4725
adding form class for addinglot
2021-12-30 13:52:06 +01:00
94bf3aaf87
management of the form of adding a device in a batch from the frontend
2021-12-30 12:41:37 +01:00
a5a08a162c
adding lots in to modal addinglot form
2021-12-29 13:44:28 +01:00
f0dd2fb4ec
adding modal menu in for lots
2021-12-29 13:02:39 +01:00
8591af5abd
adding buttons of lots actions exports and tags with dropdown menu
2021-12-29 12:14:29 +01:00
2ea5c875c1
table with search and ordering fields
2021-12-29 10:57:39 +01:00
5b07c274ef
drop submoduls in inventory module
2021-12-29 10:13:34 +01:00
e0de5c018c
changes order the input checkbox in the devices table
2021-12-29 10:13:03 +01:00
Santiago L
74ae8ce559
Replace favicon with USOdy logo
2021-12-29 08:30:46 +01:00
Santiago L
b1d7eb12b7
Set page title
2021-12-29 08:17:42 +01:00
Santiago L
9f31c2cad8
Implement 'remember me' feature
2021-12-29 08:10:26 +01:00
1da6484f26
adding table
2021-12-28 14:14:02 +01:00
c8be2bb640
adding rendering list
2021-12-28 13:55:56 +01:00
9e042125a3
clean configs
2021-12-28 13:55:26 +01:00
Santiago L
f4e2689f82
Add USOdy logo to login & navbar
2021-12-28 13:41:45 +01:00
Santiago L
e97ee61c36
Define Stamps link to StampsView
2021-12-28 13:31:24 +01:00
Santiago L
a9515dce13
Print current_user info & drop topbar unused elements
2021-12-28 13:26:56 +01:00
Santiago L
43b5a67cab
Create logout view
2021-12-28 13:05:41 +01:00
a23d3427fb
Merge branch 'feature/server-side-render' into feature/server-side-render-devices
2021-12-28 12:36:46 +01:00
ed48df70db
adding templates for inventory1
2021-12-28 12:36:02 +01:00
Santiago L
c226844a43
Encapsulate required app config on Devicehub
2021-12-28 12:32:38 +01:00
8aa997a2f6
comment decorators
2021-12-28 11:46:17 +01:00
fb81edf799
insert LoginManager in devicehub app
2021-12-28 11:45:53 +01:00
1feb287ca0
SECRET_KEY in config
2021-12-28 11:13:30 +01:00
Santiago L
338afcc556
Secure UserProfileView with login_required
2021-12-28 09:44:04 +01:00
Santiago L
3af67fee01
Implement user login based on sessions
...
Use Flask-Login & Flask-WTF libraries
2021-12-28 09:39:12 +01:00
Santiago L
95cc6f5e94
Update links on sidebar menu
2021-12-27 09:58:27 +01:00
Santiago L
a0509a23a4
Create user login view
2021-12-27 09:15:06 +01:00
Santiago L
bf5c76cd04
Create base_site.html
2021-12-27 09:14:10 +01:00
Santiago L
093e1d415d
Refactor: use Flask class based views
2021-12-27 08:54:55 +01:00
Santiago L
d5b972e9e3
Create base template based on NiceAdmin Template
...
Only minimal dependencies are loaded:
- bootstrap
- bootstrap-icons
2021-12-23 00:41:59 +01:00
Santiago L
339d7f7d7f
Create core Blueprint skeleton
2021-12-23 00:29:44 +01:00
47dcb5efe8
fixing tests
2021-12-21 10:32:04 +01:00
4acd03e714
fixing ereuse pdf
2021-12-21 09:55:06 +01:00
46dd173a12
fixing tests
2021-12-16 14:00:54 +01:00
a670a01c5e
fixing bug us2524
2021-12-16 13:21:35 +01:00
10a1e23a5d
Metrics only lot
2021-12-07 13:20:16 +01:00
daed1bdafb
.
2021-12-03 09:54:59 +01:00
ba858aff89
fixing permitions for excel
2021-11-29 12:15:37 +01:00
f0d9ead977
deactivate removes for RAMs slots
2021-11-26 14:08:11 +01:00
596b54f818
up of version
2021-11-25 10:29:32 +01:00
03ee4fba34
changes some values of headers
2021-11-24 12:20:40 +01:00
0543fb64a5
Merge branch 'testing' into feature/power_on_hours
2021-11-24 11:17:26 +01:00
e8ccbedf40
change of version
2021-11-24 10:15:18 +01:00
c4a2b720ef
adding property power_on_hours
2021-11-23 15:27:16 +01:00
56dcdf2897
get_status docuemnts in metrics
2021-11-23 11:08:48 +01:00
b117a4b267
Merge pull request #170 from eReuse/feature/delete-devices
...
Feature/delete devices
2021-11-22 12:38:00 +01:00
2d5ead7c1b
checking permitions of actions
2021-11-22 12:01:12 +01:00
e09073216c
fixing migration
2021-11-22 11:34:03 +01:00
bef5df414b
fixing bug in sync
2021-11-22 11:14:27 +01:00
40bf280c75
Fixing name of document container in metrics
2021-11-22 10:31:20 +01:00
9d4df05831
litle bugfix taiga 2357
2021-11-22 10:16:39 +01:00
818e3ad0cc
new tests
2021-11-19 12:44:52 +01:00
3b41ddb66a
Merge branch 'testing' into feature/delete-devices
2021-11-19 12:07:14 +01:00
aa17d4b492
clean code test
2021-11-19 11:34:13 +01:00
d8382f8331
drop assert for lot[devices] in dummy
2021-11-18 11:52:59 +01:00
63f7adf69c
try to use only_fields for devices but not used
2021-11-18 11:50:29 +01:00
5510417125
reduce latency for timeout for lots
2021-11-18 11:48:57 +01:00
e447e15aeb
fixing update of migration
2021-11-12 22:26:08 +01:00
fb5286648d
fixing update of migration
2021-11-12 22:24:23 +01:00
287ac8d741
fixing migration of olds confirmRevokes datas
2021-11-12 22:16:02 +01:00
8e47af8e27
refactoring trading and trading for web
2021-11-12 10:00:43 +01:00
1279180700
fixing confirms
2021-11-11 22:50:07 +01:00
e326e8ccdf
fixing revoke when the device is in one future trade
2021-11-11 22:21:58 +01:00
872a0be866
rebuild trading function
2021-11-11 22:08:28 +01:00
cef22f01ce
fixing deletr_from_trade
2021-11-11 17:23:45 +01:00
54977d432d
refactory in delete_from_trade function
2021-11-11 17:06:26 +01:00
9dc79a59dc
fixing revokeView and reset_owner
2021-11-10 18:59:44 +01:00
f06007e199
fixing conflict
2021-11-08 18:07:07 +01:00
c7ced04e9d
fixing bug for documents
2021-11-08 17:33:22 +01:00
f8be48d524
fixing schema
2021-11-05 13:10:23 +01:00
6bf1354109
fixing change status next trade
2021-11-05 13:00:01 +01:00
5ebf4f48b5
adding trade in status actions
2021-11-05 12:35:10 +01:00
56df40c81a
fixing actions for computer
2021-11-04 13:27:25 +01:00
6de83ce4d2
Fixing order of actions_multiple devices
2021-11-04 11:58:15 +01:00
b233b7bb75
fixed
2021-11-03 10:37:15 +01:00
34def7bd70
fixint trading fuction
2021-11-02 14:25:49 +01:00
c34cbb5c26
fixing metrics
2021-11-02 12:47:23 +01:00
283f869b4d
drop remove
2021-10-28 12:19:49 +02:00
03238acb9f
fixing session in listener
2021-10-26 16:35:41 +02:00
5861d2fd6f
fixing session in listener
2021-10-26 16:21:05 +02:00
5cce2f4efb
change some sintaxis
2021-10-25 13:24:22 +02:00
15fa4546d1
fixing general case for devices
2021-10-25 12:20:16 +02:00
1c2f6ba92c
fixing tests
2021-10-23 13:02:10 +02:00
9faa1697a7
fixing event device
2021-10-22 21:14:10 +02:00
6091f31c17
adding event instead of reuse create_code function
2021-10-22 19:26:27 +02:00
2ade5a14d4
adding tag when there are a new device
2021-10-22 14:19:42 +02:00
7c6b20597b
fixing supplier permitions
2021-10-20 14:53:33 +02:00
f099a579fb
fixing rows
2021-10-19 19:25:17 +02:00
87f30a1391
adding metrics for tradeDocuments
2021-10-19 18:19:25 +02:00
31de27769d
Merge branch 'testing' into feature/new-metrix
2021-10-18 11:53:05 +02:00
5ec005e63b
resolve conflict
2021-10-18 11:47:55 +02:00
2d37baca8d
fixing minor changes of review
2021-10-18 11:20:05 +02:00
0eed8330ce
adding metrics for documents
2021-10-15 15:04:58 +02:00
17f8aebb94
fixing rows
2021-10-14 18:13:20 +02:00
5e9b9bf08d
new metrics
2021-10-14 12:56:33 +02:00
aa7a3ffe12
Merge branch 'feature/new-recycling-action' into feature/new-metrix
2021-10-11 14:11:59 +02:00
35e891bf5d
trace in metrics
2021-10-11 14:11:56 +02:00
007e9a96c6
Merge branch 'testing' into feature/new-recycling-action
2021-10-06 12:49:42 +02:00
fbf74643e9
resolve conflict
2021-10-06 12:11:05 +02:00
2e564862e8
excluding when it is in one trade action
2021-10-06 11:53:41 +02:00
03cfbfaa35
fixing model action device
2021-10-06 10:51:53 +02:00
aa4ebeb504
fixing, vanish deactivate devices
2021-10-05 14:33:28 +02:00
9ea0a05de6
migration file
2021-10-05 14:00:55 +02:00
6dd54d9645
deactivate devices
2021-10-05 12:17:07 +02:00
ec2d286ed3
adding action delete
2021-10-05 11:56:19 +02:00
ab74240d6c
fixing 3 bugs, #168
2021-10-04 13:35:51 +02:00
920937a51f
fixing bug of trade without devices
2021-10-01 13:30:39 +02:00
6599f4b66c
fixing bug
2021-10-01 10:46:08 +02:00
eeb6db7bc2
test for recycling documents
2021-09-29 21:12:46 +02:00
7e4af161d3
solve conflict
2021-09-29 14:13:42 +02:00
aff86a8f94
using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices
2021-09-29 12:59:44 +02:00
baa5fccda0
Merge pull request #163 from eReuse/feature/container
...
Feature/container
2021-09-29 12:58:01 +02:00
84da94430e
fixing bug
2021-09-28 15:44:25 +02:00
f10f2b848f
get the status and history status of one devices
2021-09-28 13:05:58 +02:00
38db59b150
put the correct user un rol_user
2021-09-27 14:58:25 +02:00
c2b0e6341f
adding new models for Use, Recycling, Refurbish and Management actions
2021-09-24 12:37:33 +02:00
b195e380a9
adding basic action reuse and recycling
2021-09-22 14:01:49 +02:00
4eb4c1a480
downgrade of version
2021-09-22 11:35:06 +02:00
328facab50
adding dhid
2021-09-22 11:30:37 +02:00
9df5872a44
upgrade version
2021-09-21 12:45:58 +02:00
1466cbc4f4
fixing bug of csv
2021-09-21 12:44:07 +02:00
3559b98535
fixing bug
2021-09-20 16:16:53 +02:00
bcaf907255
adding total weight in lots
2021-09-10 14:07:35 +02:00
b7396b4f23
adding action moveOn inside of tradeDocuments
2021-09-09 13:34:24 +02:00
6cd28a3e3a
Adding MoveOnDocument in migration and fixing schema
2021-09-08 13:54:10 +02:00
74af5add3c
adding action moveOn endpoint
2021-09-06 12:45:47 +02:00
f398c50288
clean old code as documents
2021-09-06 12:44:57 +02:00
0d73bb1f63
Build action moveOn
2021-09-03 16:06:53 +02:00
1d73a8f0c1
Merge branch 'testing' into feature/container
2021-09-03 11:05:47 +02:00
16b6325c1b
Merge branch 'testing' into feature/lot-unassigned
2021-08-16 11:15:30 +02:00
faa58df4b4
clean pdbs
2021-08-13 17:18:48 +02:00
b2390f3010
adding more mimes type
2021-08-13 17:16:31 +02:00
de727f2645
pdbs
2021-08-11 13:40:37 +02:00
b56e9b106f
adding migration for recycle document model
2021-08-10 13:57:18 +02:00
5799be2a3a
fixing foreingkey
2021-08-10 13:56:33 +02:00
727a7cfccb
reolve conflicts
2021-08-10 13:06:53 +02:00
9086bb628f
fixing change type for document_type
2021-08-10 12:55:47 +02:00
f1220dd756
new Recycling document
2021-08-10 12:45:03 +02:00
9217f7392a
Merge branch 'feature/document-erased' into feature/container
2021-08-09 17:22:46 +02:00
ed43bd477c
we only need the data files
2021-08-06 11:08:58 +02:00
eed117808c
Fixing nullables in models
2021-08-04 18:15:15 +02:00
710e61fca8
resolve conflicts
2021-08-04 18:03:40 +02:00
9b2936c795
adding weight to trade documents
2021-08-03 16:40:17 +02:00
d123b4e8a8
up the version
2021-08-03 13:13:35 +02:00
6326c0b59d
fixing reported_uncorrectable_errors
2021-08-03 11:55:47 +02:00
1961e3d408
rebuild query for filter devs without lots
2021-08-02 18:17:08 +02:00
bc95a618c1
adding result, software and url for DataWipe action
2021-07-30 14:36:10 +02:00
7160b88199
fixing migration downgrade
2021-07-29 15:55:59 +02:00
3119178c9c
heredit datawipe document form general document model
2021-07-29 15:46:49 +02:00
1811b81e93
adding success and software field in document
2021-07-29 14:54:58 +02:00
bfe56a8626
DataWipe instead of ToErased
2021-07-29 12:45:43 +02:00
f8ce81cc19
drop endpoint
2021-07-29 11:19:45 +02:00
bb3145f3d8
fixing test_basic
2021-07-28 15:59:11 +02:00
833b55aefc
external document erase
2021-07-26 11:33:11 +02:00
c5e62914b6
try solve problems with foreignkey
2021-07-21 15:02:23 +02:00
811a3c5262
fixing with bigsIntegers
2021-07-21 09:03:26 +02:00
2ec03d962e
change changelog
2021-07-21 08:46:09 +02:00
740783b9fd
adding generic documents model
2021-07-21 08:35:18 +02:00
c2745fa437
update changelog and versions
2021-07-07 12:46:24 +02:00
eab0400124
open of security
2021-07-07 11:06:07 +02:00
919d4a43d3
return validating error
2021-07-06 16:23:31 +02:00
e63b2a50ec
growing security
2021-07-05 15:57:09 +02:00
45950997f8
fixed bug manual snapshots
2021-07-05 15:48:17 +02:00
c554d30291
fixing tests
2021-07-05 15:04:44 +02:00
25482125a3
pass into .env
2021-07-05 15:04:14 +02:00
b8e9ed22f6
fixing new jwt into a json
2021-07-05 12:31:16 +02:00
4b4c0a1480
fixing owner_id in computer
2021-07-05 12:29:21 +02:00
3d027270cc
ading jwt in snapshots
2021-07-02 15:25:19 +02:00
167f16b641
Merge branch 'testing' into feature/#155_decode_snapshots
2021-07-01 12:57:08 +02:00
5e8c4a3231
add code of user for show in angular
2021-07-01 12:08:18 +02:00
06c5137b32
implementation of hash3 for snapshots
2021-06-30 15:05:44 +02:00
b7e652906e
clean views of trade documents
2021-06-29 19:13:00 +02:00
e3a0ea7e5b
first iteration #155 decode snapshot json
2021-06-29 17:15:45 +02:00
c8b0c56bbb
confirm Revoke, confirm and revoke documents actions
2021-06-28 16:06:07 +02:00
8a797f079b
fixing models and build views for revokeDocument
2021-06-24 19:09:12 +02:00
77000882f5
change model action_trade_documents
2021-06-24 11:41:14 +02:00
f85a0f5ef4
fixing documents trade
2021-06-22 16:53:10 +02:00
c08ccd8d34
Merge branch 'feature/endpoint-confirm' into feature/trade-documents
2021-06-17 13:30:56 +02:00
5dc1b79596
fixing bug 2281
2021-06-16 17:07:00 +02:00
00d2b2e81f
fixing bug taiga 2280
2021-06-16 11:55:05 +02:00
4b7a40e6c1
bugfix taiga 2280
2021-06-16 10:53:18 +02:00
0a96d4f6ef
fixing schemas interdependences
2021-06-15 15:22:49 +02:00
f7070dbbf7
adding documents in schema of lots
2021-06-15 15:14:29 +02:00
814922dbff
change tradedocuments in an other file version
2021-06-15 14:45:41 +02:00
1e05f600a7
fixing schema in migration file
2021-06-15 14:29:38 +02:00
b1f7b629c7
fixing url
2021-06-15 13:11:49 +02:00
80b7b98ec8
adding trade documents to migration file
2021-06-15 12:58:10 +02:00
315eb097c9
change view for save hash
2021-06-15 12:38:24 +02:00
b1414cf143
redefine models
2021-06-15 12:38:02 +02:00
7cee2693ff
resolve conflict
2021-06-15 11:22:17 +02:00
0d4c70a74e
fixing bug
2021-06-11 15:49:31 +02:00
ab32b996bd
resolve conflict
2021-06-11 12:52:39 +02:00
b12d54d6f1
drop id of trade action
2021-06-11 12:27:14 +02:00
2cfb126c6c
fixing litle bug in delete dev of a lot
2021-06-11 12:26:36 +02:00
94d4b57be9
fixing id of trading
2021-06-09 12:02:31 +02:00
a0d26a104f
Merge pull request #140 from eReuse/feature/endpoint-confirm
...
Feature/endpoint confirm
2021-06-09 11:46:32 +02:00
c0558733ec
fixing remove decvices from a temporary lot
2021-06-09 11:36:11 +02:00
eaea1c3fa3
Merge branch 'feature/endpoint-confirm' into feature/trade-documents
2021-06-08 16:14:54 +02:00
99fe0407f0
clean
2021-06-08 16:14:30 +02:00
1e0d993cfe
resolve conflict
2021-06-08 09:30:13 +02:00
24e05b4ecd
fixing foreinkey action for confirm actions
2021-06-07 18:18:09 +02:00
1da5a6cc0e
fixing migration
2021-06-07 17:12:53 +02:00
e9a09ec2ae
fixing automatic confirmation
2021-06-07 17:12:30 +02:00
6546332fe5
swap @s for _s in code
2021-06-07 16:04:33 +02:00
a9b341076a
fixed
2021-06-07 15:48:55 +02:00
eb52c39ca3
fixing migrations
2021-06-07 15:45:48 +02:00
f9189ea413
confirm check
2021-06-07 15:45:32 +02:00
8289f24b69
fixing confirm and code in schema
2021-06-07 15:45:04 +02:00
efbc74f7fb
fixing confirm in migrate
2021-06-07 14:37:56 +02:00
589c399231
fixing relation files interdependences
2021-06-07 13:10:28 +02:00
f3f65efeaf
resolve conflicts
2021-06-07 12:08:55 +02:00
289126a8a7
fixing revoke
2021-06-07 11:48:50 +02:00
21cdcb5350
simplify the algorithm for to manager the confirms flow
2021-06-07 10:50:08 +02:00
6dc7fb830b
fixing bug of filter devices
2021-06-06 10:02:24 +02:00
80e74b6d3d
fixing supplier and receiver
2021-06-04 19:27:01 +02:00
a0824f986b
not allow than other users can insert devices, show better the status of trade for devices
2021-06-03 19:05:57 +02:00
8d1e6bb2d7
drop istemporary lot
2021-06-03 12:11:14 +02:00
e4554a9e27
use open filter for checke frontend trade
2021-06-02 15:33:03 +02:00
0c99a85361
add raise instead of assert
2021-06-02 13:46:28 +02:00
20e029b359
bugfix: restriction delete lot by the owner
2021-06-02 10:11:20 +02:00
57c9269907
add trade instead of deliverynote in lots view
2021-06-02 10:10:36 +02:00
6c689878a4
Fixing schema trade
2021-06-01 15:59:54 +02:00
e1348e3809
adding isTemporary lot
2021-05-31 11:34:46 +02:00
6142b89f41
adding confirm_status in devices
2021-05-27 15:56:10 +02:00
ef2e800281
change confirm for confirms field
2021-05-27 15:55:24 +02:00
8731d90d9a
add lots in csv of devices
2021-05-26 11:43:53 +02:00
145cc2ec3e
Merge branch 'testing' of https://github.com/eReuse/devicehub-teal into testing
2021-05-26 11:01:13 +02:00
816411aa7b
fixing settings.ini wbconf
2021-05-26 11:00:43 +02:00
ab3510b67b
fixed bug
2021-05-25 12:57:21 +02:00
dd03b4d203
change id of migration fixied
2021-05-25 11:46:13 +02:00
1098ef773f
resolve conflict
2021-05-25 09:03:34 +02:00
b34feee800
fixing bug
2021-05-24 13:00:03 +02:00
2a66fb94a3
actions trade for documents
2021-05-21 13:16:30 +02:00
28da6a953d
adding trade for documents
2021-05-19 13:59:59 +02:00
020e6afd53
saved phisical documents to disk
2021-05-19 09:47:14 +02:00
4b11372719
Definition of endpoint, view and scheme for basic document
2021-05-14 12:58:56 +02:00
a3f5401e1f
fixing versions of alembic
2021-05-13 17:27:19 +02:00
c21de78982
base for documents
2021-05-13 13:35:46 +02:00
821178359e
resolve conflicts
2021-05-12 19:06:03 +02:00
a1119b6130
Merge branch 'testing' into feature/endpoint-confirm
2021-05-12 18:52:50 +02:00
3fc3828326
up version
2021-05-12 17:31:44 +02:00
c7ff58273f
fixing bug changing database model
2021-05-12 13:02:36 +02:00
5222f2ceb7
add actionDocuments and drop documents field from Trade action
2021-05-12 11:48:52 +02:00
f36fa2bb7d
add var in config
2021-05-12 11:47:03 +02:00
e2898b22a3
fixing defs
2021-05-10 11:52:10 +02:00
dc5d8fcbe0
fixing representation classes
2021-05-10 11:51:28 +02:00
7593c4e7df
cleaning and fixing validates of trade and confirms
2021-05-10 11:50:13 +02:00
2808da24ba
adding Confirm and Revoke in the lots when it is a trade lot
2021-05-10 11:48:43 +02:00
a2f106bed0
move views actions in more files
2021-05-10 11:47:56 +02:00
951d067dd6
adding revoke and fixing ConfigRevike
2021-04-30 17:54:03 +02:00
34fbf0dca6
ConfirmRevoke as a new action
2021-04-30 12:44:32 +02:00
b2bd820d50
resolve conflict
2021-04-29 17:04:25 +02:00
76271ce430
drop tradeNotes
2021-04-29 11:25:17 +02:00
4afa21d7d7
Merge branch 'testing' into feature/#135-trade-without-to
2021-04-29 11:23:00 +02:00
faf45e118b
upgrade version to 1.0.6b
2021-04-27 21:33:38 +02:00
ec4d87d8ec
add blank line
2021-04-27 15:39:37 +02:00
035c4fa269
validate schema confirm
2021-04-27 15:39:11 +02:00
c1081994de
fixing model
2021-04-27 13:54:13 +02:00
77ddb79d64
fixing versions of migrations
2021-04-26 18:16:38 +02:00
97d784f849
Merge branch 'testing' into feature/endpoint-confirm
2021-04-26 17:11:35 +02:00
a65e4ffb82
fixing bug
2021-04-26 15:22:30 +02:00
e2fbe87c6a
clean actionView of Snapshot section put in other class
2021-04-22 13:40:45 +02:00
39dc489cb3
clean ActionView with more classes
2021-04-22 13:04:38 +02:00
310d92169b
fixed view confirm
2021-04-22 11:13:04 +02:00
e65dfbdc0c
fixing schema confirm
2021-04-22 11:12:14 +02:00
865c9d5d07
fixing model confirm
2021-04-22 11:11:23 +02:00
21a5d14adc
def confirm endpoint
2021-04-22 11:10:13 +02:00
939a2bff71
clean tradeview for obsolet
2021-04-21 14:45:53 +02:00
4e6f43a8bb
new tradenote schema
2021-04-21 14:43:41 +02:00
57ca10be38
fixing model tradenote
2021-04-21 14:43:21 +02:00
17b409c9ee
redefine tradenoteDef
2021-04-21 14:37:32 +02:00
f57b65107e
fixing enum in migration
2021-04-20 21:45:43 +02:00
85e514bb6d
fixing enum in migration
2021-04-20 21:37:00 +02:00
1b9aaf538a
fixing migrations
2021-04-20 19:12:07 +02:00
c6f908041b
adding tradenote to migration
2021-04-20 16:26:58 +02:00
6822c5bbf8
made one automatic note when add/remove one device of one lot
2021-04-20 16:21:02 +02:00
afea2cff79
adding confirmation model
2021-04-20 16:19:40 +02:00
006fe4b855
fixing definitions
2021-04-19 19:37:26 +02:00
387c2e15e5
fixing view action trade
2021-04-19 19:34:22 +02:00
3bb7482876
fixing schemas and states
2021-04-19 19:33:35 +02:00
e058e2491f
change model for trade
2021-04-19 19:33:05 +02:00
55e27caa83
change migrations
2021-04-19 19:32:32 +02:00
149255bcfe
resolve conflicts
2021-04-16 18:16:07 +02:00
e9d85e3d9e
resolv conflict
2021-04-16 15:46:19 +02:00
e6f098abc8
Merge branch 'testing' into feature/#130-code-for-device
2021-04-16 14:44:49 +02:00
70188f43a2
simplify get_token method
2021-04-15 21:21:41 +02:00
3f423e7712
drop schema users for view
2021-04-15 21:20:08 +02:00
e1f8f89a9b
fixing auth for token
2021-04-15 21:19:20 +02:00
b3d77ba212
fixing model and migration
2021-04-15 21:18:15 +02:00
bae5a1d2b1
add session schema
2021-04-15 21:17:24 +02:00
9c489c7564
fixing create new users
2021-04-15 21:16:32 +02:00
d46db11813
adding devices from lot
2021-04-14 13:02:39 +02:00
e1cca540c4
change verification link for erasure certificate doc
2021-04-13 19:02:16 +02:00
21f019dc14
useing session table in wbconf
2021-04-13 18:33:49 +02:00
bfa9746de1
session table and model
2021-04-13 18:33:15 +02:00
7e4513f5d2
Merge branch 'testing' into feature/#128-endpoint-config-wb
2021-04-12 19:48:23 +02:00
4704045da8
more easy to read
2021-04-12 19:34:33 +02:00
3be8678328
resolve bad name of var logout1
2021-04-12 12:10:57 +02:00
aa09413011
fixing review comments
2021-04-12 12:05:52 +02:00
22633054ba
fixing phantom account existing
2021-04-09 22:21:13 +02:00
a882396f09
check the propertary of the devices
2021-04-09 22:20:30 +02:00
48894567c3
check if the validate user is one of the users of the trade
2021-04-09 20:12:30 +02:00
eae5422d42
resolve conflict
2021-04-09 14:57:26 +02:00
c5ef11e670
fixing for todo trade pr
2021-04-09 14:43:20 +02:00
2ab9afa1e4
fixing migration
2021-04-08 21:31:50 +02:00
e88a508efb
create correct migrations
2021-04-08 21:22:10 +02:00
b80322355f
create automatic trade and creation of phantom account in the view
2021-04-08 21:21:29 +02:00
f7f60f6988
remove pdbs
2021-04-08 21:20:14 +02:00
17a744a660
add filter active and phantom for login view
2021-04-08 21:19:24 +02:00
9a43ab0097
add new columns in user model, (active and phantom fields)
2021-04-08 19:13:28 +02:00
a9ec5de237
do a better check from schema
2021-04-08 19:11:27 +02:00
054f59453d
fixing tests
2021-04-08 19:09:52 +02:00
6fde0cabc6
change offer with new requirements
2021-04-07 10:49:28 +02:00
84fac3f04a
fixing schema offer
2021-04-03 17:47:30 +02:00
98daa0e3ad
fixing enum currency in migration
2021-04-03 17:46:16 +02:00
799c2a49bc
fixing migration
2021-04-03 15:09:53 +02:00
5df9c46f43
fixing shema and model
2021-04-03 15:09:35 +02:00
bbc22f4a53
Merge branch 'testing' into feature/trade-without-from
2021-04-03 15:02:06 +02:00
47dd5b24d8
change offer-trade for 2192 aproach
2021-04-03 13:33:56 +02:00
83eeace6fa
fixing migrations
2021-03-26 17:58:05 +01:00
8f1eee0e89
fixing url to device
2021-03-26 17:57:45 +01:00
ee55020f3c
resolve conflict
2021-03-26 11:04:04 +01:00
45b44ce17b
fixing tests
2021-03-25 11:26:30 +01:00
e884ced4d1
try define offer
2021-03-24 14:17:18 +01:00
edf3700fde
Adding Offer action
2021-03-19 11:53:04 +01:00
a66ddc8390
bugfix trade action
2021-03-18 16:36:19 +01:00
acbc252fe8
new version of trade
2021-03-18 10:59:38 +01:00
361c4946fe
fixing migrations
2021-03-16 21:43:57 +01:00
34aeae9908
fixing models
2021-03-16 21:39:17 +01:00
4cbe28d591
fixing comment
2021-03-16 20:55:07 +01:00
b13d8e5b97
fixing merge
2021-03-16 20:50:57 +01:00
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
Cayo Puigdefabregas
Santiago L
cayop
nad
Jordi Nadeu
fedjo
yiorgos marinellis
Big Lebowski
emmdim
jordi.nadeu