Commit graph

431 commits

Author SHA1 Message Date
Alex Kriuchykhin
2a6b33deec
Fix downloading of BioEddie files in reports [SCI-6037] (#3623) 2022-02-02 10:41:57 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
aignatov-bio
34b0aec5b7
Update permission checks for reports [SCI-6105] (#3570) 2021-10-01 14:25:52 +02:00
aignatov-bio
a99f9db520
Small CSS fixes [SCI-6017][SCI-6019] (#3548) 2021-09-17 14:15:01 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration
Features/bioeddie integration
2021-08-03 13:32:53 +02:00
aignatov-bio
a782ce50d1
Add bio eddie files to export all [SCI-5877] (#3426) 2021-08-02 13:27:02 +02:00
artoscinote
723b594632
Merge pull request #3398 from artoscinote/ma_SCI_5828
Expose experiment IDs in interface and reports [SCI-5828]
2021-06-30 12:58:25 +02:00
Martin Artnik
b623e2f40f Report generation fixes [SCI-5851] 2021-06-29 13:46:45 +02:00
Martin Artnik
a32219b1aa Amend how PDF report generation works [SCI-5837] 2021-06-21 14:20:30 +02:00
Oleksii Kriuchykhin
7d31b99386 Revert to fontawesome CDN link in reports and update wicked_pdf [SCI-5650] 2021-06-18 15:03:17 +02:00
Martin Artnik
afc1b2d8b6 Added experiment code to PDF and DOCX [SCI-5830] 2021-06-18 14:14:02 +02:00
Oleksii Kriuchykhin
bb458abec6 Remove old reports code [SCI-5650] 2021-06-18 10:40:00 +02:00
Oleksii Kriuchykhin
1e3197875c Fix repositories selection in report wizard and deleted repositories handling [SCI-5831] 2021-06-17 16:23:27 +02:00
Alex Kriuchykhin
4caa5f9ac1
Merge pull request #3394 from okriuchykhin/ok_SCI_5776_v2
Fix repository snapshots for export all [SCI-5776]
2021-06-17 11:35:16 +02:00
Oleksii Kriuchykhin
85a5cca98a Fix repository snapshots for export all [SCI-5776] 2021-06-16 16:17:12 +02:00
aignatov-bio
12d8b84cfd
Fix snapshots for deleted inventory [SCI-5826] (#3393) 2021-06-16 15:23:34 +02:00
aignatov-bio
7313b5fa16
Add archived and deleted repositories to reports [SCI-5781] (#3387)
* Add archived and deleted repositories to reports [SCI-5781]

* Small markup fix [SCI-5781]
2021-06-16 10:56:08 +02:00
Miha Mencin
b7513c6d5f
Merge pull request #3381 from aignatov-bio/ai-sci-5799-add-dynamic-logo-to-reports
Add dynamic logo to default report [SCI-5799]
2021-06-15 07:36:48 +02:00
Martin Artnik
20484cfe5c Handle old reports with no templates properly [SCI-5810] 2021-06-14 10:53:46 +02:00
aignatov-bio
ea94ce19b1 Add dynamic logo to default report [SCI-5799] 2021-06-10 15:29:28 +02:00
Miha Mencin
dc72bfc527
Merge pull request #3379 from okriuchykhin/ok_SCI_5776
Remove forgotten byebug assertion [SCI-5776]
2021-06-10 13:08:39 +02:00
Oleksii Kriuchykhin
8b1a9a1b7c Remove forgotten byebug assertion [SCI-5776] 2021-06-10 13:06:31 +02:00
Miha Mencin
48202c88d1
Merge pull request #3350 from aignatov-bio/ai-sci-5601-add-pdf-preview-for-docx-report
Add pdf preview for docx reports [SCI-5601]
2021-06-09 11:27:45 +02:00
aignatov-bio
16f83a3e60 Remove docx preview processing flag [SCI-5601] 2021-06-09 10:58:27 +02:00
Oleksii Kriuchykhin
16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
Alex Kriuchykhin
d9b7526f11
Merge pull request #3359 from aignatov-bio/ai-sci-5775-fix-snapshots-in-reports
Fix snapshots render in reports [SCI-5775]
2021-05-28 14:24:35 +02:00
aignatov-bio
f7849cf677 Fix snapshots render in reports [SCI-5775] 2021-05-28 13:13:56 +02:00
aignatov-bio
2be59bf8b2 Add pdf preview for docx reports [SCI-5601] 2021-05-25 15:14:50 +02:00
aignatov-bio
f586865696 Small report wizard fixes [SCI-5758] 2021-05-25 13:14:57 +02:00
aignatov-bio
2651e8ff35 Fast fix for export all [SCI-5753] 2021-05-24 13:16:43 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Miha Mencin
6142c2d89d
Merge pull request #3336 from aignatov-bio/ai-sci-5740-default-template-selection
Add default template selection [SCI-5740]
2021-05-20 15:11:33 +02:00
Oleksii Kriuchykhin
7bfde7dc1e Render report element children container only if children are present [SCI-5739] 2021-05-20 14:16:39 +02:00
aignatov-bio
1b56190116 Add default template selection [SCI-5740] 2021-05-20 13:18:57 +02:00
Alex Kriuchykhin
8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports
Add search field to reports page [SCI-5551]
2021-05-17 11:50:03 +02:00
Miha Mencin
491dc22294
Merge pull request #3321 from okriuchykhin/ok_SCI_5724
Fix default empty options for report wizard first page [SCI-5724]
2021-05-17 10:28:57 +02:00
Alex Kriuchykhin
5e06768fa6
Merge pull request #3322 from okriuchykhin/ok_SCI_5726
Fix default selection of results in reports wizard [SCI-5726]
2021-05-14 12:02:49 +02:00
aignatov-bio
e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +02:00
Alex Kriuchykhin
34c79d66b8
Merge pull request #3278 from okriuchykhin/ok_SCI_5664
Add report templates loader and move out templates from the main source tree [SCI-5664]
2021-05-13 15:51:24 +02:00
Oleksii Kriuchykhin
167ebd3d58 Fix default selection of results in reports wizard [SCI-5726] 2021-05-13 15:44:06 +02:00
Oleksii Kriuchykhin
697809ff6a Fix default empty options for report wizard first page [SCI-5724] 2021-05-13 14:24:47 +02:00
Alex Kriuchykhin
9675dafd25
Merge pull request #3319 from aignatov-bio/ai-sci-5679-fix-report-wizard-results-collapsing-arrows
Fix report wizard results collapsing [SCI-5679]
2021-05-13 11:45:49 +02:00
Alex Kriuchykhin
4d30d9dec1
Merge pull request #3317 from okriuchykhin/ok_SCI_5709
Improve rendering of inventories in reports [SCI-5709]
2021-05-13 11:45:26 +02:00
aignatov-bio
64279f7193 Fix report wizard results collapsing [SCI-5679] 2021-05-12 14:28:54 +02:00
Oleksii Kriuchykhin
4bbf968c18 Fix code formatting in report project content [SCI-5707] 2021-05-12 13:10:01 +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
Oleksii Kriuchykhin
ca0f5348a1 Improve rendering of inventories in reports [SCI-5709] 2021-05-11 17:09:39 +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
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
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
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
aignatov-bio
689967f82c Add Scinote Report Template [SCI-5686] 2021-05-05 15:13:06 +02:00
aignatov-bio
3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +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
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
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
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
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
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
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
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
Oleksii Kriuchykhin
a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +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
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
aignatov-bio
0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio
3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
aignatov-bio
c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +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
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
aignatov-bio
07831c0294 Add new asset icons to report [SCI-5263] 2021-01-19 12:53:49 +01:00
Oleksii Kriuchykhin
67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Oleksii Kriuchykhin
94b6c96e48 Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273] 2020-12-12 22:46:30 +01:00
aignatov-bio
c43851a2f4 Fix download links in reports [SCI-5279] 2020-12-03 12:16:48 +01:00
aignatov-bio
8cdf09f244 Add preview files to export all 2020-11-27 11:07:37 +01:00
aignatov-bio
2947426b44 Add scinote link to pdf reports 2020-11-17 13:54:13 +01:00
aignatov-bio
7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
aignatov-bio
f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
Add filer previews to reports [SCI-5110]
2020-11-02 18:48:45 +01:00
aignatov-bio
2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
aignatov-bio
bb983af42f
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
Update checkbox style at repository and protocol datatable [SCI-4579]
2020-10-27 10:22:56 +01:00
aignatov-bio
d6f8e156c1 Update checkbox style at repository and protocol datatable 2020-10-22 16:42:12 +02:00
Urban Rotnik
aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
mlorb
3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580
Fix buttons visability on reports page according to new styleguide [SCI-4580]
2020-09-10 09:32:16 +02:00
Urban Rotnik
9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
Urban Rotnik
c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
Mojca Lorber
1f0d9f3ad7 Fix buttons visability on reports page according to new styleguide 2020-09-03 16:19:02 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
aignatov-bio
f09ead703c Fix markup 2020-07-28 09:54:47 +02:00
aignatov-bio
b644950e4e Fix I18n markup 2020-07-28 09:53:35 +02:00
aignatov-bio
a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00
aignatov-bio
1d3055011f Merge branch 'features/tinymce-tables' into develop 2020-07-22 13:41:43 +02:00
Oleksii Kriuchykhin
7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +02:00
aignatov-bio
f77902f6d4 Add tinymce table support to docx 2020-07-15 09:44:25 +02:00
aignatov-bio
39b5651283 Revert FontAwesome in reports to CDN 2020-07-14 09:44:03 +02:00
aignatov-bio
f8c6d9f260 Fix markup 2020-07-13 14:31:57 +02:00
aignatov-bio
a7fac38fcb Improve pdf reports 2020-07-13 14:29:59 +02:00
Urban Rotnik
5d067077b1 Add logo and timestamp to PDF and Doc reports 2020-07-08 10:48:29 +02:00
Urban Rotnik
69d086ba32 Scope snapshots to project 2020-06-03 22:58:22 +02:00
Oleksii Kriuchykhin
d774a82762 Fix handling of snapshots of deleted repositories in reports [SCI-4698] 2020-05-29 16:30:27 +02:00
Oleksii Kriuchykhin
7a95355e81 Add extra check for repository presence in report [SCI-4698] 2020-05-29 11:39:07 +02:00
Oleksii Kriuchykhin
b430d507cf Fix handling of deleted repositories in reports [SCI-4698] 2020-05-27 12:15:19 +02:00
Urban Rotnik
df8fe20d03 Keep reportElements up to date with active snapshots and repositories 2020-05-25 13:19:33 +02:00
Urban Rotnik
359517eb17 Add deleted repositories to report 2020-05-25 13:19:30 +02:00
Urban Rotnik
2b493ce6f6 Refactor assigned rows 2020-05-25 13:19:29 +02:00
Urban Rotnik
9536939b3b Show snapshot rows in report 2020-05-25 13:19:28 +02:00
Oleksii Kriuchykhin
15a793a343 Fix start date interpolation in reports [SCI-4504] 2020-03-31 18:44:43 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
aignatov-bio
da4b55ceea Fix protocol and report create modals after dashboard redirect 2020-03-19 19:43:20 +01:00
aignatov-bio
95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
aignatov-bio
5953c2543d Fix typo and boostrap load order 2020-01-08 12:07:33 +01:00
aignatov-bio
68646276f5 Replace bootstrap styles for button 2020-01-07 16:13:34 +01:00
aignatov-bio
a281f09e7f Add reports and missed modals 2020-01-06 10:40:20 +01:00
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00