Commit graph

9500 commits

Author SHA1 Message Date
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
Alex Kriuchykhin
454a70605b
Merge pull request #3255 from biosistemika/SCI-5635
[SCI-5635] Report not generated in case of tasks from more experiments
2021-04-13 10:34:46 +02:00
miha
4c29de62be [SCI-5635] Use update_column in the migration in order to avoid callbacks 2021-04-13 10:28:41 +02:00
Miha Mencin
1713674f74
Merge pull request #3253 from biosistemika/SCI-5635
SCI-5635  Report not generated in case of tasks from more experiments
2021-04-12 14:39:59 +02:00
miha
b6a4a5326f replace .find with .find_each 2021-04-12 13:57:03 +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
Alex Kriuchykhin
57b133d0fc
Merge pull request #3251 from okriuchykhin/ok_SCI_5612
Add settings to reports [SCI-5612]
2021-04-09 13:30:05 +02:00
Oleksii Kriuchykhin
67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +02:00
Alex Kriuchykhin
16da4394a2
Merge pull request #3248 from aignatov-bio/ai-sci-5572-add-report-wizzard-second-step
Add report wizard step 2 [SCI-5572]
2021-04-08 12:58:51 +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
Alex Kriuchykhin
304d0b4303
Merge pull request #3250 from aignatov-bio/ai-sci-5611-add-step-3-for-report-wizard
Add report wizard step 3 [SCI-5611]
2021-04-07 19:38:52 +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
ec9b986b95
Merge pull request #3229 from aignatov-bio/ai-sci-5559-add-document-preview-to-report
Add document preview to reports [SCI-5559]
2021-04-07 11:16:54 +02:00
aignatov-bio
a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Miha Mencin
c70588a473
Merge pull request #3249 from biosistemika/develop
Release of 1.21.7, April 2021
2021-04-07 07:48:23 +02:00
Miha Mencin
79cae3536d
Bump version to 1.2.7 2021-04-07 07:39:43 +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
Alex Kriuchykhin
020067a3f2
Merge pull request #3242 from biosistemika/dependabot/npm_and_yarn/y18n-3.2.2
Bump y18n from 3.2.1 to 3.2.2
2021-04-06 14:00:21 +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 Mencin
1b7845b6b5
Merge pull request #3245 from aignatov-bio/ai-sci-5628-fix-css-for-repositories
Fix css for repository header [SCI-5628]
2021-04-06 10:28:56 +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
Alex Kriuchykhin
7115234002
Merge pull request #3244 from aignatov-bio/ai-sci-5570-add-project-and-template-selector
Add project and template selector [SCI-5570]
2021-04-01 11:21:59 +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
Miha Mencin
a6e02ba203
Merge pull request #3243 from biosistemika/develop
Release 1.21.6, March 2021
2021-03-31 09:37:35 +02:00
Miha Mencin
c0ff2865b5
Bump version to 1.21.6 2021-03-31 09:34:06 +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
dependabot[bot]
3bc3e654a7
Bump y18n from 3.2.1 to 3.2.2
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-30 16:07:09 +00:00
aignatov-bio
ad8e404bca Add template partials to reports [SCI-5571] 2021-03-30 13:40:36 +02:00
Alex Kriuchykhin
b243587cd9
Merge pull request #3231 from aignatov-bio/ai-sci-5569-report-wizzard-layout
Add reports wizard layout [SCI-5569]
2021-03-30 13:28:28 +02:00
Alex Kriuchykhin
3e0f4e7eb3
Merge pull request #3240 from okriuchykhin/ok_SCI_5604
Fix for API float parsing in the inventory number type column [SCI-5604]
2021-03-29 16:22:38 +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
Alex Kriuchykhin
511243b197
Merge pull request #3238 from okriuchykhin/ok_SCI_5595_v2
Fix copyright info for vendor files [SCI-5595]
2021-03-29 12:19:37 +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
Oleksii Kriuchykhin
e4d82ea81b Fix copyright info for vendor files [SCI-5595] 2021-03-29 11:49:19 +02:00
miha
a82479cd49 unfreeze extents 2021-03-29 11:31:04 +02:00
miha
e20191a865 fix code style 2 2021-03-29 11:13:32 +02:00