Anton
fcd76661c7
Fix inline edit
2023-08-08 11:09:26 +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
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
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
Anton
aa87b332e4
Prepare step components for results refactor [SCI-8880]
2023-07-24 14:07:11 +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
Martin Artnik
5cc087835a
Merge branch 'develop' into features/august-release
2023-07-19 11:21:24 +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
Anton
4cc6513f82
Fix css for protocol checklists [SCI-8788]
2023-07-13 13:55:32 +02:00
Martin Artnik
ed4af7ae26
Properly unload scroll listener when unloading a select [SCI-8802]
2023-07-06 10:31:26 +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
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] ( #5593 )
2023-06-14 14:57:58 +02:00
Anton
b434c8a2c7
Update css for team selection and search field [SCI-8540]
2023-06-13 11:52:14 +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
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
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
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
Anton
043ce88434
Fix tinyMCE layout in safari [SCI-8426]
2023-05-23 13:28:31 +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
artoscinote
a52ee99781
Add debounce file [SCI-8300] ( #5419 )
2023-05-17 12:00:37 +02:00
Soufiane
dda3d1bc6b
Fix typo [SCI-8250] ( #5393 )
2023-05-16 11:19:19 +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
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
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
Martin Artnik
863054b044
Implement basic select/search-select components in vue [SCI-8249]
2023-05-03 12:37:14 +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
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
Giga Chubinidze
5fa59ec2a0
Not saved checklist item at pasting text [SCI-7459]
2023-04-13 21:58:49 +04: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
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
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
Anton
0c76d7a9b1
Merge branch 'develop' into features/navigation-refactor
2023-03-31 20:31:30 +02:00
Anton
ed1c4bcb69
Replace webpacker with jsbundling-rails [SCI-7926]
2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
7fff3e8f78
Merge branch 'hotfix/1.26.6.2' into develop
2023-03-20 15:36:49 +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
Martin Artnik
165e012d23
Replace highlight.js with prism.js [SCI-7974]
2023-02-28 16:22:35 +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
Alex Kriuchykhin
958f9784b0
Add minimum length validation to label template name [SCI-7319] ( #4930 )
2023-02-03 15:36:32 +01:00
Anton
a39058ffe5
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:56:15 +01:00
Martin Artnik
14c6c67a1a
Fix merging tables in TinyMCE [SCI-7697]
2023-01-13 15:29:16 +01:00
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
Martin Artnik
2010ff091c
Styling fixes and cleanup [SCI-7574]
2022-12-22 10:37:47 +01:00
Martin Artnik
3ea059529d
Fix table scroll wrapping [SCI-7569]
2022-12-14 14:32:23 +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
Oleksii Kriuchykhin
b20c2b13a3
Fix label printers dropdown on print modal [SCI-7258]
2022-10-03 10:37:04 +02:00
aignatov-bio
aba760f1a4
Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component
...
Fix duplicate labels in dropdown components [SCI-7285]
2022-09-30 19:51:34 +02:00
Anton
0107368b67
Fix duplicate labels in dropdown components [SCI-7285]
2022-09-29 21:11:00 +02:00
ajugo
103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] ( #4475 )
2022-09-29 14:47:59 +02:00
aignatov-bio
d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template
...
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
2022-09-29 13:56:39 +02:00
Anton
7e06f29a75
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
2022-09-28 11:34:24 +02:00
Anton
07f0142789
Fix links in locked step texts elements [SCI-7224]
2022-09-20 15:44:52 +02:00
Anton
73917ec4c0
Fix tinymce errors [SCI-7182]
2022-09-09 15:50:59 +02:00
artoscinote
6a2037dc00
Fix smart annotations in locked elements [SCI-7135] ( #4421 )
2022-09-09 11:15:33 +02:00
artoscinote
44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] ( #4385 )
...
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]
* Cleanup and refactor [SCI-7081]
* Clean up legacy plugins [SCI-7150]
* Linter fix [SCI-7081]]
2022-09-05 11:29:19 +02:00
Anton
5f21c06b26
Fix error handling for tinymce [SCI-7127]
2022-09-02 11:19:54 +02:00
Anton
81dd259c25
Fix tinymce memory leak [SCI-7138]
2022-08-26 10:52:55 +02:00
artoscinote
5df1701ae7
Improve cancel edit button reliability, fix blink for non-smart-annotation fields [SCI-7068] ( #4344 )
2022-08-10 15:34:17 +02:00
artoscinote
a37c236518
Inline edit and checklist improvements [SCI-7031] ( #4340 )
...
* Inline edit and checklist improvements [SCI-7031]
* Fix smart annotations in inline edit [SCI-7031]
2022-08-10 14:43:23 +02:00
ajugo
b6f273410b
Fix protocol repository CSS [SCI-7064] ( #4335 )
...
* Fix protocol repository CSS [SCI-7064]
* Fix protocol repository CSS [SCI-7064]
* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
artoscinote
187197488b
Pdf viewer and protocol fixes [SCI-7074] ( #4327 )
2022-08-09 10:13:43 +02:00
ajugo
1ee091aa53
Fix selected default step title and step name placeholder [SCI-7067] ( #4326 )
...
* Fix selected default step title in edit mode and step name placeholder [SCI-7067]
* Add new placeholder label [SCI-7067]
2022-08-08 16:50:34 +02:00
artoscinote
6bfb25ba50
Fix cancel edit buttons [SCI-7068] ( #4325 )
2022-08-08 16:18:59 +02:00
Anton
ffaa6c6abb
Fix inline field when value change [SCI-7069]
2022-08-08 11:32:10 +02:00
Anton
7992cd97a1
Fix smart annotation on step text and checklist [SCI-7059]
2022-08-05 11:23:36 +02:00
artoscinote
9478779218
TinyMCE fixes [SCI-7033] ( #4308 )
2022-08-04 11:06:25 +02:00
artoscinote
89a3bc8072
Checklist fixes [SCI-7031] ( #4302 )
2022-08-02 10:18:25 +02:00
Anton
70fe27f31b
Allow multiline in checklist items [SCI-7008]
2022-07-25 11:21:31 +02:00
artoscinote
49dfa2c2aa
Fix multiline paste on windows [SCI-6960] ( #4267 )
2022-07-19 16:44:35 +02:00
artoscinote
c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] ( #4241 )
...
* Also validate char count on paste in TinyMCE [SCI-6952]
* Fix new text tinymce init [SCI-6956]
* Fix step head styling [SCI-6952]
* Fix step dropdown icon [SCI-6948]
2022-07-13 18:02:35 +02:00
artoscinote
c89968453e
Fix checklist issues [SCI-6960] ( #4222 )
2022-07-12 10:41:58 +02:00
ajugo
045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] ( #4211 )
2022-07-11 11:52:38 +02:00
artoscinote
d897a4f9a8
Fix missing error class on inline edit [SCI-6954] ( #4218 )
2022-07-11 11:23:54 +02:00
artoscinote
a51ce1c322
Fix text field error states [SCI-6952] ( #4216 )
2022-07-11 10:44:27 +02:00
Anton
a54cac44da
Fixed smart annotations [SCI-6939]
2022-07-08 13:50:40 +02:00
Anton
972cc49389
Fix smart annotation for step editing [SCI-6939]
2022-07-08 12:51:43 +02:00
Anton
4e2cb29f48
Fix step complete and name editing [SCI-6949]
2022-07-07 14:33:38 +02:00
Anton
b3d7c3ff75
Fix microinteractions for step editing [SCI-6933]
2022-07-06 14:31:55 +02:00
artoscinote
79b801121a
Fix protocol title, disable reordering of elements if less than 2 [SCI-6934] ( #4187 )
2022-07-04 13:55:26 +02:00
Anton
66212fd703
Finalize inline edit field [SCI-6782]
2022-06-09 14:40:45 +02:00
Anton
e86a0610b2
Add metadata block in protocol repository [SCI-6869]
2022-06-06 13:56:22 +02:00
artoscinote
b486f3fd31
Implement checklists [SCI-6789] ( #4089 )
2022-05-11 15:51:26 +02:00
Anton
c0660d0243
Small fixes [SCI-6808]
2022-05-11 11:32:27 +02:00
Anton
04e16cf6b5
Add text component [SCI-6808]
2022-05-11 09:51:47 +02:00
artoscinote
b00968fd55
Implement basic checklist functionality [SCI-6786] ( #4073 )
...
* Implement protocol status bar functionality [SCI-6760]
* Inline edit interactions, checklist name edit improvements [SCI-6786]
2022-05-05 12:56:31 +02:00
Martin Artnik
ebdd22a892
Fix inline editing for blank values [SCI-6749]
2022-04-26 14:30:07 +02:00
artoscinote
8aaab73856
Add inline edit component, protocol name updates [SCI-6749] ( #4057 )
2022-04-26 14:13:17 +02:00
artoscinote
4e118d095d
Fix dropdown component for group select [SCI-6583] ( #3905 )
2022-02-28 13:21:17 +01:00
artoscinote
3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] ( #3898 )
...
* Fix filter overwrite [SCI-6582]
* Fix date/time filter loading [SCI-6582]
* Fix time/time range filter loading [SCI-6582]
* Code style fixes [SCI-6582]
2022-02-25 15:27:31 +01:00
aignatov-bio
f7cc20ebab
Update blank state for datetime filters [SCI-6571] ( #3891 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 14:55:04 +01:00
aignatov-bio
3ae683307d
Fix time filter [SCI-6575] ( #3886 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 09:24:11 +01:00
aignatov-bio
358ff50cc3
Update blank state for date filter [SCI-6541] ( #3880 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 09:40:16 +01:00
aignatov-bio
ed5b69c0ab
Add validation for date picker [SCI-6541] ( #3875 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:10:50 +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
aignatov-bio
8fcf4e9aa2
Add styling for repository filters [SCI-6232] ( #3779 )
...
Co-authored-by: Anton <anton@scinote.net>
2022-01-17 10:24:57 +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
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
aignatov-bio
8ce321456e
Add time filter [SCI-6217] ( #3738 )
...
* Add time filter [SCI-6217]
* Add datetime filter for inventory [SCI-6220]
* Refactor components structure
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 12:22:24 +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
00f30b8d6c
Add assigned tasks filters [SCI-6221] ( #3726 )
...
* Add endpoint for repository tasks [SCI-6221]
* Add assigned tasks filter [SCI-6221]
Co-authored-by: Anton <anton@scinote.net>
2021-12-07 15:28:20 +01:00
artoscinote
f1ede0f439
Add asset filter type [SCI-6215] ( #3711 )
2021-12-01 11:24:34 +01:00
aignatov-bio
06788bfeb6
Update CSS for BMT filters [SCI-6084] ( #3652 )
...
* Update css for bmt filters [SCI-6084]
* Create shared component for dropdown [SCI-6084]
Co-authored-by: Anton <anton@scinote.net>
2021-11-16 14:46:08 +01:00
