Anton
75a15310ac
Merge branch 'features/team-permissions' into features/label-templates
2022-09-13 14:26:15 +02:00
Anton
d68bb6ddf4
Fix dupicate protocols in activities search [SCI-7171]
2022-09-13 12:38:26 +02:00
aignatov-bio
06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable
...
Add ability to disable zebra printers [SCI-7148]
2022-09-12 13:54:52 +02:00
Oleksii Kriuchykhin
bb6e638528
Add activities for label template actions [SCI-7086]
2022-09-08 16:35:53 +02:00
Oleksii Kriuchykhin
3d3fa6e871
Do not change team if inventory is shared with current one [SCI-7164]
2022-09-07 11:01:53 +02:00
artoscinote
9126b7fca4
Add missing protocol description activity [SCI-7140] ( #4401 )
2022-09-06 11:03:13 +02:00
Anton
47e20d1b27
Add ability to disable zebra printers [SCI-7148]
2022-09-05 12:37:03 +02:00
Oleksii Kriuchykhin
f85a6b5a2e
Make experiment card dropdown menu async [SCI-7158]
2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin
e27d063b61
Make permission checks for card selection async [SCI-7157]
2022-09-02 18:10:16 +02:00
Martin Artnik
a2a5e8c4c8
Add caching and improve dynamic reload [SCI-7159]
2022-09-02 16:54:41 +02:00
Martin Artnik
ef9cd21ecf
Make project action dropdowns async [SCI-7159]
2022-09-02 13:47:45 +02:00
Alex Kriuchykhin
a5fc66a6f3
Merge pull request #4388 from okriuchykhin/ok_SCI_7047
...
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-09-01 14:13:18 +02:00
Oleksii Kriuchykhin
e276054a80
Optimize PE cards loading [SCI-7133]
2022-09-01 11:59:39 +02:00
Oleksii Kriuchykhin
ba54f42d2f
Wrap unsaring actions in transaction [SCI-6918]
2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
bf8f838214
Update repository sharing actions [SCI-6918]
2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
eb04bc974d
Update tests with new team user assignments [SCI-6843]
2022-08-31 16:37:00 +02:00
Anton
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +02:00
Anton
bcc681b14d
Add labels template to team import/export [SCI-7089]
2022-08-31 10:28:29 +02:00
Oleksii Kriuchykhin
b2b059b7e1
Add syncing service and schedule for Fluics templates sync [SCI-7047]
2022-08-29 09:59:13 +02:00
ajugo
185bf0b197
Add label template dropdown to print dialog [SCI-7051] ( #4369 )
2022-08-26 10:53:55 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] ( #4370 )
2022-08-24 13:55:54 +02:00
Anton
e22af8830a
Add activties to step duplication [SCI-7109]
2022-08-24 13:45:39 +02:00
Anton
bc112dd6af
Add step duplication [SCI-7109]
2022-08-23 17:54:33 +02:00
Anton
1bac9aeb4c
Add duplication to components [SCI-7108]
2022-08-22 15:03:49 +02:00
Oleksii Kriuchykhin
497fc3a2a5
Fix API endpoints for step elements creation [SCI-7101]
2022-08-18 17:31:29 +02:00
Oleksii Kriuchykhin
f02f625e1e
Add client for ZPL preview generation service [SCI-7049]
2022-08-12 12:57:19 +02:00
ajugo
83c78d660f
Added activity for update protocol name [SCI-7095] ( #4346 )
...
* Added activity for update protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
* Fix activity log for updated protocol name [SCI-7095]
2022-08-11 14:09:01 +02:00
aignatov-bio
f1013c59fd
Merge pull request #4341 from aignatov-bio/ai-sci-7094-fix-protocol-description-save-in-repository
...
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:57:18 +02:00
Anton
f39e86d40b
Fix protocol description save in protocol repository [SCI-7094]
2022-08-10 13:46:50 +02:00
artoscinote
610ee6bdaa
Don't adjust step position in bulk deletion [SCI-7079] ( #4339 )
2022-08-10 12:05:24 +02:00
artoscinote
4e768bec04
Add endpoint for fetching label template tags [SCI-7053] ( #4319 )
2022-08-10 11:35:38 +02:00
artoscinote
3a26b62bf5
Activity and checklist fixes [SCI-7079] ( #4330 )
2022-08-10 10:37:27 +02:00
Alex Kriuchykhin
f67654ffeb
Merge pull request #4332 from okriuchykhin/ok_SCI_6986_v2
...
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 17:03:48 +02:00
Oleksii Kriuchykhin
d1a46b3fc2
Fix protocol linked protocol changes tracking [SCI-6986]
2022-08-09 14:15:49 +02:00
artoscinote
187197488b
Pdf viewer and protocol fixes [SCI-7074] ( #4327 )
2022-08-09 10:13:43 +02:00
Alex Kriuchykhin
897a8f71ec
Merge pull request #4318 from okriuchykhin/ok_SCI_7058
...
Fix team switching when viewing repository from another team [SCI-7058]
2022-08-08 13:10:31 +02:00
Anton
6db1ec0a34
Fix marvinJS save issue [SCI-7062]
2022-08-08 11:48:58 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] ( #4316 )
...
* Implement typed label templates [SCI-7046]
* Add structure.sql, fix migration [SCI-7046]
* Fix method name [SCI-7046]
* Add dependent option to team - label_template relation [SCI-7046]
* Migration code style, add input sanitization [SCI-7046]
* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
Oleksii Kriuchykhin
13c33c3c05
Fix team switching when viewing repository from another team [SCI-7058]
2022-08-05 14:13:36 +02:00
aignatov-bio
e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen
...
Add general layout for template view screen [SCI-7030]
2022-08-04 14:13:25 +02:00
Anton
a38aa80fb5
Add main functionality to view/edit screen [SCI-7041]
2022-08-04 13:37:21 +02:00
ajugo
b58e3cd4d8
Add zebra settings screen [SCI-7016] ( #4310 )
...
* Add zebra settings screen [SCI-7016]
* Fix hound [SCI-7016]
2022-08-04 11:14:35 +02:00
Anton
31202922af
Add general layout for template [SCI-7030]
2022-08-04 10:51:30 +02:00
Anton
8c080ea04c
Add promo page for label templates [SCI-7029]
2022-08-02 14:51:18 +02:00
Anton
67df01711f
Add edit actions to label templates [SCI-7019]
2022-07-28 14:42:13 +02:00
ajugo
ad4f52d912
Add Label template list screen - view mode [SCI-7018] ( #4292 )
...
* Initial label template datatable [SCI-7018]
* Add new columns to LabelTemplate and update datatable view [SCI-7018]
* Fix after rebase [SCI-7018]
* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
2022-07-27 10:10:32 +02:00
Anton
6131b6c0b7
Add new templates section and navigation [SCI-7017]
2022-07-26 13:53:51 +02:00
ajugo
e4c5c66d35
Fix wopi file creation [SCI-7014] ( #4276 )
2022-07-21 14:19:06 +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
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
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
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
artoscinote
c89968453e
Fix checklist issues [SCI-6960] ( #4222 )
2022-07-12 10:41:58 +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
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] ( #4203 )
2022-07-07 12:00:35 +02:00
artoscinote
bcb8ed95fc
Fix reorder permission check [SCI-6941] ( #4195 )
2022-07-06 11:53:45 +02:00
Alex Kriuchykhin
9aeb107635
Fix saving protocol to repository [SCI-6935] ( #4190 )
2022-07-06 11:45:04 +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
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
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
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
artoscinote
b880f6fc39
Add API endpoints for step texts [SCI-6889] ( #4173 )
2022-06-27 12:30:45 +02:00
Anton
5296b50c2f
Add delete all steps button [SCI-6921]
2022-06-24 11:21:47 +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
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
Oleksii Kriuchykhin
31ae9ffbda
Fix switching between views on experiment canvas [SCI-6879]
2022-06-09 14:13:29 +02:00
Oleksii Kriuchykhin
07716e56a5
Improve Inventory table loading time [SCI-6886]
2022-06-08 13:23:39 +02:00
Anton
46631a1f46
Finalize protocol repository [SCI-6870]
2022-06-07 12:10:10 +02:00
Anton
e86a0610b2
Add metadata block in protocol repository [SCI-6869]
2022-06-06 13:56:22 +02:00
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
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
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
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
Anton
61464b3780
Add new protocol view to repository [SCI-6858]
2022-06-02 11:05:25 +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
artoscinote
95a2cc5298
Fix counts for archived tasks [SCI-6881] ( #4132 )
2022-06-01 11:43:15 +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
Martin Artnik
b7e78f567c
Add missing base controller
2022-05-27 12:22:44 +02:00
artoscinote
894eb8932d
Implement checklist item ordering [SCI-6847] ( #4119 )
2022-05-26 14:02:02 +02:00
aignatov-bio
82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description
...
Add tinyMce field to protocol [SCI-6810]
2022-05-26 12:46:15 +02:00
aignatov-bio
5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section
...
Add comments to step [SCI-6837]
2022-05-25 22:01:48 +02:00
Anton
7bc5c622a7
Add comments to step [SCI-6837]
2022-05-25 15:06:12 +02:00
artoscinote
df0f001afa
Refactor step elements controllers [SCI-6848] ( #4117 )
2022-05-25 14:23:35 +02:00
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
Anton
a494051f61
Add placeholder for new files in step [SCI-6833]
2022-05-23 13:44:34 +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
