scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 19:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
12045 commits 69 branches 179 tags 165 MiB
Commit graph

9364 commits

Author SHA1 Message Date
ajugo ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
artoscinote eec5fd9ab3
Merge pull request #4570 from artoscinote/ma_SCI_7357 
Only render last label in ZPL [SCI-7357]
 2022-10-25 11:53:52 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Martin Artnik 7f384f1964 Only render last label in ZPL [SCI-7357] 2022-10-24 15:50:10 +02:00
Anton 8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Andrej 09a1adb194 Fix hound [SCI-7181] 2022-10-24 13:12:28 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Alex Kriuchykhin 60dc26a42b
Merge pull request #4567 from okriuchykhin/ok_SCI_7375 
Fix display of user access for experiments and tasks [SCI-7375]
 2022-10-24 13:05:02 +02:00
Oleksii Kriuchykhin 09440d4f83 Fix display of user access for experiments and tasks [SCI-7375] 2022-10-24 12:57:08 +02:00
Oleksii Kriuchykhin d38556e3fa Fix repository permissions helper [SCI-7360] 2022-10-21 14:51:16 +02:00
Alex Kriuchykhin 3bc3036b58
Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2 
Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]
 2022-10-21 14:36:52 +02:00
Alex Kriuchykhin 23a8f8fc07
Merge pull request #4561 from okriuchykhin/ok_SCI_7363 
Fix task access display modal [SCI-7363]
 2022-10-21 14:29:28 +02:00
Oleksii Kriuchykhin a9e7e81e51 Fix typo in update team assignments service, improve shared inventories migration [SCI-7360] 2022-10-21 14:04:33 +02:00
Alex Kriuchykhin 2ddb6d8685
Merge pull request #4558 from rekonder/aj_SCI_7373 
Fix permission on experiment open for org admins [SCI-7373]
 2022-10-21 13:48:28 +02:00
Alex Kriuchykhin 207b8311af
Merge pull request #4559 from aignatov-bio/ai-sci-7374-fix-protocol-creation-from-dashboard 
Fix protocol creation from dashboard [SCI-7374]
 2022-10-21 13:47:33 +02:00
Oleksii Kriuchykhin 8dfedfe165 Fix task access display modal [SCI-7363] 2022-10-21 13:33:22 +02:00
Anton bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton 05902d485b Fix protocol creation from dashboard [SCI-7374] 2022-10-21 11:40:50 +02:00
Andrej 140dc8c768 Fix permission on experiment open for org admins [SCI-7373] 2022-10-21 11:25:54 +02:00
Oleksii Kriuchykhin 7d3f48199a Fix shared repositories migration, update sharing logic and permissions [SCI-7360] 2022-10-21 11:00:52 +02:00
Alex Kriuchykhin 1799361944
Merge pull request #4555 from okriuchykhin/ok_SCI_7366 
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
 2022-10-21 10:35:10 +02:00
Oleksii Kriuchykhin 94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
Alex Kriuchykhin a55390898a
Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2 
Fix protocol permission propagation [SCI-7348]
 2022-10-20 09:24:44 +02:00
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin 5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
ajugo 0a56d772b7
Move print button for shared repository in view mode [SCI-7277] (#4550) 2022-10-19 14:10:04 +02:00
ajugo 9639e30c72
Generate correct format for create at at print time [SCI-7351] (#4547) 2022-10-19 13:18:52 +02:00
ajugo 98c32fda78
Fix label preview for custom repository columns [SCI-7358] (#4549) 2022-10-19 13:18:33 +02:00
Anton 2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
aignatov-bio 822a4f87c7
Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo 
Replace label template promo logo [SCI-7350]
 2022-10-19 11:44:06 +02:00
Anton 1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +02:00
Anton c6e5fba21c Fix file name in attachment delete modal [SCI-7356] 2022-10-19 11:12:27 +02:00
Alex Kriuchykhin 482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346 
Update default density for label templates [SCI-7346]
 2022-10-19 10:04:53 +02:00
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
aignatov-bio 83c3699493
Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button 
Save dimensions on refresh label template preview [SCI-7340]
 2022-10-18 11:26:36 +02:00
ajugo fab625d819
Set correct permission for repository on team role change [SCI-7341] (#4540) 2022-10-18 10:43:51 +02:00
ajugo 64975effc6
Close print label modal at print click [SCI-7327] (#4526) 2022-10-18 10:42:50 +02:00
Andrej 538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Anton bb354f2dbc Save dimensions on refresh label template preview [SCI-7340] 2022-10-17 12:25:08 +02:00
Anton 91c46e2005 Fix copy experiment only to active projects [SCI-7345] 2022-10-17 11:08:59 +02:00
Alex Kriuchykhin 6abfc8d293
Merge pull request #4527 from rekonder/aj_SCI_7326 
Move loading label print modal for task [SCI-7326]
 2022-10-17 10:21:51 +02:00
Alex Kriuchykhin 4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338 
Fix user role selection when inviting new users [SCI-7338]
 2022-10-17 10:21:37 +02:00
Alex Kriuchykhin 63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2 
Unify tags loading order [SCI-6943]
 2022-10-17 10:21:13 +02:00
Alex Kriuchykhin d12cdb8a9a
Merge pull request #4530 from okriuchykhin/ok_SCI_7297_v2 
Fix display of a creator in the reports table [SCI-7297]
 2022-10-17 10:18:09 +02:00
Alex Kriuchykhin 15813166fe
Merge pull request #4537 from okriuchykhin/ok_SCI_7343 
Allow team owners to manage project users [SCI-7343]
 2022-10-17 10:16:50 +02:00
Alex Kriuchykhin eba3fc574b
Merge pull request #4536 from okriuchykhin/ok_SCI_7330 
Fix permission checking in reports controller [SCI-7330][SCI-7331]
 2022-10-17 10:16:15 +02:00
Alex Kriuchykhin 51da8edacc
Merge pull request #4533 from okriuchykhin/ok_SCI_7336 
Fix project users assignment to newly created experiments [SCI-7336]
 2022-10-17 10:15:44 +02:00
Alex Kriuchykhin 15af00934b
Merge pull request #4535 from rekonder/aj_SCI_7322 
Implemented label preview options for the Viewer role [SCI-7322]
 2022-10-17 09:35:47 +02:00
Oleksii Kriuchykhin bded75ac2c Allow team owners to manage project users [SCI-7343] 2022-10-14 15:51:37 +02:00
Alex Kriuchykhin ec81234ec5
Merge pull request #4531 from rekonder/aj_SCI_7305 
Remove old label printer modal code [SCI-7305]
 2022-10-14 14:44:02 +02:00
Oleksii Kriuchykhin 8e838fe09f Fix permission checking in reports controller [SCI-7330][SCI-7331] 2022-10-14 14:26:02 +02:00
Andrej 16b4a89fb8 Disable label preview options for Viewer role [SCI-7322] 2022-10-14 11:49:31 +02:00
Oleksii Kriuchykhin a5336608f8 Fix user role selection when inviting new users [SCI-7338] 2022-10-14 11:35:35 +02:00
Alex Kriuchykhin c725e1f100
Merge pull request #4521 from okriuchykhin/ok_SCI_7325 
Fix protocol import in templates [SCI-7325]
 2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin a3b8f98b24 Fix project users assignment to newly created experiments [SCI-7336] 2022-10-14 10:23:57 +02:00
Giga Chubinidze 62febd44dd centered project code for tables 2022-10-13 20:31:37 +04:00
Giga Chubinidze 94e28ecc8d fixed switching from cards to list 2022-10-13 19:22:41 +04:00
Andrej f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
Oleksii Kriuchykhin 68fab55328 Fix display of a creator in the reports table [SCI-7297] 2022-10-13 14:55:24 +02:00
Oleksii Kriuchykhin e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Andrej 5752401a29 Move loading label print modal on task [SCI-7326] 2022-10-13 13:16:18 +02:00
ajugo 58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +02:00
Oleksii Kriuchykhin 1bd3a7e783 Fix protocol import in templates [SCI-7325] 2022-10-12 14:27:21 +02:00
Alex Kriuchykhin 1e6c6da964
Merge pull request #4517 from okriuchykhin/ok_SCI_7298 
Add option to disable local password log in [SCI-7298]
 2022-10-12 12:54:34 +02:00
Alex Kriuchykhin 827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314 
Fixed the existing templates  [SCI-7314]
 2022-10-12 11:49:09 +02:00
Martin Artnik b67bea81b8 Remove legacy protocol links [SCI-7323] 2022-10-12 11:01:16 +02:00
Oleksii Kriuchykhin f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +02:00
Andrej 230aea15fc Update experiment templates [SCI-7314] 2022-10-11 15:55:56 +02:00
ajugo e96ccdb1d5
Fix start date on locked task and correct format of number [SCI-7098] (#4366) 2022-10-11 11:31:53 +02:00
Alex Kriuchykhin 99ffbf47ab
Merge pull request #4512 from okriuchykhin/ok_SCI_7297 
Fix report creation permission check [SCI-7297]
 2022-10-11 11:01:31 +02:00
ajugo 0493d6f31d
Fix label template preview issues [SCI-7313] (#4514) 
* Add preview label at open modal [SCI-7313]

* Add density and unit to the label template [SCI-7313]
 2022-10-11 10:58:37 +02:00
Alex Kriuchykhin 4c9f96f7f7
Merge pull request #4510 from okriuchykhin/ok_SCI_7292 
Add logic for user role updates for team child objects [SCI-7292]
 2022-10-11 10:49:08 +02:00
Oleksii Kriuchykhin f68e85532c Fix report creation permission check [SCI-7297] 2022-10-10 16:16:54 +02:00
Alex Kriuchykhin 3592faea78
Merge pull request #4511 from okriuchykhin/ok_SCI_7230 
Fix filtering by user role for teams table [SCI-7320]
 2022-10-10 16:07:34 +02:00
Alex Kriuchykhin 4ac46f876a
Merge pull request #4509 from rekonder/aj_SCI_7315 
Fix selected printer for printing [SCI-7315]
 2022-10-10 15:59:29 +02:00
Alex Kriuchykhin 3a9b568358
Merge pull request #4508 from rekonder/aj_SCI_7318 
Fix view permission at label template table [SCI-7318]
 2022-10-10 15:59:02 +02:00
Oleksii Kriuchykhin a88e936693 Fix filtering by user role for teams table [SCI-7230] 2022-10-10 15:48:38 +02:00
Oleksii Kriuchykhin 9322052f9d Add logic for user role updates for team child objects [SCI-7292] 2022-10-10 15:27:42 +02:00
Andrej 5d6b454756 Fix selected printer for printing [SCI-7315] 2022-10-10 13:33:35 +02:00
Andrej 42193bbe81 Fix view permission at label template table [SCI-7318] 2022-10-07 17:16:40 +02:00
Giga Chubinidze f7472d25b9 more styling fixes 2022-10-07 17:14:43 +04:00
Alex Kriuchykhin 5158b3e155
Merge pull request #4505 from okriuchykhin/ok_SCI_7308 
Fix user invitation modal [SCI-7308]
 2022-10-07 14:53:34 +02:00
Alex Kriuchykhin 4d529cfcb5
Merge pull request #4499 from okriuchykhin/ok_SCI_7291 
Update teams table with new user assignments system [SCI-7291]
 2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin 0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +02:00
Giga Chubinidze 3f3c2a3504 project name card size change 2022-10-07 15:27:33 +04:00
G-Chubinidze 47e4244d9e
Update _manage_due_date_modal.html.erb 2022-10-07 14:38:59 +04:00
Giga Chubinidze 8b5ff3955b fixed can not set due date on task card issue [SCI-7251] 2022-10-07 14:14:29 +04:00
Oleksii Kriuchykhin 173e3b09cd Fix user invitation modal [SCI-7308] 2022-10-06 17:55:51 +02:00
Alex Kriuchykhin 07d470b2ff
Merge pull request #4479 from okriuchykhin/ok_SCI_7271 
Fix label printing status modal [SCI-7271]
 2022-10-06 15:46:36 +02:00
Alex Kriuchykhin 0f394b34ce
Merge pull request #4495 from okriuchykhin/ok_SCI_7289 
Fix search in team members table [SCI-7289]
 2022-10-06 15:46:03 +02:00
Alex Kriuchykhin 9152cee31f
Merge pull request #4496 from okriuchykhin/ok_SCI_7290 
Fix user role loading for Team in permission checking concern [SCI-7290]
 2022-10-06 15:45:48 +02:00
Alex Kriuchykhin d648492bad
Merge pull request #4500 from okriuchykhin/ok_SCI_7293 
Fix project visibility for team admins [SCI-7293]
 2022-10-06 15:45:29 +02:00
Alex Kriuchykhin 5ab361123e
Merge pull request #4501 from okriuchykhin/ok_SCI_7295 
Assign user to public projects after adding to a team [SCI-7295]
 2022-10-06 15:45:17 +02:00
artoscinote 77b91b467a
Merge pull request #4485 from rekonder/aj_SCI_7270 
Add label printer modal to task [SCI-7270][7296]
 2022-10-06 15:01:31 +02:00
ajugo 5f38464369
Fix open label template in new tab [SCI-7302] (#4503) 2022-10-06 14:57:45 +02:00
Andrej 16a7dd261f Add name to zebra printer initialization [SCI-7312] 2022-10-06 14:52:15 +02:00
ajugo 88d9ece237
Fix zebra printer library load [SCI-7310] (#4502) 2022-10-06 13:52:49 +02:00
ajugo f87b42d042
Remove icon from the status repository column at label print time [SCI-7267] (#4471) 
* Remove icon from the status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]

* Fix status repository column at label print time [SCI-7267]
 2022-10-06 11:53:12 +02:00
ajugo eef93c42d8
Disable print modal button for offline printer statuses [SCI-7276] (#4493) 
* Disable print modal button for offline printer statuses [SCI-7276]

* Disable print modal button for offline printer statuses [SCI-7276]
 2022-10-06 11:19:51 +02:00
aignatov-bio bd535dc9ad
Add dimension saving to label templates [SCI-7268] (#4489) 2022-10-06 11:09:10 +02:00
Alex Kriuchykhin ae8f5526be
Merge pull request #4490 from aignatov-bio/ai-sci-7287-fix-validation-on-print-modal 
Fix validation on print modal [SCI-7287]
 2022-10-06 10:42:36 +02:00
Oleksii Kriuchykhin 9a05bf04bd Assign user to public projects after adding to a team [SCI-7295] 2022-10-05 22:40:46 +02:00
Oleksii Kriuchykhin b87ed7db8e Fix project visibility for team admins [SCI-7293] 2022-10-05 19:40:45 +02:00
Oleksii Kriuchykhin 0a8ebef095 Update teams table with new user assignments system [SCI-7291] 2022-10-05 18:28:40 +02:00
Oleksii Kriuchykhin cf34ddcbd1 Fix user role loading for Team in permission checking concern [SCI-7290] 2022-10-04 13:53:45 +02:00
ajugo 7fbac92f9c
Add status for Zebra printers in label print modal [SCI-7269] (#4492) 2022-10-04 09:57:47 +02:00
Andrej 884fe58525 Fix label print open issue [SCI-7296] 2022-10-03 17:33:42 +02:00
Oleksii Kriuchykhin 830248ada9 Fix search in team members table [SCI-7289] 2022-10-03 16:56:15 +02:00
Andrej e05ad97498 Enable label print modal for smart annotations [SCI-7270] 2022-10-03 13:39:18 +02:00
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
aignatov-bio aba760f1a4
Merge pull request #4486 from aignatov-bio/ai-sci-7285-fix-duplicate-label-in-dropdown-component 
Fix duplicate labels in dropdown components [SCI-7285]
 2022-09-30 19:51:34 +02:00
Anton 85248a0426 Fix validation on print modal [SCI-7287] 2022-09-30 19:48:13 +02:00
artoscinote b65422b74d
Merge pull request #4488 from artoscinote/ma_SCI_7288 
Add extension to icon image path, to fix it in production [SCI-7288]
 2022-09-30 14:31:43 +02:00
Martin Artnik 846690401d Add extension to icon image path, to fix it in production [SCI-7288] 2022-09-30 14:26:32 +02:00
aignatov-bio 13f24cac08
Merge pull request #4483 from aignatov-bio/ai-sci-7262-css-fixes-label-templates 
CSS fixes for label templates [SCI-7262]
 2022-09-30 09:47:39 +02:00
Anton 0107368b67 Fix duplicate labels in dropdown components [SCI-7285] 2022-09-29 21:11:00 +02:00
aignatov-bio 096c285235
Merge pull request #4484 from aignatov-bio/ai-sci-7265-fix-css-label-templates-table-view 
Fix css label templates table view [SCI-7265]
 2022-09-29 20:58:51 +02:00
Andrej e8528e6120 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7270 2022-09-29 16:36:44 +02:00
Andrej eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
ajugo 103bdff654
Select default label template based on selected pritner type [SCI-7268][7257] (#4475) 2022-09-29 14:47:59 +02:00
ajugo 69bc48fef8
Add cancel button and fix number input [SCI-7274] (#4478) 2022-09-29 14:45:10 +02:00
Anton 9d9f6e26bb Fix css label templates table view [SCI-7265] 2022-09-29 14:29:25 +02:00
Anton 9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +02:00
aignatov-bio d9dc76c0f9
Merge pull request #4476 from aignatov-bio/ai-sci-7259-label-printer-modal-add-icons-template 
Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260]
 2022-09-29 13:56:39 +02:00
artoscinote d08838bf48
Merge branch 'develop' into master_1_26_0_5 2022-09-29 10:12:29 +02:00
Oleksii Kriuchykhin ac11d41359 Fix label printing status modal [SCI-7271] 2022-09-28 17:01:07 +02:00
Anton 7e06f29a75 Add icon and tooltip to label template dropdown [SCI-7259][SCI-7260] 2022-09-28 11:34:24 +02:00
aignatov-bio 31554d0fd9
Merge pull request #4472 from aignatov-bio/ai-sci-7255-add-label-validation-to-print-modal 
Add label validation and preview in print modal [SCI-7255][SCI-7256]
 2022-09-28 11:32:39 +02:00
ajugo 0e8ad6abf1
Implement toggle for zebra printers searching feature [SCI-7242] (#4470) 2022-09-27 15:57:23 +02:00
Anton 3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02:00
Anton d22ec4960d Add loading label to settings printers search [SCI-7253] 2022-09-27 12:02:50 +02:00
Alex Kriuchykhin db0a5ede84
Merge pull request #4462 from okriuchykhin/ok_SCI_7240 
Fix user adding/removing from a team [SCI-7240]
 2022-09-27 10:30:35 +02:00
Alex Kriuchykhin 0c41ee9dec
Merge pull request #4466 from okriuchykhin/ok_SCI_7263 
Fix sorting in label templates datatable [SCI-7263]
 2022-09-27 10:30:08 +02:00
Giga Chubinidze 8608e61513 fixed duplicate titles in empty index repositories [SCI-7162] 2022-09-27 12:25:39 +04:00
ajugo aa10259d40
Fix loading of zebra printers to modal and some other small fixes [SCI-7244] (#4463) 
* Fix loading of zebra printers to modal and some other small fixes [SCI-7244]

* Fix zebra printing [SCI-7244]
 2022-09-27 09:58:22 +02:00
Oleksii Kriuchykhin 0d656f8976 Fix sorting in label templates datatable [SCI-7263] 2022-09-26 22:21:45 +02:00
Anton dbfc3b2e2a Fix column label template format [SCI-7236] 2022-09-26 21:01:31 +02:00
Oleksii Kriuchykhin b675fb14eb Fix user adding/removing from a team [SCI-7240] 2022-09-26 12:14:03 +02:00
Alex Kriuchykhin fcd235b654
Merge pull request #4457 from okriuchykhin/ok_SCI_7241 
Improve error handling in label template preview generation [SCI-7241]
 2022-09-26 10:33:30 +02:00
aignatov-bio e96b15b241
Merge pull request #4444 from aignatov-bio/ai-sci-7222-update-fluics-template-screen 
Update fluics view and permissions for label templates [SCI-7222]
 2022-09-26 10:22:01 +02:00
ajugo 8c2f7da87f
Escape underscores when sending ZPL to render service [SCI-7223] (#4456) 2022-09-26 10:21:12 +02:00
Anton d3886c9bf7 Small fixes [SCI-7193] 2022-09-26 10:02:41 +02:00
Anton 40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
aignatov-bio bc1683dc40
Merge pull request #4459 from rekonder/aj_SCI_7250 
Fix archived task button [SCI-7250]
 2022-09-23 13:50:09 +02:00
aignatov-bio 94044d020d
Merge pull request #4458 from aignatov-bio/ai-sci-7239-fix-checkboxes-safari 
Fix checkbox in safari [SCI-7239]
 2022-09-23 12:50:39 +02:00
Andrej c60ca19c62 Fix archived task button [SCI-7250] 2022-09-23 12:42:17 +02:00
Anton 4e32707245 Fix dupicate protocols in activities search [SCI-7171] 2022-09-23 12:38:44 +02:00
ajugo b7861f5fdb
Add zebra javascript print library [SCI-7245] (#4455) 2022-09-23 12:34:43 +02:00
Oleksii Kriuchykhin 1d7bca0664 Improve error handling in label template preview generation [SCI-7241] 2022-09-22 15:24:30 +02:00
ajugo a3ea6e608c
Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448) 
* Add validation to print modal [SCI-7052]

* Fix dropdown on label modal print [SCI-7052]

* Fix hound [SCI-7052]

* Rename validation endpoint [SCI-7052]

* Add zpl label printing and fix fluics printing [SCI-7221]

* Fix hound [SCI-7221]
 2022-09-22 15:06:36 +02:00
Anton 9bc4610cae Fix checkbox in safari [SCI-7239] 2022-09-22 11:24:02 +02:00
artoscinote e0e592338c
Merge pull request #4440 from artoscinote/ma_SCI_7219 
Migration fixes [SCI-7219]
 2022-09-21 13:45:29 +02:00
Anton 2d925a3bfe Add help and quick toolbar plugin to tinymce [SCI-7190] 2022-09-21 12:01:08 +02:00
artoscinote e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184 
Add y-scroll to step tables [SCI-7184]
 2022-09-21 10:29:19 +02:00
artoscinote 50e7531ffa
Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]" 2022-09-21 10:07:44 +02:00
Anton 07f0142789 Fix links in locked step texts elements [SCI-7224] 2022-09-20 15:44:52 +02:00
ajugo 6f3a32f09f
Add label template dropdown to print dialog [SCI-7104] (#4387) 
* Add label template dropdown to print dialog [SCI-7051]

* Add zebra printers in printing progress and modal [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Fix hound [SCI-7104]

* Clean code for zebra printer [SCI-7104]
 2022-09-20 14:10:34 +02:00
Anton fed1228adc Update fluics and permissions for label templates [SCI-7222] 2022-09-20 12:59:58 +02:00
aignatov-bio e524355207
Merge pull request #4441 from aignatov-bio/ai-sci-7210-add-code-validation-to-label-templates 
Add validation to label template code [SCI-7210]
 2022-09-20 11:59:59 +02:00
artoscinote 6faa59581e
Merge pull request #4427 from artoscinote/ma_SCI_7163 
Skip previews for non-supported images in team zip export [SCI-7163]
 2022-09-19 13:59:35 +02:00
artoscinote cf3a233f4e
Merge branch 'develop' into ma_SCI_7177 2022-09-19 13:58:33 +02:00
artoscinote dddbc16a50
Merge pull request #4438 from scinote-eln/ma_SCI_7184 
Add y-scroll to step tables [SCI-7184]
 2022-09-19 13:56:17 +02:00
Anton 17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +02:00
Martin Artnik e99e021479 Fix user smart annotations [SCI-7219] 2022-09-16 16:08:36 +02:00
Martin Artnik c67213db41 Add y-scroll to step tables [SCI-7184] 2022-09-16 11:16:39 +02:00
Andrej ec77c2a076 Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027 2022-09-16 10:44:07 +02:00
Andrej 231dd40602 Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:41:51 +02:00
Andrej 4fb3f7ff3d Fix hound and add emoji in title [SCI-7027] 2022-09-16 10:39:39 +02:00
Andrej ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
Giga Chubinidze 102eed8241 Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:27:23 +04:00
Giga Chubinidze b31f60026a Expose project IDs in tables & cards view [SCI-7172] [SCI-7173] 2022-09-15 22:20:04 +04:00
artoscinote 500adb346e
Merge pull request #4426 from G-Chubinidze/gc_SCI_7115 
added scrollbar to task paper dropdown [SCI-7115]
 2022-09-15 15:29:25 +02:00
Giga Chubinidze 7c0407af7a refactored scrollbar to fit style guides 2022-09-15 16:44:40 +04:00
aignatov-bio e1ce81280e
Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities 
Fix duplicate protocols in activities search [SCI-7171]
 2022-09-15 14:07:23 +02:00
aignatov-bio c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps 2022-09-15 11:25:25 +02:00
aignatov-bio 7d23f3c8a6
Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export 2022-09-15 11:20:20 +02:00
Anton 0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton d7990cb058 Add new permissions for label templates [SCI-7088] 2022-09-14 15:13:13 +02:00
aignatov-bio 4182194b31
Merge branch 'features/label-templates' into features/team-permissions 2022-09-14 14:34:02 +02:00
aignatov-bio 33f210638a
Merge branch 'features/team-permissions' into ok_SCI_6947 2022-09-14 14:31:45 +02:00
aignatov-bio 9e63dcab22
Merge pull request #4207 from okriuchykhin/ok_SCI_6918 
Update repository sharing actions [SCI-6918]
 2022-09-14 14:23:52 +02:00
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Giga Chubinidze 22aa04a5ac exposed prefixed ids for projects table [SCI_7172] 2022-09-13 15:57:17 +04:00
Giga Chubinidze 133302964c exposed prefixed ids for projects table [SCI_7172] 2022-09-13 15:53:41 +04:00
Giga Chubinidze 0a1b879c3d exposed prefixed ids for projects table [SCI_7172] 2022-09-13 15:49:12 +04:00
Martin Artnik 3d1bdac1f4 Added task code to task details [SCI-7178] 2022-09-13 13:17:18 +02:00
Martin Artnik b836b9a12b Add task IDs to canvas view [SCI-7177] 2022-09-13 12:42:12 +02:00
Anton d68bb6ddf4 Fix dupicate protocols in activities search [SCI-7171] 2022-09-13 12:38:26 +02:00
Giga Chubinidze 2c393a1bef exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:31:04 +04:00
Giga Chubinidze fbbe394029 exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:24:06 +04:00
Anton 7d02b9f26d Fix repository selection in reports [SCI-7167] 2022-09-13 09:59:11 +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
Martin Artnik 2e3956aaf9 Skip previews for non-supported images in team zip export [SCI-7163] 2022-09-12 12:31:17 +02:00
Giga Chubinidze 271867710f added scrollbar to task paper dropdown [SCI-7115] 2022-09-09 23:28:37 +04:00
Alex Kriuchykhin f62e4e8509
Merge pull request #4423 from okriuchykhin/ok_SCI_7180 
Improve speed of group unassignment job as it is executed in foreground [SCI-7180]
 2022-09-09 15:58:44 +02:00
Anton 73917ec4c0 Fix tinymce errors [SCI-7182] 2022-09-09 15:50:59 +02:00
Oleksii Kriuchykhin b8dc0617b2 Improve speed of group unassignment job as it is executed in foreground [SCI-7180] 2022-09-09 13:31:16 +02:00
artoscinote fa7e39c6a9
Fix experiment page infinite scroll [SCI-7160] (#4422) 2022-09-09 11:42:37 +02:00
artoscinote 6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
Oleksii Kriuchykhin 557c4b205a Reimplement custom TinyMCE plugin: customImageUploader [SCI-7151] 2022-09-09 10:59:20 +02:00
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
Anton 9b52b7f3db Fix tinymce pack code styling [SCI-7183] 2022-09-08 15:37:23 +02:00
aignatov-bio 7d9fbb45d5
Merge branch 'features/tiny_mce_6' into ai-sci-7152-update-tinymce-image-toolbar-plugin 2022-09-08 12:13:58 +02:00
G-Chubinidze e179182d21
fix archived repositories show button not showing [SCI-7162] (#4408) 
* fix archived repositories show button not showing [SCI-7162]

* fix archived repositories show button not showing [SCI-7162]

Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
 2022-09-08 11:51:47 +02:00
Anton 2f01a5a358 Update tinymce placeholder plugin [SCI-7153] 2022-09-07 15:16:03 +02:00
Anton c8af3e1fa8 Update tinymce image toolbar plugin [SCI-7152] 2022-09-07 11:24:54 +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 95105b86af
Fix ininite scroll [SCI-7160] (#4414) 2022-09-07 10:01:00 +02:00
Anton 1ebd4046cd Update tinyMCE marvinjs plugin [SCI-7154] 2022-09-06 13:05:56 +02:00
aignatov-bio 2407b95e37
Merge pull request #4411 from aignatov-bio/ai-sci-7169-remove-scroll-before-page-leave 
Remove scroll before page leave [SCI-7169]
 2022-09-06 12:44:20 +02:00
artoscinote d2b022a17d
Remove obsolete code [SCI-7160] (#4412) 2022-09-06 12:10:20 +02:00
artoscinote 21f91089e9
Prevent loading empty next page in P/E infinite scroll [SCI-7160] (#4410) 2022-09-06 11:57:34 +02:00
Anton 90e962ccbf Remove scroll before page leave [SCI-7169] 2022-09-06 11:15:28 +02:00
artoscinote 9126b7fca4
Add missing protocol description activity [SCI-7140] (#4401) 2022-09-06 11:03:13 +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
aignatov-bio b585219be2
Merge pull request #4402 from aignatov-bio/ai-sci-7127-fix-error-handling-for-tinymce 
Fix error handling for tinymce [SCI-7127]
 2022-09-05 12:36:36 +02:00
artoscinote 44b7c866b5
Move tinymce to webpacker and upgrade to v6 [SCI-7081] (#4385) 
* Move tinymce to webpacker and upgrade to v6 [SCI-7081]

* Cleanup and refactor [SCI-7081]

* Clean up legacy plugins [SCI-7150]

* Linter fix [SCI-7081]]
 2022-09-05 11:29:19 +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
Alex Kriuchykhin 0fcedc32ba
Merge pull request #4403 from artoscinote/ma_SCI_7159 
Make project action dropdowns async [SCI-7159]
 2022-09-02 17:05:35 +02:00
Martin Artnik a2a5e8c4c8 Add caching and improve dynamic reload [SCI-7159] 2022-09-02 16:54:41 +02:00
artoscinote 27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161 
Fix underline in docx report generator [SCI-7161]
 2022-09-02 15:13:13 +02:00
Giga Chubinidze f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Anton 34b87ae92f Fix files loading during copy [SCI-7149] 2022-09-02 15:09:56 +02:00
Giga Chubinidze 85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
Martin Artnik ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02:00
aignatov-bio 491ff286f6
Merge pull request #4390 from aignatov-bio/ai-sci-7113-fix-assigned-repositry-bell-flyout 
Fix bell flyout in assigned repository [SCI-7113]
 2022-09-02 11:21:17 +02:00
aignatov-bio 2e190510c4
Merge pull request #4397 from aignatov-bio/ai-sci-7136-fix-rte-toolbar-position 
Fix rte toolbar position [SCI-7136]
 2022-09-02 11:20:32 +02:00
aignatov-bio e605471269
Merge pull request #4392 from aignatov-bio/ai-sci-7100-fix-inivitation-modal 
Invite user modal fixes [SCI-7100]
 2022-09-02 11:20:18 +02:00
Anton 5f21c06b26 Fix error handling for tinymce [SCI-7127] 2022-09-02 11:19:54 +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
Alex Kriuchykhin 284bfe106d
Merge pull request #4398 from okriuchykhin/ok_SCI_7133 
Optimise PE cards loading [SCI-7133]
 2022-09-01 12:05:05 +02:00
Oleksii Kriuchykhin e276054a80 Optimize PE cards loading [SCI-7133] 2022-09-01 11:59:39 +02:00
artoscinote 87e944c9c4
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141 
Fix superscript and subscript  in docx report generator [SCI-7141]
 2022-09-01 11:34:08 +02:00
Giga Chubinidze 57c5947d91 Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:49:17 +04:00
Giga Chubinidze 922652417a Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:15:31 +04: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 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 312f2a1357 Fix rte toolbar position [SCI-7136] 2022-08-31 13:15:08 +02:00
Anton d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
aignatov-bio 57282069e9
Merge pull request #4361 from aignatov-bio/ai-sci-7084-add-sorting-by-default-template 
Add sorting by default label template [SCI-7084]
 2022-08-31 10:36:02 +02:00
Anton bcc681b14d Add labels template to team import/export [SCI-7089] 2022-08-31 10:28:29 +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
aignatov-bio 17d69131f3
Merge pull request #4383 from aignatov-bio/ai-sci-7124-fix-old-tinymce-big-tables 
Fix overflow issue on step text [SCI-7124]
 2022-08-31 10:13:27 +02:00
aignatov-bio 042e0330a7
Merge pull request #4386 from aignatov-bio/ai-sci-7117-fix-project-scroll-issue 
Fix project/experiment scroll issue [SCI-7117]
 2022-08-31 10:13:10 +02:00
artoscinote ceb3d95e0f
Merge pull request #4394 from artoscinote/ma_SCI_7135 
Fix smart annotations for locked tasks [SCI-7135]
 2022-08-31 09:58:48 +02:00
Martin Artnik d3665a940e Fix smart annotations for locked tasks [SCI-7135] 2022-08-31 09:49:47 +02:00
artoscinote 04245c8244
Merge pull request #4393 from artoscinote/ma_SCI_7118 
Fix sorting of results by newest/oldest (by updated_at) [SCI-7118]
 2022-08-31 09:10:26 +02:00
Martin Artnik 6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
Martin Artnik bd1e30d19b Add default measurments to label templates [SCI-7129] 2022-08-30 16:16:02 +02:00
Martin Artnik 194963a94e Fix sorting of results by newest/oldest (by updated_at) [SCI-7118] 2022-08-30 11:48:09 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Anton d2639d4633 Fix bell flyout in assigned repository [SCI-7113] 2022-08-29 11:30:39 +02:00
Oleksii Kriuchykhin b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
Anton a1117fbc0e Fix project/experiment scroll issue [SCI-7117] 2022-08-26 16:29:53 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
Anton 81dd259c25 Fix tinymce memory leak [SCI-7138] 2022-08-26 10:52:55 +02:00
Anton 0747a495c9 Fix overflow issue on step text [SCI-7124] 2022-08-25 15:32:03 +02:00
aignatov-bio 6706e886e3
Merge pull request #4382 from aignatov-bio/ai-sci-7085-update-css-for-view-screen 
Fix css for label template view screen [SCI-7085]
 2022-08-25 14:33:57 +02:00
Alex Kriuchykhin dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045 
Add list label templates method to Fluics API client [SCI-7045]
 2022-08-25 13:40:40 +02:00
Anton 9daa3f6d69 Fix css for label view page [SCI-7085] 2022-08-25 13:25:34 +02:00
Anton 771c40d4f0 CSS fixes for label template screen [SCI-7085] 2022-08-24 17:57:34 +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
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
artoscinote 766d2bb3e0
Fix checkboxes for technicians [SCI-7122] (#4378) 2022-08-23 18:10:28 +02:00
Anton 3e539adbde Fix step drag/drop file [SCI-7123] 2022-08-23 17:59:28 +02:00
Anton bc112dd6af Add step duplication [SCI-7109] 2022-08-23 17:54:33 +02:00
Alex Kriuchykhin 8744286d98
Merge pull request #4377 from okriuchykhin/ok_SCI_7126 
Fix export of protocols with empty step text fields [SCI-7126]
 2022-08-23 15:11:09 +02:00
Oleksii Kriuchykhin 3d00249644 Fix export of protocols with empty step text fields [SCI-7126] 2022-08-23 14:30:30 +02:00
artoscinote 74b9101e6f
Enable table scroll for locked tasks [SCI-7125] (#4375) 2022-08-23 14:23:21 +02:00
Anton d8bcdb09e4 Fix drag n drop for locked tasks [SCI-7123 2022-08-23 14:20:24 +02:00
artoscinote c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] (#4374) 2022-08-23 10:10:20 +02:00
Anton 1bac9aeb4c Add duplication to components [SCI-7108] 2022-08-22 15:03:49 +02:00
Andrej 371f5e782b Remove strikethrough for step name and checklist items [SCI-7116] 2022-08-19 16:02:20 +02:00
Oleksii Kriuchykhin 497fc3a2a5 Fix API endpoints for step elements creation [SCI-7101] 2022-08-18 17:31:29 +02:00
Anton 45bbbfffe4 Update label template promo text [SCI-7060] 2022-08-18 15:33:19 +02:00
aignatov-bio 1e6e0f5038
Merge pull request #4360 from aignatov-bio/ai-sci-7107-fix-attachmets-actions-dropdown-position 
Fix attachments actions dropdown position [SCI-7107]
 2022-08-18 12:47:01 +02:00
Anton 46990b3df4 Add sorting by default label template [SCI-7084] 2022-08-18 11:49:22 +02:00
Anton 2d60ce7e99 Fix attachments actions dropdown position [SCI-7107] 2022-08-18 11:35:30 +02:00
Anton 96d52254c3 Fix file uploading for unlimited storage [SCI-7105] 2022-08-18 11:26:42 +02:00
Anton 5677e45e0c Add insert ability for code in content block [SCI-7055] 2022-08-17 13:40:35 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
aignatov-bio 606b0bdaa3
Merge pull request #4357 from aignatov-bio/ai-sci-7033-fix-error-on-task-text-field 
Fix error on task text field [SCI-7033]
 2022-08-16 12:23:03 +02:00
Anton 46b2b87654 Fix error on task text field [SCI-7033] 2022-08-16 12:21:59 +02:00
ajugo 5cdc8488b5
Add tooltips to step asset file name [SCI-7022] (#4356) 2022-08-16 12:20:37 +02:00
Anton 1a13e1bfc6 Fix unexpected error on step attachments [SCI-7032] 2022-08-16 11:22:19 +02:00
Anton 174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
Oleksii Kriuchykhin 08e654d5fb Add list label templates method to Fluics API client [SCI-7045] 2022-08-12 19:47:29 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
ajugo 8dec17f606
Add print label button in view repository role [SCI-7097] (#4351) 2022-08-12 14:55:14 +02:00
Oleksii Kriuchykhin f02f625e1e Add client for ZPL preview generation service [SCI-7049] 2022-08-12 12:57:19 +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
Alex Kriuchykhin 32c53e223b
Merge pull request #4342 from okriuchykhin/ok_SCI_7071 
Fix WOPI editing after creation issue [SCI-7071]
 2022-08-11 15:52:17 +02:00
Alex Kriuchykhin 9d1218398b
Merge pull request #4334 from okriuchykhin/ok_SCI_7070 
Fix toggling of checklist items with smart annotations [SCI-7070]
 2022-08-11 15:52:02 +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
Anton 3d6d6c3b5a Fix css for step insert component menu [SCI-6955] 2022-08-11 11:10:12 +02:00
ajugo 2c3ddcbb93
Add tinymce image to imported protocol [SCI-7076] (#4345) 2022-08-11 10:00:14 +02:00
ajugo 12fc3b0b3b
Fix protocol repository issues [SCI-7003] (#4343) 
* Fix protocol repository issues [SCI-7003]

* Remove unnecessary inRepository [SCI-7003]
 2022-08-10 15:39:45 +02:00
artoscinote 5df1701ae7
Improve cancel edit button reliability, fix blink for non-smart-annotation fields [SCI-7068] (#4344) 2022-08-10 15:34:17 +02:00
Oleksii Kriuchykhin fc77adf2bc Fix toggling of checklist items with smart annotations [SCI-7070] 2022-08-10 14:48:47 +02:00
artoscinote a37c236518
Inline edit and checklist improvements [SCI-7031] (#4340) 
* Inline edit and checklist improvements [SCI-7031]

* Fix smart annotations in inline edit [SCI-7031]
 2022-08-10 14:43:23 +02:00
Oleksii Kriuchykhin 7cea3faf1e Fix WOPI editing after creation issue [SCI-7071] 2022-08-10 14:02:09 +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
Alex Kriuchykhin b91d9e3a28
Merge pull request #4336 from okriuchykhin/ok_SCI_7073 
Fix result with WOPI file creation [SCI-7073]
 2022-08-10 11:24:27 +02:00
aignatov-bio 6334b481ef
Merge pull request #4337 from aignatov-bio/ai-sci-7080-fix-step-element-deletetion 
Fix step element delete callback [SCI-7080]
 2022-08-10 11:03:17 +02:00
Anton 8694a02cf1 Fix asset serializer [SCI-7093] 2022-08-10 10:58:39 +02:00
Oleksii Kriuchykhin d178bc38a6 Fix result with WOPI file creation [SCI-7073] 2022-08-10 10:50:56 +02:00
Anton 5cd887831c Fix step element delete callback [SCI-7080] 2022-08-10 10:50:18 +02:00
artoscinote 04a282b725
Hide blank table name if task is locked [SCI-7066] (#4333) 2022-08-10 10:38:10 +02:00
artoscinote 3a26b62bf5
Activity and checklist fixes [SCI-7079] (#4330) 2022-08-10 10:37:27 +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
aignatov-bio b4e7877b99
Merge pull request #4328 from aignatov-bio/ai-sci-7077-fix-report-protocol-name-issue 
Fix protocol name in report [SCI-7077][SCI-7078]
 2022-08-10 10:06:05 +02:00
aignatov-bio 30000676e9
Merge pull request #4331 from aignatov-bio/ai-sci-7072-fix-rearrange-step-issues 
Add title to rearrange modal elements [SCI-7072]
 2022-08-10 10:05:45 +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
Anton c044215b21 Add title to rearrange modal elements [SCI-7072] 2022-08-09 14:19:28 +02:00
Oleksii Kriuchykhin d1a46b3fc2 Fix protocol linked protocol changes tracking [SCI-6986] 2022-08-09 14:15:49 +02:00
Anton 147127a739 Fix protocol name in report [SCI-7077][SCI-7078] 2022-08-09 13:50:00 +02:00
artoscinote c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote 187197488b
Pdf viewer and protocol fixes [SCI-7074] (#4327) 2022-08-09 10:13:43 +02:00
artoscinote 19d2fea4fe
Fix checkboxes [SCI-7057] (#4317) 2022-08-09 09:25:18 +02:00
ajugo 1ee091aa53
Fix selected default step title and step name placeholder [SCI-7067] (#4326) 
* Fix selected default step title in edit mode and step name placeholder [SCI-7067]

* Add new placeholder label [SCI-7067]
 2022-08-08 16:50:34 +02:00
artoscinote 6bfb25ba50
Fix cancel edit buttons [SCI-7068] (#4325) 2022-08-08 16:18:59 +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
aignatov-bio 85cc7ae581
Merge pull request #4324 from aignatov-bio/ai-sci-7062-marvinjs-save-issue 
Fix marvinJS save issue [SCI-7062]
 2022-08-08 11:52:15 +02:00
aignatov-bio 0fdc9e9723
Merge pull request #4322 from aignatov-bio/ai-sci-7075-fix-protocol-creation-from-dashboard 
Fix protocol creation from dashboard [SCI-7075]
 2022-08-08 11:50:15 +02:00
Anton 6db1ec0a34 Fix marvinJS save issue [SCI-7062] 2022-08-08 11:48:58 +02:00
Anton ffaa6c6abb Fix inline field when value change [SCI-7069] 2022-08-08 11:32:10 +02:00
Anton edbcbffae4 Fix protocol creation from dashboard [SCI-7075] 2022-08-08 11:26:12 +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
Oleksii Kriuchykhin 13c33c3c05 Fix team switching when viewing repository from another team [SCI-7058] 2022-08-05 14:13:36 +02:00
Anton 7992cd97a1 Fix smart annotation on step text and checklist [SCI-7059] 2022-08-05 11:23:36 +02:00
ajugo 899ab608f8
Prefill protocol name at save to protocol repository modal [SCI-7065] (#4314) 2022-08-05 10:46:54 +02:00
ajugo 68bbb87797
Fix cancel at closing file modal and remove edit button for marvinjs asset [SCI-7061] (#4313) 2022-08-05 10:46:14 +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
artoscinote 9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
artoscinote ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] (#4309) 2022-08-04 11:05:55 +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
Oleksii Kriuchykhin cb71bb4a99 Fix copying of TinyMCE images when loading protocol from repository [SCI-7043] 2022-08-02 13:43:50 +02:00
ajugo 8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote 89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
ajugo 74a688e8ae
Fix protocol title and archived result tag [SCI-6979] (#4303) 2022-08-02 10:06:00 +02:00
Alex Kriuchykhin 61395482a3
Merge pull request #4299 from okriuchykhin/ok_SCI_6978_v2 
Fix long result names in PDF reports [SCI-6978]
 2022-08-01 16:37:23 +02:00
aignatov-bio ec5879b53f
Merge pull request #4300 from aignatov-bio/ai-sci-7001-fix-attachment-menu-elements-allignment 
Fix image editor callback after save image [SCI-7019]
 2022-08-01 13:59:54 +02:00
Anton bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
Anton 784c10aec9 Fix image editor callback after save image [SCI-7019] 2022-08-01 13:32:55 +02:00
ajugo 20095067a1
Fix checklist reordering issue [SCI-7039] (#4298) 2022-08-01 13:25:29 +02:00
Oleksii Kriuchykhin fcd0de80ca Fix long result names in PDF reports [SCI-6978] 2022-08-01 13:14:53 +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
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
artoscinote 47b426539f
Fix step header functionalities in locked task [SCI-7024] (#4291) 2022-07-28 14:35:34 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
ajugo 46f90c3c36
Fix creating WOPI file [SCI-7014] (#4293) 2022-07-27 15:02:42 +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
Alex Kriuchykhin 4012f0d7a3
Merge pull request #4289 from okriuchykhin/ok_SCI_6973_v2 
Fix toggling for steps and checklists [SCI-6973]
 2022-07-26 13:51:54 +02:00
Alex Kriuchykhin a68da49907
Merge pull request #4287 from okriuchykhin/ok_SCI_7002 
Improve repository table loading speed [SCI-7002]
 2022-07-26 13:51:11 +02:00
artoscinote f08e57c428
Fix confusion with attachment indices, component key [SCI-7023] (#4288) 2022-07-26 13:42:25 +02:00
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