99fe0407f0
clean
2021-06-08 16:14:30 +02:00
1e0d993cfe
resolve conflict
2021-06-08 09:30:13 +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
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
f3f65efeaf
resolve conflicts
2021-06-07 12:08:55 +02:00
21cdcb5350
simplify the algorithm for to manager the confirms flow
2021-06-07 10:50:08 +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
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
6c689878a4
Fixing schema trade
2021-06-01 15:59:54 +02:00
ef2e800281
change confirm for confirms field
2021-05-27 15:55:24 +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
4b11372719
Definition of endpoint, view and scheme for basic document
2021-05-14 12:58:56 +02:00
c21de78982
base for documents
2021-05-13 13:35:46 +02:00
a1119b6130
Merge branch 'testing' into feature/endpoint-confirm
2021-05-12 18:52:50 +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
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
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
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
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
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
d46db11813
adding devices from lot
2021-04-14 13:02:39 +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
b80322355f
create automatic trade and creation of phantom account in the view
2021-04-08 21:21:29 +02:00
a9ec5de237
do a better check from schema
2021-04-08 19:11:27 +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
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
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
34aeae9908
fixing models
2021-03-16 21:39:17 +01:00
d7e50be052
models of new trade
2021-03-16 14:31:38 +01:00
1fff5cd32e
add format to numbers and remove some datas
2021-02-11 20:00:57 +01:00
e34371bbc5
Drop Transferred action
2021-02-10 10:41:24 +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
f140c48359
fixing bug of lifetime
2021-01-19 16:06:46 +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
12f28ba76f
metrics in csv
2021-01-13 18:11:41 +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
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
b8812f0b82
change required for display, functionality and apparence
2020-12-17 13:08:06 +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
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
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
0c1e5b8307
changes from review
2020-11-25 18:42:36 +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
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
200974e8f6
remove deallocate
2020-11-19 11:36:09 +01:00
5adfad8a5e
adding deallocate
2020-11-18 19:00:43 +01:00
16735d0199
change assigned for allocate
2020-11-18 18:13:13 +01:00
69368a8ca3
rent with assigned concept
2020-11-17 19:21:32 +01:00
820e253a12
new version of rent as asigned
2020-11-17 13:19:50 +01:00
8acca4d2cf
definition rent endpoint
2020-11-16 20:32:28 +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
19eca48db0
resolve conflict
2020-10-29 19:19:33 +01:00
5f68803d9f
adding the directory structure for save all jsons
2020-10-29 16:09:02 +01:00
b2c258b699
fixed mark time correctly in the name file of json
2020-10-29 12:10:12 +01: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
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
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
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
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
8d112c1360
Abort snapshot action if current user is not owner of the
...
(non-component) device
2020-06-01 20:43:10 +03: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
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
64a43e63d7
Adds Transferred event
2019-12-23 13:31:54 +01:00
b649bf7ac4
Adds new action TransferOwnership
2019-12-21 16:41:23 +01:00
83d9d12afb
delete visual test to compute rate (v1)
2019-10-22 15:53:44 +02:00
ce961a1bed
Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT
2019-07-07 21:36:09 +02:00
f8ec8fc882
Change ReadyToUse for Available
2019-07-06 15:06:22 +02:00
c92d6b3282
Merge branch 'rate' into devel
2019-07-01 11:31:18 +02:00
7e8c36ab3e
Snyc with new Workbench models; fix SSL bug
2019-06-29 16:26:14 +02:00
3d6fef9927
change comments to comply with the standard PEP 257
2019-06-19 13:35:26 +02:00
928863bfdf
Update comments in actions; remove workbench folder in rate
2019-06-12 16:49:55 +02:00
c19783954e
adding comments about rate algorithm
2019-05-14 20:31:43 +02:00
61f4c127d4
Change event to action complying with schema.org
2019-05-11 16:27:22 +02:00
Cayo Puigdefabregas
Jordi Nadeu
nad
yiorgos marinellis
jordi.nadeu
emmdim
Xavier Bustamante Talavera