Commit graph

378 commits

Author SHA1 Message Date
Martin Artnik
fd55aa21a6 Basic results component and structure [SCI-8947] 2023-08-07 16:09:13 +02:00
Alex Kriuchykhin
dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing
Merge features/protocol-parsing to develop
2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin
6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +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
Ivan Kljun
0bdbe84d4d Add hound linter suggestions 2023-08-02 17:02:11 +02:00
Ivan Kljun
2d26c70d40 Create vue method for toggling navigator state 2023-08-02 16:45:06 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ajugo
fa187f3b31
Add shared assets download and fix loading of the shareable button on task [SCI-8754] (#5878)
* Add shared assets download and fix loading of the shareable button on task [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Add additional check before asset loading [SCI-8754]

* Load asset for specific task [SCI-8754]
2023-08-01 16:46:41 +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
Martin Artnik
3978d9efef Merge branch 'develop' into features/august-release 2023-07-26 11:22:49 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +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
Martin Artnik
30e07ff1e9 Fix tinymce loading placeholders for text elements [SCI-8894] 2023-07-21 16:25:44 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +02: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
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +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
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
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
Giga Chubinidze
2bb27949fd TinyMCE list of smaller bugs and improvements [SCI-7976] 2023-07-05 11:52:05 +04:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
Martin Artnik
657934f9bf Bundle Inter font for proper font weights [SCI-8646] 2023-06-15 14:23:01 +02:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
Martin Artnik
c741b5ac56 Amend TinyMCE defaults [SCI-8462] 2023-06-14 10:38:17 +02:00
Anton
4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +02:00
Martin Artnik
7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +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
98cb0df46b
Fix issues with assign to task dropdowns [SCI-8588] (#5568) 2023-06-06 15:31:40 +02:00
Anton
afe5cdeede Switch to inter font [SCI-8170] 2023-06-06 12:50:28 +02:00
Martin Artnik
673c1fbaa8 Fix layout overflow when navigator is open [SCI-8589] 2023-06-01 12:14:27 +02:00
Martin Artnik
bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
Soufiane
fc1ce332de
Issue with scrollbar in smart annotation pop-up [SCI-8420] (#5479)
* Fix issues in smart annotation pop-up

- Initialize perfectScrollBar on the current atWho container.
- Close AtWho pop-up when tinyMCE editor is closed.

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

* Fix hound [SCI-8420]

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

* Close smart annotation pop-up after tinyMCE save [SCI-8420]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-25 16:01:36 +02:00
Anton
c107a48d61 Fix action toolbar init [SCI-8413] 2023-05-23 12:08:04 +02:00
Martin Artnik
a937198178 Make action toolbar initialization more robust [SCI-8413] 2023-05-18 15:52:18 +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
sboursen-scinote
16ccd9703f Implement the assign to task button [SCI-8252] 2023-05-17 16:18:11 +02:00
Anton
3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +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
Anton
8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21: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
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
Soufiane
58782131a8
Flash message for delete draft [SCI-8245] (#5300)
Add redirect flash message after draft delete and before the location redirect [SCI-8245]
2023-05-03 11:16:59 +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
ajugo
0c24360a81
Fix error message for protocol notes and repository item name [SCI-7185] (#5258) 2023-04-25 14:34:14 +02:00
Anton
3724c38e7d Add archived state for navigator [SCI-8056] 2023-04-25 13:57:29 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Anton
7143c3ed5d Add general layout for navigator [SCI-8046
]
2023-04-19 14:19:55 +02:00
aignatov-bio
d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor 2023-04-19 10:33:09 +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
Anton
7b40c305e8 Add infinite scroll to notifications flyout [SCI-8282] 2023-04-07 14:06:29 +02:00
Martin Artnik
79b4f0d03d Add display of validation errors to TinyMCE [SCI-8246] 2023-04-03 15:34:59 +02:00
Anton
52aac69488 Add final version for left menu [SCI-8016] 2023-04-03 13:29:24 +02:00
Martin Artnik
2eb4c2fd9d Enable TinyMCE menu bar on mobile [SCI-8221] 2023-04-03 12:49:04 +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
Anton
babb46baa7 Update webpacker to version 5.4.4 [SCI-7926] 2023-03-28 14:00:28 +02:00
Anton
854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
aignatov-bio
da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
Martin Artnik
165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Martin Artnik
238354a314 Add back basic TinyMCE html editor [SCI-7965] 2023-02-21 11:23:52 +01:00
artoscinote
8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] (#4998) 2023-02-21 09:12:59 +01:00
artoscinote
5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934
Fix MarvinJS image toolbar [SCI-7934]
2023-02-17 15:53:27 +01:00
Martin Artnik
fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
Martin Artnik
43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
Martin Artnik
ac9c569b39 Enable Lato font in TinyMCE iframe [SCI-7883] 2023-02-14 14:06:47 +01:00
Martin Artnik
5e63240996 Add image TinyMCE plugin [SCI-7916] 2023-02-13 15:33:56 +01:00
aignatov-bio
6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce
Fix heading styles for tinymce [SCI-7840]
2023-02-07 13:25:02 +01:00
artoscinote
ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
2023-02-07 13:11:03 +01:00
Giga Chubinidze
3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Martin Artnik
d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
artoscinote
5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187
Support compiling webpacker content from addons [SCI-7187]
2023-02-07 10:24:18 +01:00
Martin Artnik
ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +01:00
artoscinote
41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883
Update the TinyMCE font [SC-7883]
2023-02-06 11:19:29 +01:00
Giga Chubinidze
f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Anton
a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01:00
sboursen-scinote
2e037b69ff Fix Hound related issue [SCI-7585] 2023-01-26 09:23:37 +01:00
sboursen-scinote
36cc68f94a Fix Hound related issue [SCI-7585] 2023-01-26 09:20:20 +01:00
sboursen-scinote
95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01:00
sboursen-scinote
b02889c801 Fix the behavior of the clear button [SCI-7585] 2023-01-26 09:03:08 +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
2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
artoscinote
f72a281e0a
Merge pull request #4850 from artoscinote/ma_SCI_7776
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-19 14:27:19 +01:00
Alex Kriuchykhin
58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-19 13:21:35 +01:00
aignatov-bio
d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:59:20 +01:00
Anton
a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
ajugo
d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] (#4859) 2023-01-19 11:39:14 +01:00
Oleksii Kriuchykhin
a6abc9d7e5 Fix icons in custom tinyMCE menu [SCI-7779] 2023-01-18 16:43:50 +01:00
Martin Artnik
b46c92b3c6 Fix navigating away with unsaved TinyMCE changes [SCI-7776] 2023-01-18 11:00:08 +01:00
Martin Artnik
3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
Martin Artnik
33dca201ba Remove placeholder plugin [SCI-7729] 2023-01-11 15:49:18 +01:00
Martin Artnik
b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
Martin Artnik
2ffec1cf49 Fix TinyMCE style loading [SCI-7729] 2023-01-11 15:28:09 +01:00
Martin Artnik
edfc1c4e08 Fix editor close when clicking restore notification [SCI-7729] 2023-01-10 13:24:58 +01:00
Martin Artnik
2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +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
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +01:00
Andrej
884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Andrej
e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Andrej
eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +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
Anton
40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
Anton
2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
Anton
73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
Oleksii Kriuchykhin
557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +02:00
Anton
9b52b7f3db Fix tinymce pack code styling [SCI-7183] 2022-09-08 15:37:23 +02:00
aignatov-bio
7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
Anton
2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton
c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +02:00
Anton
1ebd4046cd Update tinyMCE marvinjs plugin [SCI-7154] 2022-09-06 13:05:56 +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
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
Anton
31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Anton
8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
artoscinote
6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066)
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
2022-05-03 15:18:48 +02:00
artoscinote
8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote
6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Alex Kriuchykhin
dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote
8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +01:00
artoscinote
39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
aignatov-bio
afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 12:44:22 +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
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +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
aignatov-bio
ec6886735c
Add archived on column [SCI-6482] (#3823)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 13:18:15 +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
aignatov-bio
3fc5883172
Fix purple dots after applying empty filters [SCI-6458] (#3809)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 15:14:39 +01:00
aignatov-bio
60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802)
Co-authored-by: Anton <anton@scinote.net>
2022-01-27 14:01:09 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00