Commit graph

938 commits

Author SHA1 Message Date
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
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +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
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
Martin Artnik
ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +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
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
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
Giga Chubinidze
f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04: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
Anton
a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01: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
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
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
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
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
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
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
Alex Kriuchykhin
b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1
Release/1.26.2.1
2022-11-22 11:07:20 +01:00
ajugo
4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +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
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
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
85248a0426 Fix validation on print modal [SCI-7287] 2022-09-30 19:48:13 +02:00
aignatov-bio
13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates
CSS fixes for label templates [SCI-7262]
2022-09-30 09:47:39 +02:00
Anton
0107368b67 Fix duplicate labels in dropdown components [SCI-7285] 2022-09-29 21:11:00 +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
ajugo
103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] (#4475) 2022-09-29 14:47:59 +02:00
ajugo
69bc48fef8
Add cancel button and fix number input [SCI-7274] (#4478) 2022-09-29 14:45:10 +02:00
Anton
9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +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
artoscinote
d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin
ac11d41359 Fix label printing status modal [SCI-7271] 2022-09-28 17:01:07 +02:00
Anton
7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +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
ajugo
aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463)
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]

* Fix zebra printing [SCI-7244]
2022-09-27 09:58:22 +02:00
aignatov-bio
e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen
Update fluics view and permissions for label templates [SCI-7222]
2022-09-26 10:22:01 +02: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
Anton
2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
artoscinote
e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184
Add y-scroll to step tables [SCI-7184]
2022-09-21 10:29:19 +02:00
Anton
07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
Anton
fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio
e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates
Add validation to label template code [SCI-7210]
2022-09-20 11:59:59 +02:00
artoscinote
dddbc16a50
Merge pull request #4438 from scinote-eln/ma_SCI_7184
Add y-scroll to step tables [SCI-7184]
2022-09-19 13:56:17 +02:00
Anton
17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Martin Artnik
c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps 2022-09-15 11:25:25 +02:00
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +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
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
Anton
34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00
Anton
5f21c06b26 Fix error handling for tinymce [SCI-7127] 2022-09-02 11:19:54 +02:00
Anton
d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
Martin Artnik
bd1e30d19b Add default measurments to label templates [SCI-7129] 2022-08-30 16:16:02 +02:00
Anton
81dd259c25 Fix tinymce memory leak [SCI-7138] 2022-08-26 10:52:55 +02:00
Anton
9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton
771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +02:00
aignatov-bio
6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
e22af8830a Add activties to step duplication [SCI-7109] 2022-08-24 13:45:39 +02:00
artoscinote
766d2bb3e0
Fix checkboxes for technicians [SCI-7122] (#4378) 2022-08-23 18:10:28 +02:00
Anton
3e539adbde Fix step drag/drop file [SCI-7123] 2022-08-23 17:59:28 +02:00
Anton
bc112dd6af Add step duplication [SCI-7109] 2022-08-23 17:54:33 +02:00
artoscinote
74b9101e6f
Enable table scroll for locked tasks [SCI-7125] (#4375) 2022-08-23 14:23:21 +02:00
Anton
d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +02:00
artoscinote
c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Anton
1bac9aeb4c Add duplication to components [SCI-7108] 2022-08-22 15:03:49 +02:00
Andrej
371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00
aignatov-bio
1e6e0f5038
Merge pull request #4360 from aignatov-bio/ai-sci-7107-fix-attachmets-actions-dropdown-position
Fix attachments actions dropdown position [SCI-7107]
2022-08-18 12:47:01 +02:00
Anton
2d60ce7e99 Fix attachments actions dropdown position [SCI-7107] 2022-08-18 11:35:30 +02:00
Anton
96d52254c3 Fix file uploading for unlimited storage [SCI-7105] 2022-08-18 11:26:42 +02:00
Anton
5677e45e0c Add insert ability for code in content block [SCI-7055] 2022-08-17 13:40:35 +02:00
Anton
4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
ajugo
5cdc8488b5
Add tooltips to step asset file name [SCI-7022] (#4356) 2022-08-16 12:20:37 +02:00
Anton
1a13e1bfc6 Fix unexpected error on step attachments [SCI-7032] 2022-08-16 11:22:19 +02:00
Anton
174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
artoscinote
e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348)
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
2022-08-12 10:17:45 +02:00
Alex Kriuchykhin
32c53e223b
Merge pull request #4342 from okriuchykhin/ok_SCI_7071
Fix WOPI editing after creation issue [SCI-7071]
2022-08-11 15:52:17 +02:00
Anton
3d6d6c3b5a Fix css for step insert component menu [SCI-6955] 2022-08-11 11:10:12 +02:00
ajugo
12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343)
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
2022-08-10 15:39:45 +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
Oleksii Kriuchykhin
7cea3faf1e Fix WOPI editing after creation issue [SCI-7071] 2022-08-10 14:02:09 +02:00
artoscinote
04a282b725
Hide blank table name if task is locked [SCI-7066] (#4333) 2022-08-10 10:38:10 +02:00
artoscinote
3a26b62bf5
Activity and checklist fixes [SCI-7079] (#4330) 2022-08-10 10:37:27 +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
aignatov-bio
30000676e9
Merge pull request #4331 from aignatov-bio/ai-sci-7072-fix-rearrange-step-issues
Add title to rearrange modal elements [SCI-7072]
2022-08-10 10:05:45 +02:00
Alex Kriuchykhin
f67654ffeb
Merge pull request #4332 from okriuchykhin/ok_SCI_6986_v2
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 17:03:48 +02:00
Anton
c044215b21 Add title to rearrange modal elements [SCI-7072] 2022-08-09 14:19:28 +02:00
Oleksii Kriuchykhin
d1a46b3fc2 Fix protocol linked protocol changes tracking [SCI-6986] 2022-08-09 14:15:49 +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
ajugo
68bbb87797
Fix cancel at closing file modal and remove edit button for marvinjs asset [SCI-7061] (#4313) 2022-08-05 10:46:14 +02:00
Anton
a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
artoscinote
9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
Anton
31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
ajugo
8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
Anton
c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote
89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
Anton
bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
ajugo
20095067a1
Fix checklist reordering issue [SCI-7039] (#4298) 2022-08-01 13:25:29 +02:00
artoscinote
a527edd07d
Attachment management fixes [SCI-7022] (#4296)
* Attachment management fixes [SCI-7022]

* Linter fixes [SCI-7022]
2022-08-01 13:14:04 +02:00
artoscinote
47b426539f
Fix step header functionalities in locked task [SCI-7024] (#4291) 2022-07-28 14:35:34 +02:00
aignatov-bio
0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
Alex Kriuchykhin
4012f0d7a3
Merge pull request #4289 from okriuchykhin/ok_SCI_6973_v2
Fix toggling for steps and checklists [SCI-6973]
2022-07-26 13:51:54 +02:00
artoscinote
f08e57c428
Fix confusion with attachment indices, component key [SCI-7023] (#4288) 2022-07-26 13:42:25 +02:00
artoscinote
2800274d7c
Fix table scroll in view mode [SCI-7021] (#4284) 2022-07-26 13:42:00 +02:00
Oleksii Kriuchykhin
a450780926 Fix toggling for steps and checklists [SCI-6973] 2022-07-26 13:33:43 +02:00
artoscinote
e4525dddf5
Clear isNew on element update [SCI-7025] (#4283) 2022-07-25 11:40:28 +02:00
aignatov-bio
25b808532d
Merge pull request #4258 from aignatov-bio/ai-sci-6972-fix-viewer-role
Fix step for viewer role [SCI-6972]
2022-07-25 11:38:08 +02:00
Anton
3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
Anton
70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote
5ec1002329
Simplify task locking logic on FE [SCI-6987] (#4278) 2022-07-21 15:49:03 +02:00
artoscinote
ac4e30d709
Fix reloading of attachments after saving MarvinJS [SCI-7015] (#4277) 2022-07-21 14:28:21 +02:00
artoscinote
28ca1aaec6
Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275) 2022-07-21 09:57:14 +02:00
artoscinote
d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +02:00
artoscinote
6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
artoscinote
087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
artoscinote
49dfa2c2aa
Fix multiline paste on windows [SCI-6960] (#4267) 2022-07-19 16:44:35 +02:00
Oleksii Kriuchykhin
b582b138f5 Fix protocol status bar reloading after step elements modifications [SCI-6986] 2022-07-19 14:27:03 +02:00
ajugo
ccf95fea24
Fix file block issues [SCI-6966] (#4244)
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)

* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
2022-07-15 10:13:55 +02:00
Alex Kriuchykhin
7b158133cb
Merge pull request #4252 from okriuchykhin/ok_SCI_6973
Fix step elements interactions for technician role [SCI-6973]
2022-07-15 10:12:23 +02:00
aignatov-bio
63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments
Fix step comments [SCI-6971]
2022-07-15 10:10:56 +02:00
Oleksii Kriuchykhin
a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
ajugo
c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253)
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
2022-07-15 10:00:50 +02:00
Anton
32fac2f9ab Fix merge issues for step [SCI-6949] 2022-07-14 12:50:06 +02:00
Alex Kriuchykhin
46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969
Fix file upload and edit interactions on steps page [SCI-6969]
2022-07-14 09:48:20 +02:00
ajugo
5d2d002a04
Fix text element opening tinymce [SCI-6938] (#4243)
* Fix edit step button [SCI-6938]

* Fix text element opening tinymce [SCI-6938]
2022-07-13 21:09:30 +02:00
aignatov-bio
186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +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
a73fc8c0fd
Fix automatically adding new checklist item [SCI-6960] (#4238) 2022-07-13 17:58:58 +02:00
aignatov-bio
a845eec33e
Merge pull request #4240 from aignatov-bio/ai-sci-6958-fix-delete-modal
Fix delete modals size [SCI-6958]
2022-07-13 17:58:39 +02:00
ajugo
df84496381
Fix edit step button [SCI-6938] (#4232) 2022-07-13 16:13:42 +02:00
Anton
34ff261ddf Fix delete modals size [SCI-6958] 2022-07-13 15:53:08 +02:00
Anton
496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
artoscinote
a575487271
Fix microinteraction for table editing [SCI-6957] (#4236) 2022-07-13 12:21:41 +02:00
artoscinote
17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
2022-07-13 10:47:12 +02:00
Oleksii Kriuchykhin
747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
Anton
8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
artoscinote
c89968453e
Fix checklist issues [SCI-6960] (#4222) 2022-07-12 10:41:58 +02:00
aignatov-bio
33e3d0f3f0
Merge pull request #4226 from aignatov-bio/ai-sci-6965-fix-save-to-protocol
Fix save protocol repository [SCI-6965]
2022-07-12 10:40:54 +02:00
Anton
e8a0e7c7d4 Fix save protocol repository [SCI-6965] 2022-07-12 10:37:36 +02:00
Anton
b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
ajugo
045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] (#4211) 2022-07-11 11:52:38 +02:00
aignatov-bio
cb86fe0e06
Merge pull request #4219 from aignatov-bio/ai-sci-6958-fix-steps-delete-modal
Fix delete steps modal size [SCI-6958]
2022-07-11 11:31:48 +02:00
Anton
d805a420b9 Fix delete steps modal size [SCI-6958] 2022-07-11 11:28:45 +02:00
artoscinote
d897a4f9a8
Fix missing error class on inline edit [SCI-6954] (#4218) 2022-07-11 11:23:54 +02:00
artoscinote
cb113c4bdb
Change reordering icons [SCI-6953] (#4208) 2022-07-11 10:54:18 +02:00
artoscinote
5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +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
11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton
4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
artoscinote
102b72d413
Enable text edit mode when adding text block [SCI-6956] (#4206) 2022-07-07 13:43:29 +02:00
aignatov-bio
dce755b294
Merge pull request #4205 from aignatov-bio/ai-sci-6933-add-micro-interactions-to-step
Fix microinteractions for step editing [SCI-6933]
2022-07-07 09:15:19 +02:00
Anton
b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
artoscinote
be45aac93b
Implement table click-away and auto edit mode on add [SCI-6957] (#4202) 2022-07-06 14:18:11 +02:00
artoscinote
c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184)
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
2022-07-06 14:11:48 +02:00
artoscinote
7921a7276f
Fix removing non-saved checklist item [SCI-6964] (#4204) 2022-07-06 14:06:16 +02:00
ajugo
6f5646af59
Copy & paste image to "Add file" modal [SCI-6930] (#4199)
* Upload image attachments from copy paste [SCI-6930]

* Fix opening copy paste modals and handling paste event [SCI-6930]
2022-07-06 11:43:30 +02:00
aignatov-bio
5b37a96e79
Merge pull request #4174 from aignatov-bio/ai-sci-6759-load-save-protocol-from-repository
Fix load/save protocol to repository [SCI-6759]
2022-07-05 12:57:59 +02:00
Anton
7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +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
artoscinote
709c0b0b8a
Scroll to bottom when appending step [SCI-6927] (#4181) 2022-07-04 13:54:40 +02:00
ajugo
7d09882ec2
Fix edit button on stepText element [SCI-6938] (#4189) 2022-07-04 12:46:59 +02:00
Anton
bf13708e31 Fix load/save protocol to repository [SCI-6759] 2022-06-27 13:14:45 +02:00
aignatov-bio
3a5492f875
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing
CSS fixes for step editing [SCI-6862]
2022-06-27 11:13:18 +02:00
Anton
5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton
a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
Anton
8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
aignatov-bio
247a8f9a0b
Merge pull request #4159 from aignatov-bio/ai-sci-6887-add-collapse-extend-buttons
Add collapse/expand buttons to steps [SCI-6887]
2022-06-10 10:19:13 +02:00
artoscinote
5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142)
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
2022-06-10 10:18:55 +02:00
Anton
d62f712166 Add collapse/expand buttons to steps [SCI-6887] 2022-06-09 16:16:30 +02:00
Anton
66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
Anton
46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton
e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik
8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik
ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
artoscinote
ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136)
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
2022-06-02 11:15:32 +02:00
Anton
61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
artoscinote
98d66a3276
Implement reordering activities [SCI-6851] (#4129)
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
2022-06-01 12:30:09 +02:00
artoscinote
23872f519b
Implement step element sorting modal [SCI-6849] (#4124)
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
2022-05-30 13:45:51 +02:00
aignatov-bio
57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space
Add the ability to show storage limit [SCI-6835]
2022-05-26 15:03:45 +02:00
Anton
3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
Anton
9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote
894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
aignatov-bio
45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step
Add dropable area to step [SCI-6814]
2022-05-26 12:57:51 +02:00
Anton
2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio
82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description
Add tinyMce field to protocol [SCI-6810]
2022-05-26 12:46:15 +02:00
aignatov-bio
5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section
Add comments to step [SCI-6837]
2022-05-25 22:01:48 +02:00
Anton
7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote
df0f001afa
Refactor step elements controllers [SCI-6848] (#4117) 2022-05-25 14:23:35 +02:00
ajugo
b77394a7b2
Responsive filter flyout [SCI-6494] (#4098)
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
2022-05-25 10:42:54 +02:00
artoscinote
c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
artoscinote
6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Oleksii Kriuchykhin
6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Anton
a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton
5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
Anton
9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Anton
134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Anton
9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
Anton
711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
Anton
8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
Anton
87450ea821 Add thumbnail and list view [SCI-6812] 2022-05-12 18:04:06 +02:00
Anton
940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +02:00
Anton
6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +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
aignatov-bio
d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion
Add delete step modal [SCI-6781]
2022-05-10 13:28:47 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Anton
252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +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
Anton
277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
artoscinote
5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton
3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton
e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +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
Anton
d71ba2f7a1 Fix serailizer [SCI-6758] 2022-05-03 13:55:08 +02:00
Anton
6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
Anton
6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +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