Cayo Puigdefabregas
|
f10f2b848f
|
get the status and history status of one devices
|
2021-09-28 13:05:58 +02:00 |
|
Cayo Puigdefabregas
|
38db59b150
|
put the correct user un rol_user
|
2021-09-27 14:58:25 +02:00 |
|
Cayo Puigdefabregas
|
c2b0e6341f
|
adding new models for Use, Recycling, Refurbish and Management actions
|
2021-09-24 12:37:33 +02:00 |
|
Cayo Puigdefabregas
|
b195e380a9
|
adding basic action reuse and recycling
|
2021-09-22 14:01:49 +02:00 |
|
Cayo Puigdefabregas
|
328facab50
|
adding dhid
|
2021-09-22 11:30:37 +02:00 |
|
Cayo Puigdefabregas
|
1466cbc4f4
|
fixing bug of csv
|
2021-09-21 12:44:07 +02:00 |
|
Cayo Puigdefabregas
|
3559b98535
|
fixing bug
|
2021-09-20 16:16:53 +02:00 |
|
Cayo Puigdefabregas
|
bcaf907255
|
adding total weight in lots
|
2021-09-10 14:07:35 +02:00 |
|
Cayo Puigdefabregas
|
b7396b4f23
|
adding action moveOn inside of tradeDocuments
|
2021-09-09 13:34:24 +02:00 |
|
Cayo Puigdefabregas
|
6cd28a3e3a
|
Adding MoveOnDocument in migration and fixing schema
|
2021-09-08 13:54:10 +02:00 |
|
Cayo Puigdefabregas
|
74af5add3c
|
adding action moveOn endpoint
|
2021-09-06 12:45:47 +02:00 |
|
Cayo Puigdefabregas
|
f398c50288
|
clean old code as documents
|
2021-09-06 12:44:57 +02:00 |
|
Cayo Puigdefabregas
|
0d73bb1f63
|
Build action moveOn
|
2021-09-03 16:06:53 +02:00 |
|
Cayo Puigdefabregas
|
1d73a8f0c1
|
Merge branch 'testing' into feature/container
|
2021-09-03 11:05:47 +02:00 |
|
Cayo Puigdefabregas
|
16b6325c1b
|
Merge branch 'testing' into feature/lot-unassigned
|
2021-08-16 11:15:30 +02:00 |
|
Cayo Puigdefabregas
|
faa58df4b4
|
clean pdbs
|
2021-08-13 17:18:48 +02:00 |
|
Cayo Puigdefabregas
|
b2390f3010
|
adding more mimes type
|
2021-08-13 17:16:31 +02:00 |
|
Cayo Puigdefabregas
|
de727f2645
|
pdbs
|
2021-08-11 13:40:37 +02:00 |
|
Cayo Puigdefabregas
|
5799be2a3a
|
fixing foreingkey
|
2021-08-10 13:56:33 +02:00 |
|
Cayo Puigdefabregas
|
727a7cfccb
|
reolve conflicts
|
2021-08-10 13:06:53 +02:00 |
|
Cayo Puigdefabregas
|
9086bb628f
|
fixing change type for document_type
|
2021-08-10 12:55:47 +02:00 |
|
Cayo Puigdefabregas
|
f1220dd756
|
new Recycling document
|
2021-08-10 12:45:03 +02:00 |
|
Cayo Puigdefabregas
|
9217f7392a
|
Merge branch 'feature/document-erased' into feature/container
|
2021-08-09 17:22:46 +02:00 |
|
Cayo Puigdefabregas
|
ed43bd477c
|
we only need the data files
|
2021-08-06 11:08:58 +02:00 |
|
Cayo Puigdefabregas
|
eed117808c
|
Fixing nullables in models
|
2021-08-04 18:15:15 +02:00 |
|
Cayo Puigdefabregas
|
710e61fca8
|
resolve conflicts
|
2021-08-04 18:03:40 +02:00 |
|
Cayo Puigdefabregas
|
9b2936c795
|
adding weight to trade documents
|
2021-08-03 16:40:17 +02:00 |
|
Cayo Puigdefabregas
|
1961e3d408
|
rebuild query for filter devs without lots
|
2021-08-02 18:17:08 +02:00 |
|
Cayo Puigdefabregas
|
bc95a618c1
|
adding result, software and url for DataWipe action
|
2021-07-30 14:36:10 +02:00 |
|
Cayo Puigdefabregas
|
3119178c9c
|
heredit datawipe document form general document model
|
2021-07-29 15:46:49 +02:00 |
|
Cayo Puigdefabregas
|
1811b81e93
|
adding success and software field in document
|
2021-07-29 14:54:58 +02:00 |
|
Cayo Puigdefabregas
|
bfe56a8626
|
DataWipe instead of ToErased
|
2021-07-29 12:45:43 +02:00 |
|
Cayo Puigdefabregas
|
f8ce81cc19
|
drop endpoint
|
2021-07-29 11:19:45 +02:00 |
|
Cayo Puigdefabregas
|
bb3145f3d8
|
fixing test_basic
|
2021-07-28 15:59:11 +02:00 |
|
Cayo Puigdefabregas
|
833b55aefc
|
external document erase
|
2021-07-26 11:33:11 +02:00 |
|
Cayo Puigdefabregas
|
c5e62914b6
|
try solve problems with foreignkey
|
2021-07-21 15:02:23 +02:00 |
|
Cayo Puigdefabregas
|
811a3c5262
|
fixing with bigsIntegers
|
2021-07-21 09:03:26 +02:00 |
|
Cayo Puigdefabregas
|
2ec03d962e
|
change changelog
|
2021-07-21 08:46:09 +02:00 |
|
Cayo Puigdefabregas
|
740783b9fd
|
adding generic documents model
|
2021-07-21 08:35:18 +02:00 |
|
Cayo Puigdefabregas
|
c2745fa437
|
update changelog and versions
|
2021-07-07 12:46:24 +02:00 |
|
Cayo Puigdefabregas
|
eab0400124
|
open of security
|
2021-07-07 11:06:07 +02:00 |
|
Cayo Puigdefabregas
|
919d4a43d3
|
return validating error
|
2021-07-06 16:23:31 +02:00 |
|
Cayo Puigdefabregas
|
e63b2a50ec
|
growing security
|
2021-07-05 15:57:09 +02:00 |
|
Cayo Puigdefabregas
|
45950997f8
|
fixed bug manual snapshots
|
2021-07-05 15:48:17 +02:00 |
|
Cayo Puigdefabregas
|
25482125a3
|
pass into .env
|
2021-07-05 15:04:14 +02:00 |
|
Cayo Puigdefabregas
|
b8e9ed22f6
|
fixing new jwt into a json
|
2021-07-05 12:31:16 +02:00 |
|
Cayo Puigdefabregas
|
4b4c0a1480
|
fixing owner_id in computer
|
2021-07-05 12:29:21 +02:00 |
|
Cayo Puigdefabregas
|
3d027270cc
|
ading jwt in snapshots
|
2021-07-02 15:25:19 +02:00 |
|
Cayo Puigdefabregas
|
167f16b641
|
Merge branch 'testing' into feature/#155_decode_snapshots
|
2021-07-01 12:57:08 +02:00 |
|
Cayo Puigdefabregas
|
5e8c4a3231
|
add code of user for show in angular
|
2021-07-01 12:08:18 +02:00 |
|
Cayo Puigdefabregas
|
06c5137b32
|
implementation of hash3 for snapshots
|
2021-06-30 15:05:44 +02:00 |
|
Cayo Puigdefabregas
|
b7e652906e
|
clean views of trade documents
|
2021-06-29 19:13:00 +02:00 |
nad
|
e3a0ea7e5b
|
first iteration #155 decode snapshot json
|
2021-06-29 17:15:45 +02:00 |
|
Cayo Puigdefabregas
|
c8b0c56bbb
|
confirm Revoke, confirm and revoke documents actions
|
2021-06-28 16:06:07 +02:00 |
|
Cayo Puigdefabregas
|
8a797f079b
|
fixing models and build views for revokeDocument
|
2021-06-24 19:09:12 +02:00 |
|
Cayo Puigdefabregas
|
77000882f5
|
change model action_trade_documents
|
2021-06-24 11:41:14 +02:00 |
|
Cayo Puigdefabregas
|
f85a0f5ef4
|
fixing documents trade
|
2021-06-22 16:53:10 +02:00 |
|
Cayo Puigdefabregas
|
c08ccd8d34
|
Merge branch 'feature/endpoint-confirm' into feature/trade-documents
|
2021-06-17 13:30:56 +02:00 |
|
Cayo Puigdefabregas
|
5dc1b79596
|
fixing bug 2281
|
2021-06-16 17:07:00 +02:00 |
|
Cayo Puigdefabregas
|
00d2b2e81f
|
fixing bug taiga 2280
|
2021-06-16 11:55:05 +02:00 |
|
Cayo Puigdefabregas
|
4b7a40e6c1
|
bugfix taiga 2280
|
2021-06-16 10:53:18 +02:00 |
|
Cayo Puigdefabregas
|
0a96d4f6ef
|
fixing schemas interdependences
|
2021-06-15 15:22:49 +02:00 |
|
Cayo Puigdefabregas
|
f7070dbbf7
|
adding documents in schema of lots
|
2021-06-15 15:14:29 +02:00 |
|
Cayo Puigdefabregas
|
b1f7b629c7
|
fixing url
|
2021-06-15 13:11:49 +02:00 |
|
Cayo Puigdefabregas
|
315eb097c9
|
change view for save hash
|
2021-06-15 12:38:24 +02:00 |
|
Cayo Puigdefabregas
|
b1414cf143
|
redefine models
|
2021-06-15 12:38:02 +02:00 |
|
Cayo Puigdefabregas
|
7cee2693ff
|
resolve conflict
|
2021-06-15 11:22:17 +02:00 |
|
Cayo Puigdefabregas
|
0d4c70a74e
|
fixing bug
|
2021-06-11 15:49:31 +02:00 |
|
Cayo Puigdefabregas
|
ab32b996bd
|
resolve conflict
|
2021-06-11 12:52:39 +02:00 |
|
Cayo Puigdefabregas
|
b12d54d6f1
|
drop id of trade action
|
2021-06-11 12:27:14 +02:00 |
|
Cayo Puigdefabregas
|
2cfb126c6c
|
fixing litle bug in delete dev of a lot
|
2021-06-11 12:26:36 +02:00 |
|
Cayo Puigdefabregas
|
94d4b57be9
|
fixing id of trading
|
2021-06-09 12:02:31 +02:00 |
cayop
|
a0d26a104f
|
Merge pull request #140 from eReuse/feature/endpoint-confirm
Feature/endpoint confirm
|
2021-06-09 11:46:32 +02:00 |
|
Cayo Puigdefabregas
|
c0558733ec
|
fixing remove decvices from a temporary lot
|
2021-06-09 11:36:11 +02:00 |
|
Cayo Puigdefabregas
|
eaea1c3fa3
|
Merge branch 'feature/endpoint-confirm' into feature/trade-documents
|
2021-06-08 16:14:54 +02:00 |
|
Cayo Puigdefabregas
|
99fe0407f0
|
clean
|
2021-06-08 16:14:30 +02:00 |
|
Cayo Puigdefabregas
|
1e0d993cfe
|
resolve conflict
|
2021-06-08 09:30:13 +02:00 |
|
Cayo Puigdefabregas
|
e9a09ec2ae
|
fixing automatic confirmation
|
2021-06-07 17:12:30 +02:00 |
|
Cayo Puigdefabregas
|
6546332fe5
|
swap @s for _s in code
|
2021-06-07 16:04:33 +02:00 |
|
Cayo Puigdefabregas
|
a9b341076a
|
fixed
|
2021-06-07 15:48:55 +02:00 |
|
Cayo Puigdefabregas
|
f9189ea413
|
confirm check
|
2021-06-07 15:45:32 +02:00 |
|
Cayo Puigdefabregas
|
8289f24b69
|
fixing confirm and code in schema
|
2021-06-07 15:45:04 +02:00 |
|
Cayo Puigdefabregas
|
589c399231
|
fixing relation files interdependences
|
2021-06-07 13:10:28 +02:00 |
|
Cayo Puigdefabregas
|
f3f65efeaf
|
resolve conflicts
|
2021-06-07 12:08:55 +02:00 |
|
Cayo Puigdefabregas
|
289126a8a7
|
fixing revoke
|
2021-06-07 11:48:50 +02:00 |
|
Cayo Puigdefabregas
|
21cdcb5350
|
simplify the algorithm for to manager the confirms flow
|
2021-06-07 10:50:08 +02:00 |
|
Cayo Puigdefabregas
|
6dc7fb830b
|
fixing bug of filter devices
|
2021-06-06 10:02:24 +02:00 |
|
Cayo Puigdefabregas
|
80e74b6d3d
|
fixing supplier and receiver
|
2021-06-04 19:27:01 +02:00 |
|
Cayo Puigdefabregas
|
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 |
|
Cayo Puigdefabregas
|
8d1e6bb2d7
|
drop istemporary lot
|
2021-06-03 12:11:14 +02:00 |
|
Cayo Puigdefabregas
|
e4554a9e27
|
use open filter for checke frontend trade
|
2021-06-02 15:33:03 +02:00 |
|
Cayo Puigdefabregas
|
0c99a85361
|
add raise instead of assert
|
2021-06-02 13:46:28 +02:00 |
|
Cayo Puigdefabregas
|
20e029b359
|
bugfix: restriction delete lot by the owner
|
2021-06-02 10:11:20 +02:00 |
|
Cayo Puigdefabregas
|
57c9269907
|
add trade instead of deliverynote in lots view
|
2021-06-02 10:10:36 +02:00 |
|
Cayo Puigdefabregas
|
6c689878a4
|
Fixing schema trade
|
2021-06-01 15:59:54 +02:00 |
|
Cayo Puigdefabregas
|
e1348e3809
|
adding isTemporary lot
|
2021-05-31 11:34:46 +02:00 |
|
Cayo Puigdefabregas
|
6142b89f41
|
adding confirm_status in devices
|
2021-05-27 15:56:10 +02:00 |
|
Cayo Puigdefabregas
|
ef2e800281
|
change confirm for confirms field
|
2021-05-27 15:55:24 +02:00 |
|
Cayo Puigdefabregas
|
8731d90d9a
|
add lots in csv of devices
|
2021-05-26 11:43:53 +02:00 |
|
Cayo Puigdefabregas
|
145cc2ec3e
|
Merge branch 'testing' of https://github.com/eReuse/devicehub-teal into testing
|
2021-05-26 11:01:13 +02:00 |
|
Cayo Puigdefabregas
|
816411aa7b
|
fixing settings.ini wbconf
|
2021-05-26 11:00:43 +02:00 |
|
Cayo Puigdefabregas
|
ab3510b67b
|
fixed bug
|
2021-05-25 12:57:21 +02:00 |
|
Cayo Puigdefabregas
|
1098ef773f
|
resolve conflict
|
2021-05-25 09:03:34 +02:00 |
|
Cayo Puigdefabregas
|
b34feee800
|
fixing bug
|
2021-05-24 13:00:03 +02:00 |
|
Cayo Puigdefabregas
|
2a66fb94a3
|
actions trade for documents
|
2021-05-21 13:16:30 +02:00 |
|
Cayo Puigdefabregas
|
28da6a953d
|
adding trade for documents
|
2021-05-19 13:59:59 +02:00 |
|
Cayo Puigdefabregas
|
020e6afd53
|
saved phisical documents to disk
|
2021-05-19 09:47:14 +02:00 |
|
Cayo Puigdefabregas
|
4b11372719
|
Definition of endpoint, view and scheme for basic document
|
2021-05-14 12:58:56 +02:00 |
|
Cayo Puigdefabregas
|
c21de78982
|
base for documents
|
2021-05-13 13:35:46 +02:00 |
|
Cayo Puigdefabregas
|
821178359e
|
resolve conflicts
|
2021-05-12 19:06:03 +02:00 |
|
Cayo Puigdefabregas
|
a1119b6130
|
Merge branch 'testing' into feature/endpoint-confirm
|
2021-05-12 18:52:50 +02:00 |
|
Cayo Puigdefabregas
|
c7ff58273f
|
fixing bug changing database model
|
2021-05-12 13:02:36 +02:00 |
|
Cayo Puigdefabregas
|
5222f2ceb7
|
add actionDocuments and drop documents field from Trade action
|
2021-05-12 11:48:52 +02:00 |
|
Cayo Puigdefabregas
|
e2898b22a3
|
fixing defs
|
2021-05-10 11:52:10 +02:00 |
|
Cayo Puigdefabregas
|
dc5d8fcbe0
|
fixing representation classes
|
2021-05-10 11:51:28 +02:00 |
|
Cayo Puigdefabregas
|
7593c4e7df
|
cleaning and fixing validates of trade and confirms
|
2021-05-10 11:50:13 +02:00 |
|
Cayo Puigdefabregas
|
2808da24ba
|
adding Confirm and Revoke in the lots when it is a trade lot
|
2021-05-10 11:48:43 +02:00 |
|
Cayo Puigdefabregas
|
a2f106bed0
|
move views actions in more files
|
2021-05-10 11:47:56 +02:00 |
|
Cayo Puigdefabregas
|
951d067dd6
|
adding revoke and fixing ConfigRevike
|
2021-04-30 17:54:03 +02:00 |
|
Cayo Puigdefabregas
|
34fbf0dca6
|
ConfirmRevoke as a new action
|
2021-04-30 12:44:32 +02:00 |
|
Cayo Puigdefabregas
|
b2bd820d50
|
resolve conflict
|
2021-04-29 17:04:25 +02:00 |
|
Cayo Puigdefabregas
|
76271ce430
|
drop tradeNotes
|
2021-04-29 11:25:17 +02:00 |
|
Cayo Puigdefabregas
|
4afa21d7d7
|
Merge branch 'testing' into feature/#135-trade-without-to
|
2021-04-29 11:23:00 +02:00 |
|
Cayo Puigdefabregas
|
ec4d87d8ec
|
add blank line
|
2021-04-27 15:39:37 +02:00 |
|
Cayo Puigdefabregas
|
035c4fa269
|
validate schema confirm
|
2021-04-27 15:39:11 +02:00 |
|
Cayo Puigdefabregas
|
c1081994de
|
fixing model
|
2021-04-27 13:54:13 +02:00 |
|
Cayo Puigdefabregas
|
97d784f849
|
Merge branch 'testing' into feature/endpoint-confirm
|
2021-04-26 17:11:35 +02:00 |
|
Cayo Puigdefabregas
|
a65e4ffb82
|
fixing bug
|
2021-04-26 15:22:30 +02:00 |
|
Cayo Puigdefabregas
|
e2fbe87c6a
|
clean actionView of Snapshot section put in other class
|
2021-04-22 13:40:45 +02:00 |
|
Cayo Puigdefabregas
|
39dc489cb3
|
clean ActionView with more classes
|
2021-04-22 13:04:38 +02:00 |
|
Cayo Puigdefabregas
|
310d92169b
|
fixed view confirm
|
2021-04-22 11:13:04 +02:00 |
|
Cayo Puigdefabregas
|
e65dfbdc0c
|
fixing schema confirm
|
2021-04-22 11:12:14 +02:00 |
|
Cayo Puigdefabregas
|
865c9d5d07
|
fixing model confirm
|
2021-04-22 11:11:23 +02:00 |
|
Cayo Puigdefabregas
|
21a5d14adc
|
def confirm endpoint
|
2021-04-22 11:10:13 +02:00 |
|
Cayo Puigdefabregas
|
939a2bff71
|
clean tradeview for obsolet
|
2021-04-21 14:45:53 +02:00 |
|
Cayo Puigdefabregas
|
4e6f43a8bb
|
new tradenote schema
|
2021-04-21 14:43:41 +02:00 |
|
Cayo Puigdefabregas
|
57ca10be38
|
fixing model tradenote
|
2021-04-21 14:43:21 +02:00 |
|
Cayo Puigdefabregas
|
17b409c9ee
|
redefine tradenoteDef
|
2021-04-21 14:37:32 +02:00 |
|
Cayo Puigdefabregas
|
6822c5bbf8
|
made one automatic note when add/remove one device of one lot
|
2021-04-20 16:21:02 +02:00 |
|
Cayo Puigdefabregas
|
afea2cff79
|
adding confirmation model
|
2021-04-20 16:19:40 +02:00 |
|
Cayo Puigdefabregas
|
006fe4b855
|
fixing definitions
|
2021-04-19 19:37:26 +02:00 |
|
Cayo Puigdefabregas
|
387c2e15e5
|
fixing view action trade
|
2021-04-19 19:34:22 +02:00 |
|
Cayo Puigdefabregas
|
3bb7482876
|
fixing schemas and states
|
2021-04-19 19:33:35 +02:00 |
|
Cayo Puigdefabregas
|
e058e2491f
|
change model for trade
|
2021-04-19 19:33:05 +02:00 |
|
Cayo Puigdefabregas
|
149255bcfe
|
resolve conflicts
|
2021-04-16 18:16:07 +02:00 |
|
Cayo Puigdefabregas
|
e9d85e3d9e
|
resolv conflict
|
2021-04-16 15:46:19 +02:00 |
|
Cayo Puigdefabregas
|
70188f43a2
|
simplify get_token method
|
2021-04-15 21:21:41 +02:00 |
|
Cayo Puigdefabregas
|
3f423e7712
|
drop schema users for view
|
2021-04-15 21:20:08 +02:00 |
|
Cayo Puigdefabregas
|
b3d77ba212
|
fixing model and migration
|
2021-04-15 21:18:15 +02:00 |
|
Cayo Puigdefabregas
|
bae5a1d2b1
|
add session schema
|
2021-04-15 21:17:24 +02:00 |