Commit graph

1077 commits

Author SHA1 Message Date
Anton
7d02b9f26d Fix repository selection in reports [SCI-7167] 2022-09-13 09:59:11 +02:00
artoscinote
6a2037dc00
Fix smart annotations in locked elements [SCI-7135] (#4421) 2022-09-09 11:15:33 +02:00
artoscinote
27b4f398a4
Merge pull request #4404 from G-Chubinidze/gc_SCI_7161
Fix underline in docx report generator [SCI-7161]
2022-09-02 15:13:13 +02:00
Giga Chubinidze
f8842cd066 Fix underline in docx report generator [SCI-7161] 2022-09-02 17:11:36 +04:00
Giga Chubinidze
85873213b8 Fix underline in docx report generator [SCI-7161] 2022-09-02 16:44:51 +04:00
artoscinote
87e944c9c4
Merge pull request #4400 from G-Chubinidze/gc_SCI_7141
Fix superscript and subscript  in docx report generator [SCI-7141]
2022-09-01 11:34:08 +02:00
Giga Chubinidze
57c5947d91 Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:49:17 +04:00
Giga Chubinidze
922652417a Fix superscript and subscript in docx report generator [SCI-7141] 2022-09-01 10:15:31 +04:00
Oleksii Kriuchykhin
ba54f42d2f Wrap unsaring actions in transaction [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
bf8f838214 Update repository sharing actions [SCI-6918] 2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin
eb04bc974d Update tests with new team user assignments [SCI-6843] 2022-08-31 16:37:00 +02:00
Anton
bcc681b14d Add labels template to team import/export [SCI-7089] 2022-08-31 10:28:29 +02:00
Martin Artnik
6b25759715 Fix import issues with date formatting [SCI-7111] 2022-08-31 09:06:16 +02:00
Oleksii Kriuchykhin
b2b059b7e1 Add syncing service and schedule for Fluics templates sync [SCI-7047] 2022-08-29 09:59:13 +02:00
Alex Kriuchykhin
dac492cfd4
Merge pull request #4353 from okriuchykhin/ok_SCI_7045
Add list label templates method to Fluics API client [SCI-7045]
2022-08-25 13:40:40 +02:00
aignatov-bio
6d8908c1f5
Merge branch 'features/label-templates' into ai-sci-7054-add-flyout-to-search-repository-columns-to-zpl-editor 2022-08-24 17:48:48 +02:00
artoscinote
7a7df03396
Implement label preview component [SCI-7050] (#4370) 2022-08-24 13:55:54 +02:00
Anton
4f312bf329 Finalize insert field dropdown [SCI-7054] 2022-08-17 12:58:27 +02:00
Anton
174d33bba8 Add column dropdown to label template editor [SCI-7054] 2022-08-16 10:16:40 +02:00
Oleksii Kriuchykhin
08e654d5fb Add list label templates method to Fluics API client [SCI-7045] 2022-08-12 19:47:29 +02:00
Oleksii Kriuchykhin
f02f625e1e Add client for ZPL preview generation service [SCI-7049] 2022-08-12 12:57:19 +02:00
ajugo
2c3ddcbb93
Add tinymce image to imported protocol [SCI-7076] (#4345) 2022-08-11 10:00:14 +02:00
artoscinote
4e768bec04
Add endpoint for fetching label template tags [SCI-7053] (#4319) 2022-08-10 11:35:38 +02:00
aignatov-bio
b4e7877b99
Merge pull request #4328 from aignatov-bio/ai-sci-7077-fix-report-protocol-name-issue
Fix protocol name in report [SCI-7077][SCI-7078]
2022-08-10 10:06:05 +02:00
Anton
147127a739 Fix protocol name in report [SCI-7077][SCI-7078] 2022-08-09 13:50:00 +02:00
artoscinote
c106c2d997
Add active reminders filter [SCI-7004] (#4280) 2022-08-09 10:23:40 +02:00
artoscinote
eb619184a5
Implement typed label templates [SCI-7046] (#4316)
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
2022-08-08 10:06:00 +02:00
ajugo
74a688e8ae
Fix protocol title and archived result tag [SCI-6979] (#4303) 2022-08-02 10:06:00 +02:00
ajugo
1732c8897a
Docx report fixes [SCI-6979] (#4265)
* Fixes for docx [SCI-6979]

* Remove step description from DOCX [SCI-6979]
2022-07-20 10:12:38 +02:00
Alex Kriuchykhin
0a8acb36f8
Merge pull request #4231 from okriuchykhin/ok_SCI_6974
Fix display of stock consumption in assigned items table [SCI-6974]
2022-07-14 09:47:57 +02:00
artoscinote
3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
Oleksii Kriuchykhin
d3a8b3ca59 Fix display of stock consumption in assigned items table [SCI-6974] 2022-07-12 16:53:07 +02:00
Alex Kriuchykhin
26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +02:00
ajugo
454c1f01d0
Switch to fluics api v3 [SCI-6859] (#4201) 2022-07-06 13:02:48 +02:00
artoscinote
e38fbf4b10
Add join alias for consistent assigned my modules count [SCI-6942] (#4197) 2022-07-06 11:53:26 +02:00
ajugo
8e7307c5c1
Project json exporter adaptions for step improvements [SCI-6898] (#4177)
* Adapt project export to step improvements [SCI-6898]

* Add tests [SCI-6898]
2022-07-06 11:45:50 +02:00
Martin Artnik
910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
ajugo
a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164)
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
2022-06-21 10:49:03 +02:00
Alex Kriuchykhin
49f05f3df9
Merge pull request #4162 from okriuchykhin/ok_SCI_6907
Fix repository export with enabled stock management [SCI-6907]
2022-06-13 10:14:53 +02:00
Oleksii Kriuchykhin
10f7460648 Fix repository export with enabled stock management [SCI-6907] 2022-06-10 15:46:22 +02:00
artoscinote
e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
Anton
fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00
ajugo
5d198924af
DOCX: Render image for step table [SCI-6885] (#4144) 2022-06-08 13:37:03 +02:00
ajugo
13798374ed
Add consume column to assigned item export [SCI-6841] (#4115)
* Add consume column to assigned item export [SCI-6841]

* Fix hound [SCI-6841]
2022-06-03 10:10:00 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
Anton
08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
Anton
a2f7f38e31 Update step structure in report [SCI-6855] 2022-05-30 11:33:56 +02:00
ajugo
90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012)
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
2022-05-19 09:08:05 +02:00
Oleksii Kriuchykhin
823e552ef6 Fix displaying of stock consumption units [SCI-6795] 2022-05-10 10:19:37 +02:00
ajugo
2bda271615
Open repository on print view [SCI-6566] (#4055) 2022-05-03 09:30:33 +02:00
Alex Kriuchykhin
892b5e2348
Merge pull request #4056 from okriuchykhin/ok_SCI_6769
Fix blank stock consumption representation in reports [SCI-6769]
2022-04-28 11:18:12 +02:00
Oleksii Kriuchykhin
b6501fcf36 Fix blank stock consumption representation in reports [SCI-6769] 2022-04-25 17:10:44 +02:00
Oleksii Kriuchykhin
9f5ebee4e2 Fix duplicated inventories on tasks for export all [SCI-6776] 2022-04-25 13:45:58 +02:00
Anton
84f91634d3 Fix stock consumption in reports [SCI-6735] 2022-04-14 14:46:09 +02:00
aignatov-bio
4a232ac391
Merge pull request #4020 from biosistemika/features/projects-experiments-pagination
Features/projects experiments pagination
2022-04-14 10:45:27 +02:00
Alex Kriuchykhin
f7f03b19c0
Add locking and unique index to repository row assigning [SCI-6591] (#3921) 2022-04-13 10:54:23 +02:00
Anton
d091c56e9f Add pagination for experiments [SCI-6656] 2022-04-12 15:16:02 +02:00
Alex Kriuchykhin
f8a598b408
Improve loading of the dashboard [SCI-6618] (#4001) 2022-04-08 11:09:13 +02:00
Alex Kriuchykhin
09d0bb4a32
Fix sorting by date time columns in inventories [SCI-6683] (#4002) 2022-04-08 11:08:51 +02:00
Martin Artnik
45a325e824 Merge branch 'develop' into features/stock-management 2022-03-30 11:10:40 +02:00
ajugo
f75265974e
Print protocol smart annotation and table improvements [SCI-6566] (#3925)
* Improve table printing in the print menu [SCI-6566]

* Open smart annotation in new tab for print view [SCI-6566]

* Unify naming of same parameter [SCI-6566]

* Fix typo [SCI-6566]

* Fix hound errors [SCI-6566]
2022-03-29 12:09:33 +02:00
artoscinote
725549c8ca
Add alias to cell sort query, to prevent join conflicts [SCI-6649] (#3953)
* Add alias to cell sort query, to prevent join conflicts [SCI-6649]

* Added value_type to join condition to make use of DB index [SCI-6649]
2022-03-28 16:48:05 +02:00
Anton
8b8e2c6d92 Merge branch 'develop' into features/stock-management 2022-03-14 11:56:38 +01:00
artoscinote
06430c9340
Fix moving experiment [SCI-6602] (#3927) 2022-03-09 15:30:30 +01:00
artoscinote
20ef08907a
Stock column fixes [SCI-6455] (#3878)
* Fix issues with stock column management [SCI-6455]

* Refactor stock column in datatables [SCI-6455]
2022-03-08 14:52:45 +01:00
aignatov-bio
881e6403aa
Fix rte table in docx report [SCI-6449] (#3916)
Co-authored-by: Anton <anton@scinote.net>
2022-03-03 14:12:06 +01:00
artoscinote
87d202f3eb
Fix my_module_activities in AcitivtyService [SCI-6562] (#3908) 2022-03-01 12:28:45 +01:00
aignatov-bio
99e8f7e3cb
Fix added on this month filter [SCI-6584] (#3904)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:16:29 +01:00
Alex Kriuchykhin
c0e4b6f1f6
Fix advanced filters for added on field [SCI-6578] (#3895) 2022-02-25 14:30:37 +01:00
aignatov-bio
7b4968a7a3
Fix archived on filters fix [SCI-6579] (#3897)
Co-authored-by: Anton <anton@scinote.net>
2022-02-25 14:29:27 +01:00
aignatov-bio
91ab7d0b40
Update none of operator for assigned tasks [SCI-6572] (#3884)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 10:05:24 +01:00
Alex Kriuchykhin
dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote
b8b7773a3f
Fix today, this month, this year operators [SCI-6527] (#3845) 2022-02-22 14:14:16 +01:00
aignatov-bio
1f45e3f01d
Fix for docx renderer [SCI-6540] (#3879)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 13:26:52 +01:00
Alex Kriuchykhin
6b51b8a35c
Fix handling of date values in repositories [SCI-6551] (#3877) 2022-02-21 12:08:35 +01:00
Alex Kriuchykhin
fe44f6d22f
Fix advanced filters for archived_on column [SCI-6530] (#3859) 2022-02-15 18:02:08 +01:00
Alex Kriuchykhin
ad0bd44b51
Allow multiple use of same column in advanced filters [SCI-6538] (#3857) 2022-02-15 18:01:53 +01:00
artoscinote
fa6f883fc7
Fix ambiguous created_at column in added_on filter [SCI-6535] (#3852) 2022-02-14 15:03:50 +01:00
Alex Kriuchykhin
1e0966ac11
Fix advanced filtering for check list items [SCI-6522] (#3841) 2022-02-11 10:48:50 +01:00
Alex Kriuchykhin
ed8ba13525
Fix advanced search for file type columns [SCI-6518] (#3839) 2022-02-11 10:47:32 +01:00
Alex Kriuchykhin
79c32e30ad
Add support of repository snapshots to assigned items section [SCI-6439] (#3828) 2022-02-11 10:46:19 +01:00
Alex Kriuchykhin
b9204e1ce3
Add type specific indices for date time repository values [SCI-6485] (#3825) 2022-02-11 10:45:21 +01:00
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
aignatov-bio
1efe3ddd37
Add stock consumption to pdf and docx [SCI-6460] (#3816)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:09:52 +01:00
Alex Kriuchykhin
cc063a46b7
Fix time zone issues in advanced repository filters [SCI-6467] (#3819) 2022-02-04 10:30:11 +01:00
aignatov-bio
ec6886735c
Add archived on column [SCI-6482] (#3823)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 13:18:15 +01:00
Alex Kriuchykhin
c1972e4fb2
Fix advanced filtering with multiple filters [SCI-6471] (#3807) 2022-01-31 11:10:39 +01:00
Alex Kriuchykhin
fbcb94193a
Fix repository advanced filtering on time column [SCI-6467] (#3805) 2022-01-31 09:41:20 +01:00
Oleksii Kriuchykhin
dd5f8c2793 Add stock management columns to snapshots [SCI-6448] 2022-01-28 13:19:37 +01:00
Oleksii Kriuchykhin
6d877e6bf7 Fix repository users list and filtering by row name [SCI-6457] 2022-01-27 22:50:04 +01:00
artoscinote
d779f352a7
Merge pull request #3796 from biosistemika/features/repository-filters
Features/repository filters
2022-01-26 10:36:30 +01:00
Alex Kriuchykhin
e55c9ec1cc
Merge pull request #3785 from okriuchykhin/ok_SCI_6423
Fix filtering for repository snapshots [SCI-6423]
2022-01-25 12:59:46 +01:00
aignatov-bio
82aa26c282
Fix docx file preview [SCI-6299] (#3709)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 12:28:14 +01:00
Alex Kriuchykhin
d2b5db13e9
Add stock and consumption to assigned items section [SCI-6434] (#3793) 2022-01-25 12:12:55 +01:00
Alex Kriuchykhin
5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388
Fix added_on filter, add specs [SCI-6388]
2022-01-24 16:47:03 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
Oleksii Kriuchykhin
5dd7ca2218 Fix representation of experiment workflow images [SCI-6431] 2022-01-19 18:07:55 +01:00
aignatov-bio
01f1b5bd10
Add stock column type (#3786)
* Add stock column type

* Create new stock column [SCI-6410]

* Small fixed for stock column [SCI-6410]

* Add stock column validations [SCI-6410]

Co-authored-by: Anton <anton@scinote.net>
2022-01-18 13:17:05 +01:00
Oleksii Kriuchykhin
34554e57e3 Fix filtering for repository snapshots [SCI-6423] 2022-01-17 21:53:13 +01:00
Martin Artnik
66081950f0 Fix added_on filter, add specs [SCI-6388] 2022-01-04 19:20:02 +01:00
aignatov-bio
a3dda322f6
Add report and protocol repository activities to recent work widget [SCI-6336] (#3749)
Co-authored-by: Anton <anton@scinote.net>
2021-12-21 12:43:08 +01:00
Oleksii Kriuchykhin
738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Alex Kriuchykhin
e72b58e6a3
Merge pull request #3704 from okriuchykhin/ok_SCI_6303
Improve error handling in snapshot provisioning service [SCI-6303]
2021-12-15 10:18:52 +01:00
Oleksii Kriuchykhin
e67b17dd6f Optimize loading of project and experiment cards [SCI-6346] 2021-12-13 16:43:16 +01:00
Oleksii Kriuchykhin
8f1b201061 Improve activities loading speed [SCI-6345] 2021-12-09 19:28:27 +01:00
artoscinote
c80cbe34f4
Remove invalid designated users when moving experiment [SCI-6335] (#3722) 2021-12-06 14:27:26 +01:00
Miha Mencin
cd0dc454f5 Fix the code style 2021-12-02 17:14:01 +01:00
Miha Mencin
9031f5b2c5 replace perform_later with perform_now, so we can catch a possible arror during the transaction 2021-12-02 17:04:28 +01:00
Miha Mencin
b964bfd31e [SCI-6322] use correct user when creating templates, create assignment on experiments and tasks 2021-12-02 16:54:43 +01:00
aignatov-bio
850b164724
Update error handling for experiment move [SCI-6293] (#3703)
Co-authored-by: Anton <anton@scinote.net>
2021-12-01 11:24:01 +01:00
Oleksii Kriuchykhin
db2c903e54 Improve error handling in snapshot provisioning service [SCI-6303] 2021-11-29 10:51:49 +01:00
Anton
774aa6cf9c Fix experiment moving with archived tasks [SCI-6291] 2021-11-23 11:25:29 +01:00
Anton
a44dd8c915 Merge branch 'features/bmt-search' into features/repository-filters 2021-11-22 14:24:28 +01:00
aignatov-bio
06577e2f8b
Skip create assignments during team import [SCI-6280] (#3679)
Co-authored-by: Anton <anton@scinote.net>
2021-11-22 11:17:39 +01:00
aignatov-bio
8545b5787f
Create assignment after experiment move [SCI-6285] (#3689)
Co-authored-by: Anton <anton@scinote.net>
2021-11-22 10:34:11 +01:00
aignatov-bio
881251fe14
Skip null subjects for activities moving [SCI-6285] (#3686)
Co-authored-by: Anton <anton@scinote.net>
2021-11-19 14:06:26 +01:00
Alex Kriuchykhin
ebfd2f7924
Merge pull request #3682 from okriuchykhin/ok_SCI_6088
Add API endpoint for Cloning Experiments [SCI-6088]
2021-11-18 15:26:19 +01:00
aignatov-bio
57de414284
Fix user assignment for team import [SCI-6242] (#3675)
Co-authored-by: Anton <anton@scinote.net>
2021-11-17 13:33:29 +01:00
Oleksii Kriuchykhin
2e92500a73 Fix seeds to work with new UserRoles, fix Templates creation job [SCI-6270] 2021-11-15 21:36:06 +01:00
artoscinote
a6c61c2b4e
Fixed permission issues when moving experiment [SCI-6257] (#3655)
* Fixed permission issues when moving experiment [SCI-6257]

* Copy fixes [SCI-6248]

* Use canaid helper instead of permission_granted [SCI-6257]

* Fixes [SCI-6257]
2021-11-12 12:59:49 +01:00
Alex Kriuchykhin
1c3a2aa0a7
Fix permissions checks in recent work service [SCI-6253] (#3654) 2021-11-12 11:13:43 +01:00
Martin Artnik
9e7eee5f2c Fixed to use .update! [SCI-6128] 2021-11-10 11:55:38 +01:00
Martin Artnik
68362bcb9c Fix experiment move service [SCI-6128] 2021-11-10 11:46:48 +01:00
artoscinote
dcdd9ece13
Fixed docx report image generation [SCI-6203] (#3639)
* Fixed docx report image generation [SCI-6203]

* Added error logging for docx image render error [SCI-6203]
2021-11-09 09:35:02 +01:00
Alex Kriuchykhin
f11a4701d0
Merge pull request #3629 from artoscinote/ma_SCI_6193
Added optional webhook secret key [SCI-6193]
2021-11-08 21:00:40 +01:00
artoscinote
ba5403ab5e
Fixed activities service for singular relations (asset/result) [SCI-6204] (#3633) 2021-11-04 14:20:51 +01:00
artoscinote
33190e4582
Fixed typo in project overview service [SCI-6199] (#3632) 2021-11-04 14:20:42 +01:00
Martin Artnik
3406cd9235 Added optional webhook secret key [SCI-6193] 2021-11-03 15:04:13 +01:00
Oleksii Kriuchykhin
a99599efea Merge branch 'features/new_permissions' into develop 2021-10-29 15:16:30 +02:00
artoscinote
1bb30b2c49
Also move activities when moving experiment to another project [SCI-6047] (#3535)
* Also move activities when moving experiment to another project [SCI-6047]

* Changed update to update! [SCI-6047]
2021-10-28 16:35:47 +02:00
Alex Kriuchykhin
1bde37db78
Merge branch 'develop' into ok_SCI_5579 2021-10-28 13:26:27 +02:00
Oleksii Kriuchykhin
2fb71aa312 Add API endpoint for Cloning Experiments [SCI-6088] 2021-10-28 12:28:46 +02:00
aignatov-bio
9e3d64bbb6
Fix projects list in clone experiment dropdowns [SCI-6139] (#3592)
Co-authored-by: Anton <anton@scinote.net>
2021-10-27 13:55:49 +02:00
aignatov-bio
22034089a6
Update experiment move service [SCI-6149] (#3599)
* Update experiment move service [SCI-6149]

* Move permission check to helper [SCI-6149]

Co-authored-by: Anton <anton@scinote.net>
2021-10-27 13:48:52 +02:00
Alex Kriuchykhin
f6a30cac6c
Merge pull request #3593 from okriuchykhin/ok_SCI_6134
Change Dashboard::RecentWorkService to use new user roles [SCI-6134]
2021-10-26 11:43:54 +02:00
aignatov-bio
aa4b765407
Update assign/unassign rows to task [SCI-6150] (#3604)
Co-authored-by: Anton <anton@scinote.net>
2021-10-26 11:41:08 +02:00
aignatov-bio
edb09dd099
Update copy experiment permission checks [SCI-6147] (#3598)
Co-authored-by: Anton <anton@scinote.net>
2021-10-26 11:40:54 +02:00
Alex Kriuchykhin
ac176f6c9e
Merge pull request #3596 from okriuchykhin/ok_SCI_6113
Add user roles to team importer/exporter [SCI-6113]
2021-10-25 14:06:17 +02:00
Oleksii Kriuchykhin
b10a6c8b7d Add user roles to team importer/exporter [SCI-6113] 2021-10-14 13:21:36 +02:00
artoscinote
c63090da8c
Fixed scopes and added permission checks to quick create services [SCI-6135] (#3584) 2021-10-14 13:13:29 +02:00
Oleksii Kriuchykhin
bc806f0c86 Change Dashboard::RecentWorkService to use new user roles [SCI-6134] 2021-10-13 14:12:24 +02:00
artoscinote
75d6a17cb7
Fix ProjectOverviewService and automatic project assignment [SCI_6117] (#3572) 2021-10-04 11:20:47 +02:00
aignatov-bio
3eb2c98cce
Update render permission for smart annotation [SCI-6112] (#3571) 2021-10-01 14:23:29 +02:00
artoscinote
63923f0e63
Skip inaccessible elements when generating reports [SCI-6109] (#3569) 2021-10-01 14:18:40 +02:00
artoscinote
f68d724202
Rework experiment permissions [SCI-6054] (#3538)
* Rework experiment permissions [SCI-6054]
2021-09-30 11:32:11 +02:00
Martin Artnik
49b9ee37cc Merge branch 'develop' into features/bmt-search 2021-09-24 11:01:27 +02:00
aignatov-bio
4472eb1023
Fix docx preview render [SCI-6035] (#3559) 2021-09-24 10:01:55 +02:00
Alex Kriuchykhin
0db9bf46ff
Merge pull request #3528 from okriuchykhin/ok_SCI_6036
Prevent creation of duplicated repository cells [SCI-6036]
2021-09-17 16:37:48 +02:00
Oleksii Kriuchykhin
e8e1ee3011 Prevent creation of duplicated repository cells [SCI-6036] 2021-09-09 14:24:35 +02:00
Oleksii Kriuchykhin
7041cc19af Fix BMT base URL path in requests [SCI-6010] 2021-09-07 16:28:14 +02:00
Oleksii Kriuchykhin
3cab5751e7 Add rake task for creation and syncing structure of BMT inventory [SCI-6010] 2021-09-07 12:17:09 +02:00
Martin Artnik
7e6ca3be8a Merge branch 'develop' into features/new_permissions 2021-09-06 10:33:32 +02:00
Oleksii Kriuchykhin
b32477a933 Add error message in report in case of file preview generation failure [SCI-5848] 2021-08-30 14:18:31 +02:00
Martin Artnik
896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin
d4ef2b1bd4 Add BMT inventory model [SCI-6009] 2021-08-30 10:49:15 +02:00
Oleksii Kriuchykhin
0b74f34de7 Add external IDs to repositories [SCI-5990] 2021-08-30 10:49:14 +02:00
Martin Artnik
1b26a4f65a Added access token to protocols.io requests [SCI-5968] 2021-08-26 15:26:35 +02:00
Martin Artnik
56576960b0 Rework molecule registration activities [SCI-5999] 2021-08-13 15:15:45 +02:00
Martin Artnik
861be4bb35 Fix issues with BioEddie integration [SCI-5982] 2021-08-11 09:50:00 +02:00
Martin Artnik
8f3f39f7c7 Fixed handling of activity subject parents when matching activity filters [SCI-5973] 2021-08-06 13:43:30 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
artoscinote
f839cb5256
Merge pull request #3464 from biosistemika/features/bioeddie-integration
Features/bioeddie integration
2021-08-03 13:32:53 +02:00
artoscinote
c41247a5fd
Merge pull request #3439 from artoscinote/ma_SCI_5879
Implement Save & Register molecule [SCI-5879]
2021-08-03 12:15:46 +02:00
Martin Artnik
a82af505eb Merge branch 'develop' into features/webhooks 2021-08-02 16:22:52 +02:00
Martin Artnik
0f417f9730 Merge branch 'develop' into features/barcodes 2021-07-29 13:32:17 +02:00
Martin Artnik
67f4e81a3a Merge branch 'develop' into features/new_permissions 2021-07-28 15:16:47 +02:00
Martin Artnik
e57132dbd0 Added print job queue system, job status endpoint [SCI-5903] 2021-07-27 15:26:18 +02:00
Martin Artnik
53e072f79e Added error handling to API wrapper [SCI-5939] 2021-07-27 10:36:06 +02:00
Martin Artnik
61919e81b6 Remove FLUICS API client hack [SCI-5939] 2021-07-27 09:41:51 +02:00
Martin Artnik
b32b207f3d Added FLUICS API client [SCI-5939] 2021-07-23 13:52:28 +02:00
Oleksii Kriuchykhin
c26dcf4b23 Replace empty? with blank? [SCI-5579] 2021-07-23 11:56:28 +02:00
Martin Artnik
662370d2bd Removed auto-disable, fixed ActiveJob + DelayedJob retry handling [SCI-5800] 2021-07-22 13:43:36 +02:00
Martin Artnik
4bb080c25b Merge migrations, code fixes [SCI-5800] 2021-07-22 10:51:03 +02:00
Martin Artnik
04b94d504d Moved activity logging to controller [SCI-5879] 2021-07-22 09:52:04 +02:00
Alex Kriuchykhin
dfa2a7775d
Merge pull request #3422 from okriuchykhin/ok_SCI_5847
Fix repository cell joining and preloading [SCI-5847]
2021-07-21 13:18:21 +02:00
Alex Kriuchykhin
dbc54278b2
Merge pull request #3211 from okriuchykhin/ok_SCI_5531
Add basic API client for BMT [SCI-5531]
2021-07-21 13:13:52 +02:00
Oleksii Kriuchykhin
36708b47cf Fix code styling [SCI-5531] 2021-07-21 13:10:30 +02:00
artoscinote
888131a465
Merge branch 'features/bioeddie-integration' into ma_SCI_5879 2021-07-20 09:48:13 +02:00
aignatov-bio
53456988ba
Add bioEddie activities and user licenses [SCI-5845][SCI-5842] (#3411)
* Add bio eddie licens to users [SCI-5845]

* Add activities for BioEddie [SCI-5842]
2021-07-19 21:33:28 +02:00
artoscinote
5f9c04844f
Added prefixed IDs to repository rows (items) [SCI-5909] (#3441)
* Added prefixed IDs to repository rows (items) [SCI-5909]

* Fix prefixed id queries to work with joins, use subquery in repository search [SCI-5909]

* Fixed accessing repository_row parent code [SCI-5909]

* Better handling of repository_row code display [SCI-5909]

* Fix index warning for id prefixed models issue setting up project [SCI-5909]
2021-07-19 14:23:36 +02:00
Martin Artnik
96a5b97bdb Implement Save & Register molecule [SCI-5879] 2021-07-15 12:37:04 +02:00
Oleksii Kriuchykhin
549fc8e5a0 Fix repository cell joining and preloading [SCI-5847] 2021-07-07 17:43:51 +02:00
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Martin Artnik
3662365cac Small code style tweak SCI-5800 2021-06-30 13:15:08 +02:00
Martin Artnik
618f5cfb53 Code style fixes [SCI-5800] 2021-06-30 13:08:16 +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
aignatov-bio
786e74e4de
Add BioEddie integration [SCI-5654][SCI-5657][SCI-5658][SCI-5670] (#3391)
* Add backend for bioeddie [SCI-5654]

* Add modal for bioeddie [SCI-5654]

* Add bio eddie editor to steps and results [SCI-5654]

* Fix markup and code styling
2021-06-23 19:48:44 +02:00
Martin Artnik
d67d53b926 Code style fixes 2021-06-22 13:27:03 +02:00
Martin Artnik
66d2e65114 Fixed report docx generation [SCI-5837] 2021-06-21 12:52:12 +02:00
Martin Artnik
879cf5081d Added experiment code to experiment cards filter [SCI-5829] 2021-06-18 14:38:07 +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
Martin Artnik
c6648111f3 Code style fixes [SCI-5800] 2021-06-17 22:00:13 +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
Martin Artnik
47071e23a1 Added specs for webhooks 2021-06-17 14:54:30 +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
Martin Artnik
4ee50f87d5 Implement webhook service and scheduling jobs [SCI-5801, SCI-5802] 2021-06-17 09:19:04 +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
Martin Artnik
6cf9ea5bc0 Implement Activity -> ActivityFilter matching service [SCI-5800] 2021-06-15 16:13:28 +02:00
aignatov-bio
9103fcf356
Add project header to reports [SCI-5798] (#3380) 2021-06-14 12:42:18 +02:00
aignatov-bio
0e87c44c4f
Fix empty elements in docx rtf table [SCI-5659] (#3382) 2021-06-14 12:41:34 +02:00
zmagoD
25802d7043 adopt move/clone my module logic to work with new user assignments (SCI-5805) 2021-06-12 18:51:55 +02:00
Martin Artnik
c17192730e Lock repository_row before inserting RepositoryCell in SavePdfToInventoryItem [SCI-5794] 2021-06-09 15:44:38 +02:00
Miha Mencin
46e2adf2e3
Merge pull request #3334 from okriuchykhin/ok_SCI_5730
Improve filtering for inventories [SCI-5730]
2021-06-09 09:50:56 +02:00
Oleksii Kriuchykhin
16bad9eb9c Fix export all functionality [SCI-5776] 2021-06-08 14:21:34 +02:00
Miha Mencin
ef77c9d67d
Merge pull request #3363 from okriuchykhin/ok_SCI_5774
Fix dates formatting in report templates [SCI-5774]
2021-05-31 14:23:19 +02:00
Oleksii Kriuchykhin
92821d7f1e Fix dates formatting in report templates [SCI-5774] 2021-05-31 11:51:04 +02:00
Alex Kriuchykhin
cdbcbd0409
Merge pull request #3357 from okriuchykhin/ok_SCI_5751
Fix deletion of old reports [SCI-5751]
2021-05-28 13:59:36 +02:00
Oleksii Kriuchykhin
70f0535dbd Fix deletion of old reports [SCI-5751] 2021-05-27 16:31:58 +02:00
aignatov-bio
24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
Miha Mencin
30a116fc83
Merge pull request #3346 from okriuchykhin/ok_SCI_5735
Refactor DOCX report generator [SCI-5735]
2021-05-24 11:25:13 +02:00
aignatov-bio
f576af078e Fix repository selection in report wizard [SCI-5749] 2021-05-24 09:40:50 +02:00
Oleksii Kriuchykhin
64ce35c8da Refactor DOCX report generator [SCI-5735] 2021-05-21 16:40:38 +02:00
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
Oleksii Kriuchykhin
0ff1277dbf Improve filtering for inventories [SCI-5730] 2021-05-19 22:48:52 +02:00
zmagoD
c23c01c01c remove user projects enpoints, fix the role name display 2021-05-16 12:03:16 +02:00
Oleksii Kriuchykhin
c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
Oleksii Kriuchykhin
1abc0dc1eb Fix tests [SCI-5636] 2021-05-03 13:03:26 +02:00
Oleksii Kriuchykhin
bca88188de Limit created report relations depth to tasks [SCI-5665] 2021-04-28 15:33:30 +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
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
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
Oleksii Kriuchykhin
f7c865974d Switch to graphviz gem [SCI-5596] 2021-03-25 17:42:57 +01:00
Oleksii Kriuchykhin
ab9fd65a19 Add basic API client for BMT [SCI-5531] 2021-03-12 10:53:10 +01:00
aignatov-bio
c6e4d6ef94 Fix activities multiple types selected [SCI-5546] 2021-03-10 12:59:02 +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
8bacc74c17
Merge pull request #3187 from urbanrotnik/ur-sci-5439
Fix report completed_on time and username [SCI-5439]
2021-03-09 13:27:24 +01:00
Oleksii Kriuchykhin
2b5709e75f Improve behavior of the scheduler, add caching to system notifications sync service [SCI-5526] 2021-03-02 17:28:07 +01:00
aignatov-bio
0c5a1a3e21 Fix tests [SCI-5528] 2021-02-26 16:29:56 +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
Oleksii Kriuchykhin
e8b4a30b87 Improve inventory table loading speed [SCI-5509] 2021-02-22 10:34:06 +01:00
Alex Kriuchykhin
d3e960fe2b
Merge pull request #3173 from okriuchykhin/ok_SCI_5494
Multiple small bugfixes [SCI-5494]
2021-02-18 14:35:40 +01:00
Oleksii Kriuchykhin
7d89088b14 Multiple small bugfixes [SCI-5494] 2021-02-18 13:55:03 +01:00
Urban Rotnik
f29fd76822 Fix archived_on sorting 2021-02-18 09:42:17 +01:00
Urban Rotnik
933dcc93c7 Fix query with counts 2021-02-17 16:50:09 +01:00
aignatov-bio
4f8e15dbc6 Fix activities service [SCI-5485] 2021-02-15 10:23:32 +01:00
aignatov-bio
486dae7559 Add task counter to experiment card [SCI-5467] 2021-02-10 14:50:42 +01:00
Alex Kriuchykhin
1466ae114f
Merge pull request #3027 from okriuchykhin/ok_SCI_5246
Remove Demo project and Samples inventory [SCI-5246][SCI-5248]
2021-02-04 11:28:09 +01:00
Alex Kriuchykhin
dd9d75a643
Merge pull request #3130 from okriuchykhin/ok_SCI_5458
Improve visibility of experiment workflow image [SCI-5458]
2021-02-04 11:27:27 +01:00
aignatov-bio
7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
Miha Mencin
259d7d5e7c
Merge pull request #3132 from biosistemika/release/1.21.1
Release/1.21.1
2021-02-03 11:49:04 +01:00
Oleksii Kriuchykhin
58ddfe80e4 Improve visibility of experiment workflow image [SCI-5458] 2021-02-02 22:23:11 +01:00
aignatov-bio
e206892864 Add p element to docx list allowed elements [SCI-5461] 2021-02-02 11:26:54 +01:00
Oleksii Kriuchykhin
324c268594 Remove Demo project and Samples repository [SCI-5246][SCI-5248] 2021-02-01 15:02:06 +01:00