Commit Graph

1539 Commits

Author SHA1 Message Date
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
RubenPX c7e0501828 add soft init to reassign events 2022-05-12 18:58:06 +02:00
RubenPX 6a408a08c7 set const table to var
This allow modify variable
2022-05-12 18:44:26 +02:00
RubenPX cea1c2b717 full table replacament 2022-05-12 18:44:02 +02:00
cayop 5026768eb5
Merge pull request #269 from eReuse/bugfix/allocate-bugs
Bugfix/allocate bugs
2022-05-12 17:38:37 +02:00
Cayo Puigdefabregas 3a2e0bd61a fixing bugs 2022-05-12 17:25:02 +02:00
Cayo Puigdefabregas 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
Cayo Puigdefabregas b927e1ac54 Merge branch 'testing' into feature/#3100-wb-settings 2022-05-12 11:57:55 +02:00
Cayo Puigdefabregas 0e974c0e92 add tags in device list 2022-05-12 11:33:28 +02:00
Cayo Puigdefabregas fee1d6787c add column created and put order descendent from created field 2022-05-12 11:03:48 +02:00
Cayo Puigdefabregas 9b6d77573f fixed Enhancement #3384 2022-05-12 10:33:04 +02:00
Cayo Puigdefabregas 515f31c562 fixed bug #3387 2022-05-12 10:15:46 +02:00
Cayo Puigdefabregas b6966328fb fixed bug #3383 2022-05-12 10:09:03 +02:00
Cayo Puigdefabregas 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
RubenPX 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
Cayo Puigdefabregas 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
Cayo Puigdefabregas bdc04c643c fixed url == None 2022-05-11 18:14:33 +02:00
Cayo Puigdefabregas 0f512d4bb3 fix link to device and show correctly date 2022-05-11 18:00:18 +02:00
RubenPX 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
Cayo Puigdefabregas 1baeddbd56 Merge branch 'feature/server-side-render-parser-3021' into feature/list-snapshots-view-#3113 2022-05-11 17:04:47 +02:00
Cayo Puigdefabregas 123757793f add link on sidebar and put empty data 2022-05-11 17:03:31 +02:00
Cayo Puigdefabregas 5e74255145 basic list snapshots 2022-05-11 16:59:36 +02:00
Cayo Puigdefabregas b8e980cabe fixed tests 2022-05-11 13:14:11 +02:00
Cayo Puigdefabregas 0e75865757 fix settings.html 2022-05-11 11:58:54 +02:00
Cayo Puigdefabregas 7ee2f2962b add view for download Workbench settings 2022-05-11 11:48:53 +02:00
RubenPX 411fe85b19 Check devices in current page 2022-05-11 11:20:25 +02:00
RubenPX cc7b453c06 Check initial state on dom loaded & check if has devices 2022-05-11 11:19:56 +02:00
RubenPX d27cc46f64 refactor device selection 2022-05-11 11:09:38 +02:00
RubenPX 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
Cayo Puigdefabregas 37c43fe3d1 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-10 11:00:40 +02:00
Cayo Puigdefabregas a54d57f4ab fix the All devices option 2022-05-10 10:22:22 +02:00
Cayo Puigdefabregas b10a8c9e35 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-09 17:07:07 +02:00
Cayo Puigdefabregas d800c6950c fixed bug 2022-05-09 16:48:34 +02:00
Cayo Puigdefabregas 1d51629796 resolve conflict 2022-05-09 16:35:44 +02:00
RubenPX 3da1bdcad1 Show selected devices notify instead page select 2022-05-09 14:40:28 +02:00
RubenPX ff00b88fd7 fix indeterminated checkbox 2022-05-09 14:18:41 +02:00
RubenPX ec9074ae7c add register user dialog 2022-05-09 14:03:51 +02:00
RubenPX 651c0cb9d8 Fix text select lots instead devices 2022-05-09 13:57:17 +02:00
Cayo Puigdefabregas 04e4f4ff74 add generics filters 2022-05-09 13:43:02 +02:00
Lint Action 776e38aa67 Fix code style issues with ESLint 2022-05-09 09:30:23 +00:00
RubenPX 8f80e7dff4 Fix declaration variable 2022-05-09 11:29:48 +02:00
Cayo Puigdefabregas 252c5285d8 refactorice 2022-05-09 11:12:34 +02:00
Lint Action 4f72654f50 Fix code style issues with ESLint 2022-05-09 09:10:08 +00:00
RubenPX 2e42b08519 use babel to support old browsers 2022-05-09 11:07:57 +02:00
RubenPX 275b7ad0c5 fix declaration variable 2022-05-09 11:06:48 +02:00
Cayo Puigdefabregas 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
RubenPX 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
Cayo Puigdefabregas eca2795857 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 18:52:59 +02:00
Cayo Puigdefabregas 3ca7292448 drop download public links 2022-05-05 18:36:52 +02:00
Cayo Puigdefabregas e34b591690 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-05 13:32:32 +02:00
Cayo Puigdefabregas af30453c12 fix message of allocate bug 2022-05-05 13:10:02 +02:00
Cayo Puigdefabregas 33fd574f18 add lots tab in device details 2022-05-05 12:31:29 +02:00
Cayo Puigdefabregas 1c670641f4 add web: public link in device details page 2022-05-05 12:00:40 +02:00
Cayo Puigdefabregas 1023f3fdca add public link in model 2022-05-05 12:00:02 +02:00
Cayo Puigdefabregas 9eda5c0466 add checks of device.allocated 2022-05-05 11:31:13 +02:00
Cayo Puigdefabregas 875fe7a340 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 18:07:23 +02:00
Cayo Puigdefabregas 9a74eabc23 add color in bordered navs links 2022-05-04 18:06:19 +02:00
Cayo Puigdefabregas 20fc9ded06 fix url response 2022-05-04 17:58:14 +02:00
Cayo Puigdefabregas 780b7d4ef2 Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 17:56:30 +02:00
Cayo Puigdefabregas 074fd4e542 fix sidebar 2022-05-04 17:39:20 +02:00
Cayo Puigdefabregas 8cd2f22fcc Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 12:55:10 +02:00
Cayo Puigdefabregas f2a85af1c2 fix login 2022-05-04 12:53:22 +02:00
Cayo Puigdefabregas 16b8b4c78f Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-04 12:25:44 +02:00
Cayo Puigdefabregas 8a6b0cde37 change colors and log 2022-05-04 12:23:04 +02:00
RubenPX cb4f12eb1e Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes 2022-05-03 19:21:14 +02:00
RubenPX e30779fcde Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes 2022-05-03 19:20:59 +02:00
Cayo Puigdefabregas d2b63af17a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-05-03 17:20:09 +02:00
Cayo Puigdefabregas eaf8bdef65 fix bug 2022-05-03 17:00:02 +02:00
RubenPX 2aab4b49d3 Allow user to cancel all selection 2022-05-03 12:52:26 +02:00
RubenPX 9d9514e68b Select full list devices 2022-05-03 12:13:15 +02:00
RubenPX e31e3d3d45 Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes 2022-05-03 11:10:19 +02:00
RubenPX d7f7e4d2e5 fixed api not working on recive full list
Api needs filter devices to work well
2022-05-03 11:06:05 +02:00
Cayo Puigdefabregas 67ee1cdde8 resolve conflict 2022-04-29 19:26:44 +02:00
Cayo Puigdefabregas 98ffe1092c Merge branch 'testing' into bugfix/#3288-common-lots 2022-04-29 18:36:52 +02:00
Cayo Puigdefabregas 7fe33f3a42 ass form errors in message 2022-04-29 17:53:59 +02:00
RubenPX 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
RubenPX c1829a657e Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes 2022-04-29 14:28:24 +02:00
RubenPX c78c9c5d7d Lint 2022-04-29 14:07:04 +02:00
RubenPX 8bbca0301b Selection devices by page 2022-04-29 14:06:09 +02:00
RubenPX b88a514edf Fix reactivity un variables
avoid outdated data variable
2022-04-29 13:58:48 +02:00
RubenPX 7503895a4f Adds selector by pages 2022-04-29 13:34:45 +02:00
RubenPX f8f4e10f9f Restore state of checkbox before apply lots changes 2022-04-29 13:33:44 +02:00
RubenPX e238fb287a Fix remove rows using library API 2022-04-29 13:27:46 +02:00
Cayo Puigdefabregas ef71eed27f Merge branch 'testing' into feature/server-side-render-testing 2022-04-29 13:12:09 +02:00
Cayo Puigdefabregas ad0ced98e4 refactor common context 2022-04-29 13:10:44 +02:00
RubenPX 0fd12ee37c Use TableController to check all devices list 2022-04-29 12:36:42 +02:00
Cayo Puigdefabregas 02bfeea2fc Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-29 11:39:04 +02:00
Cayo Puigdefabregas 9f8f5ec9e0 fix unique identifier 2022-04-29 11:38:47 +02:00
RubenPX f26b441fef create TableController to access more easy to table info 2022-04-29 11:36:55 +02:00
Cayo Puigdefabregas 112f459db3 resolve conflict 2022-04-29 11:09:18 +02:00
Cayo Puigdefabregas c82f173edf resolve conflict 2022-04-28 18:47:56 +02:00
Cayo Puigdefabregas d8a44c661a Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-28 18:45:51 +02:00
RubenPX 8d43128e68 fix render item in confirmation dialog 2022-04-28 18:43:38 +02:00
Cayo Puigdefabregas c14d8482be Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier 2022-04-28 18:32:39 +02:00
RubenPX 9cef5188db Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes 2022-04-28 18:31:15 +02:00
RubenPX 962f7cb94c lint 2022-04-28 18:29:39 +02:00
RubenPX c824110b00 Send device model through the methods 2022-04-28 18:29:18 +02:00
Cayo Puigdefabregas 7362eb4492 add computer monitor 2022-04-28 17:56:00 +02:00
Cayo Puigdefabregas 3a5e806104 add icons types of devices in list of devices 2022-04-28 17:46:12 +02:00
RubenPX 1727ab70a3 lint 2022-04-28 17:00:23 +02:00
RubenPX 4aa024b041 checkpoint: add confirmation dialog 2022-04-28 16:58:44 +02:00
RubenPX 8d8ce63402 Optimize manage list 2022-04-28 15:32:35 +02:00
RubenPX 770ab8ea8d improvement sending variables data through methods 2022-04-28 15:29:57 +02:00
RubenPX 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
Cayo Puigdefabregas 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
RubenPX a945fc085f Query using Api instead of javascript filter 2022-04-28 11:31:24 +02:00
RubenPX c8dc1b11e2 Add trade type on api options 2022-04-28 11:22:53 +02:00
Cayo Puigdefabregas c2e4313521 change tag for Unique identifier in label_details 2022-04-28 11:16:12 +02:00
Cayo Puigdefabregas ad11521b64 fix label details for new architecture 2022-04-28 10:14:10 +02:00
Cayo Puigdefabregas e378fef1a6 add customize options in print html and pdf 2022-04-27 18:56:15 +02:00
Cayo Puigdefabregas bf42a79ef7 change devices for tags in printlabels 2022-04-27 18:55:27 +02:00
Cayo Puigdefabregas b11bb163a0 hide 2 trade buttons 2022-04-26 17:35:29 +02:00
Cayo Puigdefabregas ef3ea288ce Merge branch 'testing' into feature/extend-user-datas-#3016 2022-04-26 16:37:12 +02:00
Cayo Puigdefabregas 13950a5ff6 show only password reset 2022-04-26 16:35:16 +02:00
Cayo Puigdefabregas 11201cc0bd Merge branch 'testing' into feature/server-side-render-parser-3021 2022-04-26 13:30:52 +02:00
Cayo Puigdefabregas ef65b1084e Revert "HiddenField instead of StringField"
This reverts commit 04063db60e.
2022-04-26 12:56:34 +02:00
Cayo Puigdefabregas c3bb5cb863 Revert "add print_labels instead of call submit from the template"
This reverts commit 022d40edbe.
2022-04-26 12:56:02 +02:00
Cayo Puigdefabregas 2a7eeb0b5d Revert "add print_labels instead of call submit from the template"
This reverts commit c8aefc6029.
2022-04-26 12:55:48 +02:00
Cayo Puigdefabregas ad9a8a04bd Revert "drop commits 04063db 022d40e c8aefc6"
This reverts commit 9dbebed9d5.
2022-04-26 12:55:01 +02:00
Cayo Puigdefabregas 9dbebed9d5 drop commits 04063db 022d40e c8aefc6 2022-04-26 11:52:51 +02:00
Cayo Puigdefabregas f34fedfb74 fix migration file 2022-04-26 11:49:40 +02:00