scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
9750 commits 69 branches 179 tags 165 MiB
Commit graph

7549 commits

Author SHA1 Message Date
Alex Kriuchykhin 1fc8c9cf72
Merge pull request #3318 from okriuchykhin/ok_SCI_5707 
Fix code formatting in report project content [SCI-5707]
 2021-05-13 11:45:01 +02:00
aignatov-bio 3ba96be787 Remove report name uniqness [SCI-5718] 2021-05-12 14:56:22 +02:00
aignatov-bio 64279f7193 Fix report wizard results collapsing [SCI-5679] 2021-05-12 14:28:54 +02:00
Alex Kriuchykhin 5c57056796
Merge pull request #3307 from aignatov-bio/ai-sci-5712-revert-template-on-warning-modal-close 
Revert selected template on warning modal close [SCI-5712]
 2021-05-12 13:12:16 +02:00
Oleksii Kriuchykhin 4bbf968c18 Fix code formatting in report project content [SCI-5707] 2021-05-12 13:10:01 +02:00
aignatov-bio 285e424ab7 Fix markup [SCI-5712] 2021-05-12 12:31:37 +02:00
aignatov-bio e16b3b0d61
Report wizard add red border to report name [SCI-5703] (#3309) 2021-05-12 12:22:40 +02:00
Alex Kriuchykhin d02f4a7ff9
Merge pull request #3308 from aignatov-bio/ai-sci-5706-fix-ordering-tasks-in-report-and-wizard 
Fix ordering tasks in report and wizard [SCI-5706]
 2021-05-12 12:04:43 +02:00
aignatov-bio 8f8e685793
Change report warning modals size [SCI-5717] (#3315) 2021-05-11 21:31:44 +02:00
aignatov-bio 36f680a444
Add bold to confirmation text in report warning modals [SCI-5710] (#3312) 2021-05-11 21:31:23 +02:00
aignatov-bio 114a590a22
Report wizard fix task and experiments long names [SCI-5711] (#3311) 2021-05-11 21:31:12 +02:00
aignatov-bio 3bd774f8db
Small fixes for report index page [SCI-5695] (#3310) 2021-05-11 21:30:58 +02:00
aignatov-bio 131ff79034
Fix collased arrow in report wizard [SCI-5697] (#3306) 2021-05-11 21:29:59 +02:00
Alex Kriuchykhin 2f52d4f9ce
Merge pull request #3313 from aignatov-bio/ai-sci-5720-fix-handsone-tables-in-pdf-report 
Fix handson table in pdf report [SCI-5720]
 2021-05-11 17:32:39 +02:00
Oleksii Kriuchykhin ca0f5348a1 Improve rendering of inventories in reports [SCI-5709] 2021-05-11 17:09:39 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio dcd299f250 Fix handson table in pdf report [SCI-5720] 2021-05-11 12:20:16 +02:00
aignatov-bio 999b6b26a3
Fix results render in pdf report [SCI-5696] (#3305) 2021-05-11 10:12:03 +02:00
aignatov-bio 44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
aignatov-bio 3b55afb908 Revert selected template on warning modal close [SCI-5712] 2021-05-10 14:03:08 +02:00
Miha Mencin 56a6c0825d
Merge pull request #3296 from okriuchykhin/ok_SCI_5699 
Improve handling of selected inventories in reports [SCI-5699]
 2021-05-10 10:48:09 +02:00
Miha Mencin 1c20c02686
Merge pull request #3289 from biosistemika/SCI-5698-fix-force-2fa 
SCI-5698 fix force 2fa
 2021-05-10 10:47:49 +02:00
Miha Mencin b4b7783cd3
Merge pull request #3301 from okriuchykhin/ok_SCI_5691 
Hide empty projects in reports editor [SCI-5691]
 2021-05-10 10:47:23 +02:00
Miha Mencin 4886a78be9
Merge pull request #3297 from okriuchykhin/ok_SCI_5694 
Add flash messages for report generation [SCI-5694]
 2021-05-10 10:46:49 +02:00
Oleksii Kriuchykhin b056eb797f Hide empty projects in reports editor [SCI-5691] 2021-05-07 18:28:13 +02:00
Oleksii Kriuchykhin f5eea49116 Add link to generated report preview in notifications [SCI-5553] 2021-05-07 17:21:44 +02:00
Oleksii Kriuchykhin e4d852b9f5 Fix report PDF generation job params [SCI-5708] 2021-05-07 17:00:34 +02:00
Oleksii Kriuchykhin 06109889c5 Add flash messages for report generation [SCI-5694] 2021-05-07 16:23:35 +02:00
Oleksii Kriuchykhin 62b919cd8f Improve handling of selected inventories in reports [SCI-5699] 2021-05-07 14:55:01 +02:00
Alex Kriuchykhin 7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin eb773d94c5
Merge pull request #3294 from okriuchykhin/ok_SCI_5619 
Add default settings to existing reports [SCI-5619][SCI-5672]
 2021-05-07 11:38:41 +02:00
Alex Kriuchykhin 7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Alex Kriuchykhin 05855ccf40
Merge branch 'features/new-reports' into ai-sci-5675-add-view-mode-for-checkbox-template-element 2021-05-07 11:03:24 +02:00
Alex Kriuchykhin 4e5e58c66a
Merge pull request #3285 from aignatov-bio/ai-sci-5684-add-warning-modal-for-template-and-project-change 
Add warning modal on project and template change [SCI-5684]
 2021-05-07 10:06:18 +02:00
Oleksii Kriuchykhin b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
Oleksii Kriuchykhin 6a1c073024 Fix file icons in export all [SCI-5685] 2021-05-06 14:53:44 +02:00
aignatov-bio 2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin 96f85aeb3c Add report templates loader and move out templates from the main source tree [SCI-5664] 2021-05-06 11:27:05 +02:00
Alex Kriuchykhin 57c90a60c4
Merge pull request #3287 from aignatov-bio/ai-sci-5686-add-default-scinote-report-template 
Add Scinote Report Template [SCI-5686]
 2021-05-06 10:59:33 +02:00
Oleksii Kriuchykhin c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
miha 36788db816 SCI-5698 Make the decision to redirect to 2fa more readable 2021-05-06 08:14:39 +02:00
miha f23ff73610 SCI-5693 skip 2fa if bypass is set 2021-05-05 17:29:21 +02:00
aignatov-bio 689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
aignatov-bio 4d685f193b Fix save as bew report [SCI-5684] 2021-05-05 12:25:13 +02:00
aignatov-bio 3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +02:00
miha 136f0cd17f SCI-5693 refactor of 2fa procedure 2021-05-04 20:51:34 +02:00
Oleksii Kriuchykhin a307a16033 Fix handsontable assets inclusion in report templates [SCI-5692] 2021-05-04 16:05:19 +02:00
aignatov-bio 9ca7b76a1f Fix report assigned repository items 2021-05-04 12:49:38 +02:00
Oleksii Kriuchykhin e98ccd2860 Add confirmation modal for report regeneration action [SCI-5622] 2021-05-03 16:10:14 +02:00
aignatov-bio 3d80deb51a
Add pagination to report title page [SCI-5667] (#3275) 2021-05-03 15:27:17 +02:00
aignatov-bio 705fb1e43d
Add report front-end validations and close wizard modals [SCI-5666] (#3273) 
* Add report front-end validations and close wizard modals

* Add constant to report name validation [SCI-5666]
 2021-05-03 15:24:27 +02:00
aignatov-bio e25bd039d5
Small css fix for report action dropdown (#3279) 2021-05-03 15:17:46 +02:00
aignatov-bio 01dfd305ab
Add warning modal to report edit mode [SCI-5621] (#3266) 
* Add warning modal to report edit mode [SCI-5621]

* Move report editing modal to partial [SCI-5621]
 2021-05-03 15:17:23 +02:00
aignatov-bio 7752267808
Add styling for template values [SCI-5630] (#3264) 2021-05-03 15:17:09 +02:00
aignatov-bio 931c587af7 Add view mode for checkbox template component [SCI-5675] 2021-05-03 13:44:27 +02:00
Oleksii Kriuchykhin 1abc0dc1eb Fix tests [SCI-5636] 2021-05-03 13:03:26 +02:00
Oleksii Kriuchykhin 1b8265343e Add full-page display to PDF Report of all pages of the attached Word and PDF files in the Results [SCI-5636] 2021-05-03 11:45:45 +02:00
aignatov-bio 86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
aignatov-bio 6b023603f9
Add second template for reports [SCI-5617] (#3268) 2021-04-29 10:42:17 +02:00
Oleksii Kriuchykhin bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +02:00
Oleksii Kriuchykhin 8a915c8acf Fix assets inclusion into report [SCI-5680] 2021-04-28 14:37:16 +02:00
aignatov-bio 7c75f170d0
Add repositories settings to report wizard [SCI-5648] (#3269) 
* Add repositories settings to report wizard [SCI-5648]

* Move repositories from report settings to content [SCI-5648]
 2021-04-28 09:54:00 +02:00
Alex Kriuchykhin fe48e35cf0
Merge pull request #3263 from okriuchykhin/ok_SCI_5609 
Add additional custom fields for reports [SCI-5609]
 2021-04-23 10:53:59 +02:00
Oleksii Kriuchykhin ecbf747499 Switch to base64 encoded assets in wiked_pdf templates 2021-04-22 14:52:41 +02:00
Oleksii Kriuchykhin fab013b19b Fix file name sanitization in PDF previewer [SCI-5541] 2021-04-20 17:20:16 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +02:00
aignatov-bio d18a54c874
Update create and update action for reports controller [SCI-5641] (#3260) 
Update create and update action [SCI-5641]
 2021-04-20 13:35:40 +02:00
Miha Mencin f95e9402bd
Merge pull request #3258 from okriuchykhin/ok_SCI_5613 
Fix save report PDF to Inventory [SCI-5613]
 2021-04-15 09:30:04 +02:00
Alex Kriuchykhin 80827ce761
Merge pull request #3257 from biosistemika/SCI-5623-add-external-id-to-user 
SCI-5623 add external id to user
 2021-04-14 16:15:43 +02:00
Oleksii Kriuchykhin f13f3691b1 Fix blob permissions check to support multiple attachments [SCI-5613] 2021-04-14 16:07:01 +02:00
Oleksii Kriuchykhin fe8f006f6e Fix save report PDF to Inventory [SCI-5613] 2021-04-14 16:06:59 +02:00
Oleksii Kriuchykhin 0a9a656313 Add flash message and notification for generated reports [SCI-5552] 2021-04-14 15:45:51 +02:00
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00
miha ac18cb7225 rename partial to include html 2021-04-14 14:07:55 +02:00
Oleksii Kriuchykhin df8354bde3 Move the docx creation to the Delayed job [SCI-5560] 2021-04-14 12:39:36 +02:00
aignatov-bio 85a13b7182 Update condition for project content [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
aignatov-bio d991b631fb
Merge pull request #3252 from aignatov-bio/ai-sci-5593-add-logic-for-preparing-wizard-data-for-report 
Add logic for preparing wizard data for report [SCI-5593]
 2021-04-14 11:04:55 +02:00
miha e610683d5c [SCI-5623] added external_id setting to user 2021-04-14 09:44:09 +02:00
Alex Kriuchykhin 1df86c36d9
Merge pull request #3254 from okriuchykhin/ok_SCI_5637 
Implement PDF report generation in delayed job [SCI-5637]
 2021-04-13 16:37:16 +02:00
Oleksii Kriuchykhin f864f551d5 Implement PDF report generation in delayed job [SCI-5637] 2021-04-12 13:04:02 +02:00
aignatov-bio 101d46956c Add logic for preparing wizard data for report [SCI-5593] 2021-04-12 12:42:22 +02:00
miha 4f7f257b78 Remove cascading save from step 2021-04-12 12:20:05 +02:00
miha 2e45093856 fix a stupid2 2021-04-12 10:31:35 +02:00
miha b917a0c3e0 fix a stupid 2021-04-12 10:30:37 +02:00
miha 56ebc3dc07 [SCI-5635] add a migration to fix broken steps, fix the api so it sets last_modified_by_id, minor step model refactor 
migration fix

remove the conditoin for set_last_modified_by callback

set the last_modified_by_id in before_save callback (in case it is not set yet)

remove trailing spaces

Set last modified in protocl import service
 2021-04-12 09:59:00 +02:00
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
aignatov-bio 14f8e97b5f Add I18n for reports wizard second step [SCI-5572] 2021-04-08 12:04:34 +02:00
aignatov-bio e6edbf55f3 Add report wizard step 2 [SCI-5572] 2021-04-08 12:00:08 +02:00
aignatov-bio a1d6c30ef7 Add report wizard step 3 [SCI-5611] 2021-04-07 16:37:08 +02:00
Alex Kriuchykhin aa21d7e415
Merge pull request #3247 from okriuchykhin/ok_SCI_5591 
Add dynamic form elements in report wizard step 1 [SCI-5591]
 2021-04-07 12:05:10 +02:00
aignatov-bio a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Miha Mencin e3ca50d2d0
Merge pull request #3246 from biosistemika/SCI-5631-order-the-inventory-results 
[SCI-5631] Add ordering to inventory item api endpoint
 2021-04-06 18:40:38 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +02:00
miha 961fa9ab4e [SCI-5631] Add ordering to index endpoint so pagination works, limit maximum page size for kaminari 2021-04-06 09:59:24 +02:00
aignatov-bio 5c4099af80 Fix css for repository header [SCI-5628] 2021-04-01 12:55:58 +02:00
aignatov-bio 82be23db81 Add project and template selector [SCI-5570] 2021-03-31 15:32:03 +02:00
Alex Kriuchykhin c9688a58f7
Merge pull request #3241 from aignatov-bio/ai-sci-5571-add-template-partial-to-report 
Add template partials to reports [SCI-5571]
 2021-03-31 11:36:56 +02:00
aignatov-bio d04858d26e Fix markup [SCI-5571] 2021-03-30 23:47:34 +02:00
aignatov-bio ecca155fab Added layout for footer and header [SCI-5571] 2021-03-30 23:43:34 +02:00
aignatov-bio ad8e404bca Add template partials to reports [SCI-5571] 2021-03-30 13:40:36 +02:00
Oleksii Kriuchykhin 2b2b6f7774 Fix for API float parsing in the inventory number type column [SCI-5604] 2021-03-29 15:59:24 +02:00
Miha Mencin 6ad3f7b92f
Merge pull request #3239 from okriuchykhin/ok_SCI_5595_v2 
Remove canvas-to-blob library [SCI-5595]
 2021-03-29 14:03:35 +02:00
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
Miha Mencin 787f2d58db
Merge pull request #3237 from biosistemika/SCI-5577-filter-notifications 
[SCI-5577] Filter notifications
 2021-03-29 11:55:22 +02:00
miha 11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
aignatov-bio 1c93131ff1 Fix folders breadcrumbs [SCI-5597] 2021-03-26 11:58:18 +01:00
Oleksii Kriuchykhin f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
aignatov-bio 0ba6eec73c
Merge pull request #3232 from aignatov-bio/ai-sci-5564-fix-breadcrumbs-for-experiments-page 
Remove the project from experiments page breadcrumbs [SCI-5564]
 2021-03-25 15:41:49 +01:00
aignatov-bio b5cb46908c
Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset 
Add reload action for assets [SCI-5563]
 2021-03-25 15:40:36 +01:00
Oleksii Kriuchykhin 943c01cada Remove simple_token_authentication [SCI-5595] 2021-03-25 14:55:22 +01:00
aignatov-bio 9281a5631c Remove project from experiments page breadcrumbs [SCI-5564] 2021-03-25 14:32:05 +01:00
aignatov-bio 32b1db629a Change button_to to link_to [SCI-5563] 2021-03-25 14:21:24 +01:00
aignatov-bio 0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio 9e58380991
Merge pull request #3220 from aignatov-bio/ai-sci-5574-fix-infinite-scroll-for-dashboard 
Fix infinite scroll in current tasks on dashboard [SCI-5574]
 2021-03-24 11:42:26 +01:00
Miha Mencin 4fa1f350e4
Merge pull request #3221 from aignatov-bio/ai-sci-5564-small-breadcrumbs-fixes 
Small breadcrumbs fixes [SCI-5564]
 2021-03-24 09:46:09 +01:00
Miha Mencin 39f8cca364
Merge pull request #3230 from okriuchykhin/ok_SCI_5586 
Fix experiment workflow image loading [SCI-5586]
 2021-03-24 09:45:34 +01:00
Miha Mencin d5c8edd266
Merge pull request #3223 from aignatov-bio/ai-sci-5513-fix-office-icons-in-print-report 
Convert office icons to base64 [SCI-5513]
 2021-03-24 09:44:54 +01:00
Miha Mencin e4edc192c8
Merge pull request #3227 from aignatov-bio/ai-sci-5582-remove-project-folder-on-restore 
Remove project folder on project restore [SCI-5582]
 2021-03-24 09:44:35 +01:00
Miha Mencin 56a71ec426
Merge pull request #3228 from aignatov-bio/ai-sci-5583-fix-smart-annotations-in-experiment-details-modal 
Fix smart annotation in experiment details modal [SCI-5583]
 2021-03-24 09:44:06 +01:00
Oleksii Kriuchykhin f4abb4a6df Fix experiment workflow image loading [SCI-5586] 2021-03-23 23:13:26 +01:00
Alex Kriuchykhin f9f99cc26b
Merge pull request #3224 from okriuchykhin/ok_SCI_5575 
Implement missing missing user smart annotation notifications [SCI-5575]
 2021-03-23 12:03:51 +01:00
aignatov-bio e4256342d9 Fix smart annotation in experiment details modal [SCI-5583] 2021-03-22 15:36:10 +01:00
aignatov-bio a7d0f5050d Remove project on project restore [SCI-5582] 2021-03-22 15:20:47 +01:00
Oleksii Kriuchykhin 0e545dfee0 Fix sorting by status in team members table [SCI-4179] 2021-03-22 13:40:25 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
Oleksii Kriuchykhin d315b1327b Implement missing missing user smart annotation notifications [SCI-5575] 2021-03-19 17:11:19 +01:00
aignatov-bio c1f0896670 Convert office icons to base64 [SCI-5513] 2021-03-19 15:10:23 +01:00
aignatov-bio d3d79f4288 Small breadcrumbs fixes [SCI-5564] 2021-03-18 14:24:33 +01:00
aignatov-bio 4436876282 Fix infinite scroll in current tasks on dashboard [SCI-5574] 2021-03-18 13:17:30 +01:00
aignatov-bio 3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
Alex Kriuchykhin ee73088a81
Merge pull request #3214 from okriuchykhin/ok_SCI_5555 
Fix filtering on current tasks widget [SCI-5555]
 2021-03-17 10:40:53 +01:00
aignatov-bio a0c506e6fe
Merge pull request #3209 from aignatov-bio/ai-sci-5546-fix-activities-multiple-types-selected 
Fix activities multiple types selected [SCI-5546]
 2021-03-17 10:08:18 +01:00
Alex Kriuchykhin 936322b294
Merge pull request #3210 from urbanrotnik/ur-sci-4179-v2 
Fix Role sorting [SCI-4179]
 2021-03-16 14:08:26 +01:00
aignatov-bio c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +01:00
Oleksii Kriuchykhin d006b813b9 Add pdf and docx attachments to reports [SCI-5558] 2021-03-15 13:30:03 +01:00
aignatov-bio e8310f9b2e
Merge pull request #3212 from aignatov-bio/ai-sci-5431-implement-flyout-for-long-breadcrumbs 
Add dropdown to breadcrumbs [SCI-5431]
 2021-03-12 14:33:19 +01:00
Urban Rotnik 8107920400 Fix Role sorting for organization admin 2021-03-12 14:06:28 +01:00
Urban Rotnik c20a1f9bb6
Merge pull request #3195 from urbanrotnik/ur-sci-5513-missing-icons 
Fix CSS for missing icons [SCI-5513]
 2021-03-12 13:58:11 +01:00
Oleksii Kriuchykhin 413187e6da Fix filtering on current tasks widget [SCI-5555] 2021-03-12 13:33:37 +01:00
aignatov-bio d97225026c Fix gap after experiment name [SCI-5486] 2021-03-12 12:30:00 +01:00
aignatov-bio 63744b6a04 Add dropdown to breadcrumbs [SCI-5431] 2021-03-12 12:21:10 +01:00
Oleksii Kriuchykhin ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +01:00
aignatov-bio c6e4d6ef94 Fix activities multiple types selected [SCI-5546] 2021-03-10 12:59:02 +01:00
Urban Rotnik 07ba11c140 Fix icons in export_all and print mode 2021-03-10 12:42:12 +01:00
Urban Rotnik 8202181095
Merge pull request #3186 from urbanrotnik/ur-sci-4140-fix-notifications 
Bring back old notifications [SCI-4140]
 2021-03-09 14:54:08 +01:00
Urban Rotnik ab1477997a Update variables name 2021-03-09 14:50:14 +01:00
Urban Rotnik ee39224f73
Merge pull request #3206 from urbanrotnik/ur-sci-5518 
Fix titles hovering breadcrumbs [SCI-5518]
 2021-03-09 13:59:20 +01:00
Urban Rotnik 8bacc74c17
Merge pull request #3187 from urbanrotnik/ur-sci-5439 
Fix report completed_on time and username [SCI-5439]
 2021-03-09 13:27:24 +01:00
Urban Rotnik e16612caee
Merge pull request #3205 from urbanrotnik/ur-sci-4084 
Fix missing user placeholder icon in export_all [SCI-4084]
 2021-03-09 13:21:00 +01:00
Urban Rotnik 419b69ef60 Fix syntax error 
SCI-5518
 2021-03-08 22:04:28 +01:00
Urban Rotnik 919eeb2783 Fix titles to one line 
SCI-5518
 2021-03-08 22:04:19 +01:00
Urban Rotnik b9f77bf4fd Fix missing user placeholder icon in export_all 2021-03-08 14:39:58 +01:00
Urban Rotnik e1db291729
Merge pull request #3200 from urbanrotnik/ur-sci-5525 
Add breadcrumbs on Experiments and Tasks pages [SCI-5525]
 2021-03-08 14:13:44 +01:00
Urban Rotnik c21676f825
Merge pull request #3188 from urbanrotnik/ur-sci-4179 
Fix sorting on Teams settings page [SCI-4179]
 2021-03-08 14:13:25 +01:00
Urban Rotnik dd302142eb
Merge pull request #3194 from urbanrotnik/ur-sci-5498 
Fix grayed links when subjects gets deleted [SCI-5498]
 2021-03-08 14:12:05 +01:00
aignatov-bio 4f1905d16a
Merge pull request #3204 from aignatov-bio/ai-sci-fix-new-step-creation 
Fix new step creation
 2021-03-08 12:24:27 +01:00
aignatov-bio d99722be5c Fix new step creation 2021-03-08 12:21:10 +01:00
Urban Rotnik a4112984ea fixup! Add breadcrumbs on Experiments and Tasks pages 2021-03-08 11:51:11 +01:00
Urban Rotnik 96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode 
Store Table/Cards view setting per user [SCI-5450]
 2021-03-08 11:48:33 +01:00
aignatov-bio ea424e4a12
Merge pull request #3161 from mlorb/ml-sci-5323 
Implement styling for the inventories empty state [SCI-5323]
 2021-03-08 11:42:48 +01:00
aignatov-bio a4227874e3 Add empty office files placeholder [SCI-5490] 2021-03-08 11:35:15 +01:00
aignatov-bio 7ff6cc17ad
Merge pull request #3197 from aignatov-bio/ai-sci-5483-fix-click-zone-for-manage-users-buttons 
Fix click zone for manage users buttons [SCI-5483]
 2021-03-08 11:31:41 +01:00
aignatov-bio df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio ab33f51a59
Merge pull request #3184 from aignatov-bio/ai-sci-5460-add-long-names-navigation-tootip 
Add titles to navigation items [SCI-5460]
 2021-03-08 10:17:52 +01:00
aignatov-bio 39227e20e4
Merge pull request #3189 from aignatov-bio/ai-sci-5474-fix-duplicated-new-step-button 
Fix duplicated new step button [SCI-5474]
 2021-03-08 10:17:26 +01:00
aignatov-bio 8509d86c48
Merge pull request #3196 from aignatov-bio/ai-sci-5484-update-images-extensions 
Fix upercase file extensions [SCI-5484]
 2021-03-08 10:16:59 +01:00
aignatov-bio aa695e0c1b
Merge pull request #3203 from aignatov-bio/ai-sci-5486-fix-experimnet-card-css 
Small CSS fixes for experiment card [SCI-5486]
 2021-03-08 10:16:45 +01:00
aignatov-bio 96b712c90e
Merge pull request #3175 from aignatov-bio/ai-sci-5462-fix-dashboard-infinite-scroll 
Fix dashboard infinite scroll [SCI-5462]
 2021-03-08 10:15:26 +01:00
aignatov-bio 16c2130d0f Fix gap after experiment title [SCI-5486] 2021-03-05 14:32:25 +01:00
aignatov-bio ab9d0c018b Small CSS fixes for experiment card [SCI-5486] 2021-03-05 13:41:44 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Oleksii Kriuchykhin d557739f2e Remove notification service check from health check endpoint [SCI-5526] 2021-03-04 09:38:25 +01:00
Urban Rotnik 401224ae11 Add breadcrumbs on Experiments and Tasks pages 2021-03-04 09:00:58 +01:00
Oleksii Kriuchykhin 2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio dcea1b558b Fix click zone for manage users buttons [SCI-5483] 2021-03-02 15:32:53 +01:00
aignatov-bio 468afaaa5a Fix upercase file extensions [SCI-5484] 2021-03-02 15:04:43 +01:00
Urban Rotnik fd6165bc55 Fix grayed links when subjects gets deleted 2021-03-02 11:13:08 +01:00
aignatov-bio 0c5a1a3e21 Fix tests [SCI-5528] 2021-02-26 16:29:56 +01:00
aignatov-bio 89ac76a766 Fix duplcated new step button [SCI-5474] 2021-02-26 12:29:31 +01:00
Urban Rotnik 1d43e478a2 Fix sorting on Teams settings page 
SCI-4179
 2021-02-26 12:17:57 +01:00
Urban Rotnik 8ca8c84efd Fix report completed_on time and username (partially) 
SCI-5439
We cannot realy on last_modified_by, because it can be changed after step completion
 2021-02-25 13:24:21 +01:00
Urban Rotnik 1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Urban Rotnik 347f208480 Bring back old notifications 
SCI-4140
 2021-02-25 11:59:14 +01:00
aignatov-bio 24134174fc Add titles to navigation items [SCI-5460] 2021-02-23 15:00:11 +01:00
Urban Rotnik 6b5d07e1a4 Fix projects filter 2021-02-23 13:21:09 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Miha Mencin 3639e63954
Merge pull request #3181 from urbanrotnik/ur-sci-5519 
Fix Projects filters history items [SCI-5519]
 2021-02-22 20:14:51 +01:00
Urban Rotnik 17d68bf65f Fix Projects filters history items 2021-02-22 20:11:08 +01:00
aignatov-bio 84d61252d8
Merge pull request #3180 from aignatov-bio/ai-sci-5512-fix-datetime-selector-for-filters 
Fix datetime for projects and experiments filters [SCI-5512]
 2021-02-22 13:25:00 +01:00
aignatov-bio a131056279 Fix datetime for projects and experiments filters [SCI-5512] 2021-02-22 12:51:04 +01:00
Miha Mencin 91026857fa
Merge pull request #3179 from urbanrotnik/ur-sci-5511 
Prevent filters close when click on checkbox after input [SCI-5511]
 2021-02-22 11:40:21 +01:00
Miha Mencin cd28632979
Merge pull request #3178 from okriuchykhin/ok_SCI_5509 
Improve inventory table loading speed [SCI-5509]
 2021-02-22 10:57:44 +01:00
Miha Mencin 63dd680385
Merge pull request #3177 from urbanrotnik/ur-sci-5514 
Fix repository empty index show condition [SCI-5514]
 2021-02-22 10:56:02 +01:00
Urban Rotnik 757bed3cbf Prevent filters close when click on checkbox after input 
SCI-5511
 2021-02-22 10:50:09 +01:00
Oleksii Kriuchykhin e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
Urban Rotnik 42f8062fe0 Fix repository empty index show condition 2021-02-22 10:18:52 +01:00
aignatov-bio 58a5126a13 Fix normalize_module_position method [SCI-5508] 2021-02-19 14:41:57 +01:00
aignatov-bio 0609e9699d Fix dashboard infinite scroll [SCI-5462] 2021-02-18 15:31:31 +01:00
Urban Rotnik a89c5fef13
Merge pull request #3165 from urbanrotnik/ur-sci-5481 
Add experiment thumbnail, update archived view for experiments [SCI-5481]
 2021-02-18 15:22:01 +01:00
Urban Rotnik 2daf5aad2a
Merge pull request #3168 from urbanrotnik/ur-sci-5493-external-protocols-preview 2021-02-18 14:50:30 +01:00
Alex Kriuchykhin d3e960fe2b
Merge pull request #3173 from okriuchykhin/ok_SCI_5494 
Multiple small bugfixes [SCI-5494]
 2021-02-18 14:35:40 +01:00
Oleksii Kriuchykhin 7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
Urban Rotnik 3bca05fc94 Prevent showing empty files for experiments without Tasks 
SCI-5481
 2021-02-18 12:03:28 +01:00
Urban Rotnik 6ea39c9363 Add experiment thumbnail, update archived view for experiments 
SCI-5481
 2021-02-18 12:03:13 +01:00
Urban Rotnik bb93df004a
Merge pull request #3171 from urbanrotnik/ur-sci-4599-experiment-without-tasks-disappears 
Fix query with counts [SCI-5499]
 2021-02-18 11:10:10 +01:00
aignatov-bio d2c03f27c3
Merge pull request #3170 from aignatov-bio/ai-sci-5492-fix-shared-inventories 
Fix shared inventories [SCI-5492]
 2021-02-18 11:05:18 +01:00
aignatov-bio 1cfd9dd85e
Merge pull request #3163 from aignatov-bio/ai-sci-5469-update-experiment-card-css 
Update experiment card css [SCI-5469]
 2021-02-18 10:45:43 +01:00
Urban Rotnik f29fd76822 Fix archived_on sorting 2021-02-18 09:42:17 +01:00
Urban Rotnik 933dcc93c7 Fix query with counts 2021-02-17 16:50:09 +01:00
aignatov-bio 99c3e1430b Fix shared inventories [SCI-5492] 2021-02-17 15:14:32 +01:00
Urban Rotnik 6851746bf6 Fix HTTParty request after gem upgrade 2021-02-17 13:34:26 +01:00
Urban Rotnik 41cd8edf29 Fix 'bellow' typo across scinote 2021-02-17 11:56:30 +01:00
Urban Rotnik 5199bbff84 Fix Polymerase chain reaction experiment 2021-02-17 11:55:35 +01:00
aignatov-bio 171468444d Fix method on experiment archive action 2021-02-16 12:55:41 +01:00
aignatov-bio 060d5c1c2e
Merge pull request #3159 from aignatov-bio/ai-sci-5249-update-dashboard-widget-size 
Fix dashboard CSS [SCI-5249][SCI-5489]
 2021-02-16 12:43:36 +01:00
aignatov-bio 0368579799 Update experiment card css [SCI-5469] 2021-02-16 12:42:09 +01:00
Mojca Lorber 456d9c713f Implement styling for the inventories empty state 2021-02-15 21:01:31 +01:00
aignatov-bio e02136e664 Add scrollbar to filter dropdown on experement page [SCI-5472] 2021-02-15 13:30:02 +01:00
aignatov-bio cc2edaf71a Fix dahsboard CSS [SCI-5249][SCI-5489] 2021-02-15 12:40:26 +01:00
aignatov-bio 3ebacd90fe
Merge pull request #3158 from aignatov-bio/ai-sci-5485-fix-activity-service 
Fix activities service [SCI-5485]
 2021-02-15 10:52:37 +01:00
aignatov-bio e09f5a0604
Merge pull request #3157 from aignatov-bio/ai-sci-5476-fix-empty-toolbar-state 
Fix toolbar empty state [SCI-5476]
 2021-02-15 10:29:27 +01:00
mlorb 20dc9967f5
Merge pull request #3113 from mlorb/ml-sci-5311 
Implement the option of deleting empty folders [SCI-5311]
 2021-02-15 10:27:05 +01:00
mlorb 78a76ea3a1
Merge pull request #3154 from mlorb/ml-sci-5470 
Add no results page on experiments page [SCI-5470]
 2021-02-15 10:26:26 +01:00
Urban Rotnik 8c80484445
Merge pull request #3155 from urbanrotnik/ur-sci-5471 
Fix dots, checkbox and duplicate button visibility on Experiment cards [SCI-5471]
 2021-02-15 10:24:25 +01:00
aignatov-bio 4f8e15dbc6 Fix activities service [SCI-5485] 2021-02-15 10:23:32 +01:00
aignatov-bio e10c7fc6c9 Fix toolbar empty state [SCI-5476] 2021-02-12 14:45:09 +01:00
Urban Rotnik 79cacb41c4 Fixed uniqueness name validation for ProjectFolder 2021-02-12 13:35:44 +01:00
Urban Rotnik 1ae0b42c2c Fix Dots and Checkbox visibility on experiment cards 2021-02-12 13:25:12 +01:00
Mojca Lorber b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
Urban Rotnik 9f685327f6
Merge pull request #3152 from urbanrotnik/ur-sci-fix-new-experiment-button 
Fix typo in CSS
 2021-02-12 10:00:42 +01:00
aignatov-bio 8191306411 Fix experiment archive page route [SCI-5479] 2021-02-12 09:55:26 +01:00
Urban Rotnik b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +01:00
Urban Rotnik 7e463c77c0 Fix typo in CSS 2021-02-12 06:55:23 +01:00
aignatov-bio 41cdc47702
Merge pull request #3151 from urbanrotnik/ur-sci-5475-move-experiment-bug 
Fix Move button on Experiment card [SCI-5475]
 2021-02-11 21:14:47 +01:00
Urban Rotnik 4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber 52cbc036fc Fix hound 2021-02-11 18:29:03 +01:00
Mojca Lorber 7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
aignatov-bio bcc9d6c85c Fix sort for experiments page [SCI-5479] 2021-02-11 15:38:10 +01:00
aignatov-bio 1eff3494fb Fix archived experiments page routes and clean old archive page [SCI-5479] 2021-02-11 14:21:15 +01:00
aignatov-bio 1a3c715d72
Merge pull request #3149 from aignatov-bio/ai-sci-5468-connect-details-modal-to-more-button 
Add action to more button [SCI-5468]
 2021-02-11 13:56:54 +01:00
aignatov-bio f6422a50ac Add action to more button 2021-02-11 12:41:22 +01:00
Mojca Lorber ce451f86a8 Fix projects breadcrumbs style [SCI-5349] 2021-02-10 23:33:16 +01:00
Mojca Lorber 19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio 2fad6f5f8e
Merge pull request #3146 from aignatov-bio/ai-sci-5477-fix-archived-project-routes 
Fix archived project routes and experiment archived date [SCI-5477]
 2021-02-10 18:38:13 +01:00
aignatov-bio 8adbd11197 Fix archived project routes and experiment archived date [SCI-5477] 2021-02-10 15:05:53 +01:00
aignatov-bio 486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
aignatov-bio 8853d297ed
Merge pull request #3143 from urbanrotnik/ur-sci-5455-search-results-breadcrumbs 
Add breadcrumbs to GlobalSearch results [SCI-5455]
 2021-02-09 21:44:54 +01:00
aignatov-bio 9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
Urban Rotnik 367ade2e32 Add breadcrumbs to GlobalSearch results 2021-02-09 13:07:40 +01:00
mlorb 45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber 0d9b38a843 Add archived experiments card style 2021-02-07 19:04:30 +01:00
aignatov-bio a339d821bd
Merge pull request #3105 from aignatov-bio/ai-sci-5255-update-marvin-js-model-styling 
Update marvinJS modal CSS [SCI-5255]
 2021-02-05 15:36:14 +01:00
aignatov-bio 554c0b964a Remove commented value [SCI-5255] 2021-02-05 15:26:01 +01:00
aignatov-bio 2972fac96e
Merge pull request #3140 from aignatov-bio/ai-sci-5407-add-folders-link-to-search 
Add folder links to global search [SCI-5407]
 2021-02-05 15:24:23 +01:00
mlorb 480893c8c7
Merge pull request #3138 from mlorb/ml-sci-5456 
Change the title Projects to folder/subfolder title [SCI-5456]
 2021-02-05 13:50:13 +01:00
aignatov-bio 7c99eaed8f Add folder links to global search [SCI-5407] 2021-02-05 12:39:26 +01:00
aignatov-bio f3c1d123d4 Fix duplicate code 2021-02-05 11:28:38 +01:00
Mojca Lorber ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
Miha Mencin 107b7a0427
Merge pull request #3114 from urbanrotnik/ur-sci-5417-folders-name-uniquness-scope 
Add Archived to ProjectFolder name uniqueness scope [SCI-5417]
 2021-02-05 09:59:40 +01:00
Miha Mencin be6796c95a
Merge pull request #3137 from aignatov-bio/ai-sci-5365-add-experiments-list-view 
Add list view for experiments [SCI-5365]
 2021-02-05 09:58:52 +01:00
Miha Mencin b35e15fdd5
Merge pull request #3101 from aignatov-bio/ai-sci-5263-add-new-file-icons-to-report 
Add new asset icons to report [SCI-5263]
 2021-02-05 08:21:05 +01:00
Miha Mencin 0e9b714c9f
Applying Alex's suggestion 
Co-authored-by: Alex Kriuchykhin <okriuchykhin@biosistemika.com>
 2021-02-05 08:19:42 +01:00
aignatov-bio a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin c5b286c764 Fix corrupted SCSS file 2021-02-04 16:40:05 +01:00
Oleksii Kriuchykhin c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Alex Kriuchykhin 1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246 
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
 2021-02-04 11:28:09 +01:00
Alex Kriuchykhin cca3c57bf2
Merge pull request #3134 from okriuchykhin/ok_SCI_5463 
Fix module normalisation in canvas update [SCI-5463]
 2021-02-04 11:27:47 +01:00
Alex Kriuchykhin dd9d75a643
Merge pull request #3130 from okriuchykhin/ok_SCI_5458 
Improve visibility of experiment workflow image [SCI-5458]
 2021-02-04 11:27:27 +01:00
Oleksii Kriuchykhin 8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio b4a6644f13
Merge pull request #3133 from aignatov-bio/ai-sci-5457-update-experiments-view-screen 
Connect front-end with back-end for experiments page [SCI-5457]
 2021-02-04 11:00:17 +01:00
Mojca Lorber d897e20426 Implement new experiment card layout 2021-02-04 09:02:23 +01:00
Oleksii Kriuchykhin bba8e0326d Fix module normalization in canvas update [SCI-5463] 2021-02-03 14:58:04 +01:00
aignatov-bio a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio 7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Miha Mencin 259d7d5e7c
Merge pull request #3132 from biosistemika/release/1.21.1 
Release/1.21.1
 2021-02-03 11:49:04 +01:00
Oleksii Kriuchykhin 58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
aignatov-bio e206892864 Add p element to docx list allowed elements [SCI-5461] 2021-02-02 11:26:54 +01:00
Oleksii Kriuchykhin 6b2a94f045 Add empty repositories index page [SCI-5248] 2021-02-01 15:02:08 +01:00
Oleksii Kriuchykhin 324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00
Oleksii Kriuchykhin 8b593bc3aa Add new experiment template from demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
Oleksii Kriuchykhin 1ba13c8c5e Clean up and fix mistakes in demo project [SCI-5246] 2021-02-01 14:59:10 +01:00
Mojca Lorber 9ca89ce9d9 Fix rendering error 2021-02-01 13:16:21 +01:00
aignatov-bio 8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
aignatov-bio 29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119) 
* Move filters to shared folder [SCI-5366]
 2021-01-29 13:24:02 +01:00
aignatov-bio 1df44f8383
Try load pdf preview again on error [SCI-5449] (#3121) 
* Try load pdf preview again on error [SCI-5449]

* Add attempts counter [SCI-5449]
 2021-01-29 11:34:53 +01:00
Alex Kriuchykhin 8bd0dc2e4b
Merge pull request #3115 from urbanrotnik/ur-sci-5410-archive-task-checkbox 
Hide checkbox on task card if task is in experiment archived branch [SCI-5410]
 2021-01-29 11:06:36 +01:00
aignatov-bio 9a86cd9184
Update dashboard widgets height [SCI-5206][SCI-5249] (#3123) 2021-01-29 11:01:49 +01:00
Mojca Lorber 1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Alex Kriuchykhin 24d3ce3606
Merge pull request #3118 from okriuchykhin/ok_SCI_5369 
Add breadcrumbs to project experiments page [SCI-5369]
 2021-01-28 14:50:21 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Alex Kriuchykhin f1124f9ea0
Add experiments overview service [SCI-5430] (#3116) 2021-01-28 12:57:04 +01:00
Oleksii Kriuchykhin b872c6fd14 Add breadrumbs to project experiments page [SCI-5369] 2021-01-25 16:06:48 +01:00
aignatov-bio 8396c086f5
Add sticky toolbar for projects page [SCI-5401] (#3108) 
* Add sticky toolbar for projects page [SCI-5401]
 2021-01-25 15:36:23 +01:00
aignatov-bio cea61a6bd2
Add hover effect to project table [SCI-5372] (#3111) 
* Add hover effect to projects table [SCI-5372]

* Fix markup [SCI-5372]
 2021-01-25 10:26:10 +01:00
Urban Rotnik d54090fe0d Fix missing asset in report 
Use 40px asset in override so it will be properly compiled SCI-5446
 2021-01-25 07:49:19 +01:00
Urban Rotnik ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Urban Rotnik 7232983d59 Hide checkbox on task card if task is in experiment archived branch 
SCI-5410
 2021-01-22 09:47:00 +01:00
Urban Rotnik 68ac663370 Add Archived to ProjectFolder name uniqueness scope 
SCI-5417
 2021-01-22 08:56:43 +01:00