Commit graph

626 commits

Author SHA1 Message Date
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092)
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
Martin Artnik
3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
artoscinote
bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] (#6040) 2023-08-24 15:28:28 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote
c28b54c43b
Merge pull request #5937 from G-Chubinidze/gc_SCI_5605
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-08-18 10:04:06 +02:00
wandji20
b9e391e781 Fix inventory item CSS abd set nonce shared file preview inline JavaScript [SCI-9043] 2023-08-15 14:28:53 +01:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
wandji
a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933)
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
2023-08-09 10:33:58 +02:00
Giga Chubinidze
73e35994d5 new icon changes 2023-08-09 04:19:57 +04:00
Martin Artnik
e0ceaa44cd Fix column resizing for existing inventories with no colSize data [SCI-8984] 2023-08-08 14:01:32 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
Anton
937bc60542 Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release 2023-08-07 10:37:20 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
wandji20
c5d6239e88 Fix issue with repository header changing when fetching data [SCI-8793] 2023-07-27 20:55:11 +01:00
Martin Artnik
ca503401fe Fix loading of column order if no sizes are present [SCI-8934] 2023-07-26 16:05:03 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Alex Kriuchykhin
026e96652b
Fix team name escaping in inventories export modal [SCI-8922] (#5859) 2023-07-25 13:37:45 +02:00
Martin Artnik
7dd7566080 Fix updating repository checklist to a blank one [SCI-8921] 2023-07-25 12:21:35 +02:00
Martin Artnik
c38d58336a Preserve column widths when showing/hiding columns [SCI-8733] 2023-07-20 09:49:29 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
ajugo
0d37011bba Change behavior of repository table loading on state change [SCI-8637] (#5712) 2023-07-19 11:08:40 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
Martin Artnik
5609184c0f Fix repository export modal [SCI-8734] 2023-06-23 12:41:37 +02:00
artoscinote
b78105c546
Fix column width limiting [SCI-7961] (#5656) 2023-06-22 14:33:16 +02:00
artoscinote
ad26237d02
Implement column resizing [SCI-7961] (#5596)
* Patch datatables to support ColReorder + ColResize [SCI-7961]

* Implement repository column resizing [SCI-7961]

* Fix colResize and colReorder interactions [SCI-7961]

* Add styling improvements for column interactions [SCI-7961]

* Update grip icons [SCI-7961]

* Tweaks and fixes [SCI-7961]
2023-06-20 12:52:02 +02:00
Soufiane
72266fc636
Inventory export FE [SCI-6546] (#5622)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix text grammar in repositories export modal [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Use I18n pluralization [SCI-6546]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-19 14:16:55 +02:00
Soufiane
b254f5614b
Inventory export FE [SCI-6546] (#5608)
* Implement the front-end part of inventory export functionality [SCI-6546]

- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
2023-06-16 10:48:39 +02:00
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +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
sboursen-scinote
5ef6416f6e Refactor inline events in JavaScript HTML tempaltes [SCI-8612]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-06 09:45:00 +02:00
ajugo
31fdaf5e55
Remove search terms on datatable refresh [SCI-8574] (#5533) 2023-06-01 09:52:58 +02: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
2e9fe37040
Fix repository table reloading and flash messages [SCI-8554] (#5504)
* Fix repository table reloading and flash messages [SCI-8554]

* Pass function for repository reload [SCI-8554]
2023-05-29 11:48:13 +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
artoscinote
1b1ecbfbaf
Merge pull request #5488 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-05-29 11:08:41 +02:00
artoscinote
b1fe71719a
Merge pull request #5503 from sboursen-scinote/sb_SCI-8546
Duplicated item created in the inventory [SCI-8546]
2023-05-29 10:38:42 +02:00
ajugo
e2624987bd
Save repository table page to local storage [SCI-8512] (#5501) 2023-05-29 10:27:00 +02:00
sboursen-scinote
6240dd0a5f Fix hound [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-29 09:55:31 +02:00
sboursen-scinote
65cad3fedd Fix duplicated items created in inventories [SCI-8546]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-28 22:36:52 +02:00
Giga Chubinidze
81db122a08 Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147] 2023-05-26 03:14:27 +04:00
G-Chubinidze
2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
Anton
e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +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
5cd32d5cfa hound fix 2023-05-24 13:48:32 +04: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
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
sboursen-scinote
16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +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
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
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
Giga Chubinidze
a83625fbef Revamp of (top) toolbar + search field - inventories [SCI-8306] 2023-05-03 00:58:11 +04:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
Soufiane
ea94cf4581
Bulk editing will display inaccurate changes after saving [SCI-8219] (#5267)
Fix race condition when submitting all forms [SCI-8219]
2023-04-25 14:35:45 +02:00
ajugo
0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
G-Chubinidze
c6ab7176b8
Merge pull request #5329 from G-Chubinidze/gc_SCI_8293
Implement active/archive and view dropdowns (toolbar) [SCI-8293]
2023-04-20 15:41:45 +04:00
Giga Chubinidze
a25e361e4f Implement active/archive and view dropdowns (toolbar) [SCI-8293] 2023-04-20 15:40:38 +04:00
sboursen-scinote
dcd6f6267d Merge develop in to sb_SCI-7815 [SCI-7815] 2023-04-12 15:46:52 +02:00
artoscinote
e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote
a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-03-21 15:18:37 +01:00
Giga Chubinidze
9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Alex Kriuchykhin
87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote
9852c4507e Fix typo [SCI-7815] 2023-02-16 20:21:46 +01:00
ajugo
aa3ea584a9
Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973) 2023-02-14 16:27:17 +01:00
artoscinote
b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674
Inventories: archived by and archived on seen on active item list [SCI-7674]
2023-02-07 10:23:28 +01:00
sboursen-scinote
408dd7dcd8 Reinitialize the Table when switching the View from archived to active [SCI-7674] 2023-01-30 15:33:08 +01:00
sboursen-scinote
4be094680a Enable inventories datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:44:39 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
artoscinote
c4ba723998
Merge pull request #4662 from artoscinote/ma_SCI_7534
Make deferred SmartAnnotation loading optional [SCI-7534]
2022-11-29 13:51:28 +01:00
Martin Artnik
76de2d1380 Make deferred SmartAnnotation loading optional [SCI-7534] 2022-11-29 13:47:52 +01:00
Anton
8ef5a742f6 Fix tooltip for clear reminders [SCI-7472] 2022-11-28 10:11:06 +01:00
artoscinote
1a700b8359
Merge pull request #4650 from artoscinote/ma_SCI_7460
Fix disabling item edit button [SCI-7460]
2022-11-25 10:36:20 +01:00
Martin Artnik
6fe86f2015 Fix disabling item edit button [SCI-7460] 2022-11-25 10:24:24 +01:00
artoscinote
7d53027530
Merge pull request #4641 from G-Chubinidze/gc_SCI_7492
Missing navigate away pop up at inventory page [SCI-7492]
2022-11-23 14:14:35 +01:00
Giga Chubinidze
f78cf58552 pointer events value change 2022-11-23 17:12:25 +04:00
Giga Chubinidze
dac093823e few double quotes changed to single quotes 2022-11-23 16:08:43 +04:00
Giga Chubinidze
3b8a58b7db fixed code according to hound styling comments 2022-11-23 16:05:56 +04:00
Giga Chubinidze
47d593f0db Missing navigate away pop up at inventory page [SCI-7492] 2022-11-23 15:38:01 +04:00
Anton
961b39159e Fix tooltip on new button in inventory [SCI-7472] 2022-11-22 11:05:57 +01:00
artoscinote
92d446b43d
Merge pull request #4628 from artoscinote/ma_SCI_7473
Fix inventory multiline file uploads [SCI-7473]
2022-11-21 12:59:40 +01:00
Martin Artnik
5d41ea5fa7 Disable instead of hide edit button when selected items not on page [SCI-7460] 2022-11-21 11:58:15 +01:00
Martin Artnik
95348b82e8 Fix inventory multiline file uploads [SCI-7473] 2022-11-21 11:47:46 +01:00
Anton
c0141137eb Fix merge issue [SCI-7471] 2022-11-10 11:46:14 +01:00
artoscinote
0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00