Commit graph

7372 commits

Author SHA1 Message Date
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
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