scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
12058 commits 69 branches 179 tags 165 MiB
Commit graph

984 commits

Author SHA1 Message Date
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
aignatov-bio 8be9d3b14c
Merge pull request #3126 from biosistemika/features/new-experiments-page 
Features/new experiments page
 2021-01-29 13:28:11 +01:00
Oleksii Kriuchykhin 75da67b937 Update Rails to 6.1.1, ruby to 2.7.2 [SCI-5459] 2021-01-28 14:43:45 +01:00
Alex Kriuchykhin f1124f9ea0
Add experiments overview service [SCI-5430] (#3116) 2021-01-28 12:57:04 +01:00
Urban Rotnik ebbbfa657c
Fix folders activities [SCI-5402] [SCI-5403] (#3112) 
* Fix activities and make folders clickable

* Remove archive project activity and action

* Save nil value for root folder

* Add empty values to hash
 2021-01-22 11:24:08 +01:00
Alex Kriuchykhin f15d984d47
Fix navigation between archived and active projects [SCI-5419] (#3100) 
* Fix navigation between archived and active projects [SCI-5419]
 2021-01-19 11:28:59 +01:00
aignatov-bio 7cc6ce5659
Fix projects page member filter [SCI-5385] (#3074) 2021-01-12 14:49:24 +01:00
Oleksii Kriuchykhin 78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
Oleksii Kriuchykhin 684674952c Add Restore button to the archived Projects screen [SCI-5344] 2021-01-09 21:27:19 +01:00
Urban Rotnik be2949b316 Fix tests 2021-01-08 08:05:05 +01:00
Urban Rotnik 427b5d7107
Merge pull request #3059 from biosistemika/features/folders 
Features/folders into develop
 2021-01-08 06:26:44 +01:00
aignatov-bio 0d7da90b15
Small fixes for projects folder cards [SCI-5345] (#3049) 2021-01-07 17:02:25 +01:00
Alex Kriuchykhin 962b3a532e
Merge pull request #3057 from okriuchykhin/ok_SCI_5317 
Add project permissions check to projects toolbar [SCI-5317]
 2021-01-07 13:25:34 +01:00
aignatov-bio 1f6fff812a
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048) 
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
 2021-01-07 13:16:05 +01:00
Oleksii Kriuchykhin 9882539213 Add project permissions check to projects toolbar [SCI-5317] 2021-01-06 22:23:48 +01:00
aignatov-bio f795d5180d
Fix file previews bugs [SCI-5284] (#3026) 2021-01-05 09:11:22 +01:00
Oleksii Kriuchykhin 1c27b99ba5 Add default sorting to ProjectsOverviewService [SCI-5361] 2021-01-04 22:37:25 +01:00
Urban Rotnik a53bfbdd33
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link 
Add 'archived' to smart annotation for repository item [SCI-5283]
 2021-01-04 11:53:47 +01:00
Oleksii Kriuchykhin ffd9132b52 Make active projects view default [SCI-5340] 2020-12-31 16:00:26 +01:00
Urban Rotnik 4ff1770d50 Remove uniqueness validation on Experiment name 
SCI-5288
 2020-12-18 16:48:50 +01:00
Oleksii Kriuchykhin 67b3f853d7 Merge branch 'develop' into features/folders 2020-12-18 14:51:21 +01:00
Urban Rotnik d3e38c89f8 Update BE sorting for archived fodlers&projects 
SCI-5306
 2020-12-18 11:27:17 +01:00
Urban Rotnik 7c0ad021de Update sorting dropdown 2020-12-18 11:08:38 +01:00
Urban Rotnik 7c967d32f1 Reset invalid state 
SCI-5306
 2020-12-18 09:46:05 +01:00
Urban Rotnik 63a41b123d Fix dropdown JS bug, fix folders_search, apply all new filters to search 
SCI-5306
 2020-12-18 09:43:11 +01:00
Urban Rotnik 87ca79717c Add separate sorting for active/archived view 
[SCI-5306]
 2020-12-18 08:41:51 +01:00
Miha Mencin 6dc4fae45b
Merge pull request #3003 from okriuchykhin/ok_SCI_5268 
Archiving: add 'archived' flag on folder [SCI-5268]
 2020-12-17 13:13:26 +01:00
Oleksii Kriuchykhin f150a11c4f Archiving: add 'archived' flag on folder [SCI-5268] 2020-12-17 12:47:23 +01:00
Oleksii Kriuchykhin 0c65f3f7c2 Implement sorting on the project screen (when filterin/searching) [SCI-5281] 2020-12-17 12:43:09 +01:00
Urban Rotnik a4fd69c292 Add 'archived' to smart annotation for repository item 2020-12-15 07:36:49 +01:00
Oleksii Kriuchykhin 78e050ccc0 Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171] 2020-11-27 14:27:24 +01:00
aignatov-bio 8245f18076 Add h6 render to docx report 2020-11-27 13:33:44 +01:00
Oleksii Kriuchykhin 1553d32c6e Project filters: add text field to the filters [SCI-5204] 2020-11-26 21:29:45 +01:00
Urban Rotnik e3f9087600 Fix search 2020-11-25 19:33:12 +01:00
Urban Rotnik 5717e37f2b Remove obsolete code, fix tests 2020-11-25 18:34:46 +01:00
Urban Rotnik afc6d12b49 Project and folders sorting 2020-11-25 18:34:39 +01:00
Oleksii Kriuchykhin 0de237cece Implement project search with grouping by folder [SCI-5207] 2020-11-25 11:59:02 +01:00
Alex Kriuchykhin 1380d5873d
Merge pull request #2946 from okriuchykhin/ok_SCI_5136 
Implement search endpoint for Projects & folders search [SCI-5136]
 2020-11-23 13:09:33 +01:00
aignatov-bio e4e5fc8474
Merge pull request #2944 from aignatov-bio/ai-sci-5058-fix-smart-annotation-for-archived-projects 
Fix smart annotation for archived experiments [SCI-5058]
 2020-11-19 11:18:26 +01:00
aignatov-bio 483ff8f1f2
Merge pull request #2964 from biosistemika/features/office-file-previews 
Features/office file previews merge branch
 2020-11-19 11:11:39 +01:00
aignatov-bio 80d6e5e87c Add project folders to team import/export 2020-11-13 14:13:26 +01:00
aignatov-bio 7fd7c2de6a Add download link to reports 2020-11-11 15:48:00 +01:00
Oleksii Kriuchykhin 038cd8d5d7 Fix repository state columns handling [SCI-5190] 2020-11-10 17:24:04 +01:00
Oleksii Kriuchykhin ee1bcd7aac Implement search endpoint for Projects & folders search [SCI-5136] 2020-11-09 16:16:09 +01:00
aignatov-bio f3dd749c1d Fix smart annotation for archived experiments 2020-11-06 11:47:18 +01:00
Oleksii Kriuchykhin f2f08a31d5 Add check for zero page size in repository states [SCI-5190] 2020-11-06 11:42:33 +01:00
aignatov-bio f85a3493cd
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports 
Add filer previews to reports [SCI-5110]
 2020-11-02 18:48:45 +01:00
Urban Rotnik 1295299370 Fix SA in protocol description 2020-10-30 12:55:30 +01:00
Urban Rotnik f5118e5461
Merge pull request #2901 from okriuchykhin/ok_SCI_5063 
Refactor experiment workflow image generation [SCI-5063]
 2020-10-29 13:55:23 +01:00
Urban Rotnik c6a891bcea
Merge pull request #2912 from urbanrotnik/ur-sci-5091 
Add current team to smart annotations permission check [SCI-5091]
 2020-10-29 13:32:29 +01:00
Oleksii Kriuchykhin 13fcfedf41 Refactor experiment workflow image generation [SCI-5063] 2020-10-29 13:16:09 +01:00
Urban Rotnik 25d050cec4 Add current team to smar annotations permission check 2020-10-29 12:17:40 +01:00
aignatov-bio 2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
Miha Mencin 235f87e0d9
Merge pull request #2924 from biosistemika/release/1.20.2 
Release/1.20.2
 2020-10-28 13:58:25 +01:00
Urban Rotnik c5a1d34c36
Merge pull request #1967 from jbargu/jg_sci_2228 
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
 2020-10-23 15:33:22 +02:00
Urban Rotnik aa1520bfb8 Merge branch 'develop' into jg_sci_2228 2020-10-22 14:21:39 +02:00
Urban Rotnik a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
Urban Rotnik a728ba2f2d Fix smart annotation in checklist title 2020-10-20 13:02:49 +02:00
Urban Rotnik e748e1eff3 Fix smart annotations and links styling 2020-10-14 17:58:07 +02:00
Urban Rotnik a19e0ef846 Refactor 2020-10-13 14:23:39 +02:00
Urban Rotnik 1b860afe30 Move TinyMCE parser to separate class 2020-10-13 09:45:13 +02:00
Urban Rotnik ae8b2cbf8f Add text to I18n 2020-10-13 08:37:32 +02:00
Urban Rotnik 274293348e Clean up 2020-10-09 09:53:27 +02:00
Urban Rotnik dfca798e2d Refactored tiny_mce_table parser and renderer 2020-10-09 09:43:36 +02:00
Urban Rotnik 92b4d95c72 Implement lists in DOCX 2020-10-09 09:43:00 +02:00
aignatov-bio 9da27956d3
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects 
Show smart annotation for archived projects/experiments [SCI-4987]
 2020-09-24 13:29:49 +02:00
aignatov-bio 653fe6fb1d Fix markup 2020-09-24 11:56:17 +02:00
Urban Rotnik 3bda6a987d Fix smart annotation for RepositoryItem 2020-09-24 11:45:03 +02:00
aignatov-bio fde33e6e63 Fix tests 2020-09-21 14:41:51 +02:00
aignatov-bio 545e13304a Show smart annotation for archived projects/experiments 2020-09-21 14:09:11 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
Urban Rotnik 9066586149 Fix duedate for PDF and DOCX 2020-09-09 10:48:42 +02:00
Mojca Lorber 7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
Urban Rotnik a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik 8b0b296b90
Merge pull request #2774 from okriuchykhin/ok_SCI_4829 
Add task status to export all [SCI-4829]
 2020-08-31 11:13:44 +02:00
Urban Rotnik 5923a4c014 Merge branch 'develop' into features/task-flows 2020-08-25 15:30:22 +02:00
Oleksii Kriuchykhin e0f7e181f6 Fix user deletion script [SCI-4829] 2020-08-21 13:12:14 +02:00
Oleksii Kriuchykhin e6e47f5106 Fix failing tests [SCI-4829] 2020-08-21 11:58:12 +02:00
Alex Kriuchykhin 121644decf
Merge pull request #2770 from okriuchykhin/ok_SCI_4881 
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
 2020-08-21 11:01:49 +02:00
Alex Kriuchykhin 287f7cce79
Merge pull request #2771 from okriuchykhin/ok_SCI_4889 
Improve handling of old repository table states [SCI-4889]
 2020-08-21 10:59:34 +02:00
Urban Rotnik 0c28b5d667
Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix 
Fix activities query [SCI-4925]
 2020-08-13 10:09:45 +02:00
Urban Rotnik 9f74a86ebe Fix activities query 2020-08-12 16:56:49 +02:00
Urban Rotnik f5ffd685d8
Merge pull request #2773 from urbanrotnik/ur-sci-4879-word-format-fix 
Fix word reports when using headings [SCI-4879]
 2020-08-11 13:01:43 +02:00
aignatov-bio e9028961db Add border to tinymce table in docx 2020-08-10 13:47:32 +02:00
Oleksii Kriuchykhin 02a4da1a55 Add task status to export all [SCI-4829] 2020-08-06 10:50:11 +02:00
Urban Rotnik bdf1e62f60 Fix word reports when using headings 2020-08-05 16:25:10 +02:00
Oleksii Kriuchykhin 6a50f7f27e Improve handling of old repository table states [SCI-4889] 2020-08-05 13:15:38 +02:00
Oleksii Kriuchykhin ce8d12e1c4 Create new activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-08-05 09:59:58 +02:00
Urban Rotnik 7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik ac3c06d882
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items 
Add export for assigned items [SCI-4748]
 2020-08-03 11:30:31 +02:00
aignatov-bio b644950e4e Fix I18n markup 2020-07-28 09:53:35 +02:00
Alex Kriuchykhin 8b24a0f704
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error 
Add blacklist for dashboard activities [SCI-4730]
 2020-07-23 15:21:51 +02:00
aignatov-bio ac1915351d
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx 
Add scopes and permission checks for docx report [SCI-4886]
 2020-07-23 14:26:53 +02:00
aignatov-bio a0d19b5d98 Add new statuses to reports 2020-07-23 14:24:30 +02:00