Santiago L
6946a2584b
Refactor: group related code (delete button & modal status)
2022-04-28 11:39:40 +02:00
Santiago L
8125279619
Add comment to not rendered code
2022-04-28 11:38:31 +02:00
a945fc085f
Query using Api instead of javascript filter
2022-04-28 11:31:24 +02:00
c8dc1b11e2
Add trade type on api options
2022-04-28 11:22:53 +02:00
c2e4313521
change tag for Unique identifier in label_details
2022-04-28 11:16:12 +02:00
ad11521b64
fix label details for new architecture
2022-04-28 10:14:10 +02:00
e378fef1a6
add customize options in print html and pdf
2022-04-27 18:56:15 +02:00
bf42a79ef7
change devices for tags in printlabels
2022-04-27 18:55:27 +02:00
b11bb163a0
hide 2 trade buttons
2022-04-26 17:35:29 +02:00
ef3ea288ce
Merge branch 'testing' into feature/extend-user-datas-#3016
2022-04-26 16:37:12 +02:00
13950a5ff6
show only password reset
2022-04-26 16:35:16 +02:00
11201cc0bd
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-26 13:30:52 +02:00
ef65b1084e
Revert "HiddenField instead of StringField"
...
This reverts commit 04063db60e
2022-04-26 12:56:34 +02:00
c3bb5cb863
Revert "add print_labels instead of call submit from the template"
...
This reverts commit 022d40edbe
2022-04-26 12:56:02 +02:00
2a7eeb0b5d
Revert "add print_labels instead of call submit from the template"
...
This reverts commit c8aefc6029
2022-04-26 12:55:48 +02:00
ad9a8a04bd
Revert "drop commits 04063db 022d40e c8aefc6"
...
This reverts commit 9dbebed9d5
2022-04-26 12:55:01 +02:00
9dbebed9d5
drop commits 04063db 022d40e c8aefc6
2022-04-26 11:52:51 +02:00
f34fedfb74
fix migration file
2022-04-26 11:49:40 +02:00
1c12548851
return 422 if no there are components neither hid
2022-04-26 10:47:04 +02:00
b836e0a9ae
save exceptions of components
2022-04-26 10:44:49 +02:00
6ef2d8795d
clean try exception
2022-04-26 10:43:58 +02:00
aafebbb370
adapt correctly response 400 instead of default 422
2022-04-25 18:38:13 +02:00
Santiago L
c6bc695881
Merge branch 'testing' into filter-in-out-trades
2022-04-25 18:35:02 +02:00
e818feeebd
required datas in json of wb lite, error 422
2022-04-25 17:20:54 +02:00
f37e55e3b5
add response 201
2022-04-25 14:05:30 +02:00
a362c8644b
add sid instead of wbid in schema action snapshot
2022-04-25 11:53:27 +02:00
538541cd4d
filter in out trades from lots selector
2022-04-25 11:49:11 +02:00
7b784b6174
sid in snapshot action
2022-04-25 11:45:50 +02:00
be53827c02
sid in parser and inventory
2022-04-25 11:45:25 +02:00
9b1e8617fa
add sid in snapshot_errors
2022-04-25 11:43:30 +02:00
4ab692405f
add migrations change sid for wbid
2022-04-25 11:30:41 +02:00
Santiago L
b0f9a83dce
Merge pull request #232 from RubenPX/fix-max-lots-list
...
[Change] Set max lots list to 20
2022-04-25 11:29:04 +02:00
e48a6c1ae4
set max lots list to 20
2022-04-25 11:19:55 +02:00
1c0cef120e
Fix height list, use px instead of vh
2022-04-22 13:04:09 +02:00
c8aefc6029
add print_labels instead of call submit from the template
2022-04-22 12:54:27 +02:00
022d40edbe
add print_labels instead of call submit from the template
2022-04-22 12:36:14 +02:00
04063db60e
HiddenField instead of StringField
2022-04-22 12:35:16 +02:00
Santiago L
73d0e77281
Rename CSS files
2022-04-22 11:12:29 +02:00
Santiago L
dd4e938d30
Split custom CSS & niceadmin theme CSS
...
Keep original source Nice Admin template to keep easy future updates
2022-04-22 11:07:18 +02:00
bb62798ffe
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-22 09:55:59 +02:00
64511b33a1
change description buttons of print labels
2022-04-22 09:51:45 +02:00
85d580c094
fix duplicity snapshotErrors
2022-04-22 09:51:17 +02:00
49c7caf5bd
Fix set max height
2022-04-21 20:14:36 +02:00
7c96c5706c
Fix code style issues with ESLint
2022-04-21 18:04:42 +00:00
a9299077aa
fix typo
2022-04-21 19:59:10 +02:00
454fb891e2
Order lots
2022-04-21 19:53:27 +02:00
740af8f7b6
Style fix show lots as list
2022-04-21 19:53:09 +02:00
9f948df209
add always response 201
2022-04-21 18:55:00 +02:00
f9be7f0a14
return error response in post request
2022-04-21 14:02:16 +02:00
e37fa49c3e
fix bug in validation actions
2022-04-21 14:01:33 +02:00
7c93fc68c5
fix encode of response in client
2022-04-20 12:35:25 +02:00
8a37217a38
Fix code style issues with ESLint
2022-04-20 10:12:59 +00:00
57c3bee109
Merge branch 'testing' into ESLint-Action
2022-04-20 12:12:30 +02:00
97e931e165
Action failed, fix issues
2022-04-20 12:09:56 +02:00
Santiago L
dded82945e
Merge pull request #221 from RubenPX/change/frontend-fixes
...
Change: fix minor responsive issues
2022-04-20 12:05:56 +02:00
a51cc9872d
Fix code style issues with ESLint
2022-04-20 10:04:53 +00:00
Santiago L
33783b6e7d
Revert "Fix login width"
...
This reverts commit d3564a6ba5
2022-04-20 12:04:50 +02:00
154362613e
fix trade lots modal
2022-04-20 11:53:51 +02:00
Santiago L
9e47cd967c
Merge pull request #224 from RubenPX/bugfix/fix-clickable-lots
...
FIX: clickable lots selector not working when click in text
2022-04-19 19:49:07 +02:00
4a5ad374f8
fix UserClientFlask
2022-04-19 18:39:42 +02:00
efbbdf3d44
Merge branch 'testing' into feature/server-side-render-testing
2022-04-19 11:03:05 +02:00
7c0b3c190c
test for check general snapshots
2022-04-19 10:47:49 +02:00
22ddea4a43
Merge branch 'testing' into change/frontend-fixes
2022-04-19 10:42:51 +02:00
7d930551fa
fix exit_status number
2022-04-18 19:09:03 +02:00
5595d0ddcf
fix Computer device in the list
2022-04-18 17:20:07 +02:00
252c7b8d7d
fix smartctl bugs
2022-04-18 17:14:26 +02:00
379a2efca2
errors in snapshots
2022-04-13 20:15:40 +02:00
d870d254f1
drop pdbs
2022-04-13 19:12:12 +02:00
4e19b9233b
validate email is unique
2022-04-13 19:11:23 +02:00
04cdb8181f
drop settings and last_name of agent
2022-04-13 18:41:05 +02:00
a0a52d8248
view list for snapshot errors
2022-04-13 18:31:39 +02:00
82bdfe3db5
Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113
2022-04-13 17:30:24 +02:00
3f4b115575
fix clickable lots selector
2022-04-13 13:53:22 +02:00
febff54c6b
fix bug
2022-04-13 13:28:22 +02:00
0b5d8d46d1
fixing bug
2022-04-13 13:27:58 +02:00
c256936b7d
fix trade lots modal
2022-04-13 13:27:38 +02:00
0d65dd7686
enums of tail
2022-04-13 13:14:01 +02:00
89bb4770d9
fix individual call
2022-04-12 16:59:45 +02:00
46bfc7fd47
fix save correctly the new password and fix save profile
2022-04-12 16:59:13 +02:00
4611f79b44
lint
2022-04-12 14:12:21 +02:00
dada6cc328
Fix close dialog when apply actions
2022-04-12 14:06:41 +02:00
c733f0a1d8
Fix search count
2022-04-12 13:59:25 +02:00
Santiago L
cdc3417c74
Remove unused code (part 2)
2022-04-12 13:49:00 +02:00
28bcf17083
Merge branch SearchPR and DeviceLotsList
2022-04-12 13:41:18 +02:00
d985744fb8
fix device list padding
2022-04-12 13:19:56 +02:00
d3564a6ba5
Fix login width
2022-04-12 13:17:17 +02:00
6c4d549c0a
fix button spacing on tags management
2022-04-12 12:59:53 +02:00
08ebc862ae
fix href link
2022-04-12 12:59:22 +02:00
23d8ba1570
fix lot buttons
2022-04-12 12:57:46 +02:00
cb1f4377d6
Fix button spacing
2022-04-12 12:44:24 +02:00
89647f6ed5
Remove unused views
2022-04-12 12:41:05 +02:00
938ccedac7
show message when search is empty
2022-04-12 12:06:38 +02:00
3ab7e8796f
Fix use table library api instead replace content
...
https://github.com/fiduswriter/Simple-DataTables
2022-04-12 11:39:53 +02:00
c910e0f7c0
Avoid hide dropdown when user clicked inside
2022-04-12 11:38:31 +02:00
c8b11cf505
fix wbid bug
2022-04-12 11:13:08 +02:00
7d9d091a31
translate to english
...
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-04-12 10:35:19 +02:00
a910f9d76a
fix typo
...
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-04-12 10:34:59 +02:00
089dc92d62
fix bug upload snapshot from web
2022-04-12 10:25:45 +02:00
388f586f95
migration file
2022-04-12 10:25:00 +02:00
b9a04b59f5
add wbid and owner in snapshot_errors
2022-04-12 10:24:32 +02:00
34da3599f3
Fix start search info
2022-04-12 09:40:45 +02:00
9d4ca5a2dc
change password
2022-04-11 19:48:59 +02:00
1820b15255
save data profile
2022-04-11 17:16:20 +02:00
Santiago L
4065f46dd9
Merge branch 'testing' into PR-lots-list
2022-04-11 16:19:23 +02:00
b08a013912
Remove demo data
2022-04-11 13:51:27 +02:00
756c7bd1c4
Search lots and devices
2022-04-11 11:44:48 +00:00
e7dbb34315
Moved api lines to fork with others features branches
...
Future freature (Search feature)
2022-04-11 11:25:30 +02:00
e696f9b1af
fix response with validation raise of the snapshot schemas
2022-04-11 11:24:25 +02:00
8bd26b56f3
fix bug about version
2022-04-11 10:59:15 +02:00
06456b352f
Refactor to reduche changes code
2022-04-11 10:42:56 +02:00
2cce025e58
Re-render when completed lots changes
2022-04-11 10:35:26 +02:00
f6c332cdbf
fix bug
2022-04-08 17:05:50 +02:00
09738478ae
change schema_version for schema_api
2022-04-08 16:46:57 +02:00
26275552c5
Select all functionality
2022-04-08 12:40:50 +02:00
832006f223
fix reset list to avoid repeat api calls
2022-04-08 12:40:11 +02:00
2b5178c198
add parser schemas
2022-04-08 12:39:01 +02:00
458e267b46
fix lint javascript
2022-04-08 12:37:10 +02:00
21c5cbce9f
drop imports unused
2022-04-08 12:33:20 +02:00
028f3c8e74
precommit
2022-04-08 12:26:36 +02:00
2471fa90cf
use the common enum DataStorageInterface
2022-04-08 11:40:39 +02:00
59e8db205d
clean build2 from form uploadSnapshot
2022-04-08 11:17:58 +02:00
a8e05d76ae
refactor build in form snapshot
2022-04-08 11:12:17 +02:00
545a1013e9
add schema_version
2022-04-08 11:10:03 +02:00
cd6e079aee
rebuild api views
2022-04-07 21:04:05 +02:00
d729b55f26
load json from snapshot schemas
2022-04-07 21:01:56 +02:00
128140d4a8
refactoring build snapshot for reuse code
2022-04-07 21:00:45 +02:00
b3ab6d306e
add api resources un conftest
2022-04-07 20:59:13 +02:00
5fbcc6ba05
Fix multiple notifications & indetermined state
2022-04-07 14:59:19 +02:00
9489a70597
Fixed currentuser.token
...
It needs ":" at finally of string
2022-04-07 14:24:09 +02:00
184d22ac81
Fix User token
...
Needs encode string to Base64
2022-04-07 14:12:20 +02:00
629a773dd2
Add reactive lots list
2022-04-07 13:28:07 +02:00
5df183edf1
add view for inventor snapshot
2022-04-06 20:23:08 +02:00
fe21ac3cd8
new validate api with out teal
2022-04-06 19:43:35 +02:00
d1310a67bf
add profile form
2022-04-06 13:50:08 +02:00
9f84659026
clean white space
2022-04-06 13:49:15 +02:00
3114c678a4
add user model fields #3017
2022-04-06 12:35:08 +02:00
0150b88e6e
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-05 12:49:53 +02:00
Santiago L
277c3a84a9
Rename removelot.html -> lot_delete_modal.html
2022-04-05 11:49:47 +02:00
Santiago L
64182403a2
UI: update button colors
2022-04-05 11:47:12 +02:00
Santiago L
82cea04625
Sort lot action's buttons
2022-04-05 11:46:31 +02:00
Santiago L
c9068385c3
Update icons of device buttons
2022-04-05 11:40:23 +02:00
Santiago L
8ea8fba201
Add link to help.usody.com
2022-04-05 11:32:55 +02:00
Santiago L
1e79948e57
Drop broken link of breadcrumb
2022-04-05 11:32:27 +02:00
Santiago L
683c7cff72
Hide user profile details untils is implemented
2022-04-05 11:28:07 +02:00
Santiago L
b465513212
Fix flask.messages render
2022-04-05 11:27:21 +02:00
bf77934fdb
fix uuid
2022-04-05 11:04:16 +02:00
Santiago L
66afb7b683
Configure index route (redirect to login)
2022-04-05 10:49:27 +02:00
Santiago L
348970946b
Fix login_manager.user_loader
...
Also redirect unathorized requests to login view
2022-04-05 10:36:04 +02:00
b13c3347b9
add SnapshotErrors in inventory form
2022-04-05 09:22:02 +02:00
db637a99ac
add migrations for snapshot errors
2022-04-04 19:37:06 +02:00
d592e2fb06
bug fix uuid
2022-04-04 19:07:26 +02:00
cb5fb14c92
add model for save errors of parse snapshots
2022-04-04 13:27:04 +02:00
09ba81e92d
fix parser for qemu datas
2022-04-01 18:25:58 +02:00
6271c717a3
pass lshw and smart loadeds instead of raw data
2022-03-31 19:44:06 +02:00
7e3904700f
pass lshw dict instead of raw data
2022-03-31 19:42:50 +02:00
76336ff34d
change schema for lshw and smart data
2022-03-31 19:41:22 +02:00
026a88acb8
fix comparation datas put both in utc time
2022-03-31 19:40:05 +02:00
6fad773c91
change version of wb
2022-03-31 19:38:33 +02:00
7a532fb02c
change label for labels
2022-03-31 16:12:35 +02:00
aa5d93cf48
modularize labels instead of tags into inventory
2022-03-31 14:04:16 +02:00
90ad7afdc8
review pr 212 mv schemas, refactor forms and clean code
2022-03-30 18:29:15 +02:00
3be389c23f
review pr 212 about refactor and schemas
2022-03-30 18:27:57 +02:00
Santiago L
de23503f42
Drop numpy dependency: use math.hypot
...
Refactor code to adapt types: `numpy.hypot` supports pint units but
`math.hypot` expects float. It keeps behaviour because units are
not stored on database
2022-03-30 15:29:12 +02:00
ca71494e2b
add wbid in the snapshots
2022-03-30 13:48:55 +02:00
4881aac5c9
use numpy instead of math
2022-03-30 10:52:09 +02:00
118726d207
math.hypot instead of numpy
2022-03-30 10:33:09 +02:00
d70810e88b
drop pdb
2022-03-30 10:21:33 +02:00
fe8f636498
requirements pint
2022-03-30 10:12:54 +02:00
8fa1f41006
add requirements and drop dependencies
2022-03-29 17:32:12 +02:00
7e9a78428a
flake8 fixes
2022-03-29 17:20:58 +02:00
1c74e27fd2
fix models import not used
2022-03-29 17:09:40 +02:00
d39644716e
fix bug
2022-03-29 16:59:33 +02:00
3cd943037c
add migration for new column
2022-03-29 15:44:57 +02:00
34096b13eb
clean
2022-03-29 13:36:31 +02:00
e41ee5a987
add snapshot lite to new fornt end
2022-03-29 13:36:18 +02:00
a38c940e44
return to the origin of firewire 2
2022-03-29 13:35:00 +02:00
2c71d69a9a
return to the origin of firewire
2022-03-29 13:34:01 +02:00
90dea5492e
change integer for string in firewire bios
2022-03-29 12:23:51 +02:00
f4a657052a
.
2022-03-29 11:20:28 +02:00
ff4f78a44b
add test_data_storage in the parse disk for get lifetime
2022-03-29 11:19:29 +02:00
7a09127de9
add parsing from lshw and reuse code of worbench computer for parse
2022-03-28 19:14:19 +02:00
883c01053f
fix a lot of bugs and add storage and disk to the snapshot
2022-03-25 13:55:05 +01:00
01ceeb1be1
links parsing with snapshot view
2022-03-24 13:30:53 +01:00
f7b149f926
parser module
2022-03-24 13:13:28 +01:00
417276b88b
init parse from wb
2022-03-22 13:17:41 +01:00
Santiago L
358c569eea
Rewrite comment to be more clear
2022-03-22 11:37:46 +01:00
3c27d3d421
display
2022-03-22 11:06:46 +01:00
8052618d55
parsed for network geting of lshw
2022-03-21 19:22:47 +01:00
649e456feb
Parsing cpu and chassis of computer
2022-03-18 18:19:06 +01:00
18883b2b8d
validate fields for the new snapshot
2022-03-18 12:07:22 +01:00
6bad17013d
save snapshot
2022-03-17 18:52:58 +01:00
3ac3802719
Filter for show only dhid tags
2022-03-17 18:09:08 +01:00
f2ab02804b
new userclient from flask instead of teal
2022-03-17 13:13:15 +01:00
ec99ad22b5
.
2022-03-17 11:50:57 +01:00
f8e1776ca8
Change names tags for labels in the labels sections
2022-03-17 09:41:03 +01:00
a36fb0b0fc
generate pdf with multiple devices
2022-03-16 14:27:55 +01:00
a8df3f5e5a
Render a template for get a labels of multiple devices
2022-03-16 13:06:42 +01:00
Santiago L
8d3cad48bf
Bump to version 2.1.0.dev
2022-03-15 15:07:02 +01:00
Santiago L
24e489b9bb
Release version 2.0.0
...
First server side render version. Completely rewrites views of
angular JS client on flask.
2022-03-15 15:04:28 +01: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
Santiago L
8085700009
Hide "remember be" until it is implemented
2022-03-15 14:41:26 +01:00
Santiago L
754f75eab4
Rename base URL 'inventory.devices' => 'inventory'
2022-03-15 14:33:27 +01:00
b4b12da477
Add of DeviceHub in template
2022-03-15 11:46:32 +01:00
Santiago L
57e9a7ef9a
Include version of DeviceHub (hardcoded) on footer
2022-03-15 11:12:53 +01:00
Santiago L
678dfb0ea9
Refactor filter form HTML markup
...
Avoid using row & col
2022-03-15 10:59:55 +01:00
d20bd63cae
precommit
2022-03-15 10:02:30 +01:00
71926f01c0
new list of device for filter
2022-03-15 09:16:01 +01:00
40abcd6b67
pre commit
2022-03-09 10:30:28 +01:00
Santiago L
aa9d3bb5a5
Drop pdb statement
2022-03-08 22:09:03 +01:00
2f84aac7ef
change the title of list when there are a select data in the filter
2022-03-08 17:59:33 +01:00
be2fda3d8c
precommit
2022-03-08 17:49:56 +01:00
0bef1dee2a
adding a new device in a lot if it is created from a lot
2022-03-08 17:43:15 +01:00
b16fdd59f9
precommit
2022-03-08 11:01:10 +01:00
ea66c31a07
fix bug
2022-03-08 10:30:53 +01:00
70f093e1a1
resolve conflict
2022-03-08 10:30:31 +01:00
a983ebd6cf
add all devices as option in the select of filter
2022-03-08 10:15:53 +01:00
62f42e9e05
fix bug
2022-03-08 10:15:21 +01:00
Santiago L
c67bd93ef6
Fix flake8 unused import
2022-03-08 10:05:32 +01:00
Santiago L
46a3fc57dd
Replace add supplier & add receiver pictograms
...
Create visual relation between:
a) Supplier and incoming lot
b) Receiver and outgoing lot
2022-03-07 18:30:32 +01:00
Santiago L
bb588b10d2
Refactor HTML: use d-flex
2022-03-07 18:28:45 +01:00
bd716e2ef8
add more devices to the filter
2022-03-07 15:17:03 +01:00
34aab019b9
fix computer option
2022-03-07 13:09:11 +01:00
598b91e22b
filter search in lists
2022-03-07 13:07:26 +01:00
e90ac224c1
use commit=True for default as django pattern, when we save or remove one model
2022-03-07 11:37:32 +01:00
54a938071b
fix bug when add or delete one device of a lot. For fix this we use the pattern of flask doing the commit in the view
2022-03-07 11:31:38 +01:00
5df74d7742
extra message confirm when you want delete one lot with devices
2022-03-07 11:24:02 +01:00
9d43299592
now is possible delete a temporary lot when this lot have one or more devices
2022-03-07 10:20:18 +01:00
4fbed3c5ef
drop class col in forms when is not neccesary
2022-03-04 18:50:47 +01:00
496763473e
always show the button to delete a lot and show an error message if you try to delete a lot with devices
2022-03-04 18:30:14 +01:00
6b3ccee58f
#2890
...
Go back to lot detail when cancel lot edit
2022-03-04 13:51:05 +01:00
d98d09cc7d
propagate error of connection with the tag server to the view
2022-03-04 13:32:37 +01:00
b737aaf50a
add verbose_name in device.model instead of use template system
2022-03-04 13:31:33 +01:00
95a8b13a6b
form select type of device in the list of device. Step 1
2022-03-04 13:00:51 +01:00
075135c191
Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements
2022-03-03 11:18:57 +01:00
d25c9faf25
fix change #2825 , tags only for Computers
2022-03-03 10:43:34 +01:00
Santiago L
473a7a02de
Update ereuse_devicehub/inventory/forms.py
2022-03-02 18:51:04 +01:00
fc4ba2041e
remove imported but unused
2022-03-02 13:45:52 +01:00
7f0167f688
remove imported but unused
2022-03-02 13:39:15 +01:00
eb84884db4
remove imported but unused
2022-03-02 13:38:22 +01:00
56b8e0886c
ignoring warnings of too complex functions
2022-03-02 13:36:06 +01:00
e45a4982c6
ignoring warnings of too complex function
2022-03-02 13:31:21 +01:00
c52480231b
add error msg when there are more than one device selected for add or remove one tag
2022-03-02 13:08:23 +01:00
ad09d298a0
add order by code in tags lists and select
2022-03-02 13:07:04 +01:00
806e9ad8d0
fix bug #2840 about trade without confirm and with code
2022-03-02 10:56:31 +01:00
15d913efea
add message with result when a devices is add or remove of a lot
2022-03-02 10:36:26 +01:00
6389956adc
fix bug #2841 . Show lot and devices for all users involved in a trade
2022-03-01 14:29:25 +01:00
ab89b7eff0
#2736 Move simple-datatables to base
2022-03-01 10:30:47 +01:00
3886076f50
#2736 Move jquery to base
2022-03-01 10:07:05 +01:00
f9840e9f2b
fix buttons of form of upload trade document
2022-02-28 13:33:03 +01:00
823594dce4
add tab documents
2022-02-28 13:27:12 +01:00
b6cf1f1e3e
Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements
2022-02-28 13:06:04 +01:00
9a95587cf3
remove lot in top
2022-02-28 13:05:36 +01:00
560d9fae05
task #2740 add tag code in name of pdf file
2022-02-28 12:16:33 +01:00
c6538333f7
task #2739 Manufacter and Model empty instead of None
2022-02-28 12:02:56 +01:00
a45fd815a2
task #2741 fix Handle error message, provider connection when we are creating an unnamed tag
2022-02-28 11:46:31 +01:00
692358c343
add alert when no there are any device selected
2022-02-28 11:19:22 +01:00
f655bfb895
pre-commit
2022-02-25 12:57:13 +01:00
71d30548cc
resolve conflict
2022-02-25 12:56:01 +01:00
826584450a
resolve conflict
2022-02-25 12:34:02 +01:00
b85f4f298c
pre-commit
2022-02-25 12:27:14 +01:00
26f3a64b46
there are views than doesn't have any lot on sidebar because lots are missing as template context
2022-02-25 12:25:00 +01:00
37f50624fa
change redirect to unansigned lot next to do login instead of go to profile page
2022-02-25 11:49:05 +01:00
1772b4090c
close div tag in trade template
2022-02-25 10:16:59 +01:00
e614908c73
resolve conflict
2022-02-25 10:15:23 +01:00
04cc244f2d
resolve conflict
2022-02-25 10:07:44 +01:00
c54d9a902c
fix bug in trade template
2022-02-25 09:49:15 +01:00
179feaba44
add exports in front end
2022-02-24 14:15:58 +01:00
Santiago L
fbedbc8f7f
Drop Additional keyword arguments
...
[Deprecated since version 0.9](https://docs.sqlalchemy.org/en/12/core/type_basics.html#sqlalchemy.types.Float.params.**kwargs )
2022-02-22 12:22:23 +01:00
Santiago L
d4e61d992b
Raise error if trying to save when validation has failed
2022-02-22 12:04:26 +01:00
Santiago L
bacf14ece8
Fix method call to `get_or_create_user()`
2022-02-22 11:55:01 +01:00
bfbd7c02b7
.
2022-02-22 11:40:05 +01:00
90eb279008
fix get_or_create_user
2022-02-22 11:31:11 +01:00
88deb71a26
changes of review
2022-02-22 11:24:11 +01:00
eed2849af3
Merge branch 'feature/server-side-render-actions-trade' of github.com:eReuse/devicehub-teal into feature/server-side-render-actions-trade
2022-02-22 11:17:39 +01:00
96a240b3cd
drop enconded as unicode
2022-02-22 11:15:37 +01:00
Santiago L
2cff0499cb
Apply suggestions from code review
2022-02-22 11:13:00 +01:00
Santiago L
6eb3c62b83
Update ereuse_devicehub/inventory/forms.py
2022-02-22 11:12:15 +01:00
60d9c04e2d
view of export
2022-02-22 11:11:53 +01:00
4ce359fec4
Merge branch 'feature/server-side-render' into feature/server-side-render-actions-trade
2022-02-21 13:05:38 +01:00
83a9c66a46
show documents in list device of trade lot
2022-02-21 13:04:56 +01:00
bda39d0fc9
add trade document template
2022-02-21 13:04:13 +01:00
d056d1867b
fix template trade
2022-02-21 13:03:35 +01:00
c18532f265
new view and endpoint for trade document
2022-02-21 13:03:03 +01:00
4a2cd7adfe
new form for trade documents
2022-02-21 13:02:28 +01:00
791d2a5894
manager better the error messages in trade form
2022-02-18 13:37:45 +01:00
b72f9f37c6
add trade action iun devices when this device is insert in a lot with a trade
2022-02-18 11:29:12 +01:00
a2b074e707
problem display none for adding tag form
2022-02-18 11:18:54 +01:00
8b27b18fc1
change supplier for user_from and receiver for user_to
2022-02-18 09:30:20 +01:00
538e355026
add save instance correctly, create phantom accounts and change the owner for devices
2022-02-17 13:52:55 +01:00
37779ca05c
fix trade form for unassigned list
2022-02-17 13:51:59 +01:00
403717ccf2
fix readonly and deviceslist
2022-02-17 13:51:27 +01:00
5e46141622
fix save trade action
2022-02-16 14:03:01 +01:00
86f3c3f483
fix validate trade form
2022-02-10 13:53:52 +01:00
adad689acd
type to message from form.type.data instead of instance
2022-02-10 13:31:49 +01:00
f3ffcd89ca
fixing js form for trade
2022-02-10 13:22:47 +01:00
Santiago L
df4c6f7407
flake8: remove unused imports & sort them
2022-02-10 11:29:47 +01:00
cd16baaadb
skeleton for trade action
2022-02-09 14:06:28 +01:00
f2d6c198cc
fix css for form documents into data_wipe html
2022-02-09 11:28:57 +01:00
1ed5d394c5
fix the new version of dispatch for NewDataWipeView
2022-02-09 11:27:08 +01:00
d102eaed9c
resolve conflict
2022-02-09 10:18:56 +01:00
764d749db0
datawipe form example as 2 forms in one
2022-02-08 13:59:50 +01:00
Santiago L
b103a1a51d
Rename attribute `_form` --> `form_class`
2022-02-08 11:52:30 +01:00
Santiago L
e15e457481
Refactor: create method `get_next_url()`
2022-02-08 11:49:13 +01:00
Santiago L
f1a78e23f6
Include action type on message
2022-02-08 11:39:27 +01:00
Santiago L
aeb765dcd7
Use built-in flask.flash to implement messages
2022-02-08 11:39:08 +01:00
Santiago L
574ac41239
Render messages on base_site.html & add new action message
2022-02-07 14:52:17 +01:00
Santiago L
0d27800948
Create module to store user messages using sessions
...
Module ereuse_devicehub.messages inspired by django.contrib.messages
2022-02-07 14:50:19 +01:00
2542719378
fix insert hash for force not to do a commit
2022-02-07 14:03:01 +01:00
2a92b1f747
add form for data wipe
2022-02-07 14:02:28 +01:00
94604dd029
view for data wipe
2022-02-07 14:01:56 +01:00
8b467b95c3
template for data wipe
2022-02-07 14:01:38 +01:00
579e0e35f0
Merge branch 'feature/server-side-render-actions' into feature/server-side-render-actions-documents
2022-02-04 13:23:33 +01:00
c340122d87
check the checkbox in a devices list when one form is invalid 2
2022-02-04 13:22:47 +01:00
a55944e379
check the checkbox in a devices list when one form is invalid
2022-02-04 13:16:27 +01:00
662f75bb7b
refactoring and put again the lot in form of actions
2022-02-04 12:10:27 +01:00
f011e29ce9
add description of device in actions
2022-02-04 11:30:29 +01:00
c10a5f24b4
add count to allocate action
2022-02-03 14:05:15 +01:00
7f9a6784e9
add count of devices in action form
2022-02-03 13:58:54 +01:00
aeef04b92c
change modal-fullscreen by modal-lg
2022-02-03 11:53:18 +01:00
820078dd3f
UX: inform user about the type action thas is going to be created --> show type of action
2022-02-03 11:44:51 +01:00
4ebb312e59
first step for datawipe form
2022-02-03 11:27:16 +01:00
e8b5c1e310
deactive dataWipe action
2022-02-03 10:51:48 +01:00
f79abb05cd
isort
2022-02-03 10:50:36 +01:00
4107d67832
fix css bug for dropdown menu action
2022-02-03 10:28:15 +01:00
87faee3444
fix the return correct page when the submit is false
2022-02-03 10:14:10 +01:00
c0918e7b57
fix error message in form
2022-02-02 14:17:42 +01:00
71f5a8a98b
fix doble query
2022-02-02 13:51:54 +01:00
8149d0ed7c
reversed actions for see the better the traceability log
2022-02-02 13:27:53 +01:00
9a68ad7ab8
fix dictionary style
2022-02-02 13:09:11 +01:00
bd5ab802cd
resolve conflict
2022-02-02 13:05:55 +01:00
fedc85668a
drop lot in actions in views and forms
2022-02-02 12:52:16 +01:00
11df33060f
drop pdb
2022-02-02 12:51:15 +01:00
a0bc745893
drop lot in template of actions
2022-02-02 12:50:59 +01:00
450cef168b
solve a bug of validate
2022-02-02 12:49:03 +01:00
Santiago L
f22fd4ebcb
Fix button links of device_list & page titles
2022-02-02 12:21:30 +01:00
Santiago L
c9a46128df
Set page_title & fix breadcrumb
2022-02-02 11:41:29 +01:00
Santiago L
44a38d4dec
Fix printerType select style
2022-02-02 11:18:16 +01:00
10c756a884
show error msg for forms with errors of validations
2022-02-01 13:40:06 +01:00
Santiago L
60bca7b733
Rename Labels --> Tags on side bar menu
2022-01-31 12:14:27 +01:00
65a774550e
resolv conflicts
2022-01-31 10:41:40 +01:00
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
Santiago L
RubenPX
Cayo Puigdefabregas
Lint Action
cayop
nad