Anton
d795f996f2
Merge branch 'develop' into features/ui-revamp
2023-06-14 15:18:50 +02:00
G-Chubinidze
9315190ffe
Merge branch 'develop' into gc_SCI_8406
2023-06-13 12:13:22 +04:00
artoscinote
e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366
...
New icons implementation [SCI-8366]
2023-06-12 11:25:36 +02:00
Martin Artnik
dcc30822f5
New icon tweaks & fixes [SCI-8366]
2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584
New icons implementation [SCI-8366]
2023-06-08 10:33:37 +04:00
Alex Kriuchykhin
eacf2c0c23
Use correct permissions in repository row assigning filters [SCI-8616] ( #5565 )
2023-06-06 13:53:12 +02:00
Giga Chubinidze
a27c2b2cd3
(A) label (instead of icons) in front of titles of archived elements
2023-06-02 04:03:41 +04:00
Soufiane
46fc3d17e6
Broken modal for sharing inventories [SCI-8548] ( #5506 )
...
* Fix share_modal js loading [SCI-8548]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
* Fix hound [SCI-8548]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
* Fix hound [SCI-8548]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
---------
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 16:15:20 +02:00
ajugo
14b3a1318b
Fix empty page for inventory and fix task title [SCI-8556] ( #5511 )
...
* Remove empty state for inventory [SCI-8556]
* Fix shrinking of the task title on task page [SCI-8556]
2023-05-30 11:19:10 +02:00
artoscinote
01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464
...
CSS: inventory items top toolbar issues [SCI-8464]
2023-05-29 11:32:16 +02:00
ajugo
8d70fcf322
Fix default state for archived repository [SCI-8435] ( #5493 )
2023-05-29 10:21:34 +02:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464
2023-05-25 15:32:00 +04:00
Anton
ce7f50908d
Inventory css fixes [SCI-8510]
2023-05-25 12:14:41 +02:00
Giga Chubinidze
9d9b454dc4
CSS: inventory items top toolbar issues [SCI-8464]
2023-05-25 11:18:47 +04:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
...
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Giga Chubinidze
379ef7a9cc
moved to develop, fixed pagination style
2023-05-24 11:57:06 +04:00
Anton
ecbd900362
Fix inventory page layout [SCI-8515]
2023-05-22 15:47:59 +02:00
Alex Kriuchykhin
5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning
...
Features/sa item assigning
2023-05-17 11:45:13 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300]
...
Implement bottom action toolbar for repository items [SCI-8300]
2023-05-17 11:27:55 +02:00
Andrej
32d8fc3e0c
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-16 14:26:12 +02:00
Anton
9b2ae96a43
Merge branch 'develop' into features/navigation-refactor-v2
2023-05-16 10:22:11 +02:00
Soufiane
c28f86d46d
Refactor inline events [SCI-8434] ( #5403 )
...
Refactor inline events in task results [SCI-8434]
2023-05-16 09:34:36 +02:00
ajugo
e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] ( #5397 )
2023-05-11 13:18:19 +02:00
Anton
8f5560b016
Add barcode search field [SCI-8283]
2023-05-11 11:21:50 +02:00
Anton
5ec202e2c4
Update protocol top toolbar [SCI-8386]
2023-05-09 14:59:43 +02:00
sboursen-scinote
5f8eafedf9
Create a modal for item assignment from inventory page [SCI-8250]
...
- Fix the behavior of the search_select.
- Fix select options positioning.
- Get the items to assign from selected rows.
- Style the modal.
Style the modal [SCI-8250]
Fix select options positioning [SCI-8250]
2023-05-08 09:43:18 +02:00
sboursen-scinote
443cd21090
WIP: Create a modal for inventory item assignment from inventory page [SCI-8250]
2023-05-05 08:44:40 +02:00
Andrej
29a9c3781e
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-04 13:34:45 +02:00
Giga Chubinidze
efa0ae9534
Revamp of (top) toolbar - items [SCI-8307]
2023-05-03 23:25:13 +04:00
Soufiane
1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] ( #5206 )
...
CSP and inline js refactor [SCI-8118][SCI-8119]
2023-05-03 11:31:17 +02:00
Giga Chubinidze
a83625fbef
Revamp of (top) toolbar + search field - inventories [SCI-8306]
2023-05-03 00:58:11 +04:00
aignatov-bio
af9219b7ae
Assign item through repository item modal [SCI-8141] ( #5237 )
2023-04-25 14:30:14 +02:00
Giga Chubinidze
a25e361e4f
Implement active/archive and view dropdowns (toolbar) [SCI-8293]
2023-04-20 15:40:38 +04:00
Anton
ed1c4bcb69
Replace webpacker with jsbundling-rails [SCI-7926]
2023-03-30 13:39:57 +02:00
sboursen-scinote
15da0f2f33
Remove commented code and change the name of the hide filters method [SCI-7585]
2023-01-26 08:47:55 +01:00
sboursen-scinote
adcb0e84f8
Add close button [SCI-7585]
2023-01-26 08:41:33 +01:00
Giga Chubinidze
e9d9f613fb
updated old code version in empty_index
2022-11-11 14:22:26 +04:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982
2022-11-10 11:04:57 +01:00
Anton
5b08ee1cc8
Hide active reminders, if stock management disabled [SCI-7428]
2022-11-03 15:48:32 +01:00
ajugo
0a56d772b7
Move print button for shared repository in view mode [SCI-7277] ( #4550 )
2022-10-19 14:10:04 +02:00
Andrej
f3fdcc1204
Remove old label printer modal code [SCI-7305]
2022-10-13 16:49:06 +02:00
Andrej
e8528e6120
Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270
2022-09-29 16:36:44 +02:00
Andrej
eebdee5129
Add label printer modal to task [SCI-7270]
2022-09-29 16:35:51 +02:00
artoscinote
d08838bf48
Merge branch 'develop' into master_1_26_0_5
2022-09-29 10:12:29 +02:00
aignatov-bio
31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal
...
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-28 11:32:39 +02:00
ajugo
0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] ( #4470 )
2022-09-27 15:57:23 +02:00
Anton
3773fff093
Add label validation and preview in print modal [SCI-7255][SCI-7256]
2022-09-27 15:46:48 +02:00
Giga Chubinidze
8608e61513
fixed duplicate titles in empty index repositories [SCI-7162]
2022-09-27 12:25:39 +04:00
Anton
d3886c9bf7
Small fixes [SCI-7193]
2022-09-26 10:02:41 +02:00
Anton
40022a7012
Add initial VUE container for print dialog [SCI-7193]
2022-09-23 14:07:52 +02:00
ajugo
a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] ( #4448 )
...
* Add validation to print modal [SCI-7052]
* Fix dropdown on label modal print [SCI-7052]
* Fix hound [SCI-7052]
* Rename validation endpoint [SCI-7052]
* Add zpl label printing and fix fluics printing [SCI-7221]
* Fix hound [SCI-7221]
2022-09-22 15:06:36 +02:00
Anton
9bc4610cae
Fix checkbox in safari [SCI-7239]
2022-09-22 11:24:02 +02:00
ajugo
6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] ( #4387 )
...
* Add label template dropdown to print dialog [SCI-7051]
* Add zebra printers in printing progress and modal [SCI-7104]
* Fix hound [SCI-7104]
* Fix hound [SCI-7104]
* Fix hound [SCI-7104]
* Clean code for zebra printer [SCI-7104]
2022-09-20 14:10:34 +02:00
Anton
0c596bb701
Merge branch 'develop' into features/label-templates
2022-09-15 10:40:17 +02:00
aignatov-bio
4182194b31
Merge branch 'features/label-templates' into features/team-permissions
2022-09-14 14:34:02 +02:00
Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
G-Chubinidze
e179182d21
fix archived repositories show button not showing [SCI-7162] ( #4408 )
...
* fix archived repositories show button not showing [SCI-7162]
* fix archived repositories show button not showing [SCI-7162]
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2022-09-08 11:51:47 +02:00
Anton
47e20d1b27
Add ability to disable zebra printers [SCI-7148]
2022-09-05 12:37:03 +02:00
Oleksii Kriuchykhin
bf8f838214
Update repository sharing actions [SCI-6918]
2022-08-31 17:21:01 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] ( #4369 )
2022-08-26 10:53:55 +02:00
ajugo
8dec17f606
Add print label button in view repository role [SCI-7097] ( #4351 )
2022-08-12 14:55:14 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] ( #4280 )
2022-08-09 10:23:40 +02:00
artoscinote
ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] ( #4309 )
2022-08-04 11:05:55 +02:00
Martin Artnik
6227b1f5a1
Added edit overlays, disable more controls [SCI-6983]
2022-07-19 14:22:40 +02:00
Martin Artnik
98b3627219
Implement multiline editing in repositories [SCI-6982]
2022-07-19 12:24:33 +02:00
ajugo
b03ce665da
Add missing classes for shrinking save button [SCI-6839] ( #4102 )
...
* Add missing classes for shrinking save button [SCI-6839]
* Change type of button for save filter [SCI-6839]
2022-05-25 10:44:27 +02:00
Oleksii Kriuchykhin
6febad1b95
Update the exiting permissions helpers so they will check new permissions [SCI-6821]
2022-05-24 10:49:49 +02:00
Anton
98efcc04b5
Small CSS fixes for repository [SCI-6767]
2022-04-28 14:32:34 +02:00
aignatov-bio
5ac9f51220
Add aibility to delete stock column [SCI-6723] ( #4017 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:23 +02:00
aignatov-bio
2a2a5b2725
Repository toolbar CSS fixes [SCI-6676] ( #3984 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-04-04 12:02:59 +02:00
aignatov-bio
b6e34266f9
Update repository card view for stock [SCI-6685] ( #3982 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-04-01 13:59:44 +02:00
aignatov-bio
a32dd54a6e
Toolbar fixes [SCI-6670] ( #3973 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:04:00 +02:00
artoscinote
36fbfcab2f
Implement hide all repository reminders button [SCI-6505] ( #3940 )
2022-03-30 10:54:55 +02:00
aignatov-bio
fecaafecf9
Refactor repository toolbar [SCI-6545] ( #3943 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-03-18 14:10:34 +01:00
Anton
8b8e2c6d92
Merge branch 'develop' into features/stock-management
2022-03-14 11:56:38 +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
aignatov-bio
d54c7f1927
Fix save button dropdown for archived page [SCI-6581] ( #3902 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 10:44:40 +01:00
artoscinote
cce6a17e8f
Perserve save filters button on toolbar reload [SCI-6553] ( #3874 )
2022-02-21 10:09:59 +01:00
aignatov-bio
0267bade3c
Add prepopulated datetime filters [SCI-6541] ( #3869 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:25:51 +01:00
artoscinote
ff613c410c
Fix date format for repository filters [SCI-6528] ( #3863 )
2022-02-16 12:02:31 +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
aignatov-bio
24127af83f
Fix dropdown behavior for repository filters [SCI-6491] ( #3842 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 11:42:31 +01:00
Alex Kriuchykhin
7216edd9bf
Fix permission checking for repository filters [SCI-6489] ( #3831 )
2022-02-11 10:47:18 +01:00
aignatov-bio
e59b18e25d
Add default selection for filters [SCI-6484] ( #3826 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 20:58:44 +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
Alex Kriuchykhin
fd92fed38f
Fix saving of advanced filters for shared repositories [SCI-6478] ( #3811 )
2022-02-01 09:59:31 +01:00
Martin Artnik
5fcf2cd080
Fix rendering of bmt/repository filters [SCI-6447]
2022-01-21 13:14:04 +01:00
Martin Artnik
711005425f
Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters
2022-01-20 13:30:33 +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
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
aignatov-bio
5512db18f0
Fix state for bmt repository [SCI-6089] ( #3758 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:34:06 +01:00
aignatov-bio
4af7a2eb7f
Add settings variable for inventory filters [SCI-6329] ( #3751 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:48:03 +01:00
Martin Artnik
023b68bfac
Fixed datatable columns for BMT repo [SCI-6385]
2021-12-21 15:15:34 +01:00
Martin Artnik
f3cc31052b
Amend BMT repository default columns [SCI-6385]
2021-12-21 12:19:19 +01:00
aignatov-bio
7bcf7a7943
Fix conflicts and update localizations [SCI-6227] ( #3733 )
...
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 15:16:12 +01:00
artoscinote
49ec3edb49
Add apply filters functionality to FE [SCI-6229] ( #3742 )
2021-12-15 12:48:28 +01:00
artoscinote
e08857886a
Implement date type filter [SCI-6216] ( #3729 )
...
Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
2021-12-10 14:12:06 +01:00
aignatov-bio
c7af5b322b
Add drodown filter [SCI-6224] ( #3728 )
...
Co-authored-by: Anton <anton@scinote.net>
2021-12-07 20:49:48 +01:00
