Commit graph

362 commits

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