Commit graph

423 commits

Author SHA1 Message Date
Martin Artnik
dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Anton
e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
aignatov-bio
1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-24 12:07:17 +02:00
Giga Chubinidze
1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
Andrej
100eab9cb0 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates 2023-05-18 10:56:10 +02:00
artoscinote
557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote
8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370
Revamp of (top) toolbar - Reports [SCI-8370]
2023-05-18 09:46:03 +02:00
Giga Chubinidze
f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373)
Update reports for plate templates and add headers to docx tables [SCI-8375]
2023-05-10 16:15:14 +02:00
Giga Chubinidze
57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +04:00
Anton
0c76d7a9b1 Merge branch 'develop' into features/navigation-refactor 2023-03-31 20:31:30 +02:00
Anton
ed1c4bcb69 Replace webpacker with jsbundling-rails [SCI-7926] 2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
89a45d2b14 Merge branch 'hotfix/1.26.6.4' into develop 2023-03-29 10:39:51 +02:00
Martin Artnik
f48350c6ea Properly handle repository snapshots in reports [SCI-8212] 2023-03-28 10:37:24 +02:00
artoscinote
e2dc2e31ee
Revert "Cursor position improvements, focused fields - part 2 (more in addons) [SCI-8147]" 2023-03-21 15:24:40 +01:00
Giga Chubinidze
9dcd2f1500 Cursor position improvements, focused fields - part 2 [SCI-8147] 2023-03-21 13:17:44 +04:00
Giga Chubinidze
4cc953663f Display the ID of the parent protocol in reports [SCI-8081] 2023-03-10 00:08:07 +04:00
ajugo
dc8b147282
Add handson table metadata to reports [SCI-7835] (#4956)
* Add handson table metadata to reports [SCI-7835]

* Fix step table loading for empty metadata [SCI-7835]
2023-02-13 11:32:18 +01:00
ajugo
c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
ajugo
6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911)
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
2023-02-01 12:01:18 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
artoscinote
a3e8000360
Merge branch 'develop' into features/exposed_ids 2022-12-08 15:58:11 +01:00
Oleksii Kriuchykhin
78660fb1aa Improve sorting of task results [SCI-7543] 2022-12-02 14:58:36 +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
Giga Chubinidze
8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
Alex Kriuchykhin
63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2
Unify tags loading order [SCI-6943]
2022-10-17 10:21:13 +02:00
Oleksii Kriuchykhin
8e838fe09f Fix permission checking in reports controller [SCI-7330][SCI-7331] 2022-10-14 14:26:02 +02:00
Oleksii Kriuchykhin
e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Anton
0c596bb701 Merge branch 'develop' into features/label-templates 2022-09-15 10:40:17 +02:00
Anton
75a15310ac Merge branch 'features/team-permissions' into features/label-templates 2022-09-13 14:26:15 +02:00
Anton
147127a739 Fix protocol name in report [SCI-7077][SCI-7078] 2022-08-09 13:50:00 +02:00
Oleksii Kriuchykhin
fcd0de80ca Fix long result names in PDF reports [SCI-6978] 2022-08-01 13:14:53 +02:00
Alex Kriuchykhin
b9d953b3a4
Fix pdf report styling and bookmarks [SCI-6978] (#4274) 2022-07-21 09:57:28 +02:00
Martin Artnik
910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Anton
1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
ajugo
a260217cec
Fix report logo inserting [SCI-6914] (#4167) 2022-06-21 14:27:51 +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
Anton
08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
Anton
b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
Anton
65ab42a938 Update PDF report with new step structure [SCI-6854] 2022-05-27 13:26:40 +02:00
Oleksii Kriuchykhin
c120a357cd Add permissions for Report model [SCI-6834] 2022-05-24 10:59:21 +02:00
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