1f85abc1e2
resolve conflicts
2022-06-24 11:32:14 +02:00
18e051596c
fixing system uuid as non physical property
2022-06-24 11:27:42 +02:00
Santiago L
cd3439b3ac
Release version 2.2.0
2022-06-24 07:22:01 +02:00
7cb5c76562
add download iso
2022-06-23 18:08:56 +02:00
6e3c032d97
3500 change name of anchor
2022-06-23 18:08:16 +02:00
8bcbf21abe
resolve conflicts
2022-06-23 17:08:07 +02:00
be7cbf02c0
remove system uuid of public page
2022-06-23 17:06:40 +02:00
e55c1d4cab
change link of export devices lots
2022-06-23 15:52:23 +02:00
2605d938e5
add placeholder model
2022-06-23 15:51:01 +02:00
bc446e7dbf
run babel
2022-06-22 09:03:12 +02:00
b47cc84859
run babel
2022-06-21 18:27:55 +02:00
db53905cf1
Fix code style issues with ESLint
2022-06-21 15:53:23 +00:00
fc50604011
add sections in menu of lots
2022-06-21 17:51:33 +02:00
cf4e1df527
add field type of transfer instead of change the name
2022-06-21 17:50:27 +02:00
7d40f5b537
add transfer in name of lot
2022-06-21 16:40:21 +02:00
2a3b7a0900
add Transfers to lot dropdown
2022-06-21 08:11:42 +02:00
3ecf4c4a89
add dropdown menu in reports lots
2022-06-20 14:36:34 +02:00
c6c443899a
add temporary lots too in reports
2022-06-20 14:35:57 +02:00
8e11aff88b
add export devices lots
2022-06-20 10:51:32 +02:00
49062d9944
add export devices lots
2022-06-20 10:40:00 +02:00
e332cd2d43
add link to devices lot export
2022-06-20 10:36:24 +02:00
740178f57b
add link for report lots
2022-06-20 09:24:48 +02:00
ec47bfaec6
export lots
2022-06-17 14:14:32 +02:00
cdf180cf38
drop metrics of devices list
2022-06-17 12:16:01 +02:00
3afdf3ea0b
return to the original state of dummy
2022-06-17 11:25:24 +02:00
559e926626
fix commit in db
2022-06-17 11:24:52 +02:00
88a164a9ee
save system uuid only for smbios >= 2.6
2022-06-16 17:58:32 +02:00
c43e7fb578
fix splits texts
2022-06-16 11:47:36 +02:00
08300ef612
add system_uuid in old devices
2022-06-16 10:38:57 +02:00
41196ae445
add system uuid to snapshots list
2022-06-15 13:39:06 +02:00
77c01ae80a
migration change uuid for system_uuid
2022-06-15 12:52:46 +02:00
34def901cb
change uuid in views and forms for system_uuid
2022-06-15 12:18:44 +02:00
0f916e5964
change uuid for system_uuid
2022-06-15 12:17:16 +02:00
dd3ff2fc5a
fix weird
2022-06-14 10:49:00 +02:00
c0081e32b1
fix uuid in device not computer
2022-06-14 10:48:01 +02:00
86446a268c
fix uuid in device not computer
2022-06-14 10:46:21 +02:00
660e238468
fix order of vars declared
2022-06-13 17:59:54 +02:00
3e3a2fbd34
add uuid for old versions from form upload
2022-06-13 17:36:03 +02:00
e1cdd56fa0
add uuid for old register api
2022-06-13 17:35:01 +02:00
686d0a9307
add system_uuid to sync run function
2022-06-13 17:33:22 +02:00
dadfbdd605
add logo in printing pdf label
2022-06-09 16:57:15 +02:00
3431bed49e
managment save and load logo in template
2022-06-08 15:37:49 +02:00
c3fbc8a0c0
Merge branch 'testing' into feature/2972-add-logo-to-label
2022-06-08 12:27:06 +02:00
328d417741
add upload logo in template
2022-06-08 12:26:47 +02:00
cfe7639734
Merge pull request #300 from eReuse/change/2973-sid-in-label
...
Change/2973 sid in label
2022-06-08 12:18:42 +02:00
a65e93b470
add sid in template
2022-06-08 11:59:47 +02:00
dd68c5c410
fix dev.sid
2022-06-08 11:59:22 +02:00
8dbb4e6e9b
Fix code style issues with ESLint
2022-06-08 08:56:46 +00:00
2eab043f3c
fix var
2022-06-08 10:55:52 +02:00
a1450f9810
fix var
2022-06-08 10:53:40 +02:00
3997235e09
fix var
2022-06-08 10:52:52 +02:00
42df98f7a2
Fix code style issues with ESLint
2022-06-08 08:17:46 +00:00
070771c077
select with shift chromium
2022-06-08 10:16:15 +02:00
5932213764
save sid in html label
2022-06-08 09:26:09 +02:00
99d0a61e87
return jwt.encode to snapshot code
2022-06-07 15:24:45 +02:00
eb66baf842
fix snapshot_uuid == None
2022-06-07 15:12:13 +02:00
74f9b88ece
preload SnapshotsLog in dummy
2022-06-07 15:06:18 +02:00
7a0e21d682
dialects.postgresql.ENUM instead of sa.Enum
2022-06-07 15:05:39 +02:00
Santiago L
498ce6763d
Release version 2.2.0rc1
2022-06-07 11:22:40 +02:00
Santiago L
083e763b25
Merge pull request #212 from eReuse/feature/server-side-render-parser-3021
...
Feature/server side render parser 3021
2022-06-07 11:00:27 +02:00
65d500c87d
Merge pull request #293 from eReuse/feature/3428-Increase-items-selected
...
increase 50 and 100 items per page
2022-06-07 09:35:30 +02:00
c615980535
increase 50 and 100 items per page
2022-06-06 18:25:56 +02:00
Santiago L
772d527ba6
Merge pull request #277 from RubenPX/add-developement-stuff-js
...
Add developement build & precomit build (javascript)
2022-06-06 16:45:10 +02:00
83bdf79514
add render views for delivery and receiver notes
2022-06-06 13:37:58 +02:00
e635abdbbc
views of delivery note and receiver note
2022-06-03 20:01:13 +02:00
2b8e7232c3
add transfer note models
2022-06-03 13:13:50 +02:00
88a0bdd44d
resolv conflicts
2022-06-03 11:34:49 +02:00
ad7848edc6
add snapshotLog in old api
2022-06-03 11:06:49 +02:00
9eb02e82a3
Merge pull request #290 from eReuse/feature/3436-search-bulk-dhid
...
add view for advanced search
2022-06-02 14:59:56 +02:00
cce7dbfdf1
add view for advanced search
2022-06-02 13:46:10 +02:00
Santiago L
560920c85a
Merge pull request #287 from RubenPX/fix/lots-button-out-of-card
...
fix apply button out of card
2022-06-02 13:26:05 +02:00
5fc3056907
fix version transfer migration
2022-06-01 16:47:40 +02:00
f58993c9d1
resolve conflicts
2022-06-01 15:01:02 +02:00
29313e3470
add colors to open and closed
2022-06-01 13:26:17 +02:00
1e50db9194
fix render lot
2022-06-01 13:15:04 +02:00
b7eb438767
fix migration datas
2022-06-01 13:14:45 +02:00
96680937e9
add arrow right
2022-06-01 13:14:27 +02:00
e1e38015ee
fix
2022-06-01 12:34:48 +02:00
ef36c11f6b
change names of vars
2022-06-01 11:54:02 +02:00
f8f1276313
add description in transfer
2022-06-01 11:09:28 +02:00
7e4bdfdc69
create transfer in angular version for code trades
2022-06-01 10:29:55 +02:00
2dd3b7c276
upgrade the datas in the migration
2022-05-31 18:33:41 +02:00
dbd5645c94
show transfers if there are transfer
2022-05-31 16:28:38 +02:00
01f2996c48
fixed query lots
2022-05-31 15:14:56 +02:00
54295556f1
fix style
2022-05-31 11:25:32 +02:00
f6d4c48487
drop pdbs
2022-05-31 10:22:01 +02:00
5b164221ae
hotfix lots search not working
2022-05-30 19:28:16 +02:00
a1728810d1
fixed bugs
2022-05-30 17:35:27 +02:00
b0c58595c1
add EditTransfer
2022-05-30 16:33:01 +02:00
9ca5ce48d1
add edit transfer
2022-05-30 16:32:25 +02:00
0f563d58d8
fix closed
2022-05-30 16:32:02 +02:00
b8819b7a4a
change is_temporary, is_outgoing, is_incoming
2022-05-27 16:48:40 +02:00
b2e11527cb
fix model transfer
2022-05-27 16:32:54 +02:00
a8368e92b8
add html and form for transfers
2022-05-27 16:32:22 +02:00
0998adc956
add model transfer
2022-05-27 11:30:48 +02:00
d3e7c49a86
fixed bugs of allocate
2022-05-26 17:55:52 +02:00
ebe800158a
modify updated and add registered
2022-05-25 17:37:24 +02:00
83067fd2bb
modify updated and add registered
2022-05-25 17:33:54 +02:00
Santiago L
c2bff5dd92
Fix #279 . Update existing enum
2022-05-24 14:08:23 +02:00
Santiago L
e081310069
Apply pre-commit hook
2022-05-24 14:06:56 +02:00
Santiago L
7d7507c1d9
Merge pull request #273 from RubenPX/feature/lots-search
...
Feature: lots-search US 3334
2022-05-23 13:39:42 +02:00
14500ec4a2
Fix code style issues with ESLint
2022-05-22 17:01:11 +00:00
4164deae2e
fix: only allow search when lots list is loaded
2022-05-22 19:00:26 +02:00
97ff171fa0
Change EOL `CRLF` to `LF`
2022-05-22 18:21:59 +02:00
c13bc0f7ce
fix dropdown not works when try to search DOM element
2022-05-22 18:20:04 +02:00
c0a7415f33
Update ereuse_devicehub/templates/inventory/device_list.html
...
Co-authored-by: Santiago L <santiago@ribaguifi.com>
2022-05-21 10:58:40 +02:00
d63a256da5
fix version in text
2022-05-20 18:31:47 +02:00
3f2d3df817
fix list for query
2022-05-20 18:31:21 +02:00
a486486995
fix circular imports
2022-05-20 18:30:43 +02:00
1a8dc80067
fix the info result
2022-05-20 13:52:32 +02:00
9590cff193
bugfix parse errors messages
2022-05-20 13:44:11 +02:00
6bf419f59a
try to fix bug
2022-05-20 11:45:53 +02:00
bf455c40c9
try to fix bug
2022-05-20 11:42:39 +02:00
6ecbd4e09d
add details of one entry snapshot log
2022-05-19 18:16:47 +02:00
744b14f286
join all snapshots logs in one for every uuid
2022-05-19 13:48:52 +02:00
cea143dcbe
fix lot render
2022-05-19 10:58:07 +02:00
a919c0ee26
force query
2022-05-19 09:47:31 +02:00
0bc75ec547
add get_status
2022-05-18 18:26:01 +02:00
f2a7a15851
drop pdbs
2022-05-18 18:25:21 +02:00
04969ad939
clean template
2022-05-18 18:02:38 +02:00
b8c97780be
add snapshotslog Ok result
2022-05-18 18:02:08 +02:00
3d73e1a368
fix version in snaposhotslog
2022-05-18 18:00:54 +02:00
1698f35e3d
fix model
2022-05-18 17:59:05 +02:00
112e6bd01a
save ok in log
2022-05-18 12:47:23 +02:00
c0abfd6f0b
change version
2022-05-18 12:46:57 +02:00
3670fe0ff1
fixing migrations
2022-05-18 12:46:34 +02:00
79ce3dfc59
Load dev build on device_list
2022-05-18 11:16:22 +02:00
a7ceab2cde
change SnapshotErrors for SnapshotsLog
2022-05-18 11:03:58 +02:00
d9e94e66d3
change views
2022-05-18 11:01:58 +02:00
99309162e3
change templates
2022-05-18 11:01:23 +02:00
e96c2c122d
add snapshots_log instead of snapshot_errors
2022-05-18 11:00:04 +02:00
bf547b6f80
Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113
2022-05-17 09:23:31 +02:00
0206f831b2
fix GenericMixin in woekbench view
2022-05-16 18:38:36 +02:00
edeae562d6
resolve conflict
2022-05-16 18:33:34 +02:00
68fc1cb2bb
resolv conflicts
2022-05-16 18:23:03 +02:00
960c971197
Change workbench_lite for schema_workbench
2022-05-16 17:57:09 +02:00
b309cc4410
change Mixin clases
2022-05-16 17:52:31 +02:00
d935c987b3
comiter monitor instead of monitor
2022-05-16 12:40:14 +02:00
727c06c3de
add public link to device list
2022-05-16 11:54:02 +02:00
3bd2dd79b1
remove all components in the filter of the inventory
2022-05-16 11:01:52 +02:00
0b78178ff4
fixed device public page
2022-05-16 10:29:07 +02:00
c1665ef4af
Merge branch 'testing' into feature/#3396-add-columns-status
2022-05-16 10:16:23 +02:00
282b9490fb
Merge pull request #265 from eReuse/feature/#3100-wb-settings
...
Feature/#3100 wb settings
2022-05-16 10:18:45 +02:00
b329474a10
remove code dependecy
2022-05-13 21:54:03 +02:00
ec0d9860f7
change map to forEach
2022-05-13 21:33:25 +02:00
a10fb5a212
add Search functionality
2022-05-13 21:29:15 +02:00
adde4f88e4
add lots search interface
2022-05-13 21:27:50 +02:00
dd081532ba
#3402 change public page of device
2022-05-13 17:17:57 +02:00
11913d68c3
fix state instead of states
2022-05-13 17:16:08 +02:00
1dcebc0112
#3401 change the values of the status in the page of device details
2022-05-13 13:11:00 +02:00
d8c9bcbcf7
#3400 change the names of the status for the correct names
2022-05-13 13:06:04 +02:00
df44849ad3
add allocate status in devices export
2022-05-13 12:51:31 +02:00
1b5f6412f0
#3397 add columns of status in the devices list
2022-05-13 12:17:14 +02:00
Santiago L
af833a673a
Merge pull request #272 from RubenPX/Show-device-labels
...
Show lots on deviceList
2022-05-13 10:41:55 +02:00
Santiago L
56ccb7591a
Cosmetics: display lots inline & use ligh bg
...
Lower visual weight because it's secundary information
2022-05-13 10:39:37 +02:00
Santiago L
300edac5a8
Dropped .badge-pill use the .rounded-pill utility instead.
...
Breaking change on Boostrap 5
https://getbootstrap.com/docs/5.0/migration/#badges
2022-05-13 10:35:11 +02:00
Santiago L
a444579c05
Merge pull request #271 from eReuse/feature/all-device-list
...
Feature: 3196 all device list
2022-05-13 10:26:49 +02:00
Santiago L
d54f2166dc
Keep unassigned as default option on device list
...
Unassigned devices are the ones that require user attention and
also all devices view will generate larger responses and more
server load.
2022-05-13 10:22:32 +02:00
c7e0501828
add soft init to reassign events
2022-05-12 18:58:06 +02:00
6a408a08c7
set const table to var
...
This allow modify variable
2022-05-12 18:44:26 +02:00
cea1c2b717
full table replacament
2022-05-12 18:44:02 +02:00
5026768eb5
Merge pull request #269 from eReuse/bugfix/allocate-bugs
...
Bugfix/allocate bugs
2022-05-12 17:38:37 +02:00
3a2e0bd61a
fixing bugs
2022-05-12 17:25:02 +02:00
763d2d1361
minimalistic settings
2022-05-12 17:19:22 +02:00
Santiago L
4406c78aed
Merge branch 'testing' into feature/all-device-list
2022-05-12 14:49:22 +02:00
Santiago L
8f3bdb71fe
Add "All devices" item to sidebar menu
2022-05-12 14:44:02 +02:00
Santiago L
290c260511
Update breadcrum: All devices VS Unassigned
2022-05-12 14:43:41 +02:00
Santiago L
9e779d279c
Allow retrieving all devices of a user
2022-05-12 14:42:55 +02:00
Santiago L
4ffbeec29d
Refactor form initialization
2022-05-12 14:23:01 +02:00
Santiago L
3e33b7d63b
Refactor DeviceListMix: split code in smaller methods
2022-05-12 14:03:09 +02:00
b927e1ac54
Merge branch 'testing' into feature/#3100-wb-settings
2022-05-12 11:57:55 +02:00
0e974c0e92
add tags in device list
2022-05-12 11:33:28 +02:00
fee1d6787c
add column created and put order descendent from created field
2022-05-12 11:03:48 +02:00
9b6d77573f
fixed Enhancement #3384
2022-05-12 10:33:04 +02:00
515f31c562
fixed bug #3387
2022-05-12 10:15:46 +02:00
b6966328fb
fixed bug #3383
2022-05-12 10:09:03 +02:00
eac90d32cf
fixed bug #3386
2022-05-12 10:05:37 +02:00
Santiago L
2457f776e1
Bump to version 2.1.2.alpha0
2022-05-11 18:53:22 +02:00
Santiago L
90690bdd66
Release version 2.1.1
2022-05-11 18:50:39 +02:00
Santiago L
6a8a38eaab
Merge pull request #259 from RubenPX/fix-indeterminated-checkbox
...
fix indeterminated checkbox on select lots
2022-05-11 18:43:51 +02:00
42760e5b9e
Fix print labels devices
2022-05-11 18:42:29 +02:00
Santiago L
80d18e34a8
Merge pull request #256 from RubenPX/makingPublic-fields
...
fix code issues & add support to old browsers
2022-05-11 18:38:14 +02:00
a2bfbef8cf
Merge branch 'testing' into feature/list-snapshots-view-#3113
2022-05-11 18:24:25 +02:00
Santiago L
87194cf090
Merge pull request #266 from eReuse/bugfix/#3380-to-text
...
Fix error when trade.document.url is None on device_list.html
2022-05-11 18:23:24 +02:00
bdc04c643c
fixed url == None
2022-05-11 18:14:33 +02:00
0f512d4bb3
fix link to device and show correctly date
2022-05-11 18:00:18 +02:00
60de8fde63
Merge branch 'testing' into fix-indeterminated-checkbox
2022-05-11 17:44:50 +02:00
Santiago L
ef7e654c26
Bump to version 2.2.0.alpha0
2022-05-11 17:27:53 +02:00
Santiago L
d218b19dd5
Release version 2.1.0
2022-05-11 17:24:59 +02:00
Santiago L
640cc99a71
Merge pull request #260 from RubenPX/fix/better-ui-selector
...
Show selected devices notification instead page select selection
2022-05-11 17:13:37 +02:00
1baeddbd56
Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113
2022-05-11 17:04:47 +02:00
123757793f
add link on sidebar and put empty data
2022-05-11 17:03:31 +02:00
5e74255145
basic list snapshots
2022-05-11 16:59:36 +02:00
b8e980cabe
fixed tests
2022-05-11 13:14:11 +02:00
0e75865757
fix settings.html
2022-05-11 11:58:54 +02:00
7ee2f2962b
add view for download Workbench settings
2022-05-11 11:48:53 +02:00
411fe85b19
Check devices in current page
2022-05-11 11:20:25 +02:00
cc7b453c06
Check initial state on dom loaded & check if has devices
2022-05-11 11:19:56 +02:00
d27cc46f64
refactor device selection
2022-05-11 11:09:38 +02:00
881f56e3e4
Fix devices length comparation
2022-05-11 10:42:32 +02:00
Santiago L
4d354b377a
Merge pull request #258 from RubenPX/add-register-info-and-fix-text
...
#3333 - Add register info and fix text
2022-05-10 22:44:45 +02:00
37c43fe3d1
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-10 11:00:40 +02:00
a54d57f4ab
fix the All devices option
2022-05-10 10:22:22 +02:00
b10a8c9e35
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-09 17:07:07 +02:00
d800c6950c
fixed bug
2022-05-09 16:48:34 +02:00
1d51629796
resolve conflict
2022-05-09 16:35:44 +02:00
3da1bdcad1
Show selected devices notify instead page select
2022-05-09 14:40:28 +02:00
ff00b88fd7
fix indeterminated checkbox
2022-05-09 14:18:41 +02:00
ec9074ae7c
add register user dialog
2022-05-09 14:03:51 +02:00
651c0cb9d8
Fix text select lots instead devices
2022-05-09 13:57:17 +02:00
04e4f4ff74
add generics filters
2022-05-09 13:43:02 +02:00
776e38aa67
Fix code style issues with ESLint
2022-05-09 09:30:23 +00:00
8f80e7dff4
Fix declaration variable
2022-05-09 11:29:48 +02:00
252c5285d8
refactorice
2022-05-09 11:12:34 +02:00
4f72654f50
Fix code style issues with ESLint
2022-05-09 09:10:08 +00:00
2e42b08519
use babel to support old browsers
2022-05-09 11:07:57 +02:00
275b7ad0c5
fix declaration variable
2022-05-09 11:06:48 +02:00
8d9abb58e3
fixed bug #3352
2022-05-09 10:18:22 +02:00
Santiago L
84b384c47b
Merge pull request #254 from RubenPX/patch-1
...
Fix minor typos
2022-05-06 20:17:36 +02:00
Santiago L
4c16065afa
Fix typo: Unassgined to Unassigned #3339
2022-05-06 20:15:35 +02:00
Santiago L
e1513e2ccf
Fix typos
2022-05-06 19:44:59 +02:00
eb5c109220
Merge commit '7177b0fbfda37e495387834c7f2342b78f6559c8' into feature/confirm-trade-changes
2022-05-06 08:26:37 +02:00
Santiago L
7177b0fbfd
Merge pull request #233 from RubenPX/filter-in-out-trades
...
Filter in out trades from lots selector
2022-05-06 07:58:11 +02:00
Santiago L
00c5070784
Merge pull request #241 from RubenPX/bugfix/various-fixes
...
Several bug fixes on selector & lot component
2022-05-06 07:52:15 +02:00
eca2795857
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-05 18:52:59 +02:00
3ca7292448
drop download public links
2022-05-05 18:36:52 +02:00
e34b591690
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-05 13:32:32 +02:00
af30453c12
fix message of allocate bug
2022-05-05 13:10:02 +02:00
33fd574f18
add lots tab in device details
2022-05-05 12:31:29 +02:00
1c670641f4
add web: public link in device details page
2022-05-05 12:00:40 +02:00
1023f3fdca
add public link in model
2022-05-05 12:00:02 +02:00
9eda5c0466
add checks of device.allocated
2022-05-05 11:31:13 +02:00
875fe7a340
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-04 18:07:23 +02:00
9a74eabc23
add color in bordered navs links
2022-05-04 18:06:19 +02:00
20fc9ded06
fix url response
2022-05-04 17:58:14 +02:00
780b7d4ef2
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-04 17:56:30 +02:00
074fd4e542
fix sidebar
2022-05-04 17:39:20 +02:00
8cd2f22fcc
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-04 12:55:10 +02:00
f2a85af1c2
fix login
2022-05-04 12:53:22 +02:00
16b8b4c78f
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-04 12:25:44 +02:00
8a6b0cde37
change colors and log
2022-05-04 12:23:04 +02:00
cb4f12eb1e
Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes
2022-05-03 19:21:14 +02:00
e30779fcde
Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes
2022-05-03 19:20:59 +02:00
d2b63af17a
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-05-03 17:20:09 +02:00
eaf8bdef65
fix bug
2022-05-03 17:00:02 +02:00
2aab4b49d3
Allow user to cancel all selection
2022-05-03 12:52:26 +02:00
9d9514e68b
Select full list devices
2022-05-03 12:13:15 +02:00
e31e3d3d45
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
2022-05-03 11:10:19 +02:00
d7f7e4d2e5
fixed api not working on recive full list
...
Api needs filter devices to work well
2022-05-03 11:06:05 +02:00
67ee1cdde8
resolve conflict
2022-04-29 19:26:44 +02:00
98ffe1092c
Merge branch 'testing' into bugfix/#3288-common-lots
2022-04-29 18:36:52 +02:00
7fe33f3a42
ass form errors in message
2022-04-29 17:53:59 +02:00
6575e418e7
fix undefined
...
This will fix when you select all lots and you make change that clears list
2022-04-29 14:39:56 +02:00
c1829a657e
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
2022-04-29 14:28:24 +02:00
c78c9c5d7d
Lint
2022-04-29 14:07:04 +02:00
8bbca0301b
Selection devices by page
2022-04-29 14:06:09 +02:00
b88a514edf
Fix reactivity un variables
...
avoid outdated data variable
2022-04-29 13:58:48 +02:00
7503895a4f
Adds selector by pages
2022-04-29 13:34:45 +02:00
f8f4e10f9f
Restore state of checkbox before apply lots changes
2022-04-29 13:33:44 +02:00
e238fb287a
Fix remove rows using library API
2022-04-29 13:27:46 +02:00
ef71eed27f
Merge branch 'testing' into feature/server-side-render-testing
2022-04-29 13:12:09 +02:00
ad0ced98e4
refactor common context
2022-04-29 13:10:44 +02:00
0fd12ee37c
Use TableController to check all devices list
2022-04-29 12:36:42 +02:00
02bfeea2fc
Merge branch 'testing' into feature/server-side-render-parser-3021
2022-04-29 11:39:04 +02:00
9f8f5ec9e0
fix unique identifier
2022-04-29 11:38:47 +02:00
f26b441fef
create TableController to access more easy to table info
2022-04-29 11:36:55 +02:00
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
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
Cayo Puigdefabregas
Santiago L
Lint Action
cayop
RubenPX