scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
12794 commits 70 branches 179 tags 165 MiB
Commit graph

2704 commits

Author SHA1 Message Date
Martin Artnik d4326c08db Add duplicating tooltips [SCI-7382] 2023-01-09 12:40:00 +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 d9426c5920
Merge pull request #4771 from aignatov-bio/ai-sci-7688-fix-experiment-table-comments-tooltip 
Experiment table - fix comments header tooltip [SCI-7688]
 2023-01-06 13:11:02 +01:00
Anton 7a7d2c0e1b Experiment table - fix new task modal CSS [SCI-7691] 2023-01-06 13:04:29 +01:00
Anton 52707fdcf8 Experiment table - fix comments header tooltip [SCI-7688] 2023-01-06 12:19:05 +01:00
Anton 802e0e602b Experiment table - fix view moda for assigned users [SCI-7693] 2023-01-06 11:44:48 +01:00
artoscinote 631608e7db
Merge pull request #4761 from G-Chubinidze/gc_SCI_7679 
Incorrect translation on the 'Edit Workflow' button in experiment canvas [SCI-7679]
 2023-01-06 10:55:01 +01:00
Giga Chubinidze 035b8831c6 Incorrect translation on the 'Edit Workflow' button in experiment canva [SCI-7679] 2023-01-06 11:47:50 +04:00
Martin Artnik 4e779e70a4 Merge branch 'develop' into features/tiny_mce_6 2023-01-04 14:21:02 +01:00
Alex Kriuchykhin 2ea5000ea5
Merge pull request #4737 from okriuchykhin/ok_SCI_7643 
Add missing permissions for inventories and protocols [SCI-7643]
 2023-01-04 13:22:33 +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
Anton 9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
Oleksii Kriuchykhin 06f3c34e3a Add missing permissions for inventories and protocols [SCI-7643] 2022-12-22 16:46:26 +01:00
ajugo 67b4ccf634
Add missing text (#4736) 2022-12-22 14:38:22 +01:00
aignatov-bio ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton d1a68adb22 Add access modal for protocols [SCI-7518] 2022-12-22 13:27:46 +01:00
ajugo b549938f13
Fix print modal css [SCI-7437] (#4648) 2022-12-22 11:09:20 +01:00
aignatov-bio 7437af540b
Merge pull request #4701 from okriuchykhin/ok_SCI_7516 
Add versions and access columns to protocols table, update protocol model [SCI-7516]
 2022-12-21 13:03:38 +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
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
Oleksii Kriuchykhin 711dcfc7ac Update Omniauth, Azure and Okta strategies [SCI-7284] 2022-12-19 16:43:24 +01:00
Oleksii Kriuchykhin 5fea4722ac Add versions and access columns to protocols table, update protocol model [SCI-7516] 2022-12-19 15:39:32 +01:00
ajugo 5ab804c35a
Implement general protocol repository toolbar [SCI-7557] (#4698) 
* Implement general protocol repository toolbar [SCI-7557]

* Move protocolsio page [SCI-7557]
 2022-12-19 13:18: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 8e1e95b219 Add new step text notification [SCI-7559] 2022-12-13 14:47:53 +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
Alex Kriuchykhin 9094dc08b5
Merge pull request #4671 from okriuchykhin/ok_SCI_7513 
Add versioning implementation to protocols data layer [SCI-7513]
 2022-12-12 14:37:50 +01:00
Anton 6b6105dfe6 CSS fixes for exposed ID [SCI-7586] 2022-12-12 11:45:59 +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
artoscinote a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +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
Giga Chubinidze 13972e6c33 CSS: sorting, experiment card, task card[SCI-7558] 2022-12-07 10:22:29 +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
Anton 2a8aaed7d1 Add actions toolbar to protocol repository [SCI-7521] 2022-12-06 15:54:50 +01:00
Giga Chubinidze 420ec69f20 BE: Column display switch (Task data display) [SCI-7442] 2022-12-06 17:51:11 +04:00
Giga Chubinidze 082745a3dc The View flyout in the Archived tasks view 2022-12-06 03:23:22 +04: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
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
Oleksii Kriuchykhin 78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +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
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
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 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
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
Oleksii Kriuchykhin b032cfbd35 Add task moving action to experiment table view [SCI-7381] 2022-12-01 13:33:07 +01:00
Oleksii Kriuchykhin 9b72474943 Add versioning implementation to protocols data layer [SCI-7513] 2022-11-30 19:52:36 +01:00
Anton bd77433fce Add user assignments dropdown for experiment table [SCI-7440] 2022-11-29 13:42:39 +01:00
Giga Chubinidze 8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04: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
ajugo 9c88a34d99
Implement empty and loader for canvas view navigator [SCI-7445] (#4651) 2022-11-28 10:35:42 +01:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04: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
Anton 2e2086a03b Add archived view for experiment table [SCI-7452] 2022-11-24 12:07:52 +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
Giga Chubinidze 47d593f0db Missing navigate away pop up at inventory page [SCI-7492] 2022-11-23 15:38:01 +04: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
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
Oleksii Kriuchykhin 49fbc2c561 Add basic modal for direct task creation [SCI-7197] 2022-11-18 17:00:11 +01: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
Giga Chubinidze 5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04: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 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
Anton a17cd78c20 Add view dropdown to experiment screen 2022-11-08 16:39:52 +01:00
Anton 7ceb94ab1f Add toolbar to experiment table [SCI-7379] 2022-11-08 12:52:49 +01:00
Oleksii Kriuchykhin c361dec0b6 Fix Fluics templates sync scheduler [SCI-7435] 2022-11-07 11:55:01 +01:00
Anton 34ffcbd8e8 Fix duplicate activities wording [SCI-7426] 2022-11-04 11:07:59 +01:00
Anton bacd3524e8 Add tags manager to experiment table view [SCI-7368] 2022-11-02 15:17:10 +01:00
G-Chubinidze 81c5978805
Merge branch 'features/exposed_ids' into gc_SCI_7172 2022-10-28 15:05:38 +04:00
ajugo 22fad95efd
Rename protocol repository to templates [SCI-7418] (#4587) 2022-10-28 11:47:54 +02:00
ajugo fedaf703d4
Add view button to experiment title bar [SCI-7216] (#4579) 2022-10-27 09:53:01 +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
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Anton 8feaedc0d1 Add core columns to experiment table [SCI-7212] 2022-10-24 15:27:57 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Anton bc86f11404 Add experiment table view [SCI-7174] 2022-10-21 12:22:38 +02:00
Anton 2ae8943d80 Update general canvas layout [SCI-7196] 2022-10-19 11:46:16 +02:00
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
Oleksii Kriuchykhin f0ea7ea2a4 Add option to disable local password log in [SCI-7298] 2022-10-12 10:30:09 +02:00
Oleksii Kriuchykhin 0e95b7ea66 Connect update fluics template button with controller action [SCI-7261] 2022-10-07 14:52:23 +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
Oleksii Kriuchykhin b20c2b13a3 Fix label printers dropdown on print modal [SCI-7258] 2022-10-03 10:37:04 +02:00
Andrej eebdee5129 Add label printer modal to task [SCI-7270] 2022-09-29 16:35:51 +02:00
Anton 9dc667f8e1 CSS fixes for label templates [SCI-7262] 2022-09-29 14:09:16 +02:00
Anton 3773fff093 Add label validation and preview in print modal [SCI-7255][SCI-7256] 2022-09-27 15:46:48 +02: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
Anton 40022a7012 Add initial VUE container for print dialog [SCI-7193] 2022-09-23 14:07:52 +02:00
ajugo b7861f5fdb
Add zebra javascript print library [SCI-7245] (#4455) 2022-09-23 12:34:43 +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
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 17bf490fef Add validation to label template code [SCI-7210] 2022-09-19 11:59:36 +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 ac7c873385 Session end implementation [SCI-7027] 2022-09-16 09:57:40 +02:00
Anton 7ccce8a6d8 Fix merge issues for templates 2022-09-15 13:48:41 +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
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
Anton 75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Giga Chubinidze fbbe394029 exposed prefixed ids for projects table [SCI_7172] 2022-09-13 13:24:06 +04:00
aignatov-bio 06548c247f
Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable 
Add ability to disable zebra printers [SCI-7148]
 2022-09-12 13:54:52 +02:00
Oleksii Kriuchykhin d5205843f4 Enable Fluics sync only if env variable is present [SCI-7047] 2022-09-08 17:22:29 +02:00
Oleksii Kriuchykhin bb6e638528 Add activities for label template actions [SCI-7086] 2022-09-08 16:35:53 +02:00
Alex Kriuchykhin 8a0656ce21
Merge pull request #4147 from okriuchykhin/ok_SCI_6834 
Update tests with new team user assignments [SCI-6843]
 2022-09-05 14:34:16 +02:00
Anton 47e20d1b27 Add ability to disable zebra printers [SCI-7148] 2022-09-05 12:37:03 +02:00
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
Martin Artnik ef9cd21ecf Make project action dropdowns async [SCI-7159] 2022-09-02 13:47:45 +02:00
Alex Kriuchykhin a5fc66a6f3
Merge pull request #4388 from okriuchykhin/ok_SCI_7047 
Add syncing service and schedule for Fluics templates sync [SCI-7047]
 2022-09-01 14:13:18 +02:00
Oleksii Kriuchykhin f586c73dc8 Convert team_repository to polymorphic relation [SCI-6917] 2022-08-31 16:42:08 +02:00
Oleksii Kriuchykhin eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
Anton d555227652 Add acitvities and flash messages for component duplication [SCI-7108] 2022-08-31 11:09:38 +02:00
aignatov-bio 91f1310338
Merge pull request #4364 from aignatov-bio/ai-sci-7060-update-promo-text 
Update label template promo text [SCI-7060]
 2022-08-31 10:13:42 +02:00
Anton 0862221345 Invite user modal fixes [SCI-7100] 2022-08-29 14:01:31 +02:00
Oleksii Kriuchykhin b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
ajugo 185bf0b197
Add label template dropdown to print dialog [SCI-7051] (#4369) 2022-08-26 10:53:55 +02:00
aignatov-bio 6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
Martin Artnik 0aa4ff11d4 Add missing route [SCI-7053] 2022-08-24 14:10:51 +02:00
artoscinote 7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton e22af8830a Add activties to step duplication [SCI-7109] 2022-08-24 13:45:39 +02:00
Anton bc112dd6af Add step duplication [SCI-7109] 2022-08-23 17:54:33 +02:00
Anton 1bac9aeb4c Add duplication to components [SCI-7108] 2022-08-22 15:03:49 +02:00
Anton 45bbbfffe4 Update label template promo text [SCI-7060] 2022-08-18 15:33:19 +02:00
Anton 4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
ajugo 39fbb2a9a0
Fix office modal and protocol status [SCI-7064] (#4352) 2022-08-12 14:57:56 +02:00
artoscinote e4a7aa3dad
Add name prompt for tables with empty names [SCI-7082] (#4348) 
* Add name prompt for tables with empty names [SCI-7082]

* Move to separate component [SCI-7082]
 2022-08-12 10:17:45 +02:00
ajugo 83c78d660f
Added activity for update protocol name [SCI-7095] (#4346) 
* Added activity for update protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]

* Fix activity log for updated protocol name [SCI-7095]
 2022-08-11 14:09:01 +02:00
artoscinote 4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
ajugo b6f273410b
Fix protocol repository CSS [SCI-7064] (#4335) 
* Fix protocol repository CSS [SCI-7064]

* Fix protocol repository CSS [SCI-7064]

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

* Add new placeholder label [SCI-7067]
 2022-08-08 16:50:34 +02:00
Anton 51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote eb619184a5
Implement typed label templates [SCI-7046] (#4316) 
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
 2022-08-08 10:06:00 +02:00
aignatov-bio e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen 
Add general layout for template view screen [SCI-7030]
 2022-08-04 14:13:25 +02:00
Anton a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310) 
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
 2022-08-04 11:14:35 +02:00
Anton 31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Anton 8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
Alex Kriuchykhin baa565db8d
Merge pull request #4297 from okriuchykhin/ok_SCI_7028 
Make devise session timeout configurable through env variable [SCI-7028]
 2022-08-01 16:37:53 +02:00
Anton bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
artoscinote a527edd07d
Attachment management fixes [SCI-7022] (#4296) 
* Attachment management fixes [SCI-7022]

* Linter fixes [SCI-7022]
 2022-08-01 13:14:04 +02:00
Oleksii Kriuchykhin da9ad5797c Make devise session timeout configurable through env variable [SCI-7028] 2022-07-28 17:15:47 +02:00
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
ajugo ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292) 
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
 2022-07-27 10:10:32 +02:00
Anton 6131b6c0b7 Add new templates section and navigation [SCI-7017] 2022-07-26 13:53:51 +02:00
Anton 3f82666619 Fix step for viewer role [SCI-6972] 2022-07-25 11:35:34 +02:00
ajugo 1732c8897a
Docx report fixes [SCI-6979] (#4265) 
* Fixes for docx [SCI-6979]

* Remove step description from DOCX [SCI-6979]
 2022-07-20 10:12:38 +02:00
Martin Artnik 6227b1f5a1 Added edit overlays, disable more controls [SCI-6983] 2022-07-19 14:22:40 +02:00
Martin Artnik 98b3627219 Implement multiline editing in repositories [SCI-6982] 2022-07-19 12:24:33 +02:00
ajugo a55d6ea9de
Replaced default ruby error pages [SCI-6967] (#4230) 
* Replaced default ruby error pages [SCI-6967]

* Remove error 500 in controller [SCI-6967]
 2022-07-15 10:43:07 +02:00
ajugo ccf95fea24
Fix file block issues [SCI-6966] (#4244) 
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)

* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
 2022-07-15 10:13:55 +02:00
Oleksii Kriuchykhin a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253) 
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
 2022-07-15 10:00:50 +02:00
Alex Kriuchykhin 46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969 
Fix file upload and edit interactions on steps page [SCI-6969]
 2022-07-14 09:48:20 +02:00
Anton 496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
artoscinote 3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
Oleksii Kriuchykhin 747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
ajugo 7b525e5986
Fix en.yml [SCI-5319] (#4225) 2022-07-12 10:33:37 +02:00
artoscinote dd27fadd98
Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] (#4179) 
* Add step reordering service endpoint to API [SCI-6891]

* Generalize reorder validation [SCI-6891]

* Add endpoint for reordering step elements, fix issues [SCI-6892]

* Add appropriate serializers [SCI-6891][SCI-6892]

* Add step elements to step serializer [SCI-6891]

* Simplify routes, add locking [SCI-6891]
 2022-07-12 10:13:47 +02:00
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
artoscinote a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
Oleksii Kriuchykhin d0d528aeac Update inventory global sharing logic to use new user assignments [SCI-6947] 2022-07-07 22:31:07 +02:00
Anton 4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
Alex Kriuchykhin 26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +02:00
Alex Kriuchykhin a7e88e59bd
Update global search to use new step text elements [SCI-6873] (#4165) 2022-07-06 14:20:55 +02:00
artoscinote c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184) 
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
 2022-07-06 14:11:48 +02:00
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Oleksii Kriuchykhin 3fbc5af9a1 Convert team_repository to polymorphic relation [SCI-6917] 2022-06-29 15:22:22 +02:00
artoscinote b880f6fc39
Add API endpoints for step texts [SCI-6889] (#4173) 2022-06-27 12:30:45 +02:00
aignatov-bio de626acd7f
Merge pull request #4169 from aignatov-bio/ai-sci-6853-fix-new-acitvities 
Fix new step activities [SCI-6893]
 2022-06-27 11:14:21 +02:00
aignatov-bio bd1f65c811
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button 
Add delete all steps button [SCI-6921]
 2022-06-27 11:13:06 +02:00
Anton 1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton 8ce0490e9a Fix new step activities [SCI-6853] 2022-06-22 14:16:01 +02:00
ajugo a5065b82cb
Show error for broken file in repository row [SCI-6838] (#4146) 2022-06-08 13:35:06 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
ajugo 9d4c97f191
Add task assignment API [SCI-6846] (#4123) 
* Add user assignment to task API [SCI-6846]

* Add test for task assignments [SCI-6846]
 2022-06-03 10:09:42 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report 
Update PDF report layout [SCI-6856]
 2022-06-02 11:18:16 +02:00
artoscinote ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136) 
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
 2022-06-02 11:15:32 +02:00
aignatov-bio cd7ca54610
Merge pull request #4135 from aignatov-bio/ai-sci-6865-add-step-text-option-to-report-wizard 
Add step text option to report wizard [SCI-6865]
 2022-06-02 11:06:48 +02:00
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton 08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
artoscinote 98d66a3276
Implement reordering activities [SCI-6851] (#4129) 
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
 2022-06-01 12:30:09 +02:00
Anton b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
artoscinote 3c63d9a3eb
CSS fix, routes fix [SCI-6844] (#4106) 2022-05-31 09:05:38 +02:00
artoscinote 23872f519b
Implement step element sorting modal [SCI-6849] (#4124) 
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
 2022-05-30 13:45:51 +02:00
aignatov-bio 57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space 
Add the ability to show storage limit [SCI-6835]
 2022-05-26 15:03:45 +02:00
Anton 3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
artoscinote 894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
ajugo e3c337aa3d
Renaming settings section and remove caching for Settings class [SCI-5625] (#4100) 
* Renaming settings section and remove caching for Settings class [SCI-5625]

* Code fix for setting model [SCI-5625]

* Clean code [SCI-5625]
 2022-05-26 13:27:18 +02:00
ajugo 054ce72d25
Add handle for going over storage limit for inventories [SCI-6604] (#4120) 2022-05-26 13:19:38 +02:00
Anton 2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
artoscinote 6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Oleksii Kriuchykhin c120a357cd Add permissions for Report model [SCI-6834] 2022-05-24 10:59:21 +02:00
Oleksii Kriuchykhin 6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Alex Kriuchykhin 679b29b32d
Merge pull request #4099 from okriuchykhin/ok_SCI_6820 
Add migration for user team roles, including protocols and inventories [SCI-6820]
 2022-05-24 10:33:35 +02:00
Oleksii Kriuchykhin 39cfcd5522 Add migration for user team roles, including protocols and inventories [SCI-6820] 2022-05-23 16:28:53 +02:00
Anton a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton 5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
ajugo 90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012) 
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
 2022-05-19 09:08:05 +02:00
Oleksii Kriuchykhin cac33bed25 Update user invitations with new user roles [SCI-6823] 2022-05-19 09:04:25 +02:00
Anton 9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Anton 134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
ajugo e8d7fa50b8
Enable smart annotation notifcation at consumption and some rewording [SCI-6802] (#4094) 2022-05-17 11:41:53 +02:00
Oleksii Kriuchykhin c397616106 Add teams, protocols and inventories specific permission definitions [SCI-6819] 2022-05-16 11:10:19 +02:00
Anton 940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +02:00
artoscinote b486f3fd31
Implement checklists [SCI-6789] (#4089) 2022-05-11 15:51:26 +02:00
Anton 24d68da455 Fix tinymce assets for steps [SCI-6809] 2022-05-11 13:01:23 +02:00
Anton c0660d0243 Small fixes [SCI-6808] 2022-05-11 11:32:27 +02:00
Anton 04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
aignatov-bio d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion 
Add delete step modal [SCI-6781]
 2022-05-10 13:28:47 +02:00
Oleksii Kriuchykhin e957d7d35e Improve loading time of canvas view/edit [SCI-6797] 2022-05-09 11:40:31 +02:00
Anton 252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
artoscinote b00968fd55
Implement basic checklist functionality [SCI-6786] (#4073) 
* Implement protocol status bar functionality [SCI-6760]

* Inline edit interactions, checklist name edit improvements [SCI-6786]
 2022-05-05 12:56:31 +02:00
Anton 277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
artoscinote 5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton 3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +02:00
artoscinote 6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066) 
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
 2022-05-03 15:18:48 +02:00
Anton 6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
artoscinote ac45edb14c
Added validations for date(time) column reminder [SCI-6775] (#4063) 2022-04-28 15:30:20 +02:00
Anton 98efcc04b5 Small CSS fixes for repository [SCI-6767] 2022-04-28 14:32:34 +02:00
artoscinote 8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
aignatov-bio 3d78559559
Merge pull request #4047 from aignatov-bio/ai-sci-6754-add-creation-step-functionality 
Add step creation/deletion functionality [SCI-6754]
 2022-04-25 12:46:33 +02:00
aignatov-bio 957e79f46a
Merge pull request #4051 from aignatov-bio/ai-sci-6743-add-newgative-validation-for-treshold 
Add negative validation for threshold [SCI-6743]
 2022-04-25 12:46:20 +02:00
Anton ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote e4b5389acf
Copy fix [SCI-6762] (#4048) 2022-04-25 12:18:50 +02:00
Anton b56f11fc18 Add negative validation for treshold [SCI-6743] 2022-04-25 12:18:22 +02:00
Alex Kriuchykhin e15a382e37
Merge pull request #4032 from okriuchykhin/ok_SCI_6712 
Add models for step orderable elements, migrate step descriptions [SCI-6712]
 2022-04-22 09:33:41 +02:00