Commit graph

184 commits

Author SHA1 Message Date
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
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio
5515bac773
Add assigned items from shared inventories to report (#2002) 2019-08-23 11:28:09 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar
5847a8b05c Convert HOT table after it was initialized
Closes SCI-3704
2019-07-23 14:17:22 +02:00
aignatov-bio
3c32fe0895
Fix formulas in table report (#1934) 2019-07-15 13:27:27 +02:00
mlorb
5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
2019-07-12 15:52:40 +02:00
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899)
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
2019-07-12 13:48:14 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
aignatov-bio
4fe3119bd2
Fix step description RTE images in report preview (#1888) 2019-07-08 15:23:44 +02:00
aignatov-bio
01a01157d3
Replace Handson table in reports with simple table [SCI-3636] (#1895)
* Replace handsone table in reports with simple table

* Add result tables
2019-07-08 13:19:12 +02:00
aignatov-bio
2793777463
Features/docx report (#1873)
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
2019-07-01 10:14:16 +02:00
Anton Ignatov
390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Oleksii Kriuchykhin
5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] (#1753)
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
2019-05-13 10:55:08 +02:00
aignatov-bio
71b3228310
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
2019-05-13 10:45:12 +02:00
aignatov-bio
0b194eb3b1
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
2019-05-13 09:09:36 +02:00
aignatov-bio
3db6129808
Fix report saving (#1748) 2019-05-13 08:58:47 +02:00
aignatov-bio
1a860037f7
Update reports for new RTE [SCI-3263] (#1691)
* Update reports for new RTE
2019-04-25 16:16:43 +02:00
Urban Rotnik
11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov
aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Jure Grabnar
1295c0583a Archived results are now separated in exported project
Closes SCI-3179
2019-04-17 16:37:21 +02:00
Urban Rotnik
26cf8271a1 Change step header, remove vertical line 2019-04-05 10:57:38 +02:00
Jure Grabnar
26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Oleksii Kriuchykhin
98e58ff7eb Add global activities to reports [SCI-3255] 2019-04-01 11:26:51 +02:00
Miha Mencin
1b19e67c07 Revert "Step header changes, removed vertical line"
This reverts commit b0f0ded87d.
2019-03-27 10:21:40 +01:00
Urban Rotnik
b0f0ded87d Step header changes, removed vertical line
SCI-3134
2019-03-25 17:25:13 +01:00
Anton Ignatov
4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Urban Rotnik
686f10cbd0 Refactor instance method 'ordered_modules' to scope 2019-01-18 16:56:33 +01:00
Urban Rotnik
1b70f42817 Refactor 'Experiment.modules_without_group' to Module's scope 2019-01-18 16:54:00 +01:00
Oleksii Kriuchykhin
ec28db6f4f Fix image URLs in export all document [SCI-2931] 2019-01-10 14:19:40 +01:00
Luka Murn
65adc7a556 Fix 2 minor visual bugs in reports 2018-12-12 11:15:32 +01:00
Alex Kriuchykhin
20e2cbf0ca
Merge pull request #1391 from okriuchykhin/ok_SCI_2880
Fix smart annotations rendering issues [SCI-2880]
2018-11-28 09:47:20 +01:00
Oleksii Kriuchykhin
2e00f1546a Fix handsontable initialization [SCI-2882] 2018-11-26 14:11:46 +01:00
Oleksii Kriuchykhin
b926cadba4 Fix smartannotations rendering issues [SCI-2880] 2018-11-23 15:07:08 +01:00
Matej Zrimšek
57dbd63aa3 Add archive badge for archived projetcs/experiments/modules in export-all PDF [SCI-2817] 2018-11-12 01:34:00 +01:00
Matej Zrimšek
48a6a64502 Move PDF generation and export logic of export all PDF to the model 2018-10-14 22:52:54 +02:00
Matej Zrimšek
69f3a919db Some specification and syntax fixes [SCI-2641] 2018-10-12 07:42:17 +02:00
Matej Zrimšek
d970576d60 Switch between generating report PDF and export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek
c0dc4f6951 Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek
7152d2f0f1 Fix/update file naming convection for exported files [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek
6f77c4772c Minor fix for assets & tables naming in export all PDF 2018-10-12 07:40:21 +02:00