Commit graph

2436 commits

Author SHA1 Message Date
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
Alex Kriuchykhin 8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834
Update tests with new team user assignments [SCI-6843]
2022-09-05 14:34:16 +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 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 f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +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
aignatov-bio 91f1310338
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text
Update label template promo text [SCI-7060]
2022-08-31 10:13:42 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +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
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
Martin Artnik 0aa4ff11d4 Add missing route [SCI-7053] 2022-08-24 14:10:51 +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
Anton 45bbbfffe4 Update label template promo text [SCI-7060] 2022-08-18 15:33:19 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
artoscinote e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348)
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
2022-08-12 10:17:45 +02:00
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
artoscinote 4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
ajugo b6f273410b
Fix protocol repository CSS [SCI-7064] (#4335)
* Fix protocol repository CSS [SCI-7064]

* Fix protocol repository CSS [SCI-7064]

* Fix hound [SCI-7064]
2022-08-10 10:27:15 +02:00
artoscinote c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
ajugo 1ee091aa53
Fix selected default step title and step name placeholder [SCI-7067] (#4326)
* Fix selected default step title in edit mode and step name placeholder [SCI-7067]

* Add new placeholder label [SCI-7067]
2022-08-08 16:50:34 +02:00
Anton 51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +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
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
Alex Kriuchykhin baa565db8d
Merge pull request #4297 from okriuchykhin/ok_SCI_7028
Make devise session timeout configurable through env variable [SCI-7028]
2022-08-01 16:37:53 +02:00
Anton bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
artoscinote a527edd07d
Attachment management fixes [SCI-7022] (#4296)
* Attachment management fixes [SCI-7022]

* Linter fixes [SCI-7022]
2022-08-01 13:14:04 +02:00
Oleksii Kriuchykhin da9ad5797c Make devise session timeout configurable through env variable [SCI-7028] 2022-07-28 17:15:47 +02:00
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +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
Anton 3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +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
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
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 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
Oleksii Kriuchykhin a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253)
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
2022-07-15 10:00:50 +02:00
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
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
Oleksii Kriuchykhin 747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
ajugo 7b525e5986
Fix en.yml [SCI-5319] (#4225) 2022-07-12 10:33:37 +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 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
artoscinote a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +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 4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
Alex Kriuchykhin 26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +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 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
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Oleksii Kriuchykhin 3fbc5af9a1 Convert team_repository to polymorphic relation [SCI-6917] 2022-06-29 15:22:22 +02:00
artoscinote b880f6fc39
Add API endpoints for step texts [SCI-6889] (#4173) 2022-06-27 12:30:45 +02:00
aignatov-bio de626acd7f
Merge pull request #4169 from aignatov-bio/ai-sci-6853-fix-new-acitvities
Fix new step activities [SCI-6893]
2022-06-27 11:14:21 +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
Anton 8ce0490e9a Fix new step activities [SCI-6853] 2022-06-22 14:16:01 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +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 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 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
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 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
artoscinote 23872f519b
Implement step element sorting modal [SCI-6849] (#4124)
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
2022-05-30 13:45:51 +02:00
aignatov-bio 57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space
Add the ability to show storage limit [SCI-6835]
2022-05-26 15:03:45 +02:00
Anton 3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
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 054ce72d25
Add handle for going over storage limit for inventories [SCI-6604] (#4120) 2022-05-26 13:19:38 +02:00
Anton 2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +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