Commit graph

932 commits

Author SHA1 Message Date
Soufiane
aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936)
- Centre vertically all related modals
- Convert task header tabs to sentence case
2023-08-10 09:43:31 +02:00
Andrej
104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
Martin Artnik
a952319afd Merge branch 'develop' into features/september-release 2023-08-09 16:43:15 +02:00
artoscinote
c42a10e131
Merge pull request #5945 from ivanscinote/SCI-8955-result-content-rearange
Make result content rearrangable [SCI-8955]
2023-08-09 15:58:17 +02:00
Ivan Kljun
669bb3dd48 Make result content rearrangable (UI needs to be finalised and tested with actual data) [SCI-8955] 2023-08-09 13:58:25 +02:00
Anton
f688995635 Refactor task page UX [SCI-8951] 2023-08-09 11:03:30 +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
Anton
fcd76661c7 Fix inline edit 2023-08-08 11:09:26 +02:00
Anton
758b28261d Merge branch 'develop' into features/september-release 2023-08-07 16:30:28 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Martin Artnik
633abf69c0 Basic results toolbar implementation [SCI-8952] 2023-08-07 16:09:15 +02:00
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
ajugo
c8fbdacf22
Merge pull request #5921 from rekonder/aj_SCI_8986
Copy shareable link when you enable sharing for task [SCI-8986]
2023-08-07 15:17:49 +02:00
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +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
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +02:00
Andrej
84233506c0 Copy shareable link when you enable sharing for task [SCI-8986] 2023-08-07 09:47:44 +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
sboursen-scinote
40f78f4a28 Fix shareable links CSS [SCI-8975]
- Fix the style of the toggle button globally.
- Fix permissions on who can toggle team shareable links.
- Change wrong translations in shareable links modal.
- Remove placeholder text for start-date
2023-08-04 12:34:04 +02:00
sboursen-scinote
c27c7245bc Fix various CSS issues [SCI-8940]
- Maintain the position of the top navigation controls when user is without team.
- Add "missing" avatar to avatar change modal
- Disable wrapping of (A) in archived P/E/T
- Fix padding/margin issues in Archived tasks and Protocol templates
2023-08-04 09:11:53 +02:00
Oleksii Kriuchykhin
b49b7c4a80 Merge branch 'develop' into features/shareable-links 2023-08-02 16:05:21 +02:00
Martin Artnik
80c5268efd Add read-only mode to OVE [SCI-8962] 2023-08-02 15:46:07 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
wandji
2680b317e5
Fix issue when toggling repository items search fields [SCI-8874] (#5855)
* Fix issue when toggling repository items search fields [SCI-8874]

* Refactor outside click directive and make it available for all components [SCI-8874]
2023-08-01 10:41:58 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
artoscinote
f117c21ea5
Merge pull request #5873 from aignatov-bio/ai-sci-8905-refactor-insert-menu
Refactor insert menu [SCI-8905]
2023-08-01 10:13:23 +02:00
Anton
2b83243aa8 Refactor insert menu [SCI-8905] 2023-07-26 16:28:32 +02:00
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Anton
f4d8983040 Update attachments section [SCI-8879] 2023-07-25 15:10:09 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Anton
9393f3cc0f Fix navigator console errors [SCI-8890] 2023-07-25 11:11:55 +02:00
Giga Chubinidze
ab41b5e219 Some icons have the checkboard pattern applied to the background [SCI-5605] 2023-07-25 11:52:31 +04:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
ajugo
f44f083b0b
Merge pull request #5846 from sboursen-scinote/sb_SCI-8239
Save as new protocol template from task - read the protocol name [SCI-8239]
2023-07-25 09:34:49 +02:00
Soufiane
effdc9563a
Improve Breadcrumbs responsiveness [SCI-8494] (#5778)
- Refactor Breadcrumbs using VUE.
- Implement responsiveness breakpoints
2023-07-25 09:24:49 +02:00
sboursen-scinote
634d4b6066 Prefill the protocol name in modal when saving from template [SCI-8239] 2023-07-25 09:23:32 +02:00
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Martin Artnik
ebfaca6966 Clear wopi file length error on input, css fix [SCI-8877] 2023-07-24 12:46:45 +02:00
artoscinote
ff83b97d7b
Merge pull request #5841 from artoscinote/ma_SCI_8894
Fix tinymce loading placeholders for text elements [SCI-8894]
2023-07-24 10:39:14 +02:00
Soufiane
5a44400fbb
Fix zebra printer CSP issue [SCI-8859] (#5806) 2023-07-21 16:54:57 +02:00
Martin Artnik
30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +02:00
Anton
2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00
Anton
0163d56186 Fix infinite scroll for notifications [SCI-8843] 2023-07-20 11:04:17 +02:00
Ivan Kljun
b516382fc4 Remove notification tabs logic and variables 2023-07-19 13:38:16 +02:00
Ivan Kljun
c306b17e93 Remove notifications tabs component [SCI-8807] 2023-07-19 13:12:42 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
f540b3dc8d Fix js error in console log [SCI-8890] 2023-07-19 09:55:27 +02:00
aignatov-bio
b18421ec4b
Merge pull request #5762 from aignatov-bio/ai-sci-8735-add-error-modal-for-protocol-parsing
Added error handling for protocol import [SCI-8735]
2023-07-18 10:21:11 +02:00
artoscinote
5a65b94ce3
Merge pull request #5714 from wandji20/wb-SCI-8744
Set blank default date for added_on repository filters [SCI-8744]
2023-07-18 08:41:14 +02:00
ajugo
d71351fcbc
Fix scrollTo for inventory filter [SCI-8869] (#5782) 2023-07-17 15:39:19 +02:00
wandji
2698681548
Fix Not correct naming for label in global activity filter (#5776)
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
2023-07-17 15:38:28 +02:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736)
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
2023-07-14 12:31:54 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766)
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
wandji20
a63e6f20b4 Remove redundant check [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
8bacfa4158 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
20fb1e9285 Set blank default date for added_on repository filters(Fix llinter errors) [SCI-8744] 2023-07-13 18:28:51 +01:00
wandji20
973d65ca00 Set blank default date for added_on repository filters [SCI-8744] 2023-07-13 18:28:51 +01:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +02:00
Anton
4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +02:00
Anton
25b11bfb24 Added error handling for protocol import [SCI-8735] 2023-07-13 11:51:35 +02:00
Alex Kriuchykhin
d419608f18
Connect protocol parsing service to rails backend [SCI-8817] (#5759) 2023-07-13 11:41:53 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes
Multiple CSS fixes [SCI-8762]
2023-07-12 14:34:59 +02:00
Anton
24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-12 09:48:27 +02:00
ajugo
051e686787
Implement automatic check for new notifications [SCI-8654] (#5631) 2023-07-11 16:05:34 +02:00
Anton
71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +02:00
artoscinote
4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683)
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
2023-07-11 09:27:15 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
G-Chubinidze
25aa644102
Removing Support button from the top navigation [SCI-8806] (#5744) 2023-07-10 14:03:47 +02:00
ajugo
6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723)
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
2023-07-06 16:05:03 +02:00
Martin Artnik
ed4af7ae26 Properly unload scroll listener when unloading a select [SCI-8802] 2023-07-06 10:31:26 +02:00
artoscinote
8f88d2d894
Merge pull request #5700 from G-Chubinidze/gc_SCI_8422
Label templates issues on edit template page [SCI-8422]
2023-07-03 14:47:00 +02:00
Giga Chubinidze
b1490c81a0 changed timeout to nexttick 2023-07-03 13:50:44 +04:00
Giga Chubinidze
4bc25ac00f Label templates issues on edit template page [SCI-8422] 2023-07-03 10:56:20 +04:00
Anton
586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +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
Soufiane
8e6854309e
Fix broken inventory page [SCI-8690] (#5633)
- Stretch the datatable body to take all of the available space.
- Reload the datatable upon item assignment to task.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-20 14:29:35 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316
Add office file to task step - reload file does not work for empty file [SCI-8316]
2023-06-20 11:12:28 +02:00
aignatov-bio
a3aeac1c1d
Merge pull request #5628 from aignatov-bio/ai-sci-ui-css-fixes
UI CSS fixes
2023-06-19 16:00:40 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Martin Artnik
6913874257 Fix bottom toolbar position update [SCI-8683] 2023-06-19 14:10:55 +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
Martin Artnik
5f3b009bfc Add support for boostrap modals to action toolbar [SCI-8681] 2023-06-16 15:14:58 +02:00
Martin Artnik
e44b3bb568 Fix bottom action toolbar responsiveness [SCI-8682] 2023-06-16 14:17:46 +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
artoscinote
0680379dd6
Merge pull request #5599 from G-Chubinidze/gc_SCI_8630
Buttons title (tooltip on hover) - top navigation [SCI-8630]
2023-06-15 15:18:52 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Giga Chubinidze
69c7176976 Buttons title (tooltip on hover) - top navigation [SCI-8630] 2023-06-15 04:59:34 +04:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
Anton
86e980f773 Updated top navigation [SCI-8540] 2023-06-13 14:12:41 +02:00
Anton
b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
artoscinote
91aab57914
Merge pull request #5580 from sboursen-scinote/sb_SCI-8545
Improvement of dropdown in Assign to task modal [SCI-8545]
2023-06-12 14:38:16 +02:00
Anton
16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575)
Disable project links if team admin is missing read permission [SCI-8381]
2023-06-12 12:55:32 +02:00
Anton
5f55070fec Navigator ui revamp [SCI-8539][SCI-8467] 2023-06-12 11:53:24 +02:00
sboursen-scinote
43bf1cf0eb Add loading state to select_search [SCI-8545]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-12 10:49:31 +02:00
sboursen-scinote
ad78759393 Handle no action buttons in the toolbar edge case [SCI-8626]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-09 10:11:31 +02:00
Martin Artnik
27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +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
artoscinote
164829fd7c
Fix issue where blur prevention is not turned off in assignment modal dropdown [SCI-8588] (#5570) 2023-06-07 09:52:57 +02:00
artoscinote
98cb0df46b
Fix issues with assign to task dropdowns [SCI-8588] (#5568) 2023-06-06 15:31:40 +02:00
G-Chubinidze
3a2ad1eda6
Well template table arrow & math calculation disabled [SCI-8596] (#5549) 2023-06-02 16:08:42 +02:00
artoscinote
fa05ce15f3
Merge pull request #5476 from G-Chubinidze/gc_SCI_8473
Position of opened drop down [SCI-8473]
2023-06-01 12:32:53 +02:00
ajugo
b9b84ef79d
Fix perfect scrollbar effects and size of the buttons on navigation [SCI-8567] (#5525) 2023-05-31 12:39:20 +02:00
sboursen-scinote
4848236fd3 Merge branch 'develop' into sb_SCI-8509
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 16:07:26 +02:00
sboursen-scinote
a58803a2cd Fix Reload button for new attachement (Wopi) when content changes [SCI-8316]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 15:49:38 +02:00
ajugo
b0a7699184
Fix action toolbar for project folders [SCI-8572] (#5514) 2023-05-30 12:50:33 +02:00
Martin Artnik
bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
artoscinote
65d7c96467
Merge pull request #5489 from G-Chubinidze/gc_SCI_8520
Missing tooltips on the bottom action toolbar [SCI-8520]
2023-05-29 11:29:50 +02:00
artoscinote
5612303f79
Merge pull request #5487 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-29 11:07:53 +02:00
artoscinote
852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385
Empty screen revamp [SCI-8385]
2023-05-29 11:02:15 +02:00
Giga Chubinidze
534afe64cb changed current team variable 2023-05-29 13:00:54 +04:00
artoscinote
5b90a657e4
Merge pull request #5502 from artoscinote/ma_SCI_8525
Add 'no actions' message to action toolbar [SCI-8525]
2023-05-29 10:26:42 +02:00
artoscinote
6ce9e41c2f
Merge pull request #5497 from aignatov-bio/ai-sci-8538-add-navigator-horizontal-scrollbar
Add navigator horizontal scrollbar [SCI-8538]
2023-05-29 10:21:26 +02:00
Martin Artnik
a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
Giga Chubinidze
59bdd7d8d2 Empty screen revamp [SCI-8385] 2023-05-29 01:42:26 +04:00
Giga Chubinidze
5df26d757f Missing tooltips on the bottom action toolbar [SCI-8520] 2023-05-28 03:52:24 +04:00
Soufiane
1a689c9329
Add no-options placehoder to experiments dropdown [SCI-8517] (#5495)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 21:10:53 +02:00
Anton
61a6d8326c Add navigator horizontal scrollbar [SCI-8538] 2023-05-26 16:58:11 +02:00
Soufiane
e5dc1f365b
Add a no-options placeholder for projects selector [SCI-8544] (#5492)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:47:35 +02:00
Soufiane
cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486)
* Fix Select bounding box calculations [SCI-8513]

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

* Abbreviate very long select text [SCI-8513]

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

* Remove gap when dropdown is open [SCI-8513]

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

* Fix hound [SCI-8513]

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

* Add small refactor [SCI-8513]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:41:47 +02:00
sboursen-scinote
a77ee62f8e Fix hover effect depending on the type of the navigator link [SCI-8509]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:19:27 +02:00
Giga Chubinidze
d72653aff2 Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098] 2023-05-26 02:59:19 +04:00
Giga Chubinidze
c68151fcdf added user dropdown class 2023-05-25 11:20:11 +04:00
Soufiane
f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441)
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
2023-05-24 10:47:27 +02:00
aignatov-bio
1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari
Fix tinyMCE layout in safari [SCI-8426]
2023-05-23 21:13:21 +02:00
Anton
043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
Anton
bbdb852377 Fix barcode button [SCI-8485] 2023-05-23 12:33:07 +02:00
Anton
7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
Anton
db06ff5946 Fix scrolling position in navigator [SCI-8491] 2023-05-19 11:46:36 +02:00
artoscinote
b10e5a4ab8
Merge pull request #5432 from aignatov-bio/ai-sci-8423-fix-navigator-hover-color
Fix navigator archive color [SCI-8423]
2023-05-18 16:46:55 +02:00
Anton
6918bbd84a Fix navigator hover color [SCI-8423] 2023-05-18 13:33:08 +02:00
Martin Artnik
f6d782392c Fix margin between toolbar buttons [SCI-8479] 2023-05-18 11:58:45 +02:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
2023-05-18 09:59:49 +02:00
aignatov-bio
31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes
Update navigation css [SCI-8438]
2023-05-18 08:58:48 +02:00
sboursen-scinote
9662eb7264 Improve the logic of the select and select_search components
> There is no need for the two components to hold their `value` state.
It can be propagated from the component that uses them.
This will help 'clear' the search when modification is finished.
2023-05-17 19:01:16 +02:00
Soufiane
adaa2b6a48
Extend flash messages for direct task items assignment [SCI-8443] (#5414)
Update item assigment modal flash messages [SCI-8443]
2023-05-17 16:17:19 +02:00
artoscinote
20593f087e
Merge pull request #5421 from artoscinote/ma_SCI_8399
Implement new toolbar for protocols [SCI-8399]
2023-05-17 15:00:38 +02:00
Anton
3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +02:00
Martin Artnik
eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
aignatov-bio
23f4b01c8e
Merge pull request #5418 from aignatov-bio/ai-sci-update-scinote-icon-font
Update SciNote icon font
2023-05-17 12:30:13 +02:00
Anton
a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
artoscinote
a52ee99781
Add debounce file [SCI-8300] (#5419) 2023-05-17 12:00:37 +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
Andrej
6ed55be62c Fix merge conflicts 2023-05-17 11:40:14 +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
15a6f72894 Navigator CSS fixes [SCI-8430][SCI-8439] 2023-05-16 14:05:56 +02:00
Soufiane
19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] (#5406) 2023-05-16 11:19:56 +02:00
Soufiane
dda3d1bc6b
Fix typo [SCI-8250] (#5393) 2023-05-16 11:19:19 +02:00
artoscinote
cf13160c4f
Merge pull request #5398 from aignatov-bio/ai-sci-8405-improve-navigation-in-archive-state
Improve navigation in archive state [SCI-8405]
2023-05-16 10:38:37 +02:00
artoscinote
1d30389298
Merge pull request #5407 from G-Chubinidze/gc_SCI_8441
CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441]
2023-05-16 10:38:04 +02:00
ajugo
d8945cc627
Fix large asset preview [SCI-8433] (#5408) 2023-05-16 10:24:08 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Giga Chubinidze
dee32d8986 CSS: Smaller visual bugs; Inventory & Tasks [SCI-8441] 2023-05-16 11:22:46 +04:00
Anton
08652e9dde Improve navigation in archive state [SCI-8405] 2023-05-11 13:14:56 +02:00
Anton
8b901cb485 Fix navigator sorting [SCI-8400] 2023-05-11 12:38:54 +02:00
artoscinote
dae4697585
Merge pull request #5383 from artoscinote/ma_SCI_8315
Track user full name update in navigation [SCI-8315]
2023-05-11 11:27:12 +02:00
aignatov-bio
168fa0a4bc
Merge pull request #5394 from aignatov-bio/ai-sci-8283-add-barcode-search-field
Add barcode search field [SCI-8283]
2023-05-11 11:26:48 +02:00
artoscinote
566b302ce1
Merge pull request #5378 from artoscinote/ma_SCI_8324
Fix main navigation issues [SCI-8324]
2023-05-11 11:26:30 +02:00
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +02:00
Martin Artnik
27e34ab407 Track user full name update in navigation [SCI-8315] 2023-05-09 15:21:07 +02:00
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
G-Chubinidze
82d0657593
Merge branch 'features/navigation-refactor-v2' into gc_SCI_8389 2023-05-09 13:41:51 +04:00
Giga Chubinidze
a462765cdb code cleanup 2023-05-09 00:06:37 +04:00
Martin Artnik
1af7015e8b Fix main navigation issues [SCI-8324] 2023-05-08 14:44:50 +02:00
sboursen-scinote
852e0eba42 Remove unused code [SCI-8250] 2023-05-08 12:52:57 +02:00
sboursen-scinote
32297c3312 Use fixed position for select option and add a fix for modals [SCI-8250] 2023-05-08 11:05:22 +02:00
Andrej
97bde133a8 Fix plate template JSON creation [SCI-8082] 2023-05-08 10:25:50 +02:00
sboursen-scinote
d6a3da2c6f Fix hound [SCI-8250] 2023-05-08 09:57:31 +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
Giga Chubinidze
f680fc43b9 Navigator elements not displaying tooltips on hover [SCI-8389] 2023-05-08 01:52:05 +04:00
Anton
f48e09786e New color mapping [SCI-8339] 2023-05-05 14:05:17 +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
artoscinote
ef8a518a83
Merge pull request #5360 from artoscinote/ma_SCI_8298
Implement task table bottom toolbar [SCI-8298]
2023-05-04 14:40:53 +02:00
Anton
5a9470f5dd Fix navigator update [SCI-8390] 2023-05-04 14:02:04 +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
Martin Artnik
9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
ajugo
d92a9d62b3
Fix opening of the step reorderable modal [SCI-8364] (#5358) 2023-05-04 09:48:59 +02:00
artoscinote
7aeb1c6adf
Merge pull request #5341 from artoscinote/ma_SCI_8249
Implement basic select/search-select components in vue [SCI-8249]
2023-05-03 12:37:47 +02:00
Martin Artnik
863054b044 Implement basic select/search-select components in vue [SCI-8249] 2023-05-03 12:37:14 +02:00
aignatov-bio
7a40a7d13f
Merge pull request #5355 from aignatov-bio/ai-sci-color-fix-for-tailwind
Color fix for tailwind
2023-04-28 11:24:25 +02:00
Anton
2305fa91a3 Fix colors for tailwind 2023-04-28 10:55:58 +02:00
Martin Artnik
8beb92fc39 Implement new experiments toolbar [SCI-8296] 2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a Implement new Projects bottom toolbar [SCI-8295] 2023-04-26 11:25:29 +02:00
Anton
1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
G-Chubinidze
413a65972b
At click away to another page save input to step table [SCI-8096] (#5257)
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-25 14:33:32 +02:00
Anton
3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
aignatov-bio
32dc12f4d0
Merge pull request #5336 from aignatov-bio/ai-sci-8233-add-backend-for-navigator
Add backend for navigator [SCI-8233]
2023-04-24 12:50:14 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Martin Artnik
7af146a580 Fix team dropdown on automatic team change [SCI-8352] 2023-04-21 12:25:42 +02:00
artoscinote
103ce8e70d
Merge pull request #5331 from scinote-eln/develop
Merge develop
2023-04-20 13:31:46 +02:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046
]
2023-04-19 14:19:55 +02:00
Andrej
a33707bd5e Reverse table header/row numbering for plate templates [SCI-8082] 2023-04-19 12:22:22 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] (#5302)
* well plate implementation without nested dropdown

* Implement dropdown submenu [SCI-7931]

* minor code cleanup

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
Anton
265272f212 Fix marvin js icon 2023-04-18 14:09:41 +02:00
Martin Artnik
cccb5cd54e Fix display of special characters in teams dropdown [SCI-8323] 2023-04-18 11:59:00 +02:00
Anton
1526553467 Small fixes for notificaitions [SCI-8331] 2023-04-17 15:23:52 +02:00
aignatov-bio
18590b502d
Merge pull request #5309 from aignatov-bio/ai-sci-8325-fix-date-sorting-in-notifications
Fix date sorting in notifications [SCI-8325]
2023-04-17 11:23:37 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +02:00
Anton
c990301f1b Fix date sorting in notifications [SCI-8325] 2023-04-14 14:46:57 +02:00
aignatov-bio
134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
2023-04-14 10:37:51 +02:00
artoscinote
dd97a83de1
Merge pull request #5303 from G-Chubinidze/gc_SCI_7459
Not saved checklist item at pasting text [SCI-7459]
2023-04-14 10:28:38 +02:00
sboursen-scinote
4783ffcc4f Fix the issue with the published version number and refactor the code [SCI-8237] 2023-04-14 09:56:35 +02:00
Giga Chubinidze
5fa59ec2a0 Not saved checklist item at pasting text [SCI-7459] 2023-04-13 21:58:49 +04:00
aignatov-bio
cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications
Add counters logic for notifications [SCI-8280]
2023-04-13 15:35:56 +02:00
Anton
cb7f41e516 Add counters logic for notifications [SCI-8280] 2023-04-13 15:35:21 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] (#5266) 2023-04-13 15:34:36 +02:00
aignatov-bio
3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
Anton
caf21959bd Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309] 2023-04-13 14:54:03 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
Features/navigation refactor
2023-04-13 13:59:25 +02:00
sboursen-scinote
0b76acbede Change the draft version to be the next one after the latest published [SCI-8237] 2023-04-11 16:29:12 +02:00
sboursen-scinote
0efeb1d4cb Add version number to publish modal [SCI-8237] 2023-04-11 15:04:14 +02:00
sboursen-scinote
b1914468c9 Add version number to protocol details [SCI-8237] 2023-04-11 15:00:21 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] (#5272)
* Load latest protocol version comment in publish modal [SCI-8279]

* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
sboursen-scinote
910b67f881 Save protocol steps order when modal is hidden [SCI-8276] 2023-04-10 09:27:44 +02:00
Anton
7b40c305e8 Add infinite scroll to notifications flyout [SCI-8282] 2023-04-07 14:06:29 +02:00
ajugo
4961243731
Fix protocol dropdown options for the locked tasks and archived protocol template [SCI-8277] (#5264) 2023-04-06 16:29:19 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
ajugo
3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] (#5221) 2023-04-05 15:34:48 +02:00
artoscinote
a1cebecdcd
Merge pull request #5037 from G-Chubinidze/gc_SCI_7673
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-04-05 15:26:18 +02:00
artoscinote
47b7d1a1ca
Merge pull request #4999 from G-Chubinidze/gc_SCI_7935
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
2023-04-05 15:23:03 +02:00
Soufiane
4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] (#5239)
Added Published on & Published by to Protocol details screen [SCI-8193]
2023-04-05 15:08:31 +02:00
G-Chubinidze
045220c657
Wrong error message for too long office file name [SCI-7949] (#5155)
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-05 13:56:25 +02:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Giga Chubinidze
57d951a690 Change title for publishing draft [SCI-8232] 2023-03-30 20:30:49 +04:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin
ee7abc2912 Fix step table renaming [SCI-8216] 2023-03-28 16:03:45 +02:00
Oleksii Kriuchykhin
0beb64511d Fix saving of big tables on steps [SCI-8216] 2023-03-28 13:29:02 +02:00
Anton
1177eaae5b Add general notifiacitons flyout [SCI-8017] 2023-03-25 17:34:26 +01:00
Anton
854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
Oleksii Kriuchykhin
7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
Anton
5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane
bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote
d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
ajugo
917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
G-Chubinidze
7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane
7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131)
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
2023-03-14 12:54:13 +01:00
Giga Chubinidze
67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
sboursen-scinote
4afac52ad3 Fix spacing issue in protocol datatable [SCI-8108] 2023-03-13 10:56:26 +01:00
Alex Kriuchykhin
cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
G-Chubinidze
f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058
Protocol permissions - button display [SCI-8058]
2023-03-09 19:02:42 +04:00
Martin Artnik
ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01: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
G-Chubinidze
32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze
553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
aignatov-bio
ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page
Fix print protocol button on protocol show page [SCI-8079]
2023-03-07 14:09:08 +01:00
G-Chubinidze
3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954
Archived protocol template navigation, icon, button [SCI-7954]
2023-03-07 15:51:51 +04:00
Anton
25050cb6cc Fix print protocol button on protocol show page [SCI-8079] 2023-03-07 11:25:59 +01:00
Alex Kriuchykhin
0ab89db29c
Fix protocol Publish button behaviour after canceling of publish action [SCI-8068] (#5081) 2023-03-07 09:49:21 +01:00
Giga Chubinidze
4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
ajugo
8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
Anton
b68291c834 Fix protocol vue component loading [SCI-8024] 2023-03-02 11:33:40 +01:00
artoscinote
3b074a4af6
Merge pull request #5044 from artoscinote/ma_SCI_7974
Replace highlight.js with prism.js [SCI-7974]
2023-03-01 12:52:57 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
Soufiane
2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904
Protocol templates - delete all steps (tasks screen) [SCI-7904]
2023-02-28 15:33:33 +01:00
Martin Artnik
7bf857a179 Fix permission checks for protocols [SCI-7992] 2023-02-28 13:48:29 +01:00
Giga Chubinidze
30e37a95d7 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-28 09:59:45 +04:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
sboursen-scinote
4ab8768024 Focus on newly added step element [sb_SCI-7938] 2023-02-24 10:49:18 +01:00
sboursen-scinote
d42cd85533 Focus on newly added Attachment [sb_SCI-7938] 2023-02-24 10:48:47 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
G-Chubinidze
dac150f75f
Revert "Add office file to task step - reload file option shows plain html page [SCI-7673]" 2023-02-22 13:29:39 +04:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
Giga Chubinidze
34cfb14869 Rearrange of checklist items does not work after pasting several items at once [SCI-7935] 2023-02-21 10:44:28 +04:00
artoscinote
3ca007981b
Merge pull request #4993 from G-Chubinidze/gc_SCI_7673
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-02-20 10:37:03 +01:00
Giga Chubinidze
0ea7d6b75e changed axios to jquery, removed page refresh after file creation 2023-02-20 13:27:17 +04:00
Giga Chubinidze
14592ebea6 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-17 22:51:10 +04:00
Martin Artnik
3961d1d6af Add delete confirmation modal to checklist items [SCI-7952] 2023-02-17 15:59:37 +01:00
artoscinote
e58f0fc1f2
Merge pull request #4912 from G-Chubinidze/gc_SCI_7195
Text block on step without title in rearrange modal [SCI-7195]
2023-02-15 10:43:44 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Anton
743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
sboursen-scinote
622b7f3341 Change the width of modal [SCI-7904] 2023-02-09 15:50:25 +01:00
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata
Save handson table metadata [SCI-7834]
2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
artoscinote
3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837
Step timestamp display [SCI-7837]
2023-02-06 12:03:02 +01:00
artoscinote
6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
2023-02-06 11:17:43 +01:00
Alex Kriuchykhin
958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze
ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Giga Chubinidze
e412f40948 simple logic update 2023-01-31 17:08:34 +04:00
Anton
68f2db7996 Fix label template logo dimenstion calculation [SCI-7822] 2023-01-30 12:59:51 +01:00
sboursen-scinote
95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01: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
sboursen-scinote
ef7395b0cd Adjust the size of the clear button on small screens [SCI-7585] 2023-01-26 08:26:34 +01:00
sboursen-scinote
ceb193deee Make the applyFilters button work again [SCI-7585] 2023-01-25 13:49:40 +01:00
sboursen-scinote
e2521e501c Change the position of the clear button [SCI-7585] 2023-01-25 11:28:39 +01:00
sboursen-scinote
2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
artoscinote
87fa3bc9a7
Merge pull request #4710 from G-Chubinidze/gc_SCI_7195
Text block on step without title in rearrange modal [SCI-7195]
2023-01-24 09:40:33 +01:00
Giga Chubinidze
01f6f4d5ea changed logic for item naming 2023-01-21 01:08:17 +04:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] (#4826) 2023-01-16 10:21:10 +01:00
Martin Artnik
14c6c67a1a Fix merging tables in TinyMCE [SCI-7697] 2023-01-13 15:29:16 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
Alex Kriuchykhin
d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo
Features/label template logo
2023-01-13 11:58:01 +01:00
Martin Artnik
4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo
b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
Martin Artnik
2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
Giga Chubinidze
ae8efa8e1a changed if else logic, added back placeholders 2022-12-16 17:22:06 +04:00
Martin Artnik
3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Giga Chubinidze
556431a0da changed code for develop branch 2022-12-12 19:17:57 +04:00
Anton
c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Martin Artnik
de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Martin Artnik
c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Martin Artnik
13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
Anton
eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Martin Artnik
31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Anton
ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
Anton
c6e5fba21c Fix file name in attachment delete modal [SCI-7356] 2022-10-19 11:12:27 +02:00
Alex Kriuchykhin
482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346
Update default density for label templates [SCI-7346]
2022-10-19 10:04:53 +02:00
Andrej
538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Anton
bb354f2dbc Save dimensions on refresh label template preview [SCI-7340] 2022-10-17 12:25:08 +02:00
Andrej
16b4a89fb8 Disable label preview options for Viewer role [SCI-7322] 2022-10-14 11:49:31 +02:00
ajugo
58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +02:00
ajugo
0493d6f31d
Fix label template preview issues [SCI-7313] (#4514)
* Add preview label at open modal [SCI-7313]

* Add density and unit to the label template [SCI-7313]
2022-10-11 10:58:37 +02:00
Andrej
5d6b454756 Fix selected printer for printing [SCI-7315] 2022-10-10 13:33:35 +02:00
Alex Kriuchykhin
07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271
Fix label printing status modal [SCI-7271]
2022-10-06 15:46:36 +02:00
artoscinote
77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270
Add label printer modal to task [SCI-7270][7296]
2022-10-06 15:01:31 +02:00
Andrej
16a7dd261f Add name to zebra printer initialization [SCI-7312] 2022-10-06 14:52:15 +02:00
ajugo
eef93c42d8
Disable print modal button for offline printer statuses [SCI-7276] (#4493)
* Disable print modal button for offline printer statuses [SCI-7276]

* Disable print modal button for offline printer statuses [SCI-7276]
2022-10-06 11:19:51 +02:00
aignatov-bio
bd535dc9ad
Add dimension saving to label templates [SCI-7268] (#4489) 2022-10-06 11:09:10 +02:00
Alex Kriuchykhin
ae8f5526be
Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal
Fix validation on print modal [SCI-7287]
2022-10-06 10:42:36 +02:00
ajugo
7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Oleksii Kriuchykhin
b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00