Commit graph

146 commits

Author SHA1 Message Date
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04: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
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
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +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
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] (#5308) 2023-04-14 15:10:35 +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
b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
sboursen-scinote
4ab8768024 Focus on newly added step element [sb_SCI-7938] 2023-02-24 10:49:18 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
Giga Chubinidze
ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Anton
eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +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
34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00
Anton
d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
Anton
e22af8830a Add activties to step duplication [SCI-7109] 2022-08-24 13:45:39 +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
Anton
d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +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
Anton
2d60ce7e99 Fix attachments actions dropdown position [SCI-7107] 2022-08-18 11:35:30 +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
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
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
Oleksii Kriuchykhin
d1a46b3fc2 Fix protocol linked protocol changes tracking [SCI-6986] 2022-08-09 14:15:49 +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
9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
Anton
c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote
47b426539f
Fix step header functionalities in locked task [SCI-7024] (#4291) 2022-07-28 14:35:34 +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
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
Anton
3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +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
d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +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
Anton
32fac2f9ab Fix merge issues for step [SCI-6949] 2022-07-14 12:50:06 +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
Anton
496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
Anton
8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
artoscinote
c89968453e
Fix checklist issues [SCI-6960] (#4222) 2022-07-12 10:41:58 +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
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
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
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
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
Anton
8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
Anton
d62f712166 Add collapse/expand buttons to steps [SCI-6887] 2022-06-09 16:16:30 +02:00
Anton
46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +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
Anton
9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
Anton
2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +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
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
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
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
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
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
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
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
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00