Commit graph

9144 commits

Author SHA1 Message Date
artoscinote 2800274d7c
Fix table scroll in view mode [SCI-7021] (#4284) 2022-07-26 13:42:00 +02:00
aignatov-bio 264a60dc55
Merge pull request #4285 from aignatov-bio/ai-sci-6965-fix-copy-protocol-to-repository
Fix protocol save to repository [SCI-6965]
2022-07-26 13:36:53 +02:00
aignatov-bio a2d72338ce
Merge pull request #4286 from aignatov-bio/ai-sci-6971-fix-comments-avatar-image
Fix comments avatar image [SCI-6971]
2022-07-26 13:36:42 +02:00
Oleksii Kriuchykhin a450780926 Fix toggling for steps and checklists [SCI-6973] 2022-07-26 13:33:43 +02:00
Oleksii Kriuchykhin 382d54320e Improve repository table loading speed [SCI-7002] 2022-07-25 15:39:11 +02:00
Anton 81b0fe3706 Fix comments avatar image [SCI-6971] 2022-07-25 13:38:36 +02:00
Anton a8ccc18b8b Fix protocol save to repository [SCI-6965] 2022-07-25 12:53:27 +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
artoscinote dabb600e6f
Fix rounded corners on text block [SCI-6996] (#4281) 2022-07-25 11:33:06 +02:00
Anton 70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote 6f72777acd
Fix rounded corners on step elements [SCI-6996] (#4279) 2022-07-21 16:36:14 +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
ajugo e4c5c66d35
Fix wopi file creation [SCI-7014] (#4276) 2022-07-21 14:19:06 +02:00
Alex Kriuchykhin b9d953b3a4
Fix pdf report styling and bookmarks [SCI-6978] (#4274) 2022-07-21 09:57:28 +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 088c4c1c94
Add hover state to step checkbox [SCI-6999] (#4271) 2022-07-20 12:24:43 +02:00
artoscinote 6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
Alex Kriuchykhin 7874a3e1c5
Fix updating protocol from repository [SCI-6993] (#4266) 2022-07-20 10:14:48 +02:00
artoscinote 087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
ajugo 1732c8897a
Docx report fixes [SCI-6979] (#4265)
* Fixes for docx [SCI-6979]

* Remove step description from DOCX [SCI-6979]
2022-07-20 10:12:38 +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
Martin Artnik 6227b1f5a1 Added edit overlays, disable more controls [SCI-6983] 2022-07-19 14:22:40 +02:00
Martin Artnik 98b3627219 Implement multiline editing in repositories [SCI-6982] 2022-07-19 12:24:33 +02:00
artoscinote b6b1fed7e2
Fix alignment of items in reorder modal [SCI-6995] (#4264) 2022-07-19 10:10:07 +02:00
artoscinote 0c42e029ae
Fix step title alignments [SCI-6994] (#4263)
* Fix step title alignments [SCI-6994]

* Fix step serializer [SCI-6994]
2022-07-19 10:09:33 +02:00
artoscinote 6b8ea376bc
CSS fix for file dropdown [SCI-6990] (#4261) 2022-07-19 10:09:19 +02:00
ajugo ca87d93cb3
Fix protocol metadata alignments [SCI-6991] (#4262) 2022-07-18 16:56:51 +02:00
ajugo 8172523f5a
Protocol alignment fixes [SCI-6988] (#4259)
* Fix rendering protocol steps

* Fix empty space for step text [SCI-6988]

* Align step number and step name [SCI-6988]

* Align step number and step name [SCI-6988]
2022-07-18 16:56:06 +02:00
ajugo a55d6ea9de
Replaced default ruby error pages [SCI-6967] (#4230)
* Replaced default ruby error pages [SCI-6967]

* Remove error 500 in controller [SCI-6967]
2022-07-15 10:43:07 +02:00
ajugo 1cd5a35b32
Fix refresh task name from linked protocol [SCI-6992] (#4256) 2022-07-15 10:14:49 +02:00
ajugo 0d8d1270ce
Disable double clikc on new repository row [SCI-6977] (#4255) 2022-07-15 10:14:26 +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
artoscinote 39f5a017cf
Add print button to protocol in repository [SCI-6871] (#4246) 2022-07-15 10:10:18 +02:00
artoscinote c707a3aac6
Fix step update activities [SCI-6980] (#4250) 2022-07-15 10:09:49 +02:00
Oleksii Kriuchykhin a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
aignatov-bio 2ec93cef43
Merge pull request #4249 from aignatov-bio/ai-sci-6989-update-protocol-name-on-link
Update protocol name on save with link [SCI-6989]
2022-07-15 10:08:41 +02:00
ajugo bab466d908
Fix grip for checklist elemnt position [SCI-6961] (#4254) 2022-07-15 10:07:31 +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 e320571876 Update protocol name on save with link [SCI-6989] 2022-07-14 12:59:12 +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
Alex Kriuchykhin 0a8acb36f8
Merge pull request #4231 from okriuchykhin/ok_SCI_6974
Fix display of stock consumption in assigned items table [SCI-6974]
2022-07-14 09:47:57 +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
ajugo 914516ac4c
Fix checklist item alignments and step edit alignment [SCI-6961] (#4242) 2022-07-13 21:02:21 +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 3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
aignatov-bio b84e77210f
Merge pull request #4237 from aignatov-bio/ai-sci-6932-protocol-section-css-fixes
Fix protocol elements alignments [SCI-6932]
2022-07-13 12:42:22 +02:00
Anton cbeac82992 Fix protocol elements allignments [SCI-6932] 2022-07-13 12:37:57 +02:00
artoscinote 15e812a358
Fix rendering of WOPI files [SCI-6936] (#4235) 2022-07-13 12:21:56 +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 d3a8b3ca59 Fix display of stock consumption in assigned items table [SCI-6974] 2022-07-12 16:53:07 +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
Martin Artnik 99e5f7558a Fix CSS syntax error 2022-07-12 10:59:33 +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
aignatov-bio 3184647141
Merge pull request #4221 from aignatov-bio/ai-sci-6959-fix-step-content-blocks-allignment
Fix elements step elements alignment [SCI-6959]
2022-07-12 10:38:15 +02:00
aignatov-bio 67dbab97d9
Merge pull request #4220 from aignatov-bio/ai-sci-6944-change-core-colors
Update accent colors [SCI-6944]
2022-07-12 10:38:01 +02:00
Anton e8a0e7c7d4 Fix save protocol repository [SCI-6965] 2022-07-12 10:37:36 +02:00
ajugo c2f17760ea
Replace favicon in public folder and fix what's new title [SCI-5319] (#4224)
* Fix what's new tab name [SCI-5319]

* Change favicons in public folder [SCI-5319]
2022-07-12 10:16:04 +02:00
artoscinote dd27fadd98
Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] (#4179)
* Add step reordering service endpoint to API [SCI-6891]

* Generalize reorder validation [SCI-6891]

* Add endpoint for reordering step elements, fix issues [SCI-6892]

* Add appropriate serializers [SCI-6891][SCI-6892]

* Add step elements to step serializer [SCI-6891]

* Simplify routes, add locking [SCI-6891]
2022-07-12 10:13:47 +02:00
ajugo 82132c865c
Add archived result counter and fix result counter [SCI-6946][6975] (#4223) 2022-07-12 09:58:21 +02:00
Alex Kriuchykhin effd75a71a
Add ordering for tags on protocols page [SCI-6943] (#4214) 2022-07-12 09:49:24 +02:00
Anton b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
Anton e472855690 Update accent colors [SCI-6944] 2022-07-11 12:00:13 +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
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +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 ee792b89df
Fix loading repositories that contain tables [SCI-6951] (#4200) 2022-07-11 10:58:20 +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
Oleksii Kriuchykhin d0d528aeac Update inventory global sharing logic to use new user assignments [SCI-6947] 2022-07-07 22:31:07 +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
Alex Kriuchykhin 26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +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
Alex Kriuchykhin a7e88e59bd
Update global search to use new step text elements [SCI-6873] (#4165) 2022-07-06 14:20: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 454c1f01d0
Switch to fluics api v3 [SCI-6859] (#4201) 2022-07-06 13:02:48 +02:00
artoscinote bcb8ed95fc
Fix reorder permission check [SCI-6941] (#4195) 2022-07-06 11:53:45 +02:00
artoscinote e38fbf4b10
Add join alias for consistent assigned my modules count [SCI-6942] (#4197) 2022-07-06 11:53:26 +02:00
ajugo 8e7307c5c1
Project json exporter adaptions for step improvements [SCI-6898] (#4177)
* Adapt project export to step improvements [SCI-6898]

* Add tests [SCI-6898]
2022-07-06 11:45:50 +02:00
ajugo 9323c5e99a
Enable copy-paste for new members invitation [SCI-6910] (#4186)
* Enable copy-paste for new memeber invitation [SCI-6910]

* Fix hound [SCI-6910]
2022-07-06 11:45:24 +02:00
Alex Kriuchykhin 9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
Alex Kriuchykhin 7af1684db0
Fix import of repository checklist items [SCI-6962] (#4198) 2022-07-06 11:44:41 +02:00
ajugo 10e95ad465
Remove datatable for repository item CARD [SCI-6913] (#4188) 2022-07-06 11:44:30 +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 ef71e59c4d
Merge pull request #4192 from aignatov-bio/ai-sci-6928-add-activities-to-bulk-step-deleteting
Add activity to bulk step deletion [SCI-6928]
2022-07-05 20:11:44 +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
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Anton f3fdf25d2f Add activity to bulk step deletion [SCI-6928] 2022-07-04 21:15:19 +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 a0578e09bb
Fix tags modal css issue [SCI-6926] (#4182) 2022-07-04 13:54:54 +02:00
artoscinote 709c0b0b8a
Scroll to bottom when appending step [SCI-6927] (#4181) 2022-07-04 13:54:40 +02:00
artoscinote a5ffb90a96
Fix multi modal support, add end of body data-hook to layout [SCI-6922] (#4180) 2022-07-04 13:54:22 +02:00
ajugo 7d09882ec2
Fix edit button on stepText element [SCI-6938] (#4189) 2022-07-04 12:46:59 +02:00
aignatov-bio d5f8cef15a
Merge pull request #4175 from aignatov-bio/ai-sci-6909-fix-image-saving-to-protocol-description
Fix image saving to tinymce field [SCI-6909]
2022-07-04 09:57:42 +02:00
Oleksii Kriuchykhin 17178c28d5 Update repository sharing actions [SCI-6918] 2022-07-01 11:55:27 +02:00
artoscinote 6b79f32e52
Fix asset V2 export/import [SCI-6936] (#4185)
* Fix asset V2 export/import [SCI-6936]

* Fix import of legacy eln step description images [SCI-6937]
2022-07-01 11:35:04 +02:00
Oleksii Kriuchykhin 3fbc5af9a1 Convert team_repository to polymorphic relation [SCI-6917] 2022-06-29 15:22:22 +02:00
Oleksii Kriuchykhin c79ff8f050 Migrate TeamRepository to new permissions [SCI-6916] 2022-06-28 13:13:36 +02:00
artoscinote 800f856ab1
Handle step description with the new step_texts structure [SCI-6890] (#4176) 2022-06-28 09:56:24 +02:00
Anton 0e36783c5c Fix image saving to tinymce field [SCI-6909] 2022-06-27 13:31:09 +02:00
Anton bf13708e31 Fix load/save protocol to repository [SCI-6759] 2022-06-27 13:14:45 +02:00
artoscinote b880f6fc39
Add API endpoints for step texts [SCI-6889] (#4173) 2022-06-27 12:30: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
aignatov-bio bd1f65c811
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button
Add delete all steps button [SCI-6921]
2022-06-27 11:13:06 +02:00
Anton 1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Oleksii Kriuchykhin 589a7d3219 Add team reference to user assignments model [SCI-6915] 2022-06-24 10:44:28 +02:00
Anton a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
ajugo a260217cec
Fix report logo inserting [SCI-6914] (#4167) 2022-06-21 14:27:51 +02:00
aignatov-bio f94f0d2a1e
Add fontawesome incons to simple sign in [SCI-6791] (#4166)
Co-authored-by: Anton <anton@scinote.net>
2022-06-21 13:07:33 +02:00
Anton 8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
ajugo a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164)
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
2022-06-21 10:49:03 +02:00
ajugo c39f0a4e4d
Fix missing bell reminder [SCI-6911] (#4163) 2022-06-17 10:01:36 +02:00
Alex Kriuchykhin 49f05f3df9
Merge pull request #4162 from okriuchykhin/ok_SCI_6907
Fix repository export with enabled stock management [SCI-6907]
2022-06-13 10:14:53 +02:00
Oleksii Kriuchykhin 10f7460648 Fix repository export with enabled stock management [SCI-6907] 2022-06-10 15:46:22 +02:00
Alex Kriuchykhin 6148c6accf
Merge pull request #4161 from okriuchykhin/ok_SCI_6907
Fix repository export in export all [SCI-6907]
2022-06-10 11:13:14 +02:00
Oleksii Kriuchykhin 9df833111d Fix repository export in export all [SCI-6907] 2022-06-10 11:04:44 +02:00
Alex Kriuchykhin ef5d6e634b
Merge pull request #4156 from okriuchykhin/ok_SCI_6879
Fix switching between views on experiment canvas [SCI-6879]
2022-06-10 10:42:15 +02:00
artoscinote 934023e9d8
Update print template to fit with new steps [SCI-6871] (#4153) 2022-06-10 10:41:57 +02:00
Alex Kriuchykhin a57881fac4
Merge pull request #4155 from okriuchykhin/ok_SCI_6805_v2
Improve inventory stock saving with comment [SCI-6805]
2022-06-10 10:41:56 +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
Alex Kriuchykhin ded673ebf3
Merge pull request #4151 from okriuchykhin/ok_SCI_6886
Improve Inventory table loading time [SCI-6886]
2022-06-09 15:59:41 +02:00
Anton 66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
Oleksii Kriuchykhin 31ae9ffbda Fix switching between views on experiment canvas [SCI-6879] 2022-06-09 14:13:29 +02:00
Oleksii Kriuchykhin f82c2af244 Improve inventory stock saving with comment [SCI-6805] 2022-06-09 13:18:00 +02:00
aignatov-bio 7446e4be9b
Merge pull request #4150 from aignatov-bio/ai-sci-5257-close-all-modals-to-esc
Fix element closing on select [SCI-5257]
2022-06-09 12:44:59 +02:00
Anton f84a972f6a Fix show password for invitation/password reset screens [SCI-6791] 2022-06-09 11:40:22 +02:00
artoscinote e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
Anton fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00
ajugo 5d198924af
DOCX: Render image for step table [SCI-6885] (#4144) 2022-06-08 13:37:03 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Oleksii Kriuchykhin 07716e56a5 Improve Inventory table loading time [SCI-6886] 2022-06-08 13:23:39 +02:00
Anton 4ab4f4c6ed Fix element closing on select [SCI-5257] 2022-06-07 15:14:00 +02:00
Anton 46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton 656d036b2a Fix markup [SCI-6869] 2022-06-07 10:02:10 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
aignatov-bio a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal
Remove protocol creation modal [SCI-6868]
2022-06-05 22:41:57 +02:00
aignatov-bio d7926654ee
Merge pull request #4139 from aignatov-bio/ai-sci-6867-add-view-mode-for-protocol-and-step
Add view mode to protocol and step [SCI-6867]
2022-06-03 15:27:15 +02:00
Anton 32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
ajugo 13798374ed
Add consume column to assigned item export [SCI-6841] (#4115)
* Add consume column to assigned item export [SCI-6841]

* Fix hound [SCI-6841]
2022-06-03 10:10:00 +02:00
ajugo 9d4c97f191
Add task assignment API [SCI-6846] (#4123)
* Add user assignment to task API [SCI-6846]

* Add test for task assignments [SCI-6846]
2022-06-03 10:09:42 +02:00
Martin Artnik 1df4433074 Fix file activity logging in steps controller 2022-06-02 13:44:03 +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 02c813bf06 Fix text serializer and file activity logging 2022-06-02 11:32:31 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report
Update PDF report layout [SCI-6856]
2022-06-02 11:18:16 +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
aignatov-bio c5f3b4affb
Merge pull request #4133 from aignatov-bio/ai-sci-6878-fix-docx-preview-after-replace-file
Fix Docx preview after replace file [SCI-6878]
2022-06-02 11:07:40 +02:00
aignatov-bio cd7ca54610
Merge pull request #4135 from aignatov-bio/ai-sci-6865-add-step-text-option-to-report-wizard
Add step text option to report wizard [SCI-6865]
2022-06-02 11:06:48 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton 08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
aignatov-bio 3645200700
Merge pull request #4127 from aignatov-bio/ai-sci-6855-update-docx-report
Update step structure in report [SCI-6855]
2022-06-01 15:42:59 +02:00
Oleksii Kriuchykhin c5c3afa906 Update team users table with new user assignments [SCI-6842] 2022-06-01 15:06:19 +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
Anton cf36ad0fb4 Fix Docx preview after replace file [SCI-6878] 2022-06-01 12:16:19 +02:00
Alex Kriuchykhin d5c80b8ab0
Merge pull request #4101 from okriuchykhin/ok_SCI_6805
Improve stock consumption recording [SCI-6805]
2022-06-01 12:01:33 +02:00
artoscinote 95a2cc5298
Fix counts for archived tasks [SCI-6881] (#4132) 2022-06-01 11:43:15 +02:00
Anton b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
artoscinote 3c63d9a3eb
CSS fix, routes fix [SCI-6844] (#4106) 2022-05-31 09:05:38 +02:00
aignatov-bio 36ffbb0eab
Merge pull request #4125 from aignatov-bio/ai-sci-6854-update-pdf-report
Update PDF report with new step structure [SCI-6854]
2022-05-30 13:46:32 +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 a2f7f38e31 Update step structure in report [SCI-6855] 2022-05-30 11:33:56 +02:00
Anton 65ab42a938 Update PDF report with new step structure [SCI-6854] 2022-05-27 13:26:40 +02:00
Martin Artnik b7e78f567c Add missing base controller 2022-05-27 12:22:44 +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
ajugo e3c337aa3d
Renaming settings section and remove caching for Settings class [SCI-5625] (#4100)
* Renaming settings section and remove caching for Settings class [SCI-5625]

* Code fix for setting model [SCI-5625]

* Clean code [SCI-5625]
2022-05-26 13:27:18 +02:00
ajugo 5ceab30aa7
Add tooltip to task names [SCI-6607] (#4109) 2022-05-26 13:21:50 +02:00
ajugo 054ce72d25
Add handle for going over storage limit for inventories [SCI-6604] (#4120) 2022-05-26 13:19:38 +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 adc87b85f1
Merge pull request #4077 from aignatov-bio/ai-sci-6791-add-show-password-button
Add show icon for password [SCI-6791]
2022-05-26 12:46:00 +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 047c1620de
Fix remove tag on backspace [SCI-6542] (#4108) 2022-05-25 10:46:42 +02:00
ajugo 0fa2e5f30b
Remove icons from task tabs [SCI-6621] (#4105) 2022-05-25 10:45:08 +02:00
ajugo b03ce665da
Add missing classes for shrinking save button [SCI-6839] (#4102)
* Add missing classes for shrinking save button [SCI-6839]

* Change type of button for save filter [SCI-6839]
2022-05-25 10:44:27 +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
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
ajugo a23eea7523
Hide stock column at importing items after stock is disabled [SCI-6801] (#4093)
* Add stock column check at importing inventory items [SCI-6801]

* Fix hound message [SCI-6801]
2022-05-24 11:49:36 +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 c120a357cd Add permissions for Report model [SCI-6834] 2022-05-24 10:59:21 +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
Alex Kriuchykhin 679b29b32d
Merge pull request #4099 from okriuchykhin/ok_SCI_6820
Add migration for user team roles, including protocols and inventories [SCI-6820]
2022-05-24 10:33:35 +02:00
Oleksii Kriuchykhin 39cfcd5522 Add migration for user team roles, including protocols and inventories [SCI-6820] 2022-05-23 16:28:53 +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
ajugo 90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012)
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
2022-05-19 09:08:05 +02:00
Oleksii Kriuchykhin cac33bed25 Update user invitations with new user roles [SCI-6823] 2022-05-19 09:04:25 +02:00
Anton 9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Oleksii Kriuchykhin 1b63da13b4 Improve stock consumption recording [SCI-6805] 2022-05-18 17:02:12 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Oleksii Kriuchykhin 03ec4cb319 Setup user assignments relations for team, inventory and protocol [SCI-6818] 2022-05-17 14:32:14 +02:00
ajugo e8d7fa50b8
Enable smart annotation notifcation at consumption and some rewording [SCI-6802] (#4094) 2022-05-17 11:41:53 +02:00
Anton 9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
ajugo ee448a9997
Micro-interactions for reminder flyout correction [SCI-6804] (#4096) 2022-05-16 11:16:07 +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
ajugo 2097fb1df4
CSS fix overlapping number in task assigned items [SCI-6794] (#4092) 2022-05-13 11:16:07 +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 24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +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
Alex Kriuchykhin ab665e5f43
Merge pull request #4086 from okriuchykhin/ok_SCI_6824
Fix display of repository snapshot with stock consumption [SCI-6824]
2022-05-10 22:26:24 +02:00
Oleksii Kriuchykhin 1e9dd95716 Fix duplicated counters on task card [SCI-6825] 2022-05-10 22:23:42 +02:00
Oleksii Kriuchykhin dfc68b997c Fix display of repository snapshot with stock consumption [SCI-6824] 2022-05-10 22:21:48 +02:00
Alex Kriuchykhin b48d0710a4
Merge pull request #4084 from okriuchykhin/ok_SCI_6822
Fix archived tasks view [SCI-6822]
2022-05-10 15:42:03 +02:00
Oleksii Kriuchykhin 6fb44eb78e Fix archived tasks view [SCI-6822] 2022-05-10 15:39:59 +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
Alex Kriuchykhin b04c8ab29c
Merge pull request #4082 from okriuchykhin/ok_SCI_6817
Fix task dropdown actions [SCI-6817]
2022-05-10 13:17:47 +02:00
Oleksii Kriuchykhin a8c56891d4 Fix task dropdown actions [SCI-6817] 2022-05-10 11:27:46 +02:00
Oleksii Kriuchykhin 823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
aignatov-bio 6cbcac3a22
Merge pull request #4080 from aignatov-bio/ai-sci-6807-fix-stock-consumption-rounding
Fix stock consumption rounding [SCI-6807]
2022-05-09 11:55:17 +02:00
Anton 2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Alex Kriuchykhin c4b524af4b
Merge pull request #4079 from okriuchykhin/ok_SCI_6797
Improve loading time of canvas view/edit [SCI-6797]
2022-05-09 11:46:04 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
artoscinote 98ac1c126f
Stock editing and reminder fixes [SCI-6803] (#4078)
* Fix stock editing after adding new value [SCI-6803]

* Don't load reminders for snapshots [SCI-6803]
2022-05-09 11:20:38 +02:00
Alex Kriuchykhin 297c58c0cd
Merge pull request #4075 from okriuchykhin/ok_SCI_6800
Allow deletion of stock columns when stock management is disabled [SCI-6800]
2022-05-09 10:26:44 +02:00
Alex Kriuchykhin 87e3a71709
Merge pull request #4071 from okriuchykhin/ok_SCI_6155
Improve input field for adding new team [SCI-6155]
2022-05-09 10:26:15 +02:00
Anton 3856fd9cf1 Add show icon for password [SCI-6791] 2022-05-06 16:14:21 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
Oleksii Kriuchykhin 2ffb4acb2f Allow deleteion of stock columns when stock management is disabled [SCI-6800] 2022-05-05 15:44:21 +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
Oleksii Kriuchykhin 3d26da9e5e Improve input field for adding new team [SCI-6155] 2022-05-04 14:30:26 +02:00
Alex Kriuchykhin 685032cafb
Fix saving of new date time columns with reminders [SCI-6774] (#4068) 2022-05-04 11:50:57 +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
ajugo 2bda271615
Open repository on print view [SCI-6566] (#4055) 2022-05-03 09:30:33 +02:00
artoscinote ac45edb14c
Added validations for date(time) column reminder [SCI-6775] (#4063) 2022-04-28 15:30:20 +02:00
aignatov-bio 0ae5006a10
Merge pull request #4062 from aignatov-bio/ai-sci-6767-repository-css-fixes
Small CSS fixes for repository [SCI-6767]
2022-04-28 14:36:46 +02:00
Anton 98efcc04b5 Small CSS fixes for repository [SCI-6767] 2022-04-28 14:32:34 +02:00
artoscinote 2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
Anton 36ae58872f Show last page message only after second page [SCI-6761] 2022-04-28 14:11:11 +02:00
Anton 189f4335ea Add main layout for step [SCI-6755] 2022-04-28 11:38:33 +02:00
Alex Kriuchykhin 892b5e2348
Merge pull request #4056 from okriuchykhin/ok_SCI_6769
Fix blank stock consumption representation in reports [SCI-6769]
2022-04-28 11:18:12 +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
Oleksii Kriuchykhin b6501fcf36 Fix blank stock consumption representation in reports [SCI-6769] 2022-04-25 17:10:44 +02:00
Alex Kriuchykhin 29bf85de44
Merge pull request #4053 from okriuchykhin/ok_SCI_6776
Fix duplicated inventories on tasks for export all [SCI-6776]
2022-04-25 15:56:01 +02:00
artoscinote da8250dba8
Stock / stock consumption display fixes [SCI-6771] (#4054) 2022-04-25 15:23:12 +02:00
Oleksii Kriuchykhin 9f5ebee4e2 Fix duplicated inventories on tasks for export all [SCI-6776] 2022-04-25 13:45:58 +02:00
Alex Kriuchykhin 5d0fb932e7
Merge pull request #4046 from okriuchykhin/ok_SCI_6722
Add results counter to second navigation [SCI-6722]
2022-04-25 13:16:18 +02:00
Alex Kriuchykhin 49bc361dee
Fix formatting of stock consumption on tasks [SCI-6737] (#4050) 2022-04-25 13:08:33 +02:00
aignatov-bio 3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality
Add step creation/deletion functionality [SCI-6754]
2022-04-25 12:46:33 +02:00
aignatov-bio 957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold
Add negative validation for threshold [SCI-6743]
2022-04-25 12:46:20 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
aignatov-bio 95060cecf9
Merge pull request #4052 from aignatov-bio/ai-sci-6770-add-bell-icon-for-negative-stock
Add bell icon for negative stock [SCI-6770]
2022-04-25 12:31:40 +02:00
Anton c9d114e71e Add bell icon for negative stock [SCI-6770] 2022-04-25 12:29:10 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
artoscinote d863618846
Enable team normal user to edit repository files [SCI-6765] (#4049) 2022-04-25 12:18:01 +02:00
Oleksii Kriuchykhin b148bd2057 Add results counter to secnd navigation [SCI-6722] 2022-04-22 12:24:14 +02:00
ajugo 2b2888e6f7
Allow tag creation on task level if you have permission [SCI-6573] (#4031) 2022-04-22 11:50:32 +02:00
aignatov-bio 4d429b28a8
Merge branch 'develop' into ai-sci-6743-add-negative-validation-for-stock-modal-and-consumption-modal 2022-04-22 11:15:04 +02:00
aignatov-bio bc80122df0
Merge pull request #4042 from aignatov-bio/ai-sci-6741-stock-consumption-modal-highlight-negative-with-red
Highlight negative value in consumption modal [SCI-6741]
2022-04-22 11:13:34 +02:00
artoscinote f9357611a0
Update stock value without reloading the table [SCI-6745] (#4041) 2022-04-22 11:13:00 +02:00
Martin Artnik 4bd5df4e0e Fix snapshot creation with stock consumption [SCI-6762] 2022-04-22 10:49:42 +02:00
Alex Kriuchykhin e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712
Add models for step orderable elements, migrate step descriptions [SCI-6712]
2022-04-22 09:33:41 +02:00
artoscinote 6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
Anton df2ff32f2e Update general layout for task [SCI-6713] 2022-04-21 14:43:10 +02:00
Anton fc3d47d220 Highlight negative value in consumption modal [SCI-6741] 2022-04-21 12:11:38 +02:00
Anton f8f5791c62 Add negative validation for stock [SCI-6743] 2022-04-20 15:11:05 +02:00
Anton e28095f781 Fix default stock column default units selection [SCI-6744] 2022-04-20 14:52:34 +02:00
Anton fd736f99c1 Add comment to repository stock activities [SCI-6746] 2022-04-20 11:29:16 +02:00
aignatov-bio 918a11a0b0
Fix decimal render function [SCI-6742] (#4037)
Co-authored-by: Anton <anton@scinote.net>
2022-04-20 11:07:37 +02:00
artoscinote 4daf01feee
Fix snapshot consumption display [SCI-6734] (#4035) 2022-04-20 11:07:26 +02:00
artoscinote e3cbf5903a
Move list-type column includes to param, unify naming [SCI-6738] (#4036)
* Add default includes for inventory columns with lists [SCI-6738]

* Move list-type column includes to param, unify naming [SCI-6738]
2022-04-20 11:07:15 +02:00
ajugo 54474b2bba
API GET repository stock column output fix [SCI-6550] (#4030)
* Add include stock unit items to Stock column get [SCI-6550]

* Fix stock column test [SCI-6550]

* Fix hound [SCI-6550]
2022-04-19 16:05:17 +02:00
aignatov-bio 1a2a58ff5f
Merge pull request #4033 from aignatov-bio/ai-sci-6740-fix-stock-modal-add-remove-value
Fix stock modal add/remove value preset value [SCI-6740]
2022-04-19 13:46:24 +02:00
Anton 1be5ba9dd0 Fix stock modal add/remove value preset value [SCI-6740] 2022-04-19 13:44:53 +02:00
Alex Kriuchykhin 42ae32f81a
Merge pull request #4025 from okriuchykhin/ok_SCI_6419
Improve stock ledger records creation [SCI-6419]
2022-04-19 13:32:58 +02:00
Oleksii Kriuchykhin 5a17ad6be9 Add models for step orderable elements, migrate step descriptions [SCI-6712] 2022-04-19 13:26:13 +02:00
Oleksii Kriuchykhin e50d52e8ef Improve stock ledger records creation [SCI-6419] 2022-04-18 16:24:27 +02:00
artoscinote 42605e1a8a
Fix inviting users to team [SCI-6725] (#4026) 2022-04-15 15:31:08 +02:00
aignatov-bio 31f4b35186
Merge branch 'develop' into ai-sci-6731-fix-edit-title-for-stock-consumption-modal 2022-04-15 14:43:51 +02:00
aignatov-bio 85a54cbcdf
Merge pull request #4029 from aignatov-bio/ai-sci-6729-highlight-negative-stock-in-modal-with-red
Highlight negative stock in modal with red [SCI-6729]
2022-04-15 14:43:07 +02:00
Anton ed49e93a6a Highlight negative stock in modal with red [SCI-6729] 2022-04-15 12:08:29 +02:00
Anton 2481ba566a Add edit title for stock consumption modal [SCI-6731] 2022-04-15 11:47:49 +02:00
Anton 441f6b977d Fix decimals in stock consumption modal [SCI-6732] 2022-04-15 11:40:47 +02:00
artoscinote 6b309871a3
Hide reminders settings and red dots if stock is disabled [SCI-6673] (#4024) 2022-04-15 10:55:14 +02:00
ajugo 02677aaaba
Focus authenticator code field [SCI-6716] (#4022) 2022-04-14 15:17:56 +02:00
aignatov-bio 4f2fd79f67
Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports
Fix stock consumption in reports [SCI-6735]
2022-04-14 14:51:38 +02:00
Anton c73dc5ea2f Fix markup 2022-04-14 14:47:51 +02:00
Anton 84f91634d3 Fix stock consumption in reports [SCI-6735] 2022-04-14 14:46:09 +02:00
artoscinote 30ee6cd40c
Refactor and fix display of stock warnings and stock consumption [SCI-6734] (#4021)
* Refactor and fix how stock consumption is displayed [SCI-6734]

* Refactor and fix display of stock warnings [SCI-6734]
2022-04-14 14:27:31 +02:00
aignatov-bio 4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination
Features/projects experiments pagination
2022-04-14 10:45:27 +02:00
artoscinote f3ce338600
Fix error modal opening on successful snapshot [SCI-6726] (#4019) 2022-04-13 14:22:34 +02:00
artoscinote dd0661a462
Change the way setting stock works [SCI-6730] (#4018) 2022-04-13 14:22:22 +02:00
aignatov-bio ab40275243
Fix red dot for date reminders [SCI-6696] (#4016)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:33 +02:00
aignatov-bio 5ac9f51220
Add aibility to delete stock column [SCI-6723] (#4017)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 14:20:23 +02:00
aignatov-bio 36639727a1
Stock small ux fixes [SCI-6714] (#4015)
Co-authored-by: Anton <anton@scinote.net>
2022-04-13 12:15:30 +02:00
artoscinote 04ab92b8e2
Fix removing stock reminder threshold [SCI-6724] (#4010) 2022-04-13 11:35:45 +02:00
artoscinote ee26204af2
Move cursor to end of value when focusing consumption amount [SCI-6727] (#4013) 2022-04-13 11:35:22 +02:00
Alex Kriuchykhin 94083cf270
Revert "tmp (#3935)" (#4014)
This reverts commit 043086d55f.
2022-04-13 11:11:07 +02:00
Alex Kriuchykhin 043086d55f
tmp (#3935) 2022-04-13 11:09:48 +02:00
Alex Kriuchykhin f7f03b19c0
Add locking and unique index to repository row assigning [SCI-6591] (#3921) 2022-04-13 10:54:23 +02:00
ajugo 1338d4524f
Align items in assigned item section [SCI-6707] (#4007) 2022-04-13 10:12:01 +02:00
Alex Kriuchykhin 1385c6964c
Fix sorting by time and time range columns [SCI-6683] (#4011) 2022-04-12 15:56:20 +02:00
Anton d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
artoscinote 83ac50c57d
Add repository snapshot error modal [SCI-6613] (#3993) 2022-04-12 13:29:11 +02:00
artoscinote 2d811cdc4c
Add snapshot error message below task status [SCI-6614] (#4009) 2022-04-12 13:28:26 +02:00
aignatov-bio 433d69c10a
Remove date red dots for snapshots [SCI-6715] (#4004)
Co-authored-by: Anton <anton@scinote.net>
2022-04-12 13:14:11 +02:00
ajugo a9fc4c3c44
Adding/changing stock consumption [SCI-6708] (#4005)
* Adding/changing stock consumption [SCI-6708]

* Fix hound [SCI-6708]
2022-04-11 10:47:24 +02:00
ajugo 986e817fdc
Removed autofocus clear on open reminder flyout [SCI-6690] (#4003)
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
2022-04-08 18:08:55 +02:00
ajugo 0a5e93a018
API: add endpoint for creating stock column [SCI-6550] (#3956)
* Add test for repositoty stock column api [SCI-6550]

* Create and update stock column [SCI-6550]

* Change stock unit [SCI-6550]

* Fix hound [SCI-6550]

* Fix on delete [SCI-6550]

* Fix houd [SCI-6550]
2022-04-08 14:09:00 +02:00
artoscinote d696239649
Fix collapsing of assigned items tables [SCI-6705] (#4000) 2022-04-08 13:55:53 +02:00
ajugo 0ca9ae2ab9
API: add endpoint for updating of stock [SCI-6549] (#3955)
* Add test for Stock repository cell [SCI-6549]

* Create and update stock inventory cell [SCI-6549]

* Fix hound errors [SCI-6549]

* Fix ledger recording [SCI-6549]

* Fix api endpoint [SCI-6549]

* Fix hound [SCI-6549]
2022-04-08 11:30:44 +02:00
aignatov-bio 29cbf99498
Fix css for stotck modal [SCI-6698] (#3999)
Co-authored-by: Anton <anton@scinote.net>
2022-04-08 11:11:24 +02:00
aignatov-bio 3a4cab9d0a
Stock modal UX fixes [SCI-6714] (#3998)
Co-authored-by: Anton <anton@scinote.net>
2022-04-08 11:09:37 +02:00
Alex Kriuchykhin f8a598b408
Improve loading of the dashboard [SCI-6618] (#4001) 2022-04-08 11:09:13 +02:00
Alex Kriuchykhin 09d0bb4a32
Fix sorting by date time columns in inventories [SCI-6683] (#4002) 2022-04-08 11:08:51 +02:00
ajugo 98144b225c
Fix color on consumption link [SCI-6686] (#3992) 2022-04-07 13:03:18 +02:00
artoscinote 5effe34221
Add reminder preset to date(time) reminders [SCI-6693] (#3996) 2022-04-07 12:27:21 +02:00
Anton d96103d714 Add pagination to projects list [SCI-6655] 2022-04-07 12:22:52 +02:00
artoscinote 352ec031ce
Fix repository full view tables without stock management [SCI-6703] (#3994) 2022-04-06 15:36:26 +02:00
artoscinote 5d8ecb0c4a
Override error styling in stock column management [SCI-6674] (#3995) 2022-04-06 15:36:11 +02:00
artoscinote 1cb7704c86
Turn off autocomplete for stock amount/reminder [SCI-6694] (#3988) 2022-04-05 15:46:04 +02:00
artoscinote 73757c4820
Added styling for failed snapshots in sidebar [SCI-6636] (#3990)
* Added styling for failed snapshots in sidebar [SCI-6636]

* Simplify markup for failed icon [SCI-6636]
2022-04-05 15:45:49 +02:00
aignatov-bio a85b78291d
Fix red dot for dates in repository [SCI-6696] (#3991)
Co-authored-by: Anton <anton@scinote.net>
2022-04-05 14:40:09 +02:00
artoscinote 785ff4152e
Stock column management UX/UI fixes [SCI-6674] (#3979) 2022-04-05 10:30:06 +02:00
aignatov-bio 4df8faec7e
Fix css stock modal [SCI-6675] (#3989)
Co-authored-by: Anton <anton@scinote.net>
2022-04-05 10:25:47 +02:00
Alex Kriuchykhin 77daa16b78
Fix inventory sorting with date time reminders [SCI-6683] (#3980) 2022-04-04 12:10:40 +02:00
aignatov-bio be9a576842
Fix reminder dropdown on task screen [SCI-6678] (#3987)
Co-authored-by: Anton <anton@scinote.net>
2022-04-04 12:10:14 +02:00
artoscinote 8d25f456d1
Add basic validation to reminder value to prevent integer overflow errors [SCI-6693] (#3986) 2022-04-04 12:09:41 +02:00
aignatov-bio 2a2a5b2725
Repository toolbar CSS fixes [SCI-6676] (#3984)
Co-authored-by: Anton <anton@scinote.net>
2022-04-04 12:02:59 +02:00
ajugo bb44152d54
Fix assigning and consuming items [SCI-6686] (#3985) 2022-04-04 11:07:46 +02:00
artoscinote 401a32edd9
Implement failed snapshot pop-up on task screen [SCI-6612] (#3950)
* Implement failed snapshot pop-up on task screen [SCI-6612]

* Copy change [SCI-6612]

* Proper handling of snapshot transition error [SCI-6612]

* Move modal auto open logic to JS file [SCI-6612]

* Remove unnecessary .html_safe [SCI-6612]
2022-04-04 11:04:03 +02:00
artoscinote a629e1ae71
Disable stock managememnt for all tables in my module context [SCI-6692] (#3983) 2022-04-04 10:13:49 +02:00
aignatov-bio b6e34266f9
Update repository card view for stock [SCI-6685] (#3982)
Co-authored-by: Anton <anton@scinote.net>
2022-04-01 13:59:44 +02:00
artoscinote da6188df94
Don't load reminders if the stock feature is disabled [SCI-6673] (#3981)
* Don't load reminders if the stock feature is disabled [SCI-6673]

* Don't load reminders if the stock feature is disabled [SCI-6673]

* Unify stock management enabled check [6673]
2022-04-01 13:54:08 +02:00
Alex Kriuchykhin 9e07766314
Fix saving of inventory date time reminders saving [SCI-6672] (#3976) 2022-03-31 14:59:29 +02:00
aignatov-bio c480f28a09
Fix red dot for datetime columns [SCI-6684] (#3977)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:57:58 +02:00
artoscinote b516cf66ef
Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) 2022-03-31 14:56:23 +02:00
aignatov-bio ede5e958db
Fix filters loading for stock filter [SCI-6687] (#3975)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:40:17 +02:00
artoscinote addd4a9522
Make stock column work properly with different orders [SCI-6677] (#3974) 2022-03-31 14:06:37 +02:00
aignatov-bio a32dd54a6e
Toolbar fixes [SCI-6670] (#3973)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:04:00 +02:00
artoscinote 229a27750f
Implement stock consumption via the API [SCI-6642] (#3964)
* Implement stock consumption via the API [SCI-6642]

* Remove unnecessary attribute from InventoryItemSerializer [SCI-6642]

* Amend permission check, add nested transaction support to consume_stock method [SCI-6642]
2022-03-30 14:33:26 +02:00
Alex Kriuchykhin ac7a6edab5
Always use Tika text extractor in server mode [SCI-6658] (#3957) 2022-03-30 14:08:36 +02:00
aignatov-bio ca53c3058a
Stock modal bugs [SCI-6667] (#3970)
Co-authored-by: Anton <anton@scinote.net>
2022-03-30 14:03:07 +02:00
Martin Artnik 45a325e824 Merge branch 'develop' into features/stock-management 2022-03-30 11:10:40 +02:00
artoscinote 36fbfcab2f
Implement hide all repository reminders button [SCI-6505] (#3940) 2022-03-30 10:54:55 +02:00
Alex Kriuchykhin ae97bd64f7
Fix assigned items fullview modal [SCI-6664] (#3968) 2022-03-30 10:14:04 +02:00
Alex Kriuchykhin fad04fa520
Show archive icon only on archived projects in the header [SCI-6617] (#3965) 2022-03-30 10:13:43 +02:00
Alex Kriuchykhin 4a4b8ff6b0
Fix caching of an experiment card dropdown [SCI-6606] (#3963) 2022-03-30 10:13:16 +02:00
aignatov-bio 1c50081de5
Add stock management toggling [SCI-6653] (#3967)
Co-authored-by: Anton <anton@scinote.net>
2022-03-29 12:33:28 +02:00
ajugo f75265974e
Print protocol smart annotation and table improvements [SCI-6566] (#3925)
* Improve table printing in the print menu [SCI-6566]

* Open smart annotation in new tab for print view [SCI-6566]

* Unify naming of same parameter [SCI-6566]

* Fix typo [SCI-6566]

* Fix hound errors [SCI-6566]
2022-03-29 12:09:33 +02:00
aignatov-bio 103e20ee9a
Update front end validation for columns managment [SCI-6657] (#3962)
Co-authored-by: Anton <anton@scinote.net>
2022-03-28 21:31:49 +02:00
artoscinote 725549c8ca
Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953)
* Add alias to cell sort query, to prevent join conflicts [SCI-6649]

* Added value_type to join condition to make use of DB index [SCI-6649]
2022-03-28 16:48:05 +02:00
Alex Kriuchykhin ea5ee65618
Fix large previews for csv files [SCI-6619] (#3961) 2022-03-28 16:32:18 +02:00
aignatov-bio 673f8c1a2a
Fix multiple stock bugs [SCI-6651] (#3959)
Co-authored-by: Anton <anton@scinote.net>
2022-03-28 12:43:09 +02:00
Alex Kriuchykhin 78a8b5d952
Add ordering to global search results [SCI-6639] (#3960) 2022-03-28 09:56:39 +02:00
Alex Kriuchykhin 5d111d3350
Improve error reporting in task status transition [SCI-6611] (#3952) 2022-03-25 15:38:15 +01:00
aignatov-bio 5e92429212
Add micro-interactions to reminders flyout [SCI-6627] (#3951)
Co-authored-by: Anton <anton@scinote.net>
2022-03-24 10:16:47 +01:00
aignatov-bio 116dfa9247
Fix assign view for task repository [SCI-6648] (#3954)
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 15:33:19 +01:00
aignatov-bio 004aeda601
Add stock filters [SCI-6547] (#3938)
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 10:05:07 +01:00
artoscinote 97c15eaac0
Implement clearing hidden repository reminders [SCI-6507] (#3936) 2022-03-23 09:51:42 +01:00
ajugo 57daddc2e6
Hide options to add New Tags for users without permissions on Task level [SCI-6573] (#3945) 2022-03-22 15:15:25 +01:00
aignatov-bio c6c073c750
Add micro interactions for stock modal [SCI-6625] (#3947)
Co-authored-by: Anton <anton@scinote.net>
2022-03-22 14:35:27 +01:00
ajugo 7cba738a9b
Date remidner flyout [SCI-6503] (#3937)
* Implement date reminder flyout [SCI-6503]

* Show only days left for date reminder [SCI-6503]

* Pluralize day in reminders [SCI-6503]

* Create partials for different reminders [SCI-6503]

* Unify css for reminder [SCI-6503]
2022-03-22 13:33:58 +01:00
aignatov-bio e6ddefe63b
Add microtransactions to stock consumptions [SCI-6626] (#3948)
Co-authored-by: Anton <anton@scinote.net>
2022-03-22 13:33:12 +01:00
artoscinote 297cd02da7
Handle locked stock consumption state [SCI-6608] (#3942) 2022-03-18 15:02:15 +01:00
artoscinote 3527c409af
Hide reminders for archived repositories [SCI-6609] (#3941)
* Hide reminders for archived repositories [SCI-6609]

* Always pass repository in datatable helper [SCI-6609]
2022-03-18 14:46:24 +01:00
aignatov-bio 0cfedb2155
Add datetime reminders to columns modal [SCI-6556] (#3934)
Co-authored-by: Anton <anton@scinote.net>
2022-03-18 14:40:09 +01:00
aignatov-bio fecaafecf9
Refactor repository toolbar [SCI-6545] (#3943)
Co-authored-by: Anton <anton@scinote.net>
2022-03-18 14:10:34 +01:00
ajugo be989245ed
Icon bell reminder for an assigned item on the task [SCI-6506] (#3929)
* Add bell icon on assigned task [SCI-6506]

* Add flyout and improve quering [SCI-6506]
2022-03-17 11:39:17 +01:00
ajugo a89244c537
Displaying low stock warning [SCI-6497] (#3912)
* Low stock warning [SCI-6497

* Fix some bugs [SCI-6497]

* Fix to long line [SCI-6497]

* Clean not needed information in renderes [SCI-6497]
2022-03-16 15:06:52 +01:00
ajugo d1610fba53
Low stock flyout reminders [SCI-6502] (#3932)
* Display low stock flyout reminder [SCI-6502]

* Display low stock flyout reminder [SCI-6502]

* Adapt showing stock reminders for every bell icon click [SCI-6502]

* Correct hound error [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix event registration for fetching reminder data [SCI-6502]

* Fix hound [SCI-6502]

* Remove not needed line [SCI-6502]

* Add reminder template [SCI-6502]

* Add clearing messages [SCI-6502]
2022-03-15 10:24:35 +01:00
Anton 8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
artoscinote 35dfa15e57
Implement hidden repository cell reminders [SCI-6504] (#3933) 2022-03-11 12:38:45 +01:00
Alex Kriuchykhin 378fbb6b76
Apply user's time zone in advanced filters for time data type [SCI-6585] (#3930) 2022-03-10 13:49:09 +01:00
ajugo 959b86b40c
Task inventory activity for assigned item consumption [SCI-6453] (#3830)
* Add task inventory activity [SCI-6453]
2022-03-09 18:43:38 +01:00
artoscinote 06430c9340
Fix moving experiment [SCI-6602] (#3927) 2022-03-09 15:30:30 +01:00
aignatov-bio bf058dea03
Add flyout for repository reminders [SCI-6501] (#3926)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 15:09:49 +01:00
aignatov-bio 10743921d4
Add reminders to stock modal [SCI-6557] (#3917)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:19:15 +01:00
aignatov-bio d89ea7d77f
Add red dot for date/datetime reminder [SCI-6499] (#3924)
Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:18:34 +01:00
artoscinote d577fcc824
Implement basic logic for Date/DateTime/Stock reminders [SCI-6554] (#3911)
* Implement basic logic for Date/DateTime/Stock reminders [SCI-6554]

* Implement bell icon [SCI-6500]

* Refactor reminder cells scope [SCI-6554]
2022-03-09 14:13:48 +01:00
aignatov-bio 7f7bf0533a
Fix tests [SCI-6486] (#3913)
* Fix tests [SCI-6486]

* Fix rspec tests [SCI-6486]

Co-authored-by: Anton <anton@scinote.net>
2022-03-09 14:12:16 +01:00
artoscinote 20ef08907a
Stock column fixes [SCI-6455] (#3878)
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
2022-03-08 14:52:45 +01:00
Alex Kriuchykhin 96e6cd3c1d
Fix time range advanced filtering [SCI-6585] (#3922) 2022-03-08 10:20:53 +01:00
artoscinote 732977b80d
Fix fetching available repository rows [SCI-6601] (#3920) 2022-03-07 17:12:41 +01:00
artoscinote 8d096df826
Fix reload of edit column index [SCI-6598] (#3918) 2022-03-07 17:11:56 +01:00
artoscinote e948fc20bc
Fix members dropdown CSS, order [SCI-6595] (#3919) 2022-03-07 17:11:35 +01:00
aignatov-bio 881e6403aa
Fix rte table in docx report [SCI-6449] (#3916)
Co-authored-by: Anton <anton@scinote.net>
2022-03-03 14:12:06 +01:00
artoscinote f9a8358d72
Fix archived column hiding issue in snapshots, fix typos [SCI-6589] (#3915) 2022-03-03 13:52:56 +01:00
artoscinote ea6873b465
Implement low stock threshold column [SCI-6555] (#3907) 2022-03-03 11:13:17 +01:00
Alex Kriuchykhin 32d005f480
Fix step deletion for API [SCI-6561] (#3914) 2022-03-03 10:00:44 +01:00
artoscinote 87d202f3eb
Fix my_module_activities in AcitivtyService [SCI-6562] (#3908) 2022-03-01 12:28:45 +01:00
aignatov-bio 577f449b95
Fix repository table header [SCI-6559] (#3906)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 14:19:31 +01:00
artoscinote 4e118d095d
Fix dropdown component for group select [SCI-6583] (#3905) 2022-02-28 13:21:17 +01:00
aignatov-bio 99e8f7e3cb
Fix added on this month filter [SCI-6584] (#3904)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:16:29 +01:00
aignatov-bio 155b437d6a
Fix blank state for time filter [SCI-6590] (#3903)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:05:01 +01:00
aignatov-bio d54c7f1927
Fix save button dropdown for archived page [SCI-6581] (#3902)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 10:44:40 +01:00
Alex Kriuchykhin bd47893947
Add inventory archiving to the API [SCI-5584] (#3885) 2022-02-28 10:33:43 +01:00
Alex Kriuchykhin cc96a7e372
Fix advanced filters for numbers [SCI-6577] (#3899) 2022-02-28 10:31:42 +01:00
ajugo 493c7d64eb
Enable result comment button after canceling result edit [SCI-6537] (#3894)
* Enable result comment button after cancelling edit button [SCI-6537]
2022-02-25 22:32:21 +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
Alex Kriuchykhin c0e4b6f1f6
Fix advanced filters for added on field [SCI-6578] (#3895) 2022-02-25 14:30:37 +01:00
artoscinote 69964aae7b
Fix time range value filter [SCI-6580] (#3896) 2022-02-25 14:29:39 +01:00
aignatov-bio 7b4968a7a3
Fix archived on filters fix [SCI-6579] (#3897)
Co-authored-by: Anton <anton@scinote.net>
2022-02-25 14:29:27 +01:00
aignatov-bio 899f2efbd6
Fix blank state for dates range [SCI-6576] (#3893)
Co-authored-by: Anton <anton@scinote.net>
2022-02-24 12:47:32 +01:00
Alex Kriuchykhin fa6aeac1d9
Fix saving of time range values [SCI-6570] (#3892) 2022-02-24 09:43:15 +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
artoscinote c097b321a7
Fix multiple saving bug for repository filters [SCI-6523] (#3890) 2022-02-23 14:30:28 +01:00
aignatov-bio d6c7305dfe
Move range filter logic to separate mixin (#3889)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 13:28:59 +01:00
aignatov-bio cf200a23a7
Fix datetime switch between operators [SCI-6571] (#3888)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 11:40:37 +01:00
aignatov-bio 91ab7d0b40
Update none of operator for assigned tasks [SCI-6572] (#3884)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 10:05:24 +01:00
Alex Kriuchykhin e750295b07
Fix filtering in repository snapshots [SCI-6423] (#3887) 2022-02-23 09:24:38 +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
Alex Kriuchykhin dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote b8b7773a3f
Fix today, this month, this year operators [SCI-6527] (#3845) 2022-02-22 14:14:16 +01:00
artoscinote 463e1a8014
Fix date/time range filtering [SCI-6574] (#3882) 2022-02-22 13:29:50 +01:00
aignatov-bio 5a65b8689b
Fix blank state for between (#3883)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 12:55:40 +01:00
aignatov-bio d9dc27c2b8
Small UX fixes for filters [SCI-6569] (#3881)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 12:07:46 +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 1f45e3f01d
Fix for docx renderer [SCI-6540] (#3879)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 13:26:52 +01:00
Alex Kriuchykhin 6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +01:00
aignatov-bio 4877455e9c
Change date operator order [SCI-6544] (#3876)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:25:12 +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
artoscinote cce6a17e8f
Perserve save filters button on toolbar reload [SCI-6553] (#3874) 2022-02-21 10:09:59 +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
artoscinote c4a75d7543
Fix assignments after my module creation [SCI-6552] (#3871) 2022-02-18 11:25:30 +01:00
aignatov-bio 10821edbba
Update datetime filters operators [SCI-6544] (#3873)
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:16:53 +01:00
artoscinote b9df85869c
View access modal fixes [SCI-6480] (#3870) 2022-02-18 10:19:13 +01:00
Alex Kriuchykhin f9e77991c6
Fix handling of empty values for numeric filter type [SCI-6543] (#3866) 2022-02-17 15:26:24 +01:00
artoscinote 8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +01:00
aignatov-bio 6cee35dfa5
Small ux fixes [SCI-6539][SCI-6516] (#3864)
Co-authored-by: Anton <anton@scinote.net>
2022-02-16 12:56:54 +01:00
artoscinote ff613c410c
Fix date format for repository filters [SCI-6528] (#3863) 2022-02-16 12:02:31 +01:00
artoscinote 39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
artoscinote 5654eddbb0
Fix using multiple file filters [SCI-6533] (#3860) 2022-02-16 11:05:16 +01:00
ajugo 9b6a70cdb0
Improve RTF responsiveness - move button to the right side [SCI-5795] (#3854) 2022-02-16 10:32:01 +01:00
Alex Kriuchykhin 9c4fca1b86
Implement repository snapshots displaying on assigned items full view modal [SCI-6442] (#3862) 2022-02-16 09:40:48 +01:00
Alex Kriuchykhin fe44f6d22f
Fix advanced filters for archived_on column [SCI-6530] (#3859) 2022-02-15 18:02:08 +01:00
Alex Kriuchykhin ad0bd44b51
Allow multiple use of same column in advanced filters [SCI-6538] (#3857) 2022-02-15 18:01:53 +01:00
aignatov-bio f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858)
Co-authored-by: Anton <anton@scinote.net>
2022-02-15 15:03:25 +01:00
Alex Kriuchykhin 039c21d603
Disable management of repository filters for shared repositories with view permissions [SCI-6489] (#3856) 2022-02-15 14:37:42 +01:00
Alex Kriuchykhin 0ce6f43cbf
Fix inventory table custom error messages [SCI-6532] (#3855) 2022-02-15 14:37:26 +01:00
artoscinote fa6f883fc7
Fix ambiguous created_at column in added_on filter [SCI-6535] (#3852) 2022-02-14 15:03:50 +01:00
artoscinote 7c3904f4ac
Add missing icon [SCI-6492] (#3850) 2022-02-14 15:03:24 +01:00
artoscinote 40b2062775
Fix DateTime range filtering [SCI-6528] (#3851) 2022-02-14 13:52:38 +01:00
artoscinote af011a3bb8
Fixed full view assigned items modal stock consumption (#3846) 2022-02-14 10:42:48 +01:00
ajugo ba4e6476b7
Change subject of Repository (#3838) 2022-02-14 10:37:58 +01:00
Alex Kriuchykhin 6cc102cfd1
Fix advanced filters for list and status data types [SCI-6524][SCI-6521] (#3844) 2022-02-11 13:50:42 +01:00
aignatov-bio 97898fef7a
Add error handling for saving filters [SCI-6488] (#3835)
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-02-11 13:32:27 +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
Alex Kriuchykhin 1e0966ac11
Fix advanced filtering for check list items [SCI-6522] (#3841) 2022-02-11 10:48:50 +01:00
Alex Kriuchykhin ed8ba13525
Fix advanced search for file type columns [SCI-6518] (#3839) 2022-02-11 10:47:32 +01:00
Alex Kriuchykhin 7216edd9bf
Fix permission checking for repository filters [SCI-6489] (#3831) 2022-02-11 10:47:18 +01:00
Alex Kriuchykhin 79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
artoscinote a5888227f5
Fix designated users permission check, fix project access modal [SCI-6480] (#3815) 2022-02-11 10:46:00 +01:00
Alex Kriuchykhin b9204e1ce3
Add type specific indices for date time repository values [SCI-6485] (#3825) 2022-02-11 10:45:21 +01:00
aignatov-bio ad5326011f
Fix validation for number field in filters [SCI-6510] (#3836)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:41:25 +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
artoscinote 553bde0bf5
Fix blank definition for user value filters [SCI-6509] (#3834) 2022-02-11 10:14:45 +01:00
artoscinote bac8fbbe58
Disable filter save button on submit [SCI-6523] (#3833) 2022-02-11 10:14:19 +01:00
aignatov-bio 1efe3ddd37
Add stock consumption to pdf and docx [SCI-6460] (#3816)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:09:52 +01:00
artoscinote f3c36a957b
Fix 'Last Week' filter in global activities [SCI-6481] (#3817) 2022-02-11 10:09:43 +01:00
artoscinote 85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +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 8604319c1b
Add front-end validation for comments field [SCI-6464] (#3829)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 10:55:58 +01:00
artoscinote 8d90c8ebb7
Fix filter updates after item deletion [SCI-6490] (#3832) 2022-02-10 09:50:34 +01:00
Alex Kriuchykhin f66b89c7bb
Add permissions checking to assigned items view on tasks [SCI-6435] (#3801) 2022-02-04 14:24:15 +01:00
artoscinote 96289b1188
Display text in smaller device navigation [SCI-5580] (#3821) 2022-02-04 11:37:26 +01:00
Alex Kriuchykhin e6010e3313
Fix repository filters to user relation [SCI-6263] (#3820) 2022-02-04 10:53:19 +01:00
Alex Kriuchykhin cc063a46b7
Fix time zone issues in advanced repository filters [SCI-6467] (#3819) 2022-02-04 10:30:11 +01:00
Alex Kriuchykhin 4627d15fc3
Implement import for repository stock values [SCI-6461] (#3818) 2022-02-04 10:29:48 +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
aignatov-bio 5223ce13f3
Fix assets operator markup error [SCI-6462] (#3822)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 12:32:19 +01:00
Alex Kriuchykhin 2a6b33deec
Fix downloading of BioEddie files in reports [SCI-6037] (#3623) 2022-02-02 10:41:57 +01:00
artoscinote f1e04cc604
Fix appearance of members pagination, copy fix [SCI-6265] (#3792) 2022-02-02 10:41:29 +01:00
artoscinote cdbf1f5fa0
Implement stock management activities [SCI-6452] (#3810)
* Implement stock management activities [SCI-6452]

* PR code fixes [SCI-6452]
2022-02-02 10:33:02 +01:00
aignatov-bio 0d6b2ad4b4
Add searchable list for advanced filters [SCI-6466] (#3808)
Co-authored-by: Anton <anton@scinote.net>
2022-02-01 14:39:04 +01:00
aignatov-bio 8c8c4344d6
Improve RTF responsiveness [SCI-5795] (#3813)
Co-authored-by: Anton <anton@scinote.net>
2022-02-01 14:38:09 +01:00
aignatov-bio 51b515fcee
Fix icons on tinyMCE [SCI-6477] (#3812)
* Fix icons on tinyMCE [SCI-6477]

* mend

* mend

Co-authored-by: Anton <anton@scinote.net>
2022-02-01 14:37:59 +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
Alex Kriuchykhin fd92fed38f
Fix saving of advanced filters for shared repositories [SCI-6478] (#3811) 2022-02-01 09:59:31 +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
Alex Kriuchykhin c1972e4fb2
Fix advanced filtering with multiple filters [SCI-6471] (#3807) 2022-01-31 11:10:39 +01:00
Alex Kriuchykhin fbcb94193a
Fix repository advanced filtering on time column [SCI-6467] (#3805) 2022-01-31 09:41:20 +01:00
aignatov-bio c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] (#3806)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 09:21:08 +01:00
Martin Artnik b22fde2334 Handle stock management in full table views [SCI-6440] 2022-01-28 17:53:56 +01:00
Oleksii Kriuchykhin dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +01:00
aignatov-bio 2c88843924
Task stock consumption modal[SCI-6444][SCI-6445] (#3798)
Add main logic for consumption on task [SCI-6444]

Co-authored-by: Anton <anton@scinote.net>
2022-01-28 11:10:56 +01:00
Oleksii Kriuchykhin 6d877e6bf7 Fix repository users list and filtering by row name [SCI-6457] 2022-01-27 22:50:04 +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
artoscinote 7de6d3d566
Merge pull request #3800 from artoscinote/ma_SCI_6474
Fix loading of saved filters [SCI-6474]
2022-01-27 13:43:35 +01:00
Martin Artnik 5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
Martin Artnik 8a9be0cc3c Fix list of assigned tasks in assigned dropdown [SCI-6456] 2022-01-27 12:59:52 +01:00
Martin Artnik 8c8d26011d Fix bad merge of additionalDataFilter.vue 2022-01-26 11:05:09 +01:00
artoscinote d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters
Features/repository filters
2022-01-26 10:36:30 +01:00
aignatov-bio 371d5f0636
Add current/new amount section to stock [SCI-6416] (#3791)
Co-authored-by: Anton <anton@scinote.net>
2022-01-26 10:28:43 +01:00
Oleksii Kriuchykhin 9f3b77ed15 Finalyze repository filter elements management backend [SCI-6396] 2022-01-26 10:12:46 +01:00
Alex Kriuchykhin e55c9ec1cc
Merge pull request #3785 from okriuchykhin/ok_SCI_6423
Fix filtering for repository snapshots [SCI-6423]
2022-01-25 12:59:46 +01:00
Alex Kriuchykhin 4a86a0ee45
Merge pull request #3771 from aignatov-bio/ai-sci-6325-user-sorting-in-assign-modals
Add A-Z sort for assignment modals [SCI-6325]
2022-01-25 12:59:15 +01:00
Alex Kriuchykhin b3c262bf2a
Merge pull request #3766 from okriuchykhin/ok_SCI_6400
Fix experiment caching issue [SCI-6400]
2022-01-25 12:58:56 +01:00
Alex Kriuchykhin a03e3e350b
Merge pull request #3763 from okriuchykhin/ok_SCI_6263
Fix user invitation with emails surrounded by spaces [SCI-6263]
2022-01-25 12:57:55 +01:00
Alex Kriuchykhin b0c3a33500
Merge pull request #3762 from okriuchykhin/ok_SCI_5584
Add handling of archiving/restoring inventory items to API [SCI-5584]
2022-01-25 12:57:22 +01:00
Alex Kriuchykhin c8ded68b8a
Merge pull request #3759 from okriuchykhin/ok_SCI_6189
Fix handling of Ctrl+S in TinyMCE editor [SCI-6189]
2022-01-25 12:57:10 +01:00
artoscinote 42a537390e
Group public users in experiments and tasks [SCI-6332] (#3769)
* Group public users in experiments and tasks [SCI-6332]

* Add list of users to the public users group elements [SCI-6404]
2022-01-25 12:41:36 +01:00
artoscinote 4ede001cf1
Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418] (#3781)
* Fix invalid return in reports jobs [SCI-6409] (#3777)

* Added UPDATE_STOCK_CONSUMPTION to MyModule permissons [SCI-6418]
2022-01-25 12:41:16 +01:00
artoscinote 790451c96f
Various fixes for BMT search [SCI-6077] (#3673)
* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
2022-01-25 12:28:38 +01:00
aignatov-bio 82aa26c282
Fix docx file preview [SCI-6299] (#3709)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 12:28:14 +01:00
aignatov-bio 2e4f687d31
Add experiment move error handling to project show [SCI-6398] (#3776)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 12:27:23 +01:00
Alex Kriuchykhin d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +01:00
aignatov-bio 86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 10:22:11 +01:00
Anton cbcba90a8e Fix markup [SCI-6325] 2022-01-25 10:10:57 +01:00
artoscinote 354bf4b808
Fix for Safari artefacts in TinyMCE [SCI-6154] (#3794) 2022-01-25 10:10:47 +01:00
Alex Kriuchykhin 5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388
Fix added_on filter, add specs [SCI-6388]
2022-01-24 16:47:03 +01:00
Martin Artnik 5fcf2cd080 Fix rendering of bmt/repository filters [SCI-6447] 2022-01-21 13:14:04 +01:00
Martin Artnik 711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +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
artoscinote 95a36b6870
Implemented stock management modal [SCI-6417] (#3788)
* Implement inventory stock management modal [SCI-6417]

* Add generalized validation mechanic, some bugfixes [SCI-6417]

* Fix permission check and method name in RepositoryStockValue [SCI-6417]
2022-01-20 12:44:57 +01:00
Oleksii Kriuchykhin 5dd7ca2218 Fix representation of experiment workflow images [SCI-6431] 2022-01-19 18:07:55 +01:00
aignatov-bio 05547da457
Add stock table renders [SCI-6412] (#3787)
Co-authored-by: Anton <anton@scinote.net>
2022-01-19 13:19:56 +01:00
aignatov-bio 01f1b5bd10
Add stock column type (#3786)
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
2022-01-18 13:17:05 +01:00
aignatov-bio 7425225520
Fix permission check for experiment moving (#3783)
Co-authored-by: Anton <anton@scinote.net>
2022-01-18 10:15:59 +01:00
Oleksii Kriuchykhin 34554e57e3 Fix filtering for repository snapshots [SCI-6423] 2022-01-17 21:53:13 +01:00
Martin Artnik caabb6ff00 Fix discarding a job due to non-existant report [SCI-6409] 2022-01-17 11:40:37 +01:00
Alex Kriuchykhin 3e714a4871
Merge pull request #3778 from okriuchykhin/ok_SCI_6402
Add initial implementation of inventory stock management [SCI-6402]
2022-01-17 11:21:08 +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
ajugo c570cef06c
Style corrections for printed protocol [SCI-6326] (#3782)
* Printed protocol display improvements [SCI-6326]

* Fix new line

* Fix hound [SCI-6326]

* Using image_tag helper [SCI-6326]

* Move pictures to asset folder [SCI-6326]
2022-01-14 15:02:04 +01:00
artoscinote 78b89733ab
Fix invalid return in reports jobs [SCI-6409] (#3777) 2022-01-13 14:36:09 +01:00
Oleksii Kriuchykhin a4d84e1a3b Add initial implementation of inventory stock management [SCI-6402] 2022-01-12 17:13:50 +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
Anton 304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
Anton 45d7718572 Add A-Z sort for assignment modals [SCI-6325] 2022-01-10 14:55:11 +01:00
Oleksii Kriuchykhin 8569a1dae7 Fix experiment caching issue [SCI-6400] 2022-01-07 14:27:52 +01:00
artoscinote 277b5f6eec
Fixed reCaptcha causing stack overflows on invite modal [SCI-6052] (#3534) 2022-01-06 10:11:20 +01:00
artoscinote 3f87d250ce
Implement saving repository filters [SCI-6230] (#3748)
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
2022-01-05 15:02:09 +01:00
Oleksii Kriuchykhin a952e46e97 Fix user invitation with emails surrounded by spaces [SCI-6263] 2022-01-04 23:40:08 +01:00
Oleksii Kriuchykhin 200c282683 Add handling of archiving/restoring inventory items to API [SCI-5584] 2022-01-04 21:05:59 +01:00
Martin Artnik 66081950f0 Fix added_on filter, add specs [SCI-6388] 2022-01-04 19:20:02 +01:00
aignatov-bio 997fbb80d3
Add snapshots to label printing [SCI-6328] (#3760)
Co-authored-by: Anton <anton@scinote.net>
2022-01-04 14:12:35 +01:00
Alex Kriuchykhin 7c4143249e
Improve speed of assigned modules popout [SCI-6350] (#3754) 2022-01-04 10:18:08 +01:00
Alex Kriuchykhin 93492c6dc4
Merge pull request #3747 from aignatov-bio/ai-sci-6338-not-all-projects-in-dropdown-for-taks-create
Change permissions for dashboard quick start modal [SCI-6338]
2022-01-04 10:07:39 +01:00
Oleksii Kriuchykhin 9f393bdb5a Fix handling of Ctrl+S in TinyMCE editor [SCI-6189] 2022-01-03 13:59:42 +01:00
aignatov-bio d71f231027
Install new TUI Image Editor [SCI-6166] (#3706)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:37:13 +01:00
aignatov-bio 478df28689
Clear bioEddie molecule on creating new one [SCI-6001] (#3757)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:36:56 +01:00
aignatov-bio 5512db18f0
Fix state for bmt repository [SCI-6089] (#3758)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 12:34:06 +01:00
aignatov-bio 75f7e67602
Fix task navigation for archived experiments [SCI-6333] (#3753)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:48:17 +01:00
aignatov-bio 4af7a2eb7f
Add settings variable for inventory filters [SCI-6329] (#3751)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:48:03 +01:00
aignatov-bio 3bef5e2caa
Update wording for repository columns [SCI-6233] (#3752)
Co-authored-by: Anton <anton@scinote.net>
2022-01-03 10:33:28 +01:00
Anton 3de3da9ecc Change permissions for dashboard quick start modal [SCI-6338] 2022-01-03 10:32:05 +01:00
Martin Artnik 0db2023baa Add x and y to task serializer [SCI-6394] 2021-12-27 13:29:03 +01:00
Martin Artnik ef0fec55df Filter fixes [SCI-6391] 2021-12-27 11:36:39 +01:00
Alex Kriuchykhin a3edadb06e
Merge pull request #3746 from aignatov-bio/ai-sci-6383-update-import-items-for-repository
Update import row for list and checklist items [SCI-6383]
2021-12-22 14:33:08 +01:00
Martin Artnik 023b68bfac Fixed datatable columns for BMT repo [SCI-6385] 2021-12-21 15:15:34 +01:00
aignatov-bio a3dda322f6
Add report and protocol repository activities to recent work widget [SCI-6336] (#3749)
Co-authored-by: Anton <anton@scinote.net>
2021-12-21 12:43:08 +01:00
Oleksii Kriuchykhin 738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik f3cc31052b Amend BMT repository default columns [SCI-6385] 2021-12-21 12:19:19 +01:00
Martin Artnik 9026029a26 Fix BMT repository default state [SCI-6386] 2021-12-20 16:19:17 +01:00
Martin Artnik c9e4a9bab7 Merge branch 'master' into features/bmt-search 2021-12-20 13:08:20 +01:00
Anton a3971caeb5 Update import row for list and checklist items [SCI-6383] 2021-12-17 12:26:58 +01:00
Martin Artnik 55905310a6 Added filter parameter formatting [SCI-6229] 2021-12-16 14:40:36 +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
Miha Mencin fd54704d3e SCI-6271 Allow giot_connect to be shown in connected accounts 2021-12-15 14:17:51 +01:00
artoscinote 49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio ac8fdb95d6
Add filters for checklist and status [SCI-6225][SCI-6226] (#3732)
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 12:31:32 +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
Oleksii Kriuchykhin cd04b453f1 Use the last status flow as a default one for new tasks [SCI-6098] 2021-12-15 11:53:19 +01:00
Alex Kriuchykhin e72b58e6a3
Merge pull request #3704 from okriuchykhin/ok_SCI_6303
Improve error handling in snapshot provisioning service [SCI-6303]
2021-12-15 10:18:52 +01:00
Alex Kriuchykhin 0be7a363d7
Merge pull request #3740 from okriuchykhin/ok_SCI_6375
Fix duplicated projects in the drop down on the new reports page [SCI-6375]
2021-12-13 17:07:58 +01:00
Oleksii Kriuchykhin f4e2727af1 Fix duplicated projects in the drop down on the new reports page [SCI-6375] 2021-12-13 17:02:36 +01:00
Miha Mencin 4bfba8d691
Merge pull request #3739 from okriuchykhin/ok_SCI_6346
Optimize loading of project and experiment cards [SCI-6346]
2021-12-13 16:58:08 +01:00
Oleksii Kriuchykhin e67b17dd6f Optimize loading of project and experiment cards [SCI-6346] 2021-12-13 16:43:16 +01:00
Miha Mencin 381be79f10
Merge pull request #3736 from okriuchykhin/ok_SCI_6348
Improve performance of repository cells index in the API [SCI-6348]
2021-12-13 15:44:33 +01:00
Alex Kriuchykhin 37b21f1b62
Merge pull request #3715 from okriuchykhin/ok_SCI_6209
Add models and controller for repository table filters [SCI-6209]
2021-12-10 15:45:08 +01:00
Alex Kriuchykhin 040b46ae26
Merge pull request #3734 from okriuchykhin/ok_SCI_6345
Improve activities loading speed [SCI-6345]
2021-12-10 14:35:39 +01:00
Alex Kriuchykhin 31d12bc739
Merge pull request #3735 from aignatov-bio/ai-sci-6344-optimize-my-modules-tags-search
Update query for search tags [SCI-6344]
2021-12-10 14:35:17 +01:00
Oleksii Kriuchykhin 153d1309b7 Improve performance of repository cells index in the API [SCI-6348] 2021-12-10 14:28:05 +01:00
Anton 21a8785b60 Update query for search tags [SCI-6344] 2021-12-10 14:21:51 +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
Oleksii Kriuchykhin 8f1b201061 Improve activities loading speed [SCI-6345] 2021-12-09 19:28:27 +01:00
aignatov-bio c7af5b322b
Add drodown filter [SCI-6224] (#3728)
Co-authored-by: Anton <anton@scinote.net>
2021-12-07 20:49:48 +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 63e446a883
Remove auto tab close when printing [SCI-6341] (#3727) 2021-12-07 14:04:59 +01:00
artoscinote 1c0a83a76e
Fix propagation and display of role on experiment role reset [SCI-6337] (#3725) 2021-12-07 11:42:14 +01:00
Alex Kriuchykhin f309205bc0
Merge pull request #3724 from okriuchykhin/ok_SCI_6323_v2
Fix user removal from projects when leaving a team [SCI-6323]
2021-12-07 10:27:14 +01:00
Oleksii Kriuchykhin 8ef0ba2200 Fix user removal from projects when leaving a team [SCI-6323] 2021-12-06 17:33:50 +01:00
Oleksii Kriuchykhin e16ce26a0c Fix permission checks for archived tasks [SCI-6331] 2021-12-06 15:36:49 +01:00
Alex Kriuchykhin c27994ae57
Merge pull request #3721 from okriuchykhin/ok_SCI_6323_v2
Fix user removal from a team [SCI-6323]
2021-12-06 14:29:46 +01:00
artoscinote c80cbe34f4
Remove invalid designated users when moving experiment [SCI-6335] (#3722) 2021-12-06 14:27:26 +01:00
Oleksii Kriuchykhin 30031e2f07 Fix user removal from a team [SCI-6323] 2021-12-06 14:24:59 +01:00
artoscinote 561746158e
Further fix scoping of table styles [SCI-6315] (#3720) 2021-12-06 10:40:08 +01:00
Alex Kriuchykhin 245f0aedd7
Fix user removal from a team [SCI-6323] (#3718) 2021-12-03 16:26:19 +01:00
artoscinote 272752ae4f
Fix scoping of table styles [SCI-6315] (#3719) 2021-12-03 16:21:18 +01:00
aignatov-bio e4606abf3e
Add basic structure for text filter [SCI-6213][SCI-6214] (#3710)
* Add basic structure for text filter [SCI-6213]

* Add actions for text filter [SCI-6213]

* Add mixins and i18n [SCI-6213]

* Add number filters [SCI-6214]

* Fix operator values

Co-authored-by: Anton <anton@scinote.net>
2021-12-03 14:50:27 +01:00
artoscinote 3f7f576b29
Print protocol fixes [SCI-6318] (#3717)
* Fix smart annotations [SCI-6318]

* Fix asset rendering [SCI-6316, SCI-6417]

* Copy fix [SCI-6315]

* Fix print protocol name handling [SCI-6318]

* CSS linter fixes

* Add support for handson tables [SCI-6318]

* Use partial for handsontable formulas [SCI-6318]
2021-12-03 13:44:18 +01:00
Miha Mencin cd0dc454f5 Fix the code style 2021-12-02 17:14:01 +01:00
Miha Mencin 9031f5b2c5 replace perform_later with perform_now, so we can catch a possible arror during the transaction 2021-12-02 17:04:28 +01:00
Miha Mencin b964bfd31e [SCI-6322] use correct user when creating templates, create assignment on experiments and tasks 2021-12-02 16:54:43 +01:00
Oleksii Kriuchykhin a8ad7ef826 Add models and controller for repository table filters [SCI-6209] 2021-12-02 14:25:23 +01:00
artoscinote c746d6b761
Add missing icon [SCI-6314] (#3714) 2021-12-02 10:09:11 +01:00
artoscinote 19a91fce66
Fix protocol layout issue [SCI-6312] (#3712) 2021-12-01 16:23:46 +01:00
artoscinote 78ab094bf2
Implement public user grouping, deletion and updates to manually assigned [SCI-6228] (#3701)
* Implement public user grouping, deletion and updates to manually assigned [SCI-6228]

* PR fixes [SCI-6228]

* Permission check improvement [SCI-6228]
2021-12-01 16:23:24 +01:00
Alex Kriuchykhin 62d4d8e36e
Merge pull request #3567 from okriuchykhin/ok_SCI_6055
Confirm the invitation when user is invited and lands in with SSO [SCI-6055]
2021-12-01 13:19:58 +01:00
Alex Kriuchykhin a58400bec9
Merge pull request #3692 from okriuchykhin/ok_SCI_6208
Add endpoint for fetching column data including connected items [SCI-6208]
2021-12-01 13:13:03 +01:00
artoscinote f1ede0f439
Add asset filter type [SCI-6215] (#3711) 2021-12-01 11:24:34 +01:00
aignatov-bio 850b164724
Update error handling for experiment move [SCI-6293] (#3703)
Co-authored-by: Anton <anton@scinote.net>
2021-12-01 11:24:01 +01:00
artoscinote 9937d1d913
Add print feature to protocols [SCI-6028] (#3700)
* Add print feature to protocols [SCI-6028]

* Close tab after closing print dialog [SCI-6028]

* CSS linter fixes [SCI-6028]
2021-12-01 11:16:45 +01:00
artoscinote 16b3ee3d94
Add non-cyclical validation to connections [SCI-6287] (#3702)
* Add non-cyclical validation to connections [SCI-6287]

* Prevent theoretical infinite loop possiblity [SCI-6287]
2021-12-01 11:14:01 +01:00
Martin Artnik ce5eb68106 Fix checklist checkboxes for locked tasks [SCI-6307] 2021-11-29 12:03:01 +01:00
Oleksii Kriuchykhin db2c903e54 Improve error handling in snapshot provisioning service [SCI-6303] 2021-11-29 10:51:49 +01:00
aignatov-bio 12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698)
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
2021-11-25 20:34:22 +01:00
Miha Mencin c63ae86e4b SCI-6302 change snapshot permission helper name 2021-11-24 15:21:42 +01:00
Alex Kriuchykhin 86c1d242ee
Merge pull request #3696 from aignatov-bio/ai-sci-6298-fix-moving-locked-tasks
Fix moving for a locked tasks [SCI-6298]
2021-11-24 11:10:23 +01:00
Miha Mencin aff369d852
Merge pull request #3697 from artoscinote/ma_SCI_6300
Don't include PDF files in PDF reports if no permission [SCI-6300]
2021-11-24 11:08:44 +01:00
Martin Artnik a3fa63152e Don't include PDF files in PDF reports if no permission [SCI-6300] 2021-11-24 11:01:57 +01:00
Anton 1b3307eb56 Fix moving for locked tasks [SCI-6298] 2021-11-24 10:56:25 +01:00
Miha Mencin 7b65ff44f6
Merge pull request #3695 from artoscinote/ma_SCI_6297
Add permission check for checkbox items [SCI-6297]
2021-11-24 09:38:30 +01:00
Martin Artnik a85b16ff2c Add permission check for checkbox items [SCI-6297] 2021-11-24 09:36:53 +01:00
Alex Kriuchykhin 8692d7f04b
Merge pull request #3694 from aignatov-bio/ai-sci-6291-fix-project-mobing-for-archived-and-locked-task
Fix experiment moving with archived tasks [SCI-6291]
2021-11-23 11:31:28 +01:00
Anton 774aa6cf9c Fix experiment moving with archived tasks [SCI-6291] 2021-11-23 11:25:29 +01:00
Martin Artnik 8a78b8376b Make all except public project assignments manual [SCI-6292] 2021-11-23 10:56:28 +01:00
Oleksii Kriuchykhin a1c4d06e3e Add endpoint for fetching column data including connected items [SCI-6208] 2021-11-22 22:48:36 +01:00
Anton a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
artoscinote 5a7d285264
Fix due/start date label render [SCI-6288] (#3690) 2021-11-22 11:18:05 +01:00
aignatov-bio 06577e2f8b
Skip create assignments during team import [SCI-6280] (#3679)
Co-authored-by: Anton <anton@scinote.net>
2021-11-22 11:17:39 +01:00
Alex Kriuchykhin ca5a81a85c
Add unique validation for user assignements [SCI-6279] (#3680) 2021-11-22 10:47:20 +01:00
aignatov-bio 8545b5787f
Create assignment after experiment move [SCI-6285] (#3689)
Co-authored-by: Anton <anton@scinote.net>
2021-11-22 10:34:11 +01:00
artoscinote a31bcd6eed
Fixed logging of project user role changes [SCI-6283] (#3687) 2021-11-22 09:50:14 +01:00
artoscinote 4fb9f8836d
Fix my_modules_controller typo [SCI-6278] (#3688) 2021-11-22 09:49:44 +01:00
aignatov-bio 881251fe14
Skip null subjects for activities moving [SCI-6285] (#3686)
Co-authored-by: Anton <anton@scinote.net>
2021-11-19 14:06:26 +01:00
artoscinote 774ffa60d0
Fix creating new users on projects for team admins [SCI-6273] (#3685) 2021-11-19 13:58:54 +01:00
artoscinote 9b06a24288
Added granular task permissions, permission check fixes [SCI-6278] (#3683) 2021-11-19 13:24:57 +01:00
artoscinote 2d6521db42
Fix delete connection in API [SCI-6087] (#3684) 2021-11-19 13:24:29 +01:00
artoscinote ee8cb033fa
Fix keys in connection serializer, fix destroy method [SCI-6087] (#3677) 2021-11-18 16:10:07 +01:00
Alex Kriuchykhin ebfd2f7924
Merge pull request #3682 from okriuchykhin/ok_SCI_6088
Add API endpoint for Cloning Experiments [SCI-6088]
2021-11-18 15:26:19 +01:00
Alex Kriuchykhin 2104bc489a
Merge pull request #3678 from okriuchykhin/ok_SCI_6275
Fix permissions check for steps completion in the API [SCI-6275]
2021-11-18 14:11:03 +01:00
Oleksii Kriuchykhin b35c283cc5 Fix permissions check for steps completion in the API [SCI-6275] 2021-11-17 21:25:31 +01:00
artoscinote 6b6a49428c
Add additional info to API project_user_assignments type error [SCI-6273] (#3674)
* Add additional info to API project_user_assignments type error [SCI-6273]

* Generalize user_assignments api controllers [SCI-6237]
2021-11-17 16:28:02 +01:00
aignatov-bio 2a135ac120
Fix repository archive title [SCI-6267] (#3671)
Co-authored-by: Anton <anton@scinote.net>
2021-11-17 14:53:04 +01:00
aignatov-bio 57de414284
Fix user assignment for team import [SCI-6242] (#3675)
Co-authored-by: Anton <anton@scinote.net>
2021-11-17 13:33:29 +01:00
artoscinote 2e84418304
Add create/destroy endpoints to connections API, add tests [SCI-6087] (#3563) 2021-11-17 12:11:22 +01:00
aignatov-bio 4b79ba209d
Remove visibility condition from projects scope [SCI-6188] (#3667)
Co-authored-by: Anton <anton@scinote.net>
2021-11-17 10:16:54 +01:00
Alex Kriuchykhin 8609b84131
Merge pull request #3669 from okriuchykhin/ok_SCI_6270
Fix seeds to work with new UserRoles, fix Templates creation job [SCI-6270]
2021-11-17 09:59:30 +01:00
Anton c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +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
aignatov-bio 27d6453527
After clear filters not reload table [SCI-6101][SCI-6102] (#3661)
Co-authored-by: Anton <anton@scinote.net>
2021-11-16 14:12:57 +01:00
artoscinote d08882e7f2
Style and copy fix [SCI-6272] (#3670) 2021-11-16 11:25:47 +01:00
artoscinote 0749fbdf7b
Regenerate user assignments when moving task workflow [SCI-6262] (#3668) 2021-11-16 11:10:15 +01:00
Oleksii Kriuchykhin 2e92500a73 Fix seeds to work with new UserRoles, fix Templates creation job [SCI-6270] 2021-11-15 21:36:06 +01:00
artoscinote 22623c821d
Fixed creating public projects on API, added missing translations [SCI-6167] (#3666) 2021-11-15 15:36:38 +01:00
aignatov-bio 8f9ab4f6c3
Refactor permissions breadcrumbs for users [SCI-6260] (#3665)
* Refactor permissions breadcrumbs for users [SCI-6260]

* Change creator assignments to automatically [SCI-6260]

Co-authored-by: Anton <anton@scinote.net>
2021-11-15 15:02:22 +01:00
artoscinote 945fd31538
Move modal copy and design fix [SCI-6248] (#3663) 2021-11-15 12:50:50 +01:00
artoscinote 4ce0c53d36
Implemented reset role functionality [SCI-6261] (#3662)
* Implemented reset role functionality [SCI-6261]

* Linter fixes [SCI-6261]
2021-11-15 11:12:31 +01:00
artoscinote a6c61c2b4e
Fixed permission issues when moving experiment [SCI-6257] (#3655)
* Fixed permission issues when moving experiment [SCI-6257]

* Copy fixes [SCI-6248]

* Use canaid helper instead of permission_granted [SCI-6257]

* Fixes [SCI-6257]
2021-11-12 12:59:49 +01:00
Alex Kriuchykhin 1c3a2aa0a7
Fix permissions checks in recent work service [SCI-6253] (#3654) 2021-11-12 11:13:43 +01:00
Alex Kriuchykhin b73cd5c31e
Allow admins to change own roles on projects [SCI-6250] (#3653) 2021-11-12 11:13:30 +01:00
artoscinote 740413fb3a
Stop role update propagation at manually assigned resources [SCI-6259] (#3659) 2021-11-12 11:12:06 +01:00
Alex Kriuchykhin ba96bd497c
Merge pull request #3658 from okriuchykhin/ok_SCI_6254
Fix activities for assigning to experiments and tasks [SCI-6254]
2021-11-12 10:11:55 +01:00
aignatov-bio 9dc7b31cbd
Hide checkbox if user doesnt have restore permission [SCI-6258] (#3657)
Co-authored-by: Anton <anton@scinote.net>
2021-11-12 10:04:26 +01:00
Oleksii Kriuchykhin f73f9dd2c1 Fix activities for assigning to experiments and tasks [SCI-6254] 2021-11-11 21:30:30 +01:00
aignatov-bio 50e93fed4e
Remove load from file button from bioeddie [SCI-6091] (#3656)
Co-authored-by: Anton <anton@scinote.net>
2021-11-11 14:07:27 +01:00
Alex Kriuchykhin eb8de58c97
Allow team admins to manage users on projects [SCI-6250] (#3650) 2021-11-10 14:47:05 +01:00