scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-27 10:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
12104 commits 69 branches 179 tags 165 MiB
Commit graph

9412 commits

Author SHA1 Message Date
Anton a88adbf020 Fix long task names in experiment table [SCI-7708] 2023-01-11 13:37:24 +01:00
artoscinote 0352a2e1d2
Merge pull request #4795 from sboursen-scinote/sb_SCI_7710 
Fix: Cannot clear task due date on experiment table view [SCI_7710]
 2023-01-11 10:03:54 +01:00
Giga Chubinidze 5ed3a22539 timing issue fixes 2023-01-11 12:15:25 +04:00
sboursen-scinote a7f17524d2 Fix scss style issues 2023-01-10 20:33:25 +01:00
sboursen-scinote 83378e4ade Fix clear due date x button not working 
- Reduce the width of the datetime-picker-container to prevent it from hiding the clear-date (x button).
 2023-01-10 19:45:02 +01:00
aignatov-bio 7503bd7af8
Merge pull request #4793 from aignatov-bio/ai-sci-7704-experiment-update-navigation-panel-along-with-table 
Update sidebar along with experiment table [SCI-7704]
 2023-01-10 14:56:04 +01:00
Anton e38c45314b Update sidebar along with experiment table [SCI-7704] 2023-01-10 13:45:15 +01:00
Martin Artnik edfc1c4e08 Fix editor close when clicking restore notification [SCI-7729] 2023-01-10 13:24:58 +01:00
Anton ba442babe2 Update tag creation option design [SCI-7698] 2023-01-10 13:07:10 +01:00
aignatov-bio d5bd26a31b
Merge pull request #4787 from aignatov-bio/ai-sci-7540-micro-interactions-fixes 
Micro interactions fixes [SCI-7540]
 2023-01-10 12:12:44 +01:00
Anton b710d15831 Micro interactions fixes [SCI-7540] 2023-01-10 12:08:26 +01:00
artoscinote 288c255c44
Merge pull request #4776 from artoscinote/ma_SCI_7653 
Fix display of archived tasks [SCI-7653]
 2023-01-10 11:56:48 +01:00
artoscinote 3ce601dfa7
Merge pull request #4778 from artoscinote/ma_SCI_7382 
Add duplicating tooltips [SCI-7382]
 2023-01-10 11:56:33 +01:00
artoscinote 4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683 
Fix task access modal for archived experiments [SCI-7683]
 2023-01-10 11:51:47 +01:00
ajugo 06cdeb2d61
Prevent double click on button new experiment [SCI-7707] (#4783) 2023-01-10 11:46:32 +01:00
ajugo 99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
Martin Artnik 19b282cba2 Merge branch 'develop' into features/tiny_mce_6 2023-01-10 11:13:23 +01:00
ajugo 1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] (#4781) 2023-01-10 11:09:23 +01:00
ajugo ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo dd0ede1c87
Remove selected rows after task renaming in experiment table view [SCI-7647] (#4775) 2023-01-10 11:08:30 +01:00
aignatov-bio 1feaa5fb71
Merge pull request #4777 from aignatov-bio/ai-sci-7699-experiment-table-css-fixes 
Fix small css issues [SCI-7699][SCI-7694][SCI-7678]
 2023-01-10 10:39:22 +01:00
Alex Kriuchykhin 6c313f86ac
Merge pull request #4680 from okriuchykhin/ok_SCI_7455 
Add API endpoint for retrieving a list of users [SCI-7455]
 2023-01-10 10:21:23 +01:00
ajugo 9f6887ddcc
Fix step element reordering at importing protocol [SCI-7529] (#4677) 2023-01-09 16:08:27 +01:00
Martin Artnik da5324d2a1 Fix task access modal for archived experiments [SCI-7683] 2023-01-09 16:04:57 +01:00
Martin Artnik d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +01:00
Anton 85eaf7c246 Fix small css issues [SCI-7699][SCI-7694][SCI-7678] 2023-01-09 12:33:59 +01:00
Martin Artnik 2edbd2fb74 Fix display of archived tasks [SCI-7653] 2023-01-09 11:40:45 +01:00
ajugo 83ba9d40dc
Refresh canvas navigator after moved tasks [SCI-7661] (#4774) 2023-01-09 09:53:03 +01:00
ajugo 92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
aignatov-bio feb596179f
Merge pull request #4772 from aignatov-bio/ai-sci-7691-fix-new-task-modal-styling 
Experiment table - fix new task modal CSS [SCI-7691]
 2023-01-06 20:28:24 +01:00
Oleksii Kriuchykhin b29aeab67a Add API endpoint for retrieving a list of users [SCI-7455] 2023-01-06 16:33:00 +01:00
aignatov-bio 329ac41bb7
Merge pull request #4770 from aignatov-bio/ai-sci-7689-fix-canvas-page-responsivness 
Fix canvas page responsiveness [SCI-7689]
 2023-01-06 13:10:52 +01:00
aignatov-bio 29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table 
Experiment table - fix comments view mode [SCI-7695]
 2023-01-06 13:10:42 +01:00
aignatov-bio 3282c1104b
Merge pull request #4768 from aignatov-bio/ai-sci-7692-assigned-users-icons-not-alligned 
Fix assigned users icons alignment [SCI-7692]
 2023-01-06 13:10:32 +01:00
aignatov-bio 46dfe2aa37
Merge pull request #4767 from aignatov-bio/ai-sci-7693-fix-view-mode-for-experiment-table-assigned-users 
Experiment table - fix view mode for assigned users [SCI-7693]
 2023-01-06 13:10:23 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Anton 3aa71fe85e Fix canvas page responsivness [SCI-7689] 2023-01-06 12:08:35 +01:00
Anton c513e6bca7 Experiment table - fix comments view mode [SCI-7695] 2023-01-06 12:02:35 +01:00
Anton 7aad22b138 Fix assigned users icons allignment [SCI-7692] 2023-01-06 11:51:32 +01:00
Anton 802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
aignatov-bio fe58a7a206
Merge pull request #4766 from aignatov-bio/ai-sci-7699-fix-z-index-for-experiment-table-header 
Fix zIndex for experiment table header [SCI-7699]
 2023-01-06 11:25:10 +01:00
aignatov-bio fbc1247e5b
Merge pull request #4765 from aignatov-bio/ai-sci-7700-fix-canvas-navigator-on-task-duplication 
Refresh experiment workflow image on task duplication [SCI-7700]
 2023-01-06 11:24:59 +01:00
aignatov-bio 0e1bf8368a
Merge pull request #4764 from aignatov-bio/ai-sci-7694-fix-new-task-canvas-position 
Fix new task canvas position [SCI-7694]
 2023-01-06 11:24:49 +01:00
aignatov-bio ac3434101b
Merge pull request #4763 from aignatov-bio/ai-sci-7690-fix-task-id-in-experiment-table 
Fix task id in experiment table [SCI-7690]
 2023-01-06 11:24:40 +01:00
aignatov-bio 7e08c62ce9
Merge pull request #4762 from aignatov-bio/ai-sci-7678-experiment-table-small-css-fixes 
Experiment table small css fixes [SCI-7678]
 2023-01-06 11:24:30 +01:00
Anton 0dd7702786 Fix zIndex for experiment table header [SCI-7699] 2023-01-06 11:18:44 +01:00
Anton 46acb5ff3c Refresh experiment workflow image on task duplication [SCI-7700] 2023-01-06 11:11:39 +01:00
Anton a8f6076b73 Fix new task canvas position [SCI-7694] 2023-01-06 11:02:56 +01:00
Anton a98aad56db Fix task id in experiment table [SCI-7690] 2023-01-06 10:58:41 +01:00
Anton f73d2496b8 Experiment table small css fixes [SCI-7678] 2023-01-06 10:54:38 +01:00
artoscinote 9914f19634
Merge pull request #4760 from G-Chubinidze/gc_SCI_7651 
Missing experiment table empty state, fix breadcrumbs [SCI-7651]
 2023-01-06 10:51:34 +01:00
Giga Chubinidze 79c7e6f0a2 Missing experiment table empty state, fix breadcrumbs [SCI-7651] 2023-01-06 11:40:41 +04:00
aignatov-bio 478269d579
Merge pull request #4759 from aignatov-bio/ai-sci-7680-fix-zoom-option-button-icon-color 
Fix color of zoom option button [SCI-7680]
 2023-01-05 17:27:36 +01:00
aignatov-bio d995019efa
Merge pull request #4758 from aignatov-bio/ai-sci-7687-fix-columns-during-sorting 
Fix placeholder columns during sorting [SCI-7687]
 2023-01-05 17:27:26 +01:00
aignatov-bio d0fd4e1cbf
Merge pull request #4757 from aignatov-bio/ai-sci-7681-microinteractions-edit-experiment-name-field 
Add microinteractions to edit experiment name field [SCI-7681]
 2023-01-05 17:27:15 +01:00
aignatov-bio 78299b64f4
Merge pull request #4756 from aignatov-bio/ai-sci-7646-fix-archived-tasks-logn-experiment-name 
Fix long experiment name on archived tasks card view [SCI-7646]
 2023-01-05 17:27:03 +01:00
Anton 79209054c4 Fix color of zoom option button [SCI-7680] 2023-01-05 13:29:13 +01:00
Anton 00d8e2dd63 Fix placeholder columns during sorting [SCI-7687] 2023-01-05 13:10:51 +01:00
Anton 637a53cbc6 Add microinteractions to edit experiment name field [SCI-7681] 2023-01-05 12:43:19 +01:00
ajugo f8d2edc2c8
Fix Manage access in the experiment table view [SCI-7648] (#4752) 2023-01-05 12:00:33 +01:00
ajugo 32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] (#4742) 2023-01-05 12:00:12 +01:00
Anton ca30c6a094 Fix long experiment name on archived tasks card view [SCI-7646] 2023-01-05 11:54:38 +01:00
ajugo 194c519a9b
Fix experiment table due date initialization [SCI-7649] (#4730) 
* Fix experiment table due date initialization [SCI-7649]

* Fix due date overflow [SCI-7649]
 2023-01-05 11:14:34 +01:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
artoscinote 36af73eb7c
Merge pull request #4749 from artoscinote/ma_SCI_7653 
Fix display of tasks table in archived experiments [SCI-7653]
 2023-01-04 13:14:22 +01:00
artoscinote 710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596 
Don't touch result when comment is created [SCI-7596]
 2023-01-04 13:14:07 +01:00
Martin Artnik 7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik 15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
Martin Artnik d466db1658 Fix display of tasks table in archived experiments [SCI-7653] 2023-01-04 11:56:25 +01:00
aignatov-bio eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
aignatov-bio fa881253b6
Merge pull request #4672 from aignatov-bio/ai-sci-7531-fix-cross-team-redirections 
Add missed notifications to steps and fix notification for protocol repository [SCI-7531]
 2023-01-04 10:07:36 +01:00
aignatov-bio 9522deef52
Merge pull request #4664 from aignatov-bio/ai-sci-7394-update-protocol-io-import-screen 
CSS update for protocol import screen [SCI-7394]
 2023-01-04 10:07:19 +01:00
aignatov-bio 6af72a28ee
Merge pull request #4715 from aignatov-bio/ai-sci-7559-add-step-text-notification 
Add new step text notification [SCI-7559]
 2023-01-04 10:06:57 +01:00
ajugo 4f55b4a749
Fix advanced filters on PET tables [SCI-7650] (#4747) 2023-01-04 09:59:05 +01:00
Alex Kriuchykhin 53a2ea6df7
Merge pull request #4649 from okriuchykhin/ok_SCI_7505 
Improve activity records creation in controllers [SCI-7505]
 2023-01-03 15:16:00 +01:00
ajugo ae55935002
Add missing microinteractions on step editing [SCI-7575] (#4711) 2023-01-03 12:25:22 +01:00
ajugo 6844144503
Fix experiment table sidebar navigation [SCI-7652] (#4741) 2023-01-03 12:24:56 +01:00
aignatov-bio b43813366e
Merge pull request #4738 from aignatov-bio/ai-sci-7645-update-tags-selector-new-task 
Update tags selection [SCI-7645]
 2023-01-03 11:59:27 +01:00
aignatov-bio 1a161c55f4
Merge pull request #4740 from aignatov-bio/ai-sci-7646-fix-experiment-table-title-width 
Fix experiment table title width [SCI-7646]
 2023-01-03 11:59:16 +01:00
Martin Artnik 1b4c209180 Fix syntax error [SCI-7368] 2022-12-23 15:03:02 +01:00
Andrej e9ddb80443 Remove session redirection [SCI-7612] 2022-12-23 10:40:07 +01:00
Anton 30606428e9 Fix experiment table title width [SCI-7646] 2022-12-23 10:35:17 +01:00
Anton 031ba603fc Update tags selection [SCI-7645] 2022-12-22 17:39:51 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
ajugo 2920dca900
Clear row selection after experiment table reload [SCI-7647] (#4731) 2022-12-22 13:30:27 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
Martin Artnik 2010ff091c Styling fixes and cleanup [SCI-7574] 2022-12-22 10:37:47 +01:00
aignatov-bio 5528686d7b
Merge pull request #4661 from aignatov-bio/ai-sci-7424-update-cheklist-table-name-copy 
Add suffix for checklist and table duplication [SCI-7424]
 2022-12-22 09:58:12 +01:00
Andrej 41362f300e Implement 2fa screen after sign in [SCI-7612] 2022-12-21 11:59:25 +01:00
aignatov-bio e3036d923b
Merge pull request #4686 from G-Chubinidze/gc_SCI_7496 
The View flyout in the Archived tasks view [SCI-7496]
 2022-12-20 15:19:58 +01:00
artoscinote 41e629d96c
Merge pull request #4728 from artoscinote/ma_SCI_7641 
Fix duplicate entries for recent work [SCI-7641]
 2022-12-20 15:12:58 +01:00
Martin Artnik 45aad7f429 Fix duplicate entries for recent work [SCI-7641] 2022-12-20 14:32:22 +01:00
Alex Kriuchykhin 5aaeee4b16
Merge pull request #4727 from okriuchykhin/ok_SCI_7422_v2 
Fix viewer permissions for inventories [SCI-7422]
 2022-12-20 13:43:36 +01:00
Oleksii Kriuchykhin 72f1cf2704 Fix viewer permissions for inventories [SCI-7422] 2022-12-20 13:26:38 +01:00
Anton 250a4b4602 CSS fixes for project/experiments cards [SCI-7628] 2022-12-20 12:51:44 +01:00
G-Chubinidze f463664885
Merge pull request #4724 from G-Chubinidze/gc_SCI_7449 
FE | BE Add new task modal field for Tags [SCI-7449]
 2022-12-20 15:50:15 +04:00
Giga Chubinidze 377872dda3 hound code cleanup 2022-12-20 10:37:40 +04:00
Oleksii Kriuchykhin 711dcfc7ac Update Omniauth, Azure and Okta strategies [SCI-7284] 2022-12-19 16:43:24 +01:00
Giga Chubinidze 1a84c60c74 FE | BE Add new task modal field for Tags [SCI-7449] 2022-12-19 14:55:38 +04:00
Anton 2fd2d7300e Revert modified date on experiment card 2022-12-19 11:32:32 +01:00
Alex Kriuchykhin f44cb2a1bb
Merge pull request #4716 from okriuchykhin/ok_SCI_7577_v2 
Improve handling of unaccessible inventories in snapshot versions sidebar [SCI-7422]
 2022-12-19 10:33:52 +01:00
Giga Chubinidze ae8efa8e1a changed if else logic, added back placeholders 2022-12-16 17:22:06 +04:00
ajugo 41892e35c6
Fix docx report generator for links in activity [SCI-7598] (#4720) 2022-12-15 10:54:24 +01:00
artoscinote fcc3a9b5d9
Merge pull request #4719 from artoscinote/ma_SCI_7569 
Fix table scroll wrapping [SCI-7569]
 2022-12-14 14:41:56 +01:00
Martin Artnik 3ea059529d Fix table scroll wrapping [SCI-7569] 2022-12-14 14:32:23 +01:00
Alex Kriuchykhin 766255e493
Merge pull request #4713 from okriuchykhin/ok_SCI_7577 
Improve user team invitation logic [SCI-7324]
 2022-12-13 16:14:48 +01:00
Oleksii Kriuchykhin 9900b62e03 Improve hadling of unaccessible inventories in snapshot versions sidebar [SCI-7577] 2022-12-13 16:12:08 +01:00
aignatov-bio 96aea292fb
Merge pull request #4714 from aignatov-bio/ai-sci-7579-experiment-card-fixes 
Fix experiment cards views [SCI-7579]
 2022-12-13 15:09:07 +01:00
Anton 8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +01:00
Anton 66d21e9c4f Fix experiment cards views [SCI-7579] 2022-12-13 13:14:51 +01:00
Oleksii Kriuchykhin 89258ce2ae Improve user team invitation logic [SCI-7577] 2022-12-13 11:34:56 +01:00
Anton d85e1e9d6c Fix divider on project/experiment view [SCI-7586] 2022-12-13 10:01:38 +01:00
Giga Chubinidze 556431a0da changed code for develop branch 2022-12-12 19:17:57 +04:00
Anton abee54699d Fix label template error handling [SCI-7572] 2022-12-12 15:21:15 +01:00
G-Chubinidze 0b27f0d973
Merge branch 'features/new_experiment_views' into gc_SCI_7496 2022-12-12 17:53:22 +04:00
G-Chubinidze 10f31c8796
Merge pull request #4687 from G-Chubinidze/gc_SCI_7442 
BE: Column display switch (Task data display) [SCI-7442]
 2022-12-12 17:51:58 +04:00
Giga Chubinidze 477066f85e code logic cleanup 2022-12-12 17:51:05 +04:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +01:00
aignatov-bio d596746893
Merge pull request #4702 from aignatov-bio/ai-sci-7581-fix-long-protocol-name-in-task-flyout 
Fix long protocol name in task protocol flyout [SCI-7581]
 2022-12-12 11:09:52 +01:00
Alex Kriuchykhin 67e4a7f658
Merge pull request #4706 from okriuchykhin/ok_SCI_7393 
Remove underscore escaping for ZPL templates previews [SCI-7393]
 2022-12-12 11:00:37 +01:00
Alex Kriuchykhin 67b6cd6ae9
Merge pull request #4700 from okriuchykhin/ok_SCI_7564 
Fix search by ID for project cards [SCI-7564]
 2022-12-12 10:34:39 +01:00
Oleksii Kriuchykhin 925d7e5c45 Remove underscore escaping for ZPL templates previews [SCI-7393] 2022-12-12 10:28:35 +01:00
aignatov-bio d3fee7eee0
Merge pull request #4691 from okriuchykhin/ok_SCI_7551 
Add img2zpl gem for ZPL image code generation [SCI-7551]
 2022-12-09 14:28:15 +01:00
aignatov-bio c2e8abb4a4
Merge pull request #4705 from aignatov-bio/ai-sci-7583-fix-protocol-id-on-task-page 
Fix protocol id on task page [SCI-7583]
 2022-12-09 14:07:20 +01:00
aignatov-bio 66b0968b66
Merge pull request #4696 from aignatov-bio/ai-sci-7552-add-company-logo-to-label-templates 
Add logo to label templates [SCI-7552]
 2022-12-09 13:36:27 +01:00
Anton c5d91b061b Add logo to label templates 2022-12-09 13:33:10 +01:00
Anton 0736a02741 Fix protocol id on task page [SCI-7583] 2022-12-09 12:56:24 +01:00
Martin Artnik de9f06a1fc Upgrade TinyMCE to 6.3, fix issues [SCI-7574] 2022-12-09 12:52:18 +01:00
Anton de35386f29 Fix long protocol name in task protocol flyout [SCI-7581] 2022-12-09 12:48:37 +01:00
Anton a3045a79a9 Fix expose ids css fixes [SCI-7578] 2022-12-09 09:59:51 +01:00
Oleksii Kriuchykhin c35df9a762 Fix search by ID for project cards [SCI-7564] 2022-12-08 21:24:21 +01:00
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
ajugo e3cc9c9105
Update experiment name field [SCI-7539] (#4689) 2022-12-08 10:16:37 +01:00
ajugo add6554732
Connect experiment options to the table view [SCI-7554] (#4692) 2022-12-07 14:51:48 +01:00
Martin Artnik c828d02b99 Merge branch 'develop' into features/tiny_mce_6 2022-12-07 14:07:43 +01:00
Oleksii Kriuchykhin 95baaefd7a Add img2zpl gem for ZPL image code generation [SCI-7551] 2022-12-07 11:59:27 +01:00
Giga Chubinidze 864e92e03b hound styling fix 2022-12-07 14:36:32 +04:00
Giga Chubinidze 96987977d1 fixed default visible column logic 2022-12-07 14:35:25 +04:00
Giga Chubinidze c9a6af8de4 logic update | removed automatic redirection 2022-12-06 22:06:34 +04:00
G-Chubinidze c2ae4e3a02
single quoted 2022-12-06 20:21:47 +04:00
G-Chubinidze d696128ae1
Merge branch 'features/new_experiment_views' into gc_SCI_7442 2022-12-06 20:15:14 +04:00
Giga Chubinidze 0bad40c00d styling changes 2022-12-06 19:58:59 +04:00
Giga Chubinidze 420ec69f20 BE: Column display switch (Task data display) [SCI-7442] 2022-12-06 17:51:11 +04:00
Martin Artnik df4654189b Revert "Revert "Add task IDs to canvas view [SCI-7177][SCI-7178]"" 
This reverts commit 50e7531ffa.
 2022-12-06 12:43:30 +01:00
Giga Chubinidze 082745a3dc The View flyout in the Archived tasks view 2022-12-06 03:23:22 +04:00
Alex Kriuchykhin 813c15838e
Merge pull request #4678 from okriuchykhin/ok_SCI_7543 
Improve sorting of task results [SCI-7543]
 2022-12-05 16:10:12 +01:00
ajugo 4b83f77c5b
Add new task modal field for Assign users for experiment views [SCI-7450] (#4670) 
* Add new task modal field for Assign users for experiment views [SCI-7450]

* Fix loading users assigned to the experiment [SCI-7450]

* Fix task creation on experiment if none exists [SCI-7450]
 2022-12-05 12:55:57 +01:00
ajugo 02f039ffed
Implement sorting for experiment table view [SCI-7451] [SCI-7497] (#4659) 
* Implement experiment table sort flyout [SCI-7451]

* Implement archive sort options for experiment table [SCI-7497]

* Fix hound [SCI-7451]

* Clean code for experiment table view sorting [SCI-7497]

* Fix hound [SCI-7451]
 2022-12-05 10:30:20 +01:00
ajugo 369fffc467
Fix building of circular protocols for protocols.io [SCI-7388] (#4665) 2022-12-05 10:21:12 +01:00
Giga Chubinidze 769fe7ebd8 fixed id sorting on reports removed model duplicate code 2022-12-05 13:17:15 +04:00
G-Chubinidze 756e81c091
Merge pull request #4588 from G-Chubinidze/gc_SCI_7176 
expose experiment ids in active / archived card views [SCI-7176] [SCI-7202]
 2022-12-02 20:16:40 +04:00
G-Chubinidze df4ac4d5b3
Merge pull request #4429 from G-Chubinidze/gc_SCI_7172 
Expose project IDs in tables & cards view [SCI-7172]  [SCI-7173] [SCI-7201]
 2022-12-02 20:16:05 +04:00
Giga Chubinidze eff5d12253 removed last-page class by default 2022-12-02 20:10:03 +04:00
artoscinote 6f60a7cd4f
Merge pull request #4673 from artoscinote/ma_SCI_7238 
Make overflowing tables in TinyMCE scrollable [SCI-7238]
 2022-12-02 16:24:45 +01:00
artoscinote 28304668e7
Merge pull request #4679 from artoscinote/ma_SCI_7192 
Properly format Excell dates in import preview [SCI-7192]
 2022-12-02 16:02:38 +01:00
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +01:00
Martin Artnik b600ca9771 Properly format Excell dates in import preview [SCI-7192] 2022-12-02 14:17:50 +01:00
aignatov-bio 7f87f850b3
Merge branch 'features/new_experiment_views' into ai-sci-7453-add-restore-task-to-experiment-table-view 2022-12-02 13:37:39 +01:00
aignatov-bio cd0af24a24
Merge pull request #4676 from aignatov-bio/ai-sci-7525-experiment-table-connect-actions-to-context-menu 
Experiment table connect task action in dropdown [SCI-7525]
 2022-12-02 13:36:01 +01:00
Giga Chubinidze 76884bafc1 code cleanup 2022-12-02 15:53:22 +04:00
Giga Chubinidze 36b99fa2cb code cleanup 2022-12-02 14:51:22 +04:00
ajugo 847280489a
Add report id to the report datatable [SCI-7199] (#4453) 
* Add report id to the report datatable [SCI-7199]

* Remove report id migration [SCI-7199]
 2022-12-02 11:41:32 +01:00
ajugo 7525ffeede
Add IDs to task cards in the canvas edit mode [SCI-7523] (#4666) 2022-12-02 11:40:57 +01:00
Oleksii Kriuchykhin 0d6c6ccd9e Introduce searchability by ID in global search field [SCI-7208] 2022-12-02 11:16:18 +01:00
ajugo 8ff822c7e5
Implement due date column in experiment table view [SCI-7406] (#4646) 
* Implement due date column in experiment table view [SCI-7406]

* Fix due date [SCI-7406]

* Move text to translation [SCI-7406]

* Fix table due date partial [SCI-7406]

* Fix table due date partial [SCI-7406]
 2022-12-02 11:01:40 +01:00
artoscinote a0682f962a
Merge pull request #4674 from G-Chubinidze/gc_SCI_7542 
Add the time to the existing timestamp in the comments side panel [SCI-7542]
 2022-12-02 10:18:08 +01:00
artoscinote eaf9017def
Merge pull request #4643 from artoscinote/ma_SCI_7206 
Add exposed IDs to recent work [SCI-7206]
 2022-12-02 10:16:51 +01:00
Anton 12f141b82e Experiment table connect task action in dropdown [SCI-7525] 2022-12-02 10:03:01 +01:00
Martin Artnik 882178a2ca Add missing job [SCI-7382] 2022-12-02 09:45:02 +01:00
Giga Chubinidze 22248d4fed Add the time to the existing timestamp in the comments side panel [SCI-7542] 2022-12-02 10:49:06 +04:00
Martin Artnik 13cf136ca4 Make overflowing tables in TinyMCE scrollable [SCI-7238] 2022-12-01 15:20:23 +01:00
artoscinote 4664ef1d9b
Implement task cloning in experiments table [SCI-7382] (#4653) 
* Implement task cloning in experiments table [SCI-7382]

* Fix provisioning status polling [SCI-7382]

* Remove unused method [SCI-7382]

* Fix linter issues [SCI-7382]

* Fix fetching last clone number [SCI-7382]

* Fixing experiment duplication [SCI-7382]

* Add truncation to cloned name [SCI-7382]

* Add readable scope to batch clone action [SCI-7382]

* Move 'Clone' to translations, simplify JS [SCI-7382]
 2022-12-01 15:08:59 +01:00
Anton 98572d9a2c Add missed notifications to steps and fix notification for protocol repository [SCI-7531] 2022-12-01 14:55:23 +01:00
Oleksii Kriuchykhin b032cfbd35 Add task moving action to experiment table view [SCI-7381] 2022-12-01 13:33:07 +01:00
aignatov-bio bd0ac95307
Merge pull request #4669 from aignatov-bio/ai-sci-7510-finish-user-assignment-modal 
Finish user assignment for experiment table [SCI-7510]
 2022-12-01 12:59:30 +01:00
G-Chubinidze 2d04357ba8
Merge pull request #4668 from G-Chubinidze/gc_SCI_7494 
Archived table view filters update [SCI-7494]
 2022-12-01 12:32:41 +04:00
Giga Chubinidze b2bbea5b62 explicit if statement 2022-11-30 20:25:22 +04:00
Anton 234c4dfaeb Finish user assignment for experiment table [SCI-7510] 2022-11-30 15:04:02 +01:00
Giga Chubinidze 8e78938b02 Archived table view filters update [SCI-7494] 2022-11-30 16:47:49 +04:00
Alex Kriuchykhin 25e6a51be8
Merge pull request #4667 from rekonder/fix_session_end 
Fix session end for remember me [SCI-7502
 2022-11-30 12:12:45 +01:00
Andrej a2dbf79716 Fix session end for remember me 2022-11-30 12:03:27 +01:00
Giga Chubinidze b695903ea4 added frozen string literal 2022-11-30 11:39:28 +04:00
Anton 393bc03d47 CSS update for protocol import screen [SCI-7394] 2022-11-29 15:41:57 +01:00
aignatov-bio 7ea57d9ffe
Merge pull request #4630 from aignatov-bio/ai-sci-7440-add-dropdown-for-assigned-user-experiment-table 
Add user assignments dropdown for experiment table [SCI-7440]
 2022-11-29 15:32:00 +01:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
aignatov-bio 887b1b062a
Merge pull request #4652 from aignatov-bio/ai-sci-7493-update-archived-my-modules-card-screen 
Update archive module cards header [SCI-7493]
 2022-11-29 14:04:30 +01:00
artoscinote c4ba723998
Merge pull request #4662 from artoscinote/ma_SCI_7534 
Make deferred SmartAnnotation loading optional [SCI-7534]
 2022-11-29 13:51:28 +01:00
Martin Artnik 76de2d1380 Make deferred SmartAnnotation loading optional [SCI-7534] 2022-11-29 13:47:52 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
Anton 5a23cd442d Add suffix for checklist and table duplication [SCI-7424] 2022-11-29 12:29:13 +01:00
Giga Chubinidze 8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
Oleksii Kriuchykhin 4430483bf4 Add creation of assigned tags and designated users to task creation action [SCI-7444] 2022-11-28 14:48:59 +01:00
G-Chubinidze fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175 
Update sorting on Projects and Experiments pages [SCI-7175]
 2022-11-28 15:57:46 +04:00
Anton 2901c7b627 Add restore action to experiment table [SCI-7453] 2022-11-28 12:45:18 +01:00
artoscinote 7cc09faa94
Merge pull request #4657 from artoscinote/ma_SCI_7534 
Move atwho initialization to when a field is focused [SCI-7534]
 2022-11-28 12:39:45 +01:00
Martin Artnik f231c69a02 Move atwho initialization to when a field is focused [SCI-7534] 2022-11-28 11:44:25 +01:00
ajugo 9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] (#4651) 2022-11-28 10:35:42 +01:00
ajugo d255e40ba2
Fix printers instructions toggle [SCI-7535] (#4656) 2022-11-28 10:35:01 +01:00
Anton 8ef5a742f6 Fix tooltip for clear reminders [SCI-7472] 2022-11-28 10:11:06 +01:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
Anton e2cd0dfd91 Update archive module cards header [SCI-7493] 2022-11-25 15:29:15 +01:00
artoscinote 1a700b8359
Merge pull request #4650 from artoscinote/ma_SCI_7460 
Fix disabling item edit button [SCI-7460]
 2022-11-25 10:36:20 +01:00
Martin Artnik 6fe86f2015 Fix disabling item edit button [SCI-7460] 2022-11-25 10:24:24 +01:00
Oleksii Kriuchykhin 3b474fc9f0 Improve activity records creation in controllers [SCI-7505] 2022-11-24 15:19:17 +01:00
ajugo 80f66736b6
Add new task modal for experiment table view [SCI-7448] (#4638) 
* Add new task modal for experiment table view [SCI-7448]

* Fix placeholder and size of the icon [SCI-7448]

* Reload experiment table [SCI-7448]
 2022-11-24 14:49:42 +01:00
aignatov-bio 0facc2bda0
Merge pull request #4647 from aignatov-bio/ai-sci-7452-add-archived-view-for-experiment-table 
Add archived view for experiment table [SCI-7452]
 2022-11-24 13:24:50 +01:00
Alex Kriuchykhin 3685176ce7
Merge pull request #4645 from okriuchykhin/ok_SCI_7439 
Update the existing endpoint for listing the users with access to the task [SCI-7439]
 2022-11-24 13:15:34 +01:00
Anton 2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +01:00
aignatov-bio c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout 
Fix time picket CSS [SCI-7359]
 2022-11-24 09:44:12 +01:00
ajugo c44aa2cb9c
Implement session end for multiple tabs [SCI-7502] (#4632) 2022-11-23 20:08:26 +01:00
Oleksii Kriuchykhin daecd6a766 Update the existing endpoint for listing the users with access to the task [SCI-7439] 2022-11-23 17:20:14 +01:00
artoscinote 5605c3dfed
Merge pull request #4644 from aignatov-bio/ai-sci-7446-experiment-table-task-flyout-menu 
Add menu to experiment table row [SCI-7446]
 2022-11-23 16:48:20 +01:00
Anton 440800537c Add menu to experiment table row [SCI-7446] 2022-11-23 15:05:13 +01:00
Martin Artnik 2959cf6276 Add exposed IDs to recent work [SCI-7206] 2022-11-23 15:03:35 +01:00
aignatov-bio d1c664e0ab
Merge pull request #4640 from aignatov-bio/ai-sci-7522-fix-session-modal-overlap 
Fix session modal overlap [SCI-7522]
 2022-11-23 14:37:53 +01:00
artoscinote 7d53027530
Merge pull request #4641 from G-Chubinidze/gc_SCI_7492 
Missing navigate away pop up at inventory page [SCI-7492]
 2022-11-23 14:14:35 +01:00
Giga Chubinidze f78cf58552 pointer events value change 2022-11-23 17:12:25 +04:00
Anton 007aeaa2b6 Fix session modal overlap [SCI-7522] 2022-11-23 13:21:28 +01:00
Giga Chubinidze dac093823e few double quotes changed to single quotes 2022-11-23 16:08:43 +04:00
Giga Chubinidze 3b8a58b7db fixed code according to hound styling comments 2022-11-23 16:05:56 +04:00
ajugo 5b291acc27
Fix smart annotation [SCI-7498] (#4626) 2022-11-23 12:58:32 +01:00
Giga Chubinidze 47d593f0db Missing navigate away pop up at inventory page [SCI-7492] 2022-11-23 15:38:01 +04:00
aignatov-bio d6b5034db9
Merge pull request #4634 from aignatov-bio/ai-sci-7472-fix-tooltip-on-new-button-in-inventory 
Fix tooltip on new button in inventory [SCI-7472]
 2022-11-23 12:05:24 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
aignatov-bio 176f3c48e1
Merge pull request #4637 from aignatov-bio/ai-sci-7233-fix-show-password-for-edit-settings 
Fix show password for edit settings [SCI-7233]
 2022-11-22 16:23:36 +01:00
Anton 7079072eb8 Fix show password for edit settings [SCI-7233] 2022-11-22 16:06:47 +01:00
Anton e940bf8c0e Small canvas edit mode changes [SCI-7387] 2022-11-22 13:08:56 +01:00
G-Chubinidze 415443a108
Merge pull request #4633 from G-Chubinidze/gc_SCI_7179 
add IDs to the protocol templates tables [SCI-7179]
 2022-11-22 14:50:57 +04:00
Anton 98e87a2f4b Fix markup [SCI-7359] 2022-11-22 11:29:57 +01:00
Alex Kriuchykhin b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1 
Release/1.26.2.1
 2022-11-22 11:07:20 +01:00
Anton 961b39159e Fix tooltip on new button in inventory [SCI-7472] 2022-11-22 11:05:57 +01:00
Alex Kriuchykhin dd54a30e13
Merge pull request #4601 from rekonder/aj_SCI_7376 
Enable checkboxes for experiment table/card view for all roles  [SCI-7376]
 2022-11-22 10:57:34 +01:00
Alex Kriuchykhin d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361 
Fixed external protocol icon out of body [SCI-7361]
 2022-11-22 10:56:55 +01:00
Alex Kriuchykhin b487894c9d
Merge pull request #4596 from aignatov-bio/ai-sci-7389-fix-protocol-import-error 
fix protocol import error [SCI-7389]
 2022-11-22 10:56:10 +01:00
Giga Chubinidze 43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
Alex Kriuchykhin dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181 
Remove old step code [SCI-7181]
 2022-11-22 10:52:06 +01:00
ajugo f2a680d826
Fix zebra printer print status [SCI-7474] (#4625) 2022-11-21 16:55:03 +01:00
artoscinote 92d446b43d
Merge pull request #4628 from artoscinote/ma_SCI_7473 
Fix inventory multiline file uploads [SCI-7473]
 2022-11-21 12:59:40 +01:00
Martin Artnik 5d41ea5fa7 Disable instead of hide edit button when selected items not on page [SCI-7460] 2022-11-21 11:58:15 +01:00
Martin Artnik 95348b82e8 Fix inventory multiline file uploads [SCI-7473] 2022-11-21 11:47:46 +01:00
Alex Kriuchykhin d9897d6e7c
Merge pull request #4624 from okriuchykhin/ok_SCI_7457 
Fix protocol owner re-assignment when removing a user from a team [SCI-7457]
 2022-11-21 11:03:50 +01:00
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin 69812786ba Fix protocol owner re-assignment when removing a user from a team [SCI-7457] 2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin 66f9f13508 Implement current team switch when navigating to tasks and experiments from another team [SCI-7447] 2022-11-18 11:48:49 +01:00
Giga Chubinidze 44d74b5797 refactoring projects scss 2022-11-17 22:29:15 +04:00
Giga Chubinidze 7f09fb8997 Archived projects cards and table updates [SCI-7201] 2022-11-17 22:25:54 +04:00
Anton 85c00c61e0 Add table columns display modal to experiment table [SCI-7441] 2022-11-16 09:54:12 +01:00
Anton 7523535e24 Add archive action to experiment table [SCI-7384] 2022-11-14 11:31:53 +01:00
ajugo 42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612) 
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]

* Fix zebra enabled [SCI-7430]
 2022-11-14 10:43:09 +01:00
ajugo 4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +01:00
Anton 51446b130f Add experiment table manage access [SCI-7385] 2022-11-13 22:33:41 +01:00
Anton 0a87513458 Add edit modal to experiment table [SCI-7383] 2022-11-11 11:24:23 +01:00
Giga Chubinidze e9d9f613fb updated old code version in empty_index 2022-11-11 14:22:26 +04:00
G-Chubinidze e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04:00
Giga Chubinidze 5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04:00
aignatov-bio c5466771ff
Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue 
Fix merge issue [SCI-7471]
 2022-11-10 11:47:54 +01:00
Anton c0141137eb Fix merge issue [SCI-7471] 2022-11-10 11:46:14 +01:00
aignatov-bio 4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms 
Fix css issues for login and signup forms [SCI-7233]
 2022-11-10 11:15:03 +01:00
aignatov-bio a72795ec98
Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step 
Fix options dropdown position on step [SCI-7387]
 2022-11-10 11:12:28 +01:00
aignatov-bio 2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982 
Implement multiline editing in repositories [SCI-6982][SCI-6983]
 2022-11-10 11:07:30 +01:00
artoscinote 0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
aignatov-bio 0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027 
Session end implementation [SCI-7027]
 2022-11-10 11:03:02 +01:00
Anton 63ce422367 Add basic filters for experiment table [SCI-7215] 2022-11-09 15:27:39 +01:00
G-Chubinidze 8e63bfb7c2
Update my_module.rb 2022-11-09 14:46:36 +04:00
G-Chubinidze 996cb68fdd
Update my_module.rb 2022-11-09 14:45:18 +04:00
G-Chubinidze 62b48ee59a
updated my_module rb, added searchable id attribute 2022-11-09 13:36:55 +04:00
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Miha Mencin c8bd5513cf
Merge pull request #4604 from okriuchykhin/ok_SCI_7434 
Fix team export/import [SCI-7434]
 2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin be7ef8fdc0 Fix team export/import [SCI-7434] 2022-11-08 14:50:16 +01:00
Giga Chubinidze 18fe2cd207 update display of the current tasks with IDs [SCI-7205] 2022-11-08 16:06:48 +04:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
Andrej aa99c2d7c8 Enable checboxes for experiment table/card view for all roles [SCI-7376] 2022-11-07 15:51:39 +01:00
ajugo dd22d53bda
Implemented pagination for experiment table [SCI-7214] (#4591) 
* Implement pagination for experiment table [SCI-7214]

* Fix table experiment pagination [SCI-7214]

* Move pagination to service [SCI-7214]
 2022-11-07 11:46:54 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Anton 5b08ee1cc8 Hide active reminders, if stock management disabled [SCI-7428] 2022-11-03 15:48:32 +01:00
Anton bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
Giga Chubinidze a8b1dbfe76 archived experiments cards updates [SCI-7202] 2022-11-02 11:18:18 +04:00
Giga Chubinidze d1aa127b7a Merge branch 'features/exposed_ids' of github.com:scinote-eln/scinote-web into gc_SCI_7176 2022-10-28 15:30:28 +04:00
Giga Chubinidze a9287df1a0 exposed experiment ids on card view page / other styling updates [SCI-7176] 2022-10-28 15:16:49 +04:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
Giga Chubinidze fe488ed00f fixed unstable project name and code styling in cards 2022-10-28 11:38:38 +04:00
Giga Chubinidze b1296adeb3 pitstop 2022-10-28 10:49:13 +04:00
ajugo 29ce28a1af
Implement canvas view navigator [SCI-7198] (#4577) 2022-10-27 14:43:31 +02:00
ajugo bdf56ea2a1
Add comments to the experiment table view [SCI-7217] (#4583) 2022-10-27 14:41:35 +02:00
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +02:00
ajugo 449283b4f5
Show only active result in experiment table view [SCI-7369] (#4578) 2022-10-27 09:52:20 +02:00
Oleksii Kriuchykhin c16d0cb7a6 Fix update of shared inventories user assignments [SCI-7360] 2022-10-25 23:26:20 +02:00
Alex Kriuchykhin d0f604f21e
Merge pull request #4576 from okriuchykhin/ok_SCI_7375 
Fix displaying of user access for E/T [SCI-7375]
 2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin 232f58dd30 Fix displaying of user access for E/T [SCI-7375] 2022-10-25 16:07:55 +02:00
artoscinote 938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377 
Add ENV setting for max step text length [SCI-7377]
 2022-10-25 16:04:36 +02:00
artoscinote 78b3975759
Merge pull request #4575 from artoscinote/ma_SCI_7396 
Fix label preview double refresh and unit issues [SCI-7396]
 2022-10-25 15:55:57 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Martin Artnik ebe0ffa286 Add ENV setting for max step text length [SCI-7377] 2022-10-25 13:08:33 +02:00
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