scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
16158 commits 70 branches 179 tags 165 MiB
Commit graph

516 commits

Author SHA1 Message Date
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
Martin Artnik 5312ddbff6 Fix issues with repository columns [SCI-8994][SCI-8846] 2023-08-21 15:59:17 +02:00
Anton 2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
Giga Chubinidze 620c76a975 UI changes of "Create new inventory" modal 2023-08-21 06:56:14 +04:00
Anton 16eedcdade Revamp modals across app [SCI-8978] 2023-08-17 14:01:26 +02:00
Alex Kriuchykhin a3bc894df8
Fix repository creation modal [SCI-9045] (#5971) 2023-08-11 13:44:26 +02:00
Giga Chubinidze 348d467d02 Non team owner user does not have access to archive inventory [SCI-8955] 2023-08-10 22:26:45 +04:00
Martin Artnik a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
Martin Artnik f1173661f5 Fix forms [SCI-9004] 2023-08-09 15:47:33 +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
artoscinote 556c1de182
Merge pull request #5896 from G-Chubinidze/gc_SCI_8846 
Inventory column resizing issues [SCI-8846]
 2023-08-01 10:39:13 +02:00
Giga Chubinidze 8827c6d447 Inventory column resizing issues [SCI-8846] 2023-08-01 11:56:30 +04:00
wandji20 c5d6239e88 Fix issue with repository header changing when fetching data [SCI-8793] 2023-07-27 20:55:11 +01: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 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
Oleksii Kriuchykhin fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane 78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Alex Kriuchykhin 97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +02:00
artoscinote 85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506 
Make label print modal work globally [SCI-8506]
 2023-07-05 09:53:56 +02:00
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
Anton 586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Soufiane fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Martin Artnik 9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
aignatov-bio 0543a9a0c4
Merge pull request #5637 from aignatov-bio/ai-sci-8660-ui-css-fixes 
Fix UI css fixes [SCI-8660]
 2023-06-20 16:36:45 +02:00
Anton f675034b7f Fix UI css fixes [SCI-8660] 2023-06-20 15:53:33 +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
Anton 4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Anton 1c1c42c88a Revert save filter and clear reminders button 2023-06-19 12:48:40 +02:00
G-Chubinidze 7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze 96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04:00
aignatov-bio e4076c931a
Merge pull request #5614 from aignatov-bio/ai-sci-8658-css-fixes 
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
 2023-06-16 12:57:17 +02:00
Anton 289c92cb00 UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662] 2023-06-16 12:38:09 +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 c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
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