scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 16:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
11363 commits 70 branches 179 tags 165 MiB
Commit graph

904 commits

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