 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 |
Cayo Puigdefabregas
|
47dcb5efe8
|
fixing tests
|
2021-12-21 10:32:04 +01:00 |
|
Cayo Puigdefabregas
|
4acd03e714
|
fixing ereuse pdf
|
2021-12-21 09:55:06 +01:00 |
|
Cayo Puigdefabregas
|
46dd173a12
|
fixing tests
|
2021-12-16 14:00:54 +01:00 |
|
Cayo Puigdefabregas
|
a670a01c5e
|
fixing bug us2524
|
2021-12-16 13:21:35 +01:00 |
|
Cayo Puigdefabregas
|
10a1e23a5d
|
Metrics only lot
|
2021-12-07 13:20:16 +01:00 |
|
Cayo Puigdefabregas
|
daed1bdafb
|
.
|
2021-12-03 09:54:59 +01:00 |
|
Cayo Puigdefabregas
|
ba858aff89
|
fixing permitions for excel
|
2021-11-29 12:15:37 +01:00 |
|
Cayo Puigdefabregas
|
f0d9ead977
|
deactivate removes for RAMs slots
|
2021-11-26 14:08:11 +01:00 |
|
Cayo Puigdefabregas
|
596b54f818
|
up of version
|
2021-11-25 10:29:32 +01:00 |
|
Cayo Puigdefabregas
|
03ee4fba34
|
changes some values of headers
|
2021-11-24 12:20:40 +01:00 |
|
Cayo Puigdefabregas
|
0543fb64a5
|
Merge branch 'testing' into feature/power_on_hours
|
2021-11-24 11:17:26 +01:00 |
|
Cayo Puigdefabregas
|
e8ccbedf40
|
change of version
|
2021-11-24 10:15:18 +01:00 |
|
Cayo Puigdefabregas
|
c4a2b720ef
|
adding property power_on_hours
|
2021-11-23 15:27:16 +01:00 |
|
Cayo Puigdefabregas
|
56dcdf2897
|
get_status docuemnts in metrics
|
2021-11-23 11:08:48 +01:00 |
cayop
|
b117a4b267
|
Merge pull request #170 from eReuse/feature/delete-devices
Feature/delete devices
|
2021-11-22 12:38:00 +01:00 |
|
Cayo Puigdefabregas
|
2d5ead7c1b
|
checking permitions of actions
|
2021-11-22 12:01:12 +01:00 |
|
Cayo Puigdefabregas
|
e09073216c
|
fixing migration
|
2021-11-22 11:34:03 +01:00 |
|
Cayo Puigdefabregas
|
bef5df414b
|
fixing bug in sync
|
2021-11-22 11:14:27 +01:00 |
|
Cayo Puigdefabregas
|
40bf280c75
|
Fixing name of document container in metrics
|
2021-11-22 10:31:20 +01:00 |
|
Cayo Puigdefabregas
|
9d4df05831
|
litle bugfix taiga 2357
|
2021-11-22 10:16:39 +01:00 |
|
Cayo Puigdefabregas
|
818e3ad0cc
|
new tests
|
2021-11-19 12:44:52 +01:00 |
|
Cayo Puigdefabregas
|
3b41ddb66a
|
Merge branch 'testing' into feature/delete-devices
|
2021-11-19 12:07:14 +01:00 |
|
Cayo Puigdefabregas
|
aa17d4b492
|
clean code test
|
2021-11-19 11:34:13 +01:00 |
|
Cayo Puigdefabregas
|
d8382f8331
|
drop assert for lot[devices] in dummy
|
2021-11-18 11:52:59 +01:00 |
|
Cayo Puigdefabregas
|
63f7adf69c
|
try to use only_fields for devices but not used
|
2021-11-18 11:50:29 +01:00 |
|
Cayo Puigdefabregas
|
5510417125
|
reduce latency for timeout for lots
|
2021-11-18 11:48:57 +01:00 |
|
Cayo Puigdefabregas
|
e447e15aeb
|
fixing update of migration
|
2021-11-12 22:26:08 +01:00 |
|
Cayo Puigdefabregas
|
fb5286648d
|
fixing update of migration
|
2021-11-12 22:24:23 +01:00 |
|
Cayo Puigdefabregas
|
287ac8d741
|
fixing migration of olds confirmRevokes datas
|
2021-11-12 22:16:02 +01:00 |
|
Cayo Puigdefabregas
|
8e47af8e27
|
refactoring trading and trading for web
|
2021-11-12 10:00:43 +01:00 |
|
Cayo Puigdefabregas
|
1279180700
|
fixing confirms
|
2021-11-11 22:50:07 +01:00 |
|
Cayo Puigdefabregas
|
e326e8ccdf
|
fixing revoke when the device is in one future trade
|
2021-11-11 22:21:58 +01:00 |
|
Cayo Puigdefabregas
|
872a0be866
|
rebuild trading function
|
2021-11-11 22:08:28 +01:00 |
|
Cayo Puigdefabregas
|
cef22f01ce
|
fixing deletr_from_trade
|
2021-11-11 17:23:45 +01:00 |
|
Cayo Puigdefabregas
|
54977d432d
|
refactory in delete_from_trade function
|
2021-11-11 17:06:26 +01:00 |
|
Cayo Puigdefabregas
|
9dc79a59dc
|
fixing revokeView and reset_owner
|
2021-11-10 18:59:44 +01:00 |
|
Cayo Puigdefabregas
|
f06007e199
|
fixing conflict
|
2021-11-08 18:07:07 +01:00 |
|
Cayo Puigdefabregas
|
c7ced04e9d
|
fixing bug for documents
|
2021-11-08 17:33:22 +01:00 |
|
Cayo Puigdefabregas
|
f8be48d524
|
fixing schema
|
2021-11-05 13:10:23 +01:00 |
|
Cayo Puigdefabregas
|
6bf1354109
|
fixing change status next trade
|
2021-11-05 13:00:01 +01:00 |
|
Cayo Puigdefabregas
|
5ebf4f48b5
|
adding trade in status actions
|
2021-11-05 12:35:10 +01:00 |
|
Cayo Puigdefabregas
|
56df40c81a
|
fixing actions for computer
|
2021-11-04 13:27:25 +01:00 |
|
Cayo Puigdefabregas
|
6de83ce4d2
|
Fixing order of actions_multiple devices
|
2021-11-04 11:58:15 +01:00 |
|
Cayo Puigdefabregas
|
b233b7bb75
|
fixed
|
2021-11-03 10:37:15 +01:00 |
|
Cayo Puigdefabregas
|
34def7bd70
|
fixint trading fuction
|
2021-11-02 14:25:49 +01:00 |
|
Cayo Puigdefabregas
|
c34cbb5c26
|
fixing metrics
|
2021-11-02 12:47:23 +01:00 |
|
Cayo Puigdefabregas
|
283f869b4d
|
drop remove
|
2021-10-28 12:19:49 +02:00 |
|
Cayo Puigdefabregas
|
03238acb9f
|
fixing session in listener
|
2021-10-26 16:35:41 +02:00 |
|
Cayo Puigdefabregas
|
5861d2fd6f
|
fixing session in listener
|
2021-10-26 16:21:05 +02:00 |
|
Cayo Puigdefabregas
|
5cce2f4efb
|
change some sintaxis
|
2021-10-25 13:24:22 +02:00 |
|
Cayo Puigdefabregas
|
15fa4546d1
|
fixing general case for devices
|
2021-10-25 12:20:16 +02:00 |
|
Cayo Puigdefabregas
|
1c2f6ba92c
|
fixing tests
|
2021-10-23 13:02:10 +02:00 |
|
Cayo Puigdefabregas
|
9faa1697a7
|
fixing event device
|
2021-10-22 21:14:10 +02:00 |
|
Cayo Puigdefabregas
|
6091f31c17
|
adding event instead of reuse create_code function
|
2021-10-22 19:26:27 +02:00 |
|
Cayo Puigdefabregas
|
2ade5a14d4
|
adding tag when there are a new device
|
2021-10-22 14:19:42 +02:00 |
|
Cayo Puigdefabregas
|
7c6b20597b
|
fixing supplier permitions
|
2021-10-20 14:53:33 +02:00 |
|
Cayo Puigdefabregas
|
f099a579fb
|
fixing rows
|
2021-10-19 19:25:17 +02:00 |
|
Cayo Puigdefabregas
|
87f30a1391
|
adding metrics for tradeDocuments
|
2021-10-19 18:19:25 +02:00 |
|
Cayo Puigdefabregas
|
31de27769d
|
Merge branch 'testing' into feature/new-metrix
|
2021-10-18 11:53:05 +02:00 |
|
Cayo Puigdefabregas
|
5ec005e63b
|
resolve conflict
|
2021-10-18 11:47:55 +02:00 |
|
Cayo Puigdefabregas
|
2d37baca8d
|
fixing minor changes of review
|
2021-10-18 11:20:05 +02:00 |
|
Cayo Puigdefabregas
|
0eed8330ce
|
adding metrics for documents
|
2021-10-15 15:04:58 +02:00 |
|
Cayo Puigdefabregas
|
17f8aebb94
|
fixing rows
|
2021-10-14 18:13:20 +02:00 |
|
Cayo Puigdefabregas
|
5e9b9bf08d
|
new metrics
|
2021-10-14 12:56:33 +02:00 |
|
Cayo Puigdefabregas
|
aa7a3ffe12
|
Merge branch 'feature/new-recycling-action' into feature/new-metrix
|
2021-10-11 14:11:59 +02:00 |
|
Cayo Puigdefabregas
|
35e891bf5d
|
trace in metrics
|
2021-10-11 14:11:56 +02:00 |
|
Cayo Puigdefabregas
|
007e9a96c6
|
Merge branch 'testing' into feature/new-recycling-action
|
2021-10-06 12:49:42 +02:00 |
|
Cayo Puigdefabregas
|
fbf74643e9
|
resolve conflict
|
2021-10-06 12:11:05 +02:00 |
|
Cayo Puigdefabregas
|
2e564862e8
|
excluding when it is in one trade action
|
2021-10-06 11:53:41 +02:00 |
|
Cayo Puigdefabregas
|
03cfbfaa35
|
fixing model action device
|
2021-10-06 10:51:53 +02:00 |
|
Cayo Puigdefabregas
|
aa4ebeb504
|
fixing, vanish deactivate devices
|
2021-10-05 14:33:28 +02:00 |
|
Cayo Puigdefabregas
|
9ea0a05de6
|
migration file
|
2021-10-05 14:00:55 +02:00 |
|
Cayo Puigdefabregas
|
6dd54d9645
|
deactivate devices
|
2021-10-05 12:17:07 +02:00 |
|
Cayo Puigdefabregas
|
ec2d286ed3
|
adding action delete
|
2021-10-05 11:56:19 +02:00 |
|
Cayo Puigdefabregas
|
ab74240d6c
|
fixing 3 bugs, #168
|
2021-10-04 13:35:51 +02:00 |
|
Cayo Puigdefabregas
|
920937a51f
|
fixing bug of trade without devices
|
2021-10-01 13:30:39 +02:00 |
|
Cayo Puigdefabregas
|
6599f4b66c
|
fixing bug
|
2021-10-01 10:46:08 +02:00 |
|
Cayo Puigdefabregas
|
eeb6db7bc2
|
test for recycling documents
|
2021-09-29 21:12:46 +02:00 |
|
Cayo Puigdefabregas
|
7e4af161d3
|
solve conflict
|
2021-09-29 14:13:42 +02:00 |
|
Cayo Puigdefabregas
|
aff86a8f94
|
using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices
|
2021-09-29 12:59:44 +02:00 |
|
cayop
|
baa5fccda0
|
Merge pull request #163 from eReuse/feature/container
Feature/container
|
2021-09-29 12:58:01 +02:00 |
|
Cayo Puigdefabregas
|
84da94430e
|
fixing bug
|
2021-09-28 15:44:25 +02:00 |
|
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
|
4eb4c1a480
|
downgrade of version
|
2021-09-22 11:35:06 +02:00 |
|
Cayo Puigdefabregas
|
328facab50
|
adding dhid
|
2021-09-22 11:30:37 +02:00 |
|
Cayo Puigdefabregas
|
9df5872a44
|
upgrade version
|
2021-09-21 12:45:58 +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 |