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

2468 commits

Author SHA1 Message Date
Alex Kriuchykhin f20b2bd2e8
Merge pull request #3356 from aignatov-bio/ai-sci-5754-add-generate-button-to-old-reports 
Add generate PDF button for old reports [SCI-5754]
 2021-05-28 14:02:18 +02:00
aignatov-bio 519a0534fc Add generate PDF button for old reports [SCI-5754] 2021-05-27 14:55:27 +02:00
aignatov-bio 24f4f6cbb2 Fix report experiments sorting [SCI-5762] 2021-05-27 12:44:45 +02:00
zmagoD be94cb09c2 fix code style 2021-05-22 14:41:56 +02:00
aignatov-bio 4f5939293e Reports close actions dropdown on docx generate click [SCI-5750] 2021-05-21 14:55:11 +02:00
Oleksii Kriuchykhin 29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +02:00
aignatov-bio 0200cd4b6e Add indeterminate state to report wizard checkbox [SCI-5714] 2021-05-20 15:54:46 +02:00
Miha Mencin b7f4ac5e67
Merge pull request #3337 from aignatov-bio/ai-sci-5729-grayed-edit-button-on-report-generating 
Disable edit button if report generating [SCI-5729]
 2021-05-20 15:13:12 +02:00
aignatov-bio fce89a8a12 Disable edit button if report generating [SCI-5729] 2021-05-20 13:39:27 +02:00
aignatov-bio 32682efd92
Check report wizard continue button status on page load [SCI-5736] (#3332) 2021-05-20 12:46:23 +02:00
aignatov-bio 7e3a281086 Small fixes for report search [SCI-5551] 2021-05-18 17:00:30 +02:00
aignatov-bio c961b493fc
Small fixes in reports templates [SCI-5723] (#3327) 
* Small fixes in reports templates [SCI-5723]

* Update template name validation [SCI-5723]
 2021-05-18 15:19:51 +02:00
aignatov-bio ff5d8571a3 Add class name to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
aignatov-bio 8f228d866d Add action to generate docx button [SCI-5722] 2021-05-17 12:06:12 +02:00
Alex Kriuchykhin 8e3e72654c
Merge pull request #3324 from aignatov-bio/ai-sci-5551-add-search-field-to-reports 
Add search field to reports page [SCI-5551]
 2021-05-17 11:50:03 +02:00
Miha Mencin 491dc22294
Merge pull request #3321 from okriuchykhin/ok_SCI_5724 
Fix default empty options for report wizard first page [SCI-5724]
 2021-05-17 10:28:57 +02:00
Miha Mencin 65004fa65f
Merge pull request #3325 from okriuchykhin/ok_SCI_5709_v2 
Fix table rendering in PDF reports [SCI-5709]
 2021-05-17 10:17:07 +02:00
Miha Mencin d952edd389
Merge pull request #3316 from okriuchykhin/ok_SCI_5702 
Add generation error states to reports [SCI-5702]
 2021-05-17 10:16:06 +02:00
zmagoD de4c28069a fix experiment level styling issues and update the dropdown placeholerds 2021-05-16 11:04:04 +02:00
Oleksii Kriuchykhin 460807b8c3 Fix table rendering in PDF reports [SCI-5709] 2021-05-14 12:01:09 +02:00
aignatov-bio e953666762 Add search field to reports page [SCI-5551] 2021-05-13 21:41:26 +02:00
Oleksii Kriuchykhin 697809ff6a Fix default empty options for report wizard first page [SCI-5724] 2021-05-13 14:24:47 +02:00
Alex Kriuchykhin dde82423f1
Merge pull request #3320 from aignatov-bio/ai-sci-5718-remove-report-name-uniqness 
Remove report name uniqueness [SCI-5718]
 2021-05-13 11:46:34 +02:00
Alex Kriuchykhin 4d30d9dec1
Merge pull request #3317 from okriuchykhin/ok_SCI_5709 
Improve rendering of inventories in reports [SCI-5709]
 2021-05-13 11:45:26 +02:00
aignatov-bio 3ba96be787 Remove report name uniqness [SCI-5718] 2021-05-12 14:56:22 +02:00
Alex Kriuchykhin 5c57056796
Merge pull request #3307 from aignatov-bio/ai-sci-5712-revert-template-on-warning-modal-close 
Revert selected template on warning modal close [SCI-5712]
 2021-05-12 13:12:16 +02:00
aignatov-bio 285e424ab7 Fix markup [SCI-5712] 2021-05-12 12:31:37 +02:00
aignatov-bio e16b3b0d61
Report wizard add red border to report name [SCI-5703] (#3309) 2021-05-12 12:22:40 +02:00
Alex Kriuchykhin d02f4a7ff9
Merge pull request #3308 from aignatov-bio/ai-sci-5706-fix-ordering-tasks-in-report-and-wizard 
Fix ordering tasks in report and wizard [SCI-5706]
 2021-05-12 12:04:43 +02:00
aignatov-bio 3bd774f8db
Small fixes for report index page [SCI-5695] (#3310) 2021-05-11 21:30:58 +02:00
Oleksii Kriuchykhin ca0f5348a1 Improve rendering of inventories in reports [SCI-5709] 2021-05-11 17:09:39 +02:00
Oleksii Kriuchykhin a175e83a16 Add generation error states to reports [SCI-5702] 2021-05-11 14:52:02 +02:00
aignatov-bio dcd299f250 Fix handson table in pdf report [SCI-5720] 2021-05-11 12:20:16 +02:00
aignatov-bio 44a17dc014 Fix ordering tasks in report and wizard [SCI-5706] 2021-05-11 09:40:51 +02:00
zmagoD 5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
aignatov-bio 3b55afb908 Revert selected template on warning modal close [SCI-5712] 2021-05-10 14:03:08 +02:00
zmagoD 331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
Alex Kriuchykhin 7bc6abd9bb
Merge pull request #3290 from okriuchykhin/ok_SCI_5614 
Improve report saving performance and error handling [SCI-5614]
 2021-05-07 11:51:57 +02:00
Alex Kriuchykhin 7a256838c1
Merge pull request #3292 from aignatov-bio/ai-sci-5638-add-missing-activities-for-new-reports 
Add new activities to reports [SCI-5638]
 2021-05-07 11:26:21 +02:00
Alex Kriuchykhin 4e5e58c66a
Merge pull request #3285 from aignatov-bio/ai-sci-5684-add-warning-modal-for-template-and-project-change 
Add warning modal on project and template change [SCI-5684]
 2021-05-07 10:06:18 +02:00
aignatov-bio 2fc5bd2521
Fix report processing state after create and update [SCI-5678] (#3276) 2021-05-06 14:22:02 +02:00
aignatov-bio bb5f985630 Add new activities to reports [SCI-5638] 2021-05-06 14:03:45 +02:00
Oleksii Kriuchykhin c0ef2eef3c Improve report saving performance and error handling [SCI-5614] 2021-05-06 10:53:40 +02:00
aignatov-bio 4d685f193b Fix save as bew report [SCI-5684] 2021-05-05 12:25:13 +02:00
aignatov-bio 3fc4ab9892 Add warning modal on project and template change [SCI-5684] 2021-05-05 12:13:52 +02:00
Oleksii Kriuchykhin e98ccd2860 Add confirmation modal for report regeneration action [SCI-5622] 2021-05-03 16:10:14 +02:00
aignatov-bio 3d80deb51a
Add pagination to report title page [SCI-5667] (#3275) 2021-05-03 15:27:17 +02:00
aignatov-bio 705fb1e43d
Add report front-end validations and close wizard modals [SCI-5666] (#3273) 
* Add report front-end validations and close wizard modals

* Add constant to report name validation [SCI-5666]
 2021-05-03 15:24:27 +02:00
aignatov-bio 01dfd305ab
Add warning modal to report edit mode [SCI-5621] (#3266) 
* Add warning modal to report edit mode [SCI-5621]

* Move report editing modal to partial [SCI-5621]
 2021-05-03 15:17:23 +02:00
aignatov-bio 7752267808
Add styling for template values [SCI-5630] (#3264) 2021-05-03 15:17:09 +02:00
zmagoD 47cb1b31dc fix code style 2021-05-02 11:36:10 +02:00
zmagoD c1d98f421d update scenarios and UI logic to handle project page reload after modal close 2021-05-02 11:22:59 +02:00
zmagoD f1ced42ae6 add filtering logic 2021-04-30 15:25:08 +02:00
zmagoD 11e5662c47 add fe logic for disable/enable fields 2021-04-30 13:26:06 +02:00
aignatov-bio 86854b015d Add third template to reports [SCI-5618] 2021-04-29 15:21:58 +02:00
zmagoD 8a74546cdf fix the logic for addin/editing new project members 2021-04-28 18:02:18 +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
zmagoD c136d953d0 create form object for role assigment, create helper object for project member, added new user_projects modal 2021-04-24 18:43:28 +02:00
Oleksii Kriuchykhin a67cc619ec Add additional custom fields for reports [SCI-5609] 2021-04-20 13:57:09 +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
zmagoD 04ef7a4478 add show and edit permissions modal 2021-04-18 17:19:16 +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
Oleksii Kriuchykhin a2a0aabb62 Implement pooling for Report document creation status [SCI-5557] 2021-04-14 15:16:08 +02:00
aignatov-bio bccd474cc6 Add edit mode for report [SCI-5620] 2021-04-14 11:51:03 +02:00
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
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
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
Oleksii Kriuchykhin 67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +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
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 a46b9cb8ea Add document preview to reports [SCI-5559] 2021-04-07 11:15:22 +02:00
Oleksii Kriuchykhin a9ac8452f2 Add dynamic form elements in report wizard step 1 [SCI-5591] 2021-04-06 13:56:24 +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
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
Oleksii Kriuchykhin 2f6194a99f Remove canvas-to-blob library [SCI-5595] 2021-03-29 14:02:30 +02:00
aignatov-bio b5cb46908c
Merge pull request #3225 from aignatov-bio/ai-sci-5563-add-reload-action-to-inline-asset 
Add reload action for assets [SCI-5563]
 2021-03-25 15:40:36 +01:00
aignatov-bio 0920d0a5cd Add reports wizzard layout [SCI-5569] 2021-03-25 13:21:54 +01:00
aignatov-bio 9e58380991
Merge pull request #3220 from aignatov-bio/ai-sci-5574-fix-infinite-scroll-for-dashboard 
Fix infinite scroll in current tasks on dashboard [SCI-5574]
 2021-03-24 11:42:26 +01:00
Oleksii Kriuchykhin f4abb4a6df Fix experiment workflow image loading [SCI-5586] 2021-03-23 23:13:26 +01:00
aignatov-bio 7c573a1ee9 Add reload action for assets [SCI-5563] 2021-03-22 13:02:13 +01:00
aignatov-bio 4436876282 Fix infinite scroll in current tasks on dashboard [SCI-5574] 2021-03-18 13:17:30 +01:00
aignatov-bio 3e5c2e83c7 Update toolbar, add docx and pdf columns [SCI-5549][SCI-5550] 2021-03-17 12:54:25 +01:00
aignatov-bio c99e8f19fd Add basic layout [SCI-5548] 2021-03-16 13:11:51 +01:00
Oleksii Kriuchykhin 413187e6da Fix filtering on current tasks widget [SCI-5555] 2021-03-12 13:33:37 +01:00
Urban Rotnik 96ef0c10da
Merge pull request #3148 from urbanrotnik/ur-sci-5450-remamber-user-view-mode 
Store Table/Cards view setting per user [SCI-5450]
 2021-03-08 11:48:33 +01:00
aignatov-bio df4297f6f7 Merge branch 'develop' into features/local_file_previews 2021-03-08 11:30:47 +01:00
aignatov-bio 96b712c90e
Merge pull request #3175 from aignatov-bio/ai-sci-5462-fix-dashboard-infinite-scroll 
Fix dashboard infinite scroll [SCI-5462]
 2021-03-08 10:15:26 +01:00
Urban Rotnik 235f19cf25 Store Table/Cards view setting per user 
SCI-5450
 2021-03-04 14:56:59 +01:00
Urban Rotnik 6b5d07e1a4 Fix projects filter 2021-02-23 13:21:09 +01:00
Oleksii Kriuchykhin bdd717b21b Refactor view project users modal [SCI-5387] 2021-02-22 22:37:32 +01:00
Miha Mencin 3639e63954
Merge pull request #3181 from urbanrotnik/ur-sci-5519 
Fix Projects filters history items [SCI-5519]
 2021-02-22 20:14:51 +01:00
Urban Rotnik 17d68bf65f Fix Projects filters history items 2021-02-22 20:11:08 +01:00
aignatov-bio 84d61252d8
Merge pull request #3180 from aignatov-bio/ai-sci-5512-fix-datetime-selector-for-filters 
Fix datetime for projects and experiments filters [SCI-5512]
 2021-02-22 13:25:00 +01:00
aignatov-bio a131056279 Fix datetime for projects and experiments filters [SCI-5512] 2021-02-22 12:51:04 +01:00
Urban Rotnik 757bed3cbf Prevent filters close when click on checkbox after input 
SCI-5511
 2021-02-22 10:50:09 +01:00
aignatov-bio 0609e9699d Fix dashboard infinite scroll [SCI-5462] 2021-02-18 15:31:31 +01:00
Urban Rotnik 6ea39c9363 Add experiment thumbnail, update archived view for experiments 
SCI-5481
 2021-02-18 12:03:13 +01:00
aignatov-bio e09f5a0604
Merge pull request #3157 from aignatov-bio/ai-sci-5476-fix-empty-toolbar-state 
Fix toolbar empty state [SCI-5476]
 2021-02-15 10:29:27 +01:00
mlorb 20dc9967f5
Merge pull request #3113 from mlorb/ml-sci-5311 
Implement the option of deleting empty folders [SCI-5311]
 2021-02-15 10:27:05 +01:00
mlorb 78a76ea3a1
Merge pull request #3154 from mlorb/ml-sci-5470 
Add no results page on experiments page [SCI-5470]
 2021-02-15 10:26:26 +01:00
aignatov-bio e10c7fc6c9 Fix toolbar empty state [SCI-5476] 2021-02-12 14:45:09 +01:00
Mojca Lorber b600f22248 Add no results page on experiment page 2021-02-12 12:12:26 +01:00
Urban Rotnik b831d5fa14 Fix duplicate button permissions 2021-02-12 07:12:26 +01:00
Urban Rotnik 4cd2bce83f Fix Move button on Experiment card 2021-02-11 18:38:23 +01:00
Mojca Lorber 52cbc036fc Fix hound 2021-02-11 18:29:03 +01:00
Mojca Lorber 7071f4a6c5 Send selected folders param to modal 2021-02-11 18:27:16 +01:00
Mojca Lorber 19733ba7d9 Refactor deleting of empty folders 2021-02-10 22:11:42 +01:00
aignatov-bio 9d3d1f8eac Connect toolbar actions to buttons [SCI-5465] 2021-02-09 15:47:15 +01:00
mlorb 45da42b924
Merge branch 'develop' into ml-sci-5311 2021-02-07 19:20:09 +01:00
Mojca Lorber ad61e59593 Change the title Projects to folder/subfolder title [SCI-5456] 2021-02-05 11:04:58 +01:00
aignatov-bio a843aac769 Add list view for experiments [SCI-5365] 2021-02-04 16:45:31 +01:00
Oleksii Kriuchykhin c62c464902 Implement editing options and modals for experiment card [SCI-5367] 2021-02-04 12:06:51 +01:00
Oleksii Kriuchykhin 8a0a0cbacc Add view only project users modal for project card [SCI-5337] 2021-02-04 11:25:35 +01:00
aignatov-bio a7a948abaf Add archive/restore toolbar buttons and backend [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio 7726eae4da Add experiments page load logic and connect filters [SCI-5457] 2021-02-03 14:29:50 +01:00
aignatov-bio 29cf9be1f6
Add filters to experiments pages [SCI-5366] (#3119) 
* Move filters to shared folder [SCI-5366]
 2021-01-29 13:24:02 +01:00
aignatov-bio 1df44f8383
Try load pdf preview again on error [SCI-5449] (#3121) 
* Try load pdf preview again on error [SCI-5449]

* Add attempts counter [SCI-5449]
 2021-01-29 11:34:53 +01:00
Mojca Lorber 1080c22b30 Update Experiments page layout and the toolbar row 2021-01-28 22:47:08 +01:00
Mojca Lorber c58d5734ad Implement the option of deleting empty folders [SCI-5311] 2021-01-21 19:42:25 +01:00
Urban Rotnik 4e0d4f4280 Remove flash message, keep only form errors 
SCI-5406
 2021-01-20 16:12:41 +01:00
Urban Rotnik 7cbea1facd
Fix card Restore/Archive actions (#3103) 2021-01-19 17:21:22 +01:00
Alex Kriuchykhin 8ab7b94443
Fix error message at login with false credential [SCI-5412] (#3102) 2021-01-19 17:19:40 +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
Urban Rotnik 0a1abf83c6
Merge pull request #3099 from urbanrotnik/ur-sci-5351 
Fix folders exports, add error message [SCI-5351]
 2021-01-19 11:01:08 +01:00
aignatov-bio f594a44cdb
Add initialization for select all checkbox in projects table [SCI-5409] (#3098) 
* Add initialization for select all checkbox in projects table [SCI-5409]
 2021-01-19 09:53:56 +01:00
Urban Rotnik ddbc22b274 Fix folders exports, add error message 
SCI-5351
 2021-01-19 09:47:42 +01:00
Urban Rotnik dbdfe4177d
Merge pull request #3092 from urbanrotnik/ur-sci-5406-error-at-saving-project 
Fix error message for name in EditProject modal [SCI-5406]
 2021-01-18 16:38:06 +01:00
Urban Rotnik 5ada4da370 Fix permissions check for cards 
SCI-5415
 2021-01-18 14:02:16 +01:00
Alex Kriuchykhin 64c0875b09
Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2 
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
 2021-01-18 10:32:27 +01:00
Urban Rotnik 02592178f3 Fix error message for name in EditProject modal 
[SCI-5406]
 2021-01-18 09:46:53 +01:00
aignatov-bio d355b4806b
Fix new project modal initialization [SCI-5381] (#3068) 2021-01-15 15:29:12 +01:00
aignatov-bio 6011bb36b6 Fix archived experiment dropdown and archived view for projects page [SCI-5392] 2021-01-15 15:08:27 +01:00
Urban Rotnik 998d66b8b9 Add data attribute for moveable permissions 
SCI-5405
 2021-01-15 13:54:18 +01:00
Urban Rotnik 517026a252
Merge pull request #3083 from urbanrotnik/ur-sci-5393-fix-filters 
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
 2021-01-15 11:34:03 +01:00
Urban Rotnik e099827b1b Trigger search on filters flyout close, fix render when filters are clear [SCI-5393] 2021-01-14 13:36:45 +01:00
Oleksii Kriuchykhin 8d3a605571 Fix projects index page JS initialization [SCI-5380] 2021-01-14 13:08:29 +01:00
Alex Kriuchykhin 5f506b7459
Merge pull request #3072 from okriuchykhin/ok_SCI_5383 
Fix folder creation for archived view [SCI-5383]
 2021-01-12 13:50:20 +01:00
Oleksii Kriuchykhin 78ec862a2c Fix folder creation for archived view [SCI-5383] 2021-01-12 13:06:43 +01:00
mlorb 8fbdfa28d5
Merge pull request #3070 from mlorb/ml-sci-5333 
Add no results page for search on project page [SCI-5333]
 2021-01-12 12:02:37 +01:00
Alex Kriuchykhin 04f68facd3
Merge pull request #3064 from okriuchykhin/ok_SCI_5344 
Add Restore button to the archived Projects screen [SCI-5344]
 2021-01-12 10:59:39 +01:00
Mojca Lorber 54a5528495 Add no results page for serach on project page [SCI-5333] 2021-01-12 09:18:19 +01:00
aignatov-bio e88848cd75
Fix comments counter [SCI-5371] (#3063) 2021-01-11 10:03:13 +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 f478ad91c3
Merge pull request #3058 from urbanrotnik/ur-sci-5312 
Folder name uniqueness validation on folder level and renaming [SCI-5312]
 2021-01-08 10:40:52 +01:00