112f459db3
resolve conflict
2022-04-29 11:09:18 +02:00
c82f173edf
resolve conflict
2022-04-28 18:47:56 +02:00
d8a44c661a
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-28 18:45:51 +02:00
8d43128e68
fix render item in confirmation dialog
2022-04-28 18:43:38 +02:00
c14d8482be
Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier
2022-04-28 18:32:39 +02:00
9cef5188db
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
2022-04-28 18:31:15 +02:00
962f7cb94c
lint
2022-04-28 18:29:39 +02:00
c824110b00
Send device model through the methods
2022-04-28 18:29:18 +02:00
7362eb4492
add computer monitor
2022-04-28 17:56:00 +02:00
3a5e806104
add icons types of devices in list of devices
2022-04-28 17:46:12 +02:00
1727ab70a3
lint
2022-04-28 17:00:23 +02:00
4aa024b041
checkpoint: add confirmation dialog
2022-04-28 16:58:44 +02:00
8d8ce63402
Optimize manage list
2022-04-28 15:32:35 +02:00
770ab8ea8d
improvement sending variables data through methods
2022-04-28 15:29:57 +02:00
bb284008cc
Fix re render table
2022-04-28 15:01:39 +02:00
Santiago L
293364acfb
Merge pull request #222 from eReuse/feature/extend-user-datas-#3016
...
Feature: allow user to update its password #3016
2022-04-28 12:08:00 +02:00
Santiago L
d0e033197c
Drop Agent.get_full_name because is unused
2022-04-28 12:06:43 +02:00
Santiago L
9afe6bf9e6
Revert all changes related to ProfileForm
...
We need to talk about the concepts of Agent and User and their
relationship before allowing the user to update their data.
2022-04-28 12:03:12 +02:00
Santiago L
3fd208c479
Restore tabs to include title "Change password"
2022-04-28 11:50:07 +02:00
87c66cf5cd
change tags for unique identifiers
2022-04-28 11:47:52 +02:00
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
Cayo Puigdefabregas
RubenPX
Santiago L
Lint Action