Cayo Puigdefabregas
dd081532ba
#3402 change public page of device
2022-05-13 17:17:57 +02:00
Cayo Puigdefabregas
1b5f6412f0
#3397 add columns of status in the devices list
2022-05-13 12:17:14 +02:00
Cayo Puigdefabregas
e34b591690
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-05 13:32:32 +02:00
Cayo Puigdefabregas
1023f3fdca
add public link in model
2022-05-05 12:00:02 +02:00
Cayo Puigdefabregas
d8a44c661a
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-28 18:45:51 +02:00
Cayo Puigdefabregas
7362eb4492
add computer monitor
2022-04-28 17:56:00 +02:00
Cayo Puigdefabregas
3a5e806104
add icons types of devices in list of devices
2022-04-28 17:46:12 +02:00
Cayo Puigdefabregas
2c71d69a9a
return to the origin of firewire
2022-03-29 13:34:01 +02:00
Cayo Puigdefabregas
90dea5492e
change integer for string in firewire bios
2022-03-29 12:23:51 +02:00
Santiago L
beb26ca232
Merge pull request #191 from eReuse/feature/server-side-render
...
Server side render - devicehub v2.0.0-alpha
2022-03-15 14:59:01 +01:00
Cayo Puigdefabregas
b737aaf50a
add verbose_name in device.model instead of use template system
2022-03-04 13:31:33 +01:00
Cayo Puigdefabregas
d25c9faf25
fix change #2825 , tags only for Computers
2022-03-03 10:43:34 +01:00
Cayo Puigdefabregas
8149d0ed7c
reversed actions for see the better the traceability log
2022-02-02 13:27:53 +01:00
Cayo Puigdefabregas
f0d9ead977
deactivate removes for RAMs slots
2021-11-26 14:08:11 +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
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
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
63f7adf69c
try to use only_fields for devices but not used
2021-11-18 11:50:29 +01:00
Cayo Puigdefabregas
8e47af8e27
refactoring trading and trading for web
2021-11-12 10:00:43 +01:00
Cayo Puigdefabregas
872a0be866
rebuild trading function
2021-11-11 22:08:28 +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
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
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
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
5ec005e63b
resolve conflict
2021-10-18 11:47:55 +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
aa4ebeb504
fixing, vanish deactivate devices
2021-10-05 14:33:28 +02:00
Cayo Puigdefabregas
6dd54d9645
deactivate devices
2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas
ab74240d6c
fixing 3 bugs, #168
2021-10-04 13:35:51 +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
16b6325c1b
Merge branch 'testing' into feature/lot-unassigned
2021-08-16 11:15:30 +02:00
Cayo Puigdefabregas
1961e3d408
rebuild query for filter devs without lots
2021-08-02 18:17:08 +02:00
Cayo Puigdefabregas
bfe56a8626
DataWipe instead of ToErased
2021-07-29 12:45:43 +02:00
Cayo Puigdefabregas
bb3145f3d8
fixing test_basic
2021-07-28 15:59:11 +02:00
Cayo Puigdefabregas
4b4c0a1480
fixing owner_id in computer
2021-07-05 12:29:21 +02:00
Cayo Puigdefabregas
8a797f079b
fixing models and build views for revokeDocument
2021-06-24 19:09:12 +02:00
Cayo Puigdefabregas
f85a0f5ef4
fixing documents trade
2021-06-22 16:53:10 +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
e4554a9e27
use open filter for checke frontend trade
2021-06-02 15:33:03 +02:00
Cayo Puigdefabregas
6142b89f41
adding confirm_status in devices
2021-05-27 15:56:10 +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
3bb7482876
fixing schemas and states
2021-04-19 19:33:35 +02:00
Cayo Puigdefabregas
e9d85e3d9e
resolv conflict
2021-04-16 15:46:19 +02:00
Cayo Puigdefabregas
e884ced4d1
try define offer
2021-03-24 14:17:18 +01:00
Cayo Puigdefabregas
edf3700fde
Adding Offer action
2021-03-19 11:53:04 +01:00
Cayo Puigdefabregas
2b60af8b08
fixing tests and property url of device
2021-03-09 12:54:57 +01:00
Cayo Puigdefabregas
b83563e0ea
swap SystemID for DevicehubID
2021-03-08 22:43:24 +01:00
Cayo Puigdefabregas
840674e83b
devicehubID instead of code
2021-03-08 19:09:12 +01:00
Cayo Puigdefabregas
ff964bfe0a
fixing path to hashcode
2021-03-08 13:22:37 +01:00
Cayo Puigdefabregas
06dfb9e31e
adding hashcode
2021-03-08 13:06:07 +01:00
Cayo Puigdefabregas
083ce4e660
show code in web
2021-03-04 19:24:05 +01:00
Cayo Puigdefabregas
bf5cae5f96
adding the create code function from ids of devices
2021-03-04 13:27:29 +01:00
Cayo Puigdefabregas
41cadcc0b3
try execute create_code
2021-03-04 10:19:31 +01:00
Cayo Puigdefabregas
269550270f
add code in device and add listener
2021-03-03 20:05:48 +01:00
Cayo Puigdefabregas
8899b40408
fixed live report
2021-02-15 10:24:22 +01:00
Cayo Puigdefabregas
30246d6be5
fixing metrics
2021-02-12 20:22:04 +01:00
Cayo Puigdefabregas
7ef2a68d39
fixed
2021-02-12 20:06:20 +01:00
Cayo Puigdefabregas
df42c27f20
remove EreusePrice of public info of devices
2021-02-12 10:29:23 +01:00
Cayo Puigdefabregas
91848a548c
deactivate manual merge
2021-02-11 20:38:18 +01:00
Cayo Puigdefabregas
1fff5cd32e
add format to numbers and remove some datas
2021-02-11 20:00:57 +01:00
Cayo Puigdefabregas
72466003d0
drop all ethereum_address in the system
2021-02-10 13:05:43 +01:00
Cayo Puigdefabregas
cb3f07eb5a
change deposit for amount
2021-02-05 13:21:20 +01:00
Cayo Puigdefabregas
fe824cc4fa
drop deliverynote_address
2021-02-04 13:06:51 +01:00
Cayo Puigdefabregas
5ae61d30bc
adding systemId in metrics csv
2021-01-20 10:39:02 +01:00
Cayo Puigdefabregas
f140c48359
fixing bug of lifetime
2021-01-19 16:06:46 +01:00
Cayo Puigdefabregas
8b8ff2d2c1
refixed bug
2021-01-14 18:18:59 +01:00
Cayo Puigdefabregas
ae596e2a49
fixing bug
2021-01-14 18:10:50 +01:00
Cayo Puigdefabregas
d974d3d78f
ereuse_devicehub/resources/action/models.py
2021-01-14 17:32:03 +01:00
Cayo Puigdefabregas
12f28ba76f
metrics in csv
2021-01-13 18:11:41 +01:00
Cayo Puigdefabregas
af1cb704d5
fixing aspect_ratio
2020-12-17 16:52:42 +01:00
Cayo Puigdefabregas
882da7b9b1
.
2020-12-17 16:03:10 +01:00
Cayo Puigdefabregas
c480e96f79
drop required in monitor too
2020-12-17 15:09:21 +01:00
Cayo Puigdefabregas
b8812f0b82
change required for display, functionality and apparence
2020-12-17 13:08:06 +01:00
Cayo Puigdefabregas
36cd61c0bd
simplify token in search
2020-12-17 11:35:55 +01:00
Cayo Puigdefabregas
5241c73a98
not required chassis in all system
2020-12-17 10:45:01 +01:00
Cayo Puigdefabregas
aef220a5dc
chassis not required
2020-12-16 22:05:33 +01:00
Cayo Puigdefabregas
349170aa99
nullable chassis
2020-12-16 11:57:51 +01:00
Cayo Puigdefabregas
729281383e
resolve conflicts
2020-12-10 10:30:50 +01:00
Cayo Puigdefabregas
2c67e3be93
resolve conflict
2020-12-09 12:32:00 +01:00
Cayo Puigdefabregas
eaa20b4302
fixing conflict merge with testing
2020-12-09 11:12:47 +01:00
Cayo Puigdefabregas
7e41c66073
implementing the warnings and unnormal cases
2020-12-04 16:58:53 +01:00
Cayo Puigdefabregas
05c81382f2
change comment of allocated
2020-12-01 15:55:21 +01:00
Cayo Puigdefabregas
4172711c93
change the endpoints for allocate and deallocate
2020-11-27 18:10:51 +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
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
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
32a17decd7
remove receives
2020-11-20 18:16:56 +01:00
Cayo Puigdefabregas
cf3d44a5e3
adding receives
2020-11-19 15:25:56 +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
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
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
73d9db3a88
fixing bug moving tags
2020-10-28 22:15:28 +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
9a488887f5
modify devices models for add listeners
2020-10-16 16:25:46 +02:00
Cayo Puigdefabregas
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
nad
a2a24f20cc
Reformat code following PEP8
2020-08-17 16:45:18 +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
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
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
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
Santiago L
