Commit graph

9974 commits

Author SHA1 Message Date
sboursen-scinote 245b4bc5b0 Fix the slight move [SCI-7663] 2023-03-23 17:57:47 +01:00
Oleksii Kriuchykhin f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32:22 +01:00
ajugo e065098082
Fix protocol templates rows selection flickering [SCI-8105] (#5185)
* Fix protocol templates rows selection flickering [SCI-8105]

* Fix double initialization of row selection [SCI-8105]
2023-03-23 13:40:21 +01:00
Oleksii Kriuchykhin 7ef2f68078 Merge branch 'hotfix/1.26.6.3' into develop 2023-03-23 13:26:12 +01:00
aignatov-bio 172068dbf7
Merge pull request #5182 from G-Chubinidze/gc_SCI_8128
Update sidebar interactions [SCI-8128]
2023-03-23 13:08:34 +01:00
Anton 4edad3f41c Fix tables css [SCI-8185] 2023-03-23 13:05:37 +01:00
ajugo 4c42748e40
Add protocolsIO import preview [SCI-8187] (#5183) 2023-03-23 12:18:30 +01:00
Giga Chubinidze 24da5a8a11 Update sidebar interactions [SCI-8128] 2023-03-23 12:54:14 +04:00
Alex Kriuchykhin 72186e8e8d
Merge pull request #5178 from okriuchykhin/ok_SCI_7919
Check permissions on current user during PDF report generation [SCI-7919]
2023-03-22 16:39:30 +01:00
Anton 854fc1764b Refactor left/top navigation [SCI-8055] 2023-03-22 14:08:21 +01:00
Anton e626c53f78 PET and Protocol tabls fixes [SCI-8176][SCI-8180][SCI-8181] 2023-03-22 13:47:59 +01:00
Oleksii Kriuchykhin 3443a6fb85 Fix create step comments permissions [SCI-8174] 2023-03-22 12:52:08 +01:00
ajugo fe37699ba5
Add switch for connected devices [SCI-8112] (#5179) 2023-03-22 12:15:01 +01:00
aignatov-bio 0044726425
Merge branch 'develop' into ai-sci-8155-css-fixes-for-version-modal 2023-03-22 11:32:49 +01:00
Oleksii Kriuchykhin ba5afe0e6b Check permissions on current user during PDF report generation [SCI-7919] 2023-03-22 10:51:45 +01:00
artoscinote 4750d61b77
Merge pull request #5177 from scinote-eln/revert-5029-gc_SCI_7763
Revert "Search by team does not work [SCI-7763]"
2023-03-22 10:24:32 +01:00
G-Chubinidze 44cc9d1c90
Revert "Search by team does not work [SCI-7763]" 2023-03-22 13:22:05 +04:00
G-Chubinidze a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]" 2023-03-22 13:21:08 +04:00
ajugo 8eb04c50c2
Add removing connected device [SCI-8146] (#5174) 2023-03-21 16:44:24 +01:00
Alex Kriuchykhin b3889de17b
Merge pull request #5171 from okriuchykhin/ok_SCI_8145
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
2023-03-21 16:40:22 +01:00
Oleksii Kriuchykhin cf599a8277 Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157] 2023-03-21 16:25:02 +01:00
artoscinote 44098ece5d
Revert "Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]" 2023-03-21 15:26:06 +01:00
artoscinote e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
artoscinote a43c941b50
Merge pull request #5170 from G-Chubinidze/gc_SCI_8147
Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]
2023-03-21 15:18:37 +01:00
artoscinote 634b4145fd
Merge pull request #5169 from G-Chubinidze/gc_SCI_8098
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-03-21 15:17:55 +01:00
artoscinote 397e4aeebe
Merge pull request #4935 from G-Chubinidze/gc_SCI_7848
user_my_modules_controller#index_old action updates [SCI-7848]
2023-03-21 11:41:38 +01:00
Giga Chubinidze 8e942379ff changed assignee to designated_users 2023-03-21 14:29:23 +04:00
Giga Chubinidze 9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze b7490ebcca Cursor position improvements, focused fields - part 1 [SCI-8098 2023-03-21 11:14:44 +04:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Andrej 8bf9e2425b Fix docx table generator if metadata are nil [SCI-8165] 2023-03-20 14:12:44 +01:00
Alex Kriuchykhin 0bfd7ee9c2
Merge pull request #5165 from aignatov-bio/ai-sci-8160-fix-version-revision
Fix permission for draft revision comment [SCI-8160]
2023-03-20 14:03:50 +01:00
Andrej 64441f791f Fix check for nil row [SCI-8165] 2023-03-20 11:59:20 +01:00
Anton a684ff2656 CSS fixes for version modal [SCI-8155] 2023-03-20 11:46:01 +01:00
Andrej 8d7d2a4539 Merge branch 'hotfix/1.26.6.2' of https://github.com/biosistemika/scinote-web into aj_SCI_8165 2023-03-20 11:16:33 +01:00
Andrej c84adfdecc Fix docx report generation with broken metadate [SCI-8165] 2023-03-20 11:14:27 +01:00
Anton 12f1456e4f Fix permission for draft revision comment [SCI-8160] 2023-03-17 14:40:19 +01:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
G-Chubinidze 06eeb3b27f
FE manage devices (table view) + revoking the device [SCI-7633] (#4920)
* FE manage devices (table view) + revoking the device [SCI-7633]

* revocation code optimisation

* hound fixes

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-17 13:44:41 +01:00
ajugo cedbd8de20
Fix access modal view for users without manage permissions [SCI-8139] (#5148) 2023-03-17 11:30:51 +01:00
aignatov-bio 5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Alex Kriuchykhin 05c4a1c4f0
Add missing sanitization helper to projects access controller [SCI-8158] (#5162) 2023-03-17 11:25:36 +01:00
Anton 248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin 4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
Anton da36b7268f Clean old protocol code [SCI-8154] 2023-03-16 14:37:19 +01:00
sboursen-scinote 0526bfaae1 Fix the result asset cancel behavior when clicking enter [SCI-7670] 2023-03-16 14:19:24 +01:00
aignatov-bio 33c880149c
Add new general account [SCI-7963] (#5127) 2023-03-16 12:54:24 +01:00
Anton 5a242021e3 Fix handson table metadata issue [SCI-8138] 2023-03-16 12:02:20 +01:00
Soufiane bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108 2023-03-16 09:20:36 +01:00
sboursen-scinote d49a992dd4 Fix styles when protocol is published [SCI-8108] 2023-03-16 09:15:22 +01:00
Alex Kriuchykhin f94c9e0b36
Avoid double escaping in user's name on protocol and step elements [SCI-8137] (#5150) 2023-03-15 16:36:06 +01:00
aignatov-bio fedd9e040e
Fix escaping for protocol keyword [SCI-8137] (#5147) 2023-03-15 16:04:33 +01:00
Alex Kriuchykhin 483a7aad5b
Improve special character escaping in data attributes [SCI-8137] (#5149) 2023-03-15 16:01:01 +01:00
Alex Kriuchykhin b0251435e5
Improve escaping of special characters in flash messages [SCI-8137] (#5144) 2023-03-15 15:56:47 +01:00
Soufiane 5cc06aedf5
Old buttons at importing protocols.io protocol (update) [SCI-8032] (#5137)
* Fix Small css inacuracies [SCI-8032]

* Remove the technician role [SCI-8032]

* Use permissions to filter the authorised roles [SCI-8032]
2023-03-15 13:28:45 +01:00
aignatov-bio 44823da268
Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145) 2023-03-15 12:55:28 +01:00
G-Chubinidze 6ba6d98989
Merge pull request #5143 from G-Chubinidze/gc_SCI_8100
increased active pagination size [SCI-8100]
2023-03-15 14:17:35 +04:00
Giga Chubinidze 57721a01e4 increased active pagination size 2023-03-15 14:15:36 +04:00
Alex Kriuchykhin 00c63b280e
Fix displaying of escaped fields [SCI-8137] (#5141) 2023-03-15 11:14:52 +01:00
G-Chubinidze b68f5ced7a
Protocol permission bugs [SCI-8058] (#5142)
* Protocol permission bugs [SCI-8058]

---------

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-03-15 11:14:20 +01:00
sboursen-scinote c6bb9850ea Merge feature/protocol_versioning into sb_SCI-8007 [SCI-8007] 2023-03-15 09:24:45 +01:00
sboursen-scinote dcbe1615cf Refactor the records generation method [8007]
Co-Authored-By: okriuchykhin <oleksii@scinote.net>
2023-03-15 09:14:01 +01:00
aignatov-bio 336cf4d855
Fix PET permission propagation [SCI-8132] (#5139) 2023-03-14 18:48:06 +01:00
ajugo 0fe3f5f38f
Fix missing tooltip and hover effect for access modal role selection [SCI-8122] (#5140) 2023-03-14 18:41:32 +01:00
ajugo 3c18e42d5e
Fix css for access modal [SCI-8127] (#5138) 2023-03-14 15:24:22 +01:00
aignatov-bio 9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
ajugo 917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] (#5102) 2023-03-14 14:20:03 +01:00
G-Chubinidze 7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-14 17:07:52 +04:00
aignatov-bio 821a9191e5
Merge pull request #5120 from G-Chubinidze/gc_SCI_8086
Archived experiments UI improvements [SCI-8086]
2023-03-14 13:07:49 +01:00
ajugo 8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Soufiane 7b93ced541
CSS: Protocol template - Details [SCI-8108] (#5131)
* Fix spacing issue in protocol details [SCI-8108]

* Fix spacing issue in protocol datatable [SCI-8108]

* Match the styles of the authors and the keywords to figma [SCI-8108]

* Fix broken dropdown footer [SCI-8108]

* Fix hound [SCI-8108]
2023-03-14 12:54:13 +01:00
Soufiane 1d396e57ab
Update of a Task Filters on a dashboard (Clear/Close function, Show results) [SCI-7607] (#4873)
* Change the position of the clear button and update the Apply button text [SCI-7607]

* Add a clos button in the header of the dropdown [SCI-7607]

* Fix scss style issue [SCI-7607]

* Change gap to margin-right [SCI-7607]
2023-03-14 12:53:27 +01:00
Giga Chubinidze d5e0c041a8 changed disabled_drafting logic 2023-03-14 14:41:00 +04:00
G-Chubinidze ef596a5579
Merge pull request #5076 from G-Chubinidze/gc_SCI_8008
Incorrect bottom action bar states for Protocol templates [SCI-8008]
2023-03-14 14:17:29 +04:00
G-Chubinidze 38a07b6dc7
Merge pull request #5132 from G-Chubinidze/gc_SCI_7630
Protocol templates table - linked tasks modal [SCI-7630]
2023-03-14 13:59:53 +04:00
aignatov-bio e6c204a246
Fix save as new protocol modal [SCI-8003] (#5129) 2023-03-14 10:22:09 +01:00
Giga Chubinidze 67539b15de Protocol permissions - button display [SCI-8058] 2023-03-14 12:12:54 +04:00
Alex Kriuchykhin d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] (#5135) 2023-03-13 18:00:30 +01:00
aignatov-bio 40f223deca
Fix XSS for tasks table titles [SCI-8133] (#5134) 2023-03-13 15:19:59 +01:00
Giga Chubinidze 0ffe9b619c Protocol templates table - linked tasks modal [SCI-7630] 2023-03-13 18:19:28 +04:00
sboursen-scinote 697cf6f19a Fix hound [SCI-8108] 2023-03-13 14:52:54 +01:00
sboursen-scinote 25b88519f9 Fix broken dropdown footer [SCI-8108] 2023-03-13 14:45:54 +01:00
aignatov-bio 946ea47d55
Fix xss for titles in tags labels [SCI-8133] (#5130) 2023-03-13 14:39:12 +01:00
ajugo 1b9b10ccfb
Fix clickaway filtering for empty filter states [SCI-8103] (#5122) 2023-03-13 13:04:23 +01:00
Giga Chubinidze 3d11400311 Archived experiments UI improvements [SCI-8086] 2023-03-13 15:12:40 +04:00
G-Chubinidze 2cef3bde31
Merge pull request #5119 from G-Chubinidze/gc_SCI_8081
Display the ID of the parent protocol in reports [SCI-8081]
2023-03-13 14:49:36 +04:00
G-Chubinidze 31b051d03f
Merge pull request #5126 from G-Chubinidze/gc_SCI_8100
CSS: Pixel-perfect issues for Protocol templates [SCI-8100]
2023-03-13 14:44:18 +04:00
Giga Chubinidze ca8375a867 hound fixes 2023-03-13 14:36:49 +04:00
sboursen-scinote 59f4768c4e Match the styles of the authors and the keywords to figma [SCI-8108] 2023-03-13 11:32:11 +01:00
Giga Chubinidze b59f922143 CSS: Pixel-perfect issues for Protocol templates [SCI-8100] 2023-03-13 14:25:04 +04:00
sboursen-scinote 4afac52ad3 Fix spacing issue in protocol datatable [SCI-8108] 2023-03-13 10:56:26 +01:00
Alex Kriuchykhin d285a0a9db
Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123) 2023-03-13 09:55:53 +01:00
sboursen-scinote 30d782d8bb Fix spacing issue in protocol details [SCI-8108] 2023-03-13 08:55:15 +01:00
sboursen-scinote d2ceeb9662 Use I18n [SCI-8007] 2023-03-12 14:10:07 +01:00
Alex Kriuchykhin fcfe8d81cb
Fix read-only experiment access modal display [SCI-8040] (#5118) 2023-03-10 15:03:11 +01:00
Alex Kriuchykhin cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" (#5121) 2023-03-10 11:45:32 +01:00
sboursen-scinote ce3fbfe4eb Sanitize datatable params [SCI-8007] 2023-03-10 11:33:28 +01:00
sboursen-scinote e9bdd218fa Sanitize te user_names_with_roles [SCI-8007] 2023-03-10 09:46:45 +01:00
sboursen-scinote 55ebb4817e Fix hound [SCI-8007] 2023-03-10 09:16:50 +01:00
sboursen-scinote 506c750eee Use datatable ajax to send version param [SCI-8007] 2023-03-09 21:59:14 +01:00
Giga Chubinidze 4cc953663f Display the ID of the parent protocol in reports [SCI-8081] 2023-03-10 00:08:07 +04:00
sboursen-scinote c4bdbdec9a Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-09 16:35:36 +01:00
Soufiane 9b444cd8fb
Merge pull request #5110 from sboursen-scinote/sb_SCI-8045
CSS bugs for "Protocol templates" [SCI-8045]
2023-03-09 16:30:46 +01:00
sboursen-scinote a419943e4e Merge 'protocol_versioning' into sb_SCI-8045 2023-03-09 16:29:40 +01:00
sboursen-scinote e314dd4f51 Use I18n [SCI-8045] 2023-03-09 16:07:24 +01:00
G-Chubinidze f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058
Protocol permissions - button display [SCI-8058]
2023-03-09 19:02:42 +04:00
aignatov-bio 376aa26ac5
Clear name on protocol create modal open [SCI-8003] (#5113) 2023-03-09 15:57:05 +01:00
ajugo b1468df3e1
Fix checkboxes at the protocol template table [SCI-8099] (#5108) 2023-03-09 15:01:21 +01:00
aignatov-bio 90ea8425ff
Merge pull request #5109 from rekonder/aj_SCI_8111
Fix loading of protocols.io to protocol templates [SCI-8111]
2023-03-09 14:54:18 +01:00
artoscinote bc6afa5efa
Merge pull request #5114 from artoscinote/ma_SCI_8109
Fix protocol link and step delete modal styling [SCI-8109]
2023-03-09 14:53:21 +01:00
aignatov-bio a50f5d270c
Merge pull request #5116 from aignatov-bio/ai-sci-8063-add-all-team-members-through-access-modal
Add all team members through access modal [SCI-8063]
2023-03-09 14:48:40 +01:00
Alex Kriuchykhin 4aded6e7b4
Fix protocol filtering by pablished attributes and draft presence [SCI-8070] (#5099) 2023-03-09 14:46:43 +01:00
Anton ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +01:00
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
artoscinote 2d0a6c387c
Merge pull request #5103 from artoscinote/ma_SCI_8039
Update access modal sizing [SCI-8039]
2023-03-09 13:13:22 +01:00
Alex Kriuchykhin 87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
sboursen-scinote 7e58eff8de Fix hound [SCI-8045] 2023-03-08 20:56:22 +01:00
sboursen-scinote 19d58789b3 Fix protocol details [SCI-8045] 2023-03-08 20:51:47 +01:00
Andrej b5c3491a38 Fix loading of protocols.io to protocol templates [SCI-8111] 2023-03-08 19:10:22 +01:00
G-Chubinidze 32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058 2023-03-08 21:15:36 +04:00
Giga Chubinidze 553c644811 Protocol permissions - button display [SCI-8058] 2023-03-08 21:12:29 +04:00
sboursen-scinote 45f3d05fdc Fix hound [SCI-8007] 2023-03-08 16:31:24 +01:00
sboursen-scinote b3f7c41548 Update the filter dropDown globaly [SCI-8007] 2023-03-08 16:25:10 +01:00
Martin Artnik 69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
sboursen-scinote 4ec15ede61 Implement the linked_children dropdown and update the modal [SCI-8007] 2023-03-08 15:15:41 +01:00
Martin Artnik e6af78112c Update access modal sizing [SCI-8039] 2023-03-08 15:03:09 +01:00
aignatov-bio 0a3efe3e24
Merge pull request #5101 from aignatov-bio/ai-sci-8067-fix-protocol-repository-sorting-by-assigned-users
Fix protocols sorting by assigned users [SCI-8074]
2023-03-08 14:12:52 +01:00
Anton fd44cc9778 Fix protocols sorting by assigned users [SCI-8074] 2023-03-08 12:22:46 +01:00
ajugo 86092e08fb
Remove not needed user roles on protocol access modals [SCI-8031] (#5098) 2023-03-08 12:10:36 +01:00
sboursen-scinote a25a49a051 Merge branch 'features/protocol_versioning' into sb_SCI-8007 2023-03-08 11:36:22 +01:00
artoscinote 66ec451d5e
Merge pull request #5096 from artoscinote/ma_SCI_8093
Add draft created activity [SCI-8093]
2023-03-08 10:49:45 +01:00
artoscinote b8c5323fdc
Merge pull request #5094 from artoscinote/ma_SCI_8038
PET access modal fixes [SCI-8038]
2023-03-08 10:49:30 +01:00
aignatov-bio 7a54856a54
Merge pull request #5095 from aignatov-bio/ai-sci-8074-fix-protocol-duplication
Fix protocol duplication table reload [SCI-8074]
2023-03-08 10:15:19 +01:00
Martin Artnik 6cc78790b0 Fix title for archived protocols table [SCI-8092] 2023-03-07 14:55:11 +01:00
Martin Artnik e4e8997cc1 Add draft created activity [SCI-8093] 2023-03-07 14:45:52 +01:00
Anton 2a794b68ac Fix protocol duplication table reload [SCI-8074] 2023-03-07 14:31:15 +01:00
ajugo 078f4583ec
Fix content of the Load from templates table [SCI-8049] (#5088) 2023-03-07 14:19:29 +01:00
Alex Kriuchykhin bee0fa2de9
Fix protocols re-assigning when removing user from a team [SCI-8034] (#5069) 2023-03-07 14:15:49 +01:00
Soufiane f22f00f856
Merge pull request #5067 from sboursen-scinote/sb_SCI-8032
Old buttons at importing protocols.io protocol [SCI-8032]
2023-03-07 14:13:02 +01:00
aignatov-bio ce36a2565b
Merge pull request #5092 from aignatov-bio/ai-sci-8077-add-empty-state-for-protocol-actions-toolbar
Add empty state for protocol actions toolbar [SCI-8077]
2023-03-07 14:09:18 +01:00
aignatov-bio ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page
Fix print protocol button on protocol show page [SCI-8079]
2023-03-07 14:09:08 +01:00
Martin Artnik 22c039fc77 PET access modal fixes [SCI-8038] 2023-03-07 14:04:05 +01:00
Alex Kriuchykhin f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Soufiane d801677392
Merge branch 'develop' into sb_SCI-7562 2023-03-07 12:52:05 +01:00
G-Chubinidze 3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954
Archived protocol template navigation, icon, button [SCI-7954]
2023-03-07 15:51:51 +04:00
Soufiane 1d80118393
Merge pull request #5035 from sboursen-scinote/sb_SCI-7996
Fix protocols repository table CSS [SCI-7996]
2023-03-07 12:50:10 +01:00
Anton ece09ee9a5 Add empty state for protocol actions toolbar [SCI-8077] 2023-03-07 11:44:03 +01:00
ajugo 6471dbed5b
Fix missing team at the StepTable creation [SCI-8036] (#5090) 2023-03-07 11:26:57 +01:00
Anton 25050cb6cc Fix print protocol button on protocol show page [SCI-8079] 2023-03-07 11:25:59 +01:00
Alex Kriuchykhin b9193748fa
Fix view access modals [SCI-8040] (#5084) 2023-03-07 11:17:56 +01:00
sboursen-scinote 6a885d4023 Fix avatars and tooltip in access column [SCI-8007] 2023-03-07 11:02:03 +01:00
aignatov-bio e090bdf443
Merge pull request #5089 from aignatov-bio/ai-sci-8004-fix-archive-restore-propagation
Fix archive/restore propagation [SCI-8004]
2023-03-07 10:59:24 +01:00
artoscinote 5407943bfd
Merge pull request #5083 from artoscinote/ma_SCI_8039
Protocol/general user assignment changes and fixes [SCI-8039][SCI-8037]
2023-03-07 10:55:37 +01:00
aignatov-bio e7afc70cab
Merge pull request #5086 from aignatov-bio/ai-sci-8003-fix-wording-for-same-protocol-name
Fix protocol creation error message [SCI-8003]
2023-03-07 10:48:12 +01:00
Anton 55dca41434 Fix archive/restore propagation [SCI-8004] 2023-03-07 10:44:44 +01:00
Alex Kriuchykhin 8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
aignatov-bio 1d9785efbe
Fix version button at action toolbar [SCI-8065] (#5085) 2023-03-07 09:52:31 +01:00
Alex Kriuchykhin 0ab89db29c
Fix protocol Publish button behaviour after canceling of publish action [SCI-8068] (#5081) 2023-03-07 09:49:21 +01:00
Alex Kriuchykhin 00c602a818
Improve filtering in protocols datatable [SCI-8020] (#5068) 2023-03-07 09:42:18 +01:00
sboursen-scinote 3612780606 Fix wrong icon [SCI-8007] 2023-03-07 07:07:51 +01:00
sboursen-scinote 5e89f1f829 Update my_module protocol status dropdown [SCI-7991] 2023-03-07 05:48:20 +01:00
Giga Chubinidze 4a02a130f0 Archived protocol template navigation, icon, button [SCI-7954] 2023-03-06 23:44:47 +04:00
Anton ca76c78a23 Fix protocol creation error message [SCI-8003] 2023-03-06 19:31:45 +01:00
Martin Artnik 2f29477e02 Protocol/general user assignment changes and fixes [SCI-8039] 2023-03-06 16:43:46 +01:00
artoscinote b2cf5548f6
Merge pull request #5071 from artoscinote/ma_SCI_8060
Ensure user assignments stay in sync with protocol versions [SCI-8060]
2023-03-06 16:12:05 +01:00
Martin Artnik cfcb80f642 Fix assignment sync to new protocol drafts and deletion [SCI-8060] 2023-03-06 16:06:38 +01:00
sboursen-scinote 03dc93b9b1 Remove outline on protocol otion [SCI-8045] 2023-03-06 14:24:02 +01:00
sboursen-scinote 34f324f7ca Update the sort component [SCI-8045] 2023-03-06 12:00:53 +01:00
ajugo 9d4e212c7d
Fix protocol template access filter [SCI-7988] (#5073) 2023-03-06 11:50:37 +01:00
ajugo 9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
G-Chubinidze 78c04a3ce0
Merge pull request #5078 from G-Chubinidze/gc_SCI_8054
CSS: Incorrect paddings in the "Protocol info" modal [SCI-8054]
2023-03-06 13:28:12 +04:00
sboursen-scinote 587606803b Update search placeholder [SCI-8045] 2023-03-06 09:28:21 +01:00
sboursen-scinote e325458f2e Add hover effect on datatable columns headers [SCI-8045] 2023-03-06 08:32:55 +01:00
sboursen-scinote 676eb96d00 Fix linked tasks column title [SCI-8045] 2023-03-06 08:25:46 +01:00
Giga Chubinidze 3fd7937154 CSS: Incorrect paddings in the "Protocol info" modal [SCI-8054] 2023-03-05 02:25:25 +04:00
Giga Chubinidze ecf27c679e Incorrect bottom action bar states for Protocol templates [SCI-8008] 2023-03-04 23:03:41 +04:00
aignatov-bio d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00
aignatov-bio 96ee59b185
Merge pull request #5075 from aignatov-bio/ai-sci-8075-fix-draft-creation-validation
Fix draft creation [SCI-8075]
2023-03-03 20:49:42 +01:00
sboursen-scinote 678e54bdc4 Add hover effect on datatable head [SCI-7562] 2023-03-03 16:27:54 +01:00
sboursen-scinote f6ce634d1c Use ordinary cursor [SCI-7562] 2023-03-03 16:17:23 +01:00
sboursen-scinote c036c72243 Fix hound [SCI-7996] 2023-03-03 16:00:50 +01:00
sboursen-scinote 9e33fae006 Make table cell single lined and limit the max width [SCI-7996] 2023-03-03 15:59:29 +01:00
Anton b4b5b70331 Fix draft creation [SCI-8075] 2023-03-03 15:51:36 +01:00
aignatov-bio da31883ac3
Add error handling to actions in protocol controller [SCI-8073] (#5074) 2023-03-03 15:33:08 +01:00
sboursen-scinote 248b13aa72 Fix hound [SCI-8030] 2023-03-03 14:32:08 +01:00
sboursen-scinote 443ee4350c Fix protocol repository sidebar on archived view [SCI-8030] 2023-03-03 14:11:40 +01:00
Martin Artnik 73ed75a73a Ensure user assignments stay in sync with protocol versions [SCI-8060] 2023-03-03 13:20:15 +01:00
sboursen-scinote 0cd31d451d Fix hound [SCI-8032] 2023-03-03 11:06:12 +01:00
ajugo 8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
sboursen-scinote c3066292a0 Style the protocol-preview-modal [SCI-8032] 2023-03-03 09:17:09 +01:00
sboursen-scinote 80b3863efa Render protocol-preview-modal independently on protocolio-modal [SCI-8032] 2023-03-03 09:02:17 +01:00
sboursen-scinote c93c8b4c5b Update full-preview-panel data id on protocol-card change [SCI-8032] 2023-03-03 09:00:12 +01:00
sboursen-scinote 8460fe3693 Implement the grant access to all team members functionality [SCI-8032] 2023-03-03 08:58:41 +01:00
Alex Kriuchykhin 4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
artoscinote a43bd9d7f9
Merge pull request #5065 from artoscinote/ma_SCI_8059
Fix display of unauthorized error on protocol page [SCI-8059]
2023-03-02 15:46:10 +01:00
ajugo ed90c912f6
Add description to cloned protocol template from protocol [SCI-8053] (#5063) 2023-03-02 15:35:18 +01:00
ajugo 72cf844c3e
Fix protocol version modification info text [SCI-8061] (#5064) 2023-03-02 15:35:02 +01:00
Martin Artnik 72831cd015 Fix display of unauthorized error on protocol page [SCI-8059] 2023-03-02 15:05:50 +01:00
aignatov-bio 25644ab5a3
Fix version number for draft created from old versions [SCI-8023] (#5040) 2023-03-02 14:34:14 +01:00
ajugo 3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +01:00
Anton b68291c834 Fix protocol vue component loading [SCI-8024] 2023-03-02 11:33:40 +01:00
ajugo a31a1778cf
Add new protocol modal on dashboard [SCI-8042] (#5057) 2023-03-02 09:57:08 +01:00
artoscinote 093c3d63f1
Merge pull request #5059 from G-Chubinidze/gc_SCI_7844
Add the action Move to archived task & experiments view [SCI-7844]
2023-03-02 09:01:21 +01:00
Giga Chubinidze 780781e57b Add the action Move to archived task & experiments view [SCI-7844] 2023-03-02 11:35:22 +04:00
Alex Kriuchykhin 420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
Martin Artnik d71c14e2eb Add missing prism.js includes to layout [SCI-7974] 2023-03-01 15:21:01 +01:00
Anton 4eab2c25f3 Save last_modified_by on protocol update [SCI-8021] 2023-03-01 15:19:34 +01:00
Alex Kriuchykhin 9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo 976ddca672
Disable save as draft if draft exists [SCI-8025] (#5049) 2023-03-01 14:41:41 +01:00
artoscinote 3b074a4af6
Merge pull request #5044 from artoscinote/ma_SCI_7974
Replace highlight.js with prism.js [SCI-7974]
2023-03-01 12:52:57 +01:00
artoscinote 434403c80c
Merge pull request #5029 from G-Chubinidze/gc_SCI_7763
Search by team does not work [SCI-7763]
2023-03-01 12:49:11 +01:00
artoscinote 4a65a9e55e
Merge pull request #4949 from sboursen-scinote/sb_SCI-7237
Improve the print functionality for protocol [SCI-7237]
2023-03-01 12:48:39 +01:00
ajugo e317ca0134
Fix deleting draft for the first time [SCI-8022] (#5048) 2023-03-01 12:02:00 +01:00
aignatov-bio e16a8f033b
Merge pull request #5047 from aignatov-bio/ai-sci-8028-fix-protocol-versioning-sorting
Protocol table fix sorting with archived columns [SCI-8028]
2023-03-01 11:56:02 +01:00
Anton beb5f67508 Fix version modal 2023-03-01 11:44:22 +01:00
Anton 07cb17e296 Protocol table fix sorting with archived columns [SCI-8028] 2023-03-01 11:38:11 +01:00
ajugo b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042)
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
2023-03-01 11:33:32 +01:00
artoscinote 54de76342e
Merge pull request #5036 from sboursen-scinote/sb_SCI-7981
Fix TOC style [SCI-7981]
2023-03-01 09:47:56 +01:00
artoscinote 2829e46eae
Merge pull request #5024 from sboursen-scinote/sb_SCI-7938
Position of newly added text/file/table to step [SCI-7938]
2023-03-01 09:46:39 +01:00
aignatov-bio 922beecd74
Merge pull request #4959 from sboursen-scinote/sb_SCI-7772
CSS:Uneven spacing around the check button [SCI-7772]
2023-03-01 09:42:09 +01:00
Andrej 64da4c5368 Fix connected device model for request without device id [SCI-7972] 2023-02-28 16:42:56 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
sboursen-scinote 88610d6b38 Add a small code refactor [SCI-7996] 2023-02-28 16:11:11 +01:00
sboursen-scinote b6ddb79183 Change the action-toolbar behavior after input from product team [SCI-7996] 2023-02-28 15:47:06 +01:00
Soufiane 2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904
Protocol templates - delete all steps (tasks screen) [SCI-7904]
2023-02-28 15:33:33 +01:00
Soufiane 53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910
Protocol templates - revert action and alert message [SCI-7910]
2023-02-28 15:33:05 +01:00
aignatov-bio bce0c9549d
Merge pull request #5039 from aignatov-bio/ai-sci-8013-fix-protocol-long-name
Fix protocol long name [SCI-8013]
2023-02-28 15:21:18 +01:00
Anton 6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
sboursen-scinote e6c92fc328 Change only datatable styles related to protocol [SCI-7996] 2023-02-28 14:53:53 +01:00
artoscinote fab7d9c3d6
Merge pull request #5038 from artoscinote/ma_SCI_7990
Fix protocol duplication in table [SCI-7990]
2023-02-28 14:28:08 +01:00
Martin Artnik a3ffb38d2b Refactor cloning feature to better prepare for bulk clone [SCI-7990] 2023-02-28 14:22:02 +01:00
ajugo 96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
artoscinote 6bfc88434e
Merge pull request #5041 from artoscinote/ma_SCI_7992
Fix permission checks for protocols [SCI-7992]
2023-02-28 14:15:07 +01:00
sboursen-scinote 1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
Martin Artnik b311f91bec Fix check for save as draft in version modal [SCI-7992] 2023-02-28 13:54:44 +01:00
Martin Artnik 7bf857a179 Fix permission checks for protocols [SCI-7992] 2023-02-28 13:48:29 +01:00
Martin Artnik 219814ec06 Change protocol clone to support bulk in future [SCI-7990] 2023-02-28 13:11:49 +01:00
sboursen-scinote 427690b236 Revert "Change the style of the header and footer borders [SCI-7904]"
This reverts commit 1397b2b2e6.

revert styles
2023-02-28 12:39:59 +01:00
sboursen-scinote 294152d90c Revert "Fix hound issues [SCI-7904]"
This reverts commit e8cae5cc86.

Revert styles
2023-02-28 12:39:42 +01:00
aignatov-bio 68cb18133f
Merge pull request #5027 from sboursen-scinote/sb_SCI-7991
Versions button is not connected to the actions toolbar [SCI-7991]
2023-02-28 12:09:14 +01:00
Anton cba85eb7fd Fix protoocl long name [SCI-8013] 2023-02-28 12:05:47 +01:00
sboursen-scinote 66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]"
This reverts commit 0f9dcda99b.
2023-02-28 11:51:42 +01:00
sboursen-scinote b482f4cfe9 Revert Unneded commits
Modal styles are not part of the current ticket
2023-02-28 11:50:32 +01:00
Martin Artnik bba9570228 Fix protocol duplication in table [SCI-7990] 2023-02-28 11:36:27 +01:00
sboursen-scinote 24e0fb6b48 Make it DRY [SCI-7991] 2023-02-28 10:39:56 +01:00
Giga Chubinidze 30e37a95d7 Add office file to task step - reload file option shows plain html page [SCI-7673] 2023-02-28 09:59:45 +04:00
sboursen-scinote 7d857fbc08 Fix TOC style [SCI-7981] 2023-02-27 21:54:57 +01:00
aignatov-bio 3735ba51b8
Fix protocol id on protocol show page [SCI-8005] (#5033) 2023-02-27 17:18:12 +01:00
aignatov-bio bda3661a9b
Fix duplicate keywords in protocol table [SCI-8009] (#5034) 2023-02-27 17:17:12 +01:00