Commit graph

541 commits

Author SHA1 Message Date
ajugo d1610fba53
Low stock flyout reminders [SCI-6502] (#3932)
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
2022-03-15 10:24:35 +01:00
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
aignatov-bio bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 15:09:49 +01:00
aignatov-bio 10743921d4
Add reminders to stock modal [SCI-6557] (#3917)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:19:15 +01:00
aignatov-bio d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:18:34 +01:00
artoscinote d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911)
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
2022-03-09 14:13:48 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878)
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
2022-03-08 14:52:45 +01:00
artoscinote 8d096df826
Fix reload of edit column index [SCI-6598] (#3918) 2022-03-07 17:11:56 +01:00
aignatov-bio 577f449b95
Fix repository table header [SCI-6559] (#3906)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 14:19:31 +01:00
Alex Kriuchykhin fa6aeac1d9
Fix saving of time range values [SCI-6570] (#3892) 2022-02-24 09:43:15 +01:00
artoscinote c097b321a7
Fix multiple saving bug for repository filters [SCI-6523] (#3890) 2022-02-23 14:30:28 +01:00
Alex Kriuchykhin 6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +01:00
artoscinote cce6a17e8f
Perserve save filters button on toolbar reload [SCI-6553] (#3874) 2022-02-21 10:09:59 +01:00
Alex Kriuchykhin 9c4fca1b86
Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) 2022-02-16 09:40:48 +01:00
aignatov-bio f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858)
Co-authored-by: Anton <anton@scinote.net>
2022-02-15 15:03:25 +01:00
Alex Kriuchykhin 0ce6f43cbf
Fix inventory table custom error messages [SCI-6532] (#3855) 2022-02-15 14:37:26 +01:00
artoscinote af011a3bb8
Fixed full view assigned items modal stock consumption (#3846) 2022-02-14 10:42:48 +01:00
aignatov-bio 97898fef7a
Add error handling for saving filters [SCI-6488] (#3835)
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-02-11 13:32:27 +01:00
Alex Kriuchykhin 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
artoscinote bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
artoscinote bac8fbbe58
Disable filter save button on submit [SCI-6523] (#3833) 2022-02-11 10:14:19 +01:00
aignatov-bio 8604319c1b
Add front-end validation for comments field [SCI-6464] (#3829)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 10:55:58 +01:00
Alex Kriuchykhin f66b89c7bb
Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) 2022-02-04 14:24:15 +01:00
artoscinote f1e04cc604
Fix appearance of members pagination, copy fix [SCI-6265] (#3792) 2022-02-02 10:41:29 +01:00
artoscinote cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810)
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00
artoscinote dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803)
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
2022-02-01 14:37:13 +01:00
aignatov-bio 2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798)
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
2022-01-28 11:10:56 +01:00
aignatov-bio 371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791)
Co-authored-by: Anton <anton@scinote.net>
2022-01-26 10:28:43 +01:00
Alex Kriuchykhin d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +01:00
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788)
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
2022-01-20 12:44:57 +01:00
aignatov-bio 05547da457
Add stock table renders [SCI-6412] (#3787)
Co-authored-by: Anton <anton@scinote.net>
2022-01-19 13:19:56 +01:00
aignatov-bio 01f1b5bd10
Add stock column type (#3786)
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
2022-01-18 13:17:05 +01:00
aignatov-bio 3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768)
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-01-12 14:39:42 +01:00
artoscinote 3f87d250ce
Implement saving repository filters [SCI-6230] (#3748)
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin 738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
artoscinote 49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio 12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698)
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
2021-11-25 20:34:22 +01:00
Martin Artnik ade1385392 Merge branch 'develop' into features/bmt-search 2021-09-06 10:51:04 +02:00
Martin Artnik 6d92af4b2f Made barcode search globally available [SCI-6022] 2021-08-30 14:41:31 +02:00
Martin Artnik 896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio 958ee92db7 Add BMT filters interactions [SCI-5955] (#3478)
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
2021-08-30 10:49:14 +02:00
aignatov-bio 7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
aignatov-bio 8d033274e4
Add barcode scanners support [SCI-5929] (#3456) 2021-07-27 22:01:08 +02:00
aignatov-bio d373c174ee
Add print label button to repository toolbar (#3453) 2021-07-27 12:34:13 +02:00
aignatov-bio ef57489cd9
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
2021-01-06 10:13:10 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
aignatov-bio 329a5bff0b
Fix repository text field rendering [SCI-5304] (#3015) 2020-12-15 12:23:19 +01:00
Mojca Lorber d7e3b57d0d [SCI-5240] Implement Create new folder function 2020-12-01 09:59:08 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
2020-11-19 11:11:39 +01:00
Oleksii Kriuchykhin 8eec4e4b59 Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047] 2020-11-02 22:19:33 +01:00
aignatov-bio d99e279ecc Add gallery to file preview 2020-10-29 14:30:26 +01:00
aignatov-bio c56f7912ef Update file preview 2020-10-29 14:23:32 +01:00
Urban Rotnik b6495becdb Set stateDuration to 0 2020-08-24 15:51:35 +02:00
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
2020-08-03 11:30:31 +02:00
Urban Rotnik 51ca828399 Fix undefined text cell 2020-07-22 17:27:36 +02:00
aignatov-bio e69e3ea8d3 Add export for assigned items 2020-07-17 15:17:09 +02:00
Mojca Lorber 9464d2753d Fix naming of filter field for repositories tables 2020-07-15 10:52:47 +02:00
Mojca Lorber cea9e6f956 Add check for search state 2020-07-10 15:39:01 +02:00
aignatov-bio 50714eb59d Disable inventories table initialization on turbolinks preview 2020-07-10 11:05:27 +02:00
mlorb 0f43f6a479
Merge pull request #2721 from mlorb/ml-sci-4788-v2
Fix bug with not hidden navigation on inventory page [SCI-4788]
2020-07-09 15:12:44 +02:00
mlorb 3f44f44cbe
Merge pull request #2711 from mlorb/ml-sci-4810
Hide inventory buttons and fix css of disabled button [SCI-4810]
2020-07-09 15:11:02 +02:00
Mojca Lorber 1a2b321523 Fix bug with not hidden navigation on inventory page 2020-07-09 14:09:55 +02:00
aignatov-bio 6245e19069
Merge pull request #2718 from biosistemika/master
Merge master to develop
2020-07-09 12:56:31 +02:00
mlorb 73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
2020-07-09 11:49:16 +02:00
mlorb d9038e6f7f
Merge branch 'develop' into ml-sci-4810 2020-07-09 11:46:54 +02:00
aignatov-bio b2a42c182b
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository
Small archived repositories fixes [SCI-4844]
2020-07-09 08:56:21 +02:00
aignatov-bio 135ac487d0 Small archived repositories fixes 2020-07-08 13:42:27 +02:00
Urban Rotnik 33aa1d3641
Merge pull request #2709 from urbanrotnik/ur-sci-4804
Fix Repository rows count & table header adjustmen [SCI-4804]
2020-07-08 11:39:44 +02:00
aignatov-bio 8c91181abc
Merge pull request #2702 from aignatov-bio/ai-sci-4800-keep-table-page-after-item-update
Keep table page after repository item update [SCI-4800]
2020-07-08 09:30:26 +02:00
aignatov-bio a994c75885
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue
Fix date columns sorting in repositories list [SCI-4801]
2020-07-08 09:30:10 +02:00
aignatov-bio 65c28d641f
Merge pull request #2698 from aignatov-bio/ai-sci-4807-disable-column-reordering-repositories-list
Disable column reordering in repositories list [SCI-4807]
2020-07-08 09:29:51 +02:00
aignatov-bio 716319354b
Merge pull request #2706 from aignatov-bio/ai-sci-4820-fix-sidebar-inventory-refresh
Improve active/archive switcher [SCI-4820]
2020-07-08 09:29:16 +02:00
Mojca Lorber 9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
Urban Rotnik d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
aignatov-bio b127d8c754 Improve active/archive switcher 2020-07-06 14:03:55 +02:00
aignatov-bio cc1b75644d Keep table page after repository item update 2020-07-03 13:45:02 +02:00
Mojca Lorber db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
aignatov-bio d226bb5622 Fix date columns sorting in repositories list 2020-07-02 14:35:48 +02:00
Urban Rotnik 1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
aignatov-bio 9340148b41 Disable column reordering in repositories list 2020-07-02 11:50:40 +02:00
Oleksii Kriuchykhin 405d5b31bb Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665] 2020-06-29 10:04:31 +02:00
Oleksii Kriuchykhin 64b66f0d73 Remove obsolete attribute in repository_datatable.js after feature branch merge 2020-06-24 16:25:42 +02:00
Oleksii Kriuchykhin 7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik 193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Alex Kriuchykhin 2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button
SCI-4780 replace delete button with archive button
2020-06-24 13:16:11 +02:00
Oleksii Kriuchykhin 29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00
aignatov-bio 5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
miha 41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782
Include archived columns to inventories export [SCI-4782]
2020-06-23 16:51:50 +02:00
aignatov-bio 414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository
Add archived_by and archived_on column to columns manage modal [SCI-4784]
2020-06-23 09:10:28 +02:00
Urban Rotnik d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
aignatov-bio dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio 6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber 8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber 6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio 323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper
Add archiving column to datatable helper [SCI-4692]
2020-06-15 15:35:19 +02:00
aignatov-bio 97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
mlorb 0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows
Archiving & restoring rows [SCI-4706]
2020-06-11 16:41:53 +02:00
aignatov-bio db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
aignatov-bio 2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
Oleksii Kriuchykhin 85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +02:00
aignatov-bio 4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
aignatov-bio 66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio 012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin 48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Urban Rotnik 9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Urban Rotnik 9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
aignatov-bio aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
aignatov-bio 3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
aignatov-bio 8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio be8ef5a310 Add I18n 2020-04-28 12:49:19 +02:00
aignatov-bio b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
Mojca Lorber 6fbecf3e88 Hide pencil for shared inventory 2020-02-12 20:28:15 +01:00
aignatov-bio d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number
Fix error in number column in repository [SCI-4347]
2020-02-12 14:16:46 +01:00
aignatov-bio 00531066f8 Fix error in number column in repository 2020-02-12 11:55:10 +01:00
aignatov-bio 4e4a2cf5ad Add "indetermined" state for the "select all" checkbox in the Share Inventory modal 2020-02-12 10:37:29 +01:00
Alex Kriuchykhin de219688cc
Merge pull request #2397 from okriuchykhin/ok_SCI_4331
Fix edit button behavior in repository table [SCI-4331]
2020-02-11 16:13:39 +01:00
Oleksii Kriuchykhin fe0ebae383 Fix edit button behaviour in repository table [SCI-4331] 2020-02-11 11:07:03 +01:00
mlorb c1aa269afc Merge pull request #2392 from mlorb/ml-sci-4313
Add empty option in dropdown selector [SCI-4313]
2020-02-10 10:32:03 +01:00
Alex Kriuchykhin 08140f23e5 Merge pull request #2393 from okriuchykhin/ok_SCI_4321
Fix file result only name update [SCI-4321]
2020-02-10 10:30:54 +01:00
Oleksii Kriuchykhin 4547e4d61a Fix DateTime picker for repositories edit mode [SCI-4331] 2020-02-07 16:42:04 +01:00
Oleksii Kriuchykhin 5470bb9b9b Fix file result only name update [SCI-4321] 2020-02-07 15:21:50 +01:00
Mojca Lorber e9e7b85e0b Add empty option in dropdown selector 2020-02-07 14:57:07 +01:00
Alex Kriuchykhin 913f599b9f
Merge pull request #2389 from okriuchykhin/ok_SCI_4301
Add unsaved data notification when navigating away from the inventory [SCI-4301]
2020-02-07 13:58:20 +01:00
mlorb ba597acf8d
Merge branch 'develop' into ml-sci-4217 2020-02-07 09:43:53 +01:00
Oleksii Kriuchykhin 21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46:16 +01:00
Mojca Lorber 769089b555 Fix hound 2020-02-06 14:44:58 +01:00
Mojca Lorber a22fe28d24 Refactor new and edit renderer for file cell 2020-02-06 14:43:17 +01:00
mlorb 415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283
Implement missing style guide changes [SCI-4283]
2020-02-04 09:37:48 +01:00
mlorb 7ad3527338
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes
Visual fixes [SCI-4274]
2020-02-03 09:44:48 +01:00
Mojca Lorber e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
mlorb 0ef066f921
Merge pull request #2365 from mlorb/ml-sci-4252
Fix checklist list in inventory table [SCI-4252]
2020-01-30 13:44:02 +01:00
aignatov-bio 44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1
Fix small visual bugs [SCI-4254]
2020-01-30 13:42:07 +01:00
Urban Rotnik 7813d3ab75
Merge pull request #2363 from urbanrotnik/ur-sci-4190
Make less opacity when editing or adding row [SCI-4190]
2020-01-30 13:24:20 +01:00
aignatov-bio 2c595d01fc
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters
Small fixes
2020-01-29 15:48:19 +01:00
Urban Rotnik 67cbd47353 Fix icon after file editing 2020-01-29 14:56:03 +01:00
aignatov-bio 3c9bed4b56 Fix markup 2020-01-29 11:03:25 +01:00
aignatov-bio 4aa0a79c02 Fix resize repository 2020-01-29 11:00:48 +01:00
aignatov-bio 0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +01:00
Mojca Lorber e6043ee0e5 Fix checklist list in inventory table 2020-01-27 15:52:52 +01:00
Urban Rotnik dc79174160 Make less opacity when editing or adding row 2020-01-27 14:39:45 +01:00
mlorb f605c0def3
Merge pull request #2358 from mlorb/ml-sci-4275
Change to new style checkboxes on share inventory modal [SCI-4275]
2020-01-27 13:38:30 +01:00
Urban Rotnik 0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00