Skip to content
Snippets Groups Projects
Commit a4efbc58 authored by François Agneray's avatar François Agneray
Browse files

#89 => progressbar steps title

parent 19e20fd7
No related branches found
No related tags found
2 merge requests!72Develop,!70Resolve "Améliorations de la personnalisation du design (instance)"
Hide whitespace changes
Inline Side-by-side
Showing
with 280 additions and 10 deletions
client/src/app/admin/instance/components/instance-form.component.html
+ 16
− 0
View file @ a4efbc58
......@@ -302,6 +302,22 @@
<input type="text" class="form-control" id="progress_bar_subtitle_color_input" [value]="form.value.progress_bar_subtitle_color" formControlName="progress_bar_subtitle_color">
</div>
</div>
<div class="form-group">
<label for="progress_bar_step_dataset_title">Progress bar step dataset title</label>
<input type="text" class="form-control" id="progress_bar_step_dataset_title" formControlName="progress_bar_step_dataset_title">
</div>
<div class="form-group">
<label for="progress_bar_step_criteria_title">Progress bar step criteria title</label>
<input type="text" class="form-control" id="progress_bar_step_criteria_title" formControlName="progress_bar_step_criteria_title">
</div>
<div class="form-group">
<label for="progress_bar_step_output_title">Progress bar step output title</label>
<input type="text" class="form-control" id="progress_bar_step_output_title" formControlName="progress_bar_step_output_title">
</div>
<div class="form-group">
<label for="progress_bar_step_result_title">Progress bar step result title</label>
<input type="text" class="form-control" id="progress_bar_step_result_title" formControlName="progress_bar_step_result_title">
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="progress_bar_color_picker">Progress bar color (picker)</label>
......
client/src/app/admin/instance/components/instance-form.component.ts
+ 4
− 0
View file @ a4efbc58
......@@ -63,6 +63,10 @@ export class InstanceFormComponent implements OnInit {
progress_bar_title_color: new UntypedFormControl('#000000'),
progress_bar_subtitle: new UntypedFormControl('Select a dataset, add criteria, select output columns and display the result.'),
progress_bar_subtitle_color: new UntypedFormControl('#6C757D'),
progress_bar_step_dataset_title: new UntypedFormControl('Dataset selection'),
progress_bar_step_criteria_title: new UntypedFormControl('Search criteria'),
progress_bar_step_output_title: new UntypedFormControl('Output columns'),
progress_bar_step_result_title: new UntypedFormControl('Result table'),
progress_bar_color: new UntypedFormControl('#E9ECEF'),
progress_bar_active_color: new UntypedFormControl('#7AC29A'),
progress_bar_circle_color: new UntypedFormControl('#FFFFFF'),
......
client/src/app/instance/instance.component.spec.ts
+ 4
− 0
View file @ a4efbc58
......@@ -110,6 +110,10 @@ describe('[Instance] InstanceComponent', () => {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......
client/src/app/instance/search/components/progress-bar.component.html
+ 7
− 7
View file @ a4efbc58
......@@ -21,7 +21,7 @@
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('dataset', true)">
<span class="fas fa-book"></span>
</div>
Dataset selection
{{ instance.progress_bar_step_dataset_title }}
</a>
</li>
<li id="criteriaStep" class="nav-item" [ngClass]="{'active': currentStep === 'criteria', 'checked': criteriaStepChecked}">
......@@ -33,13 +33,13 @@
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('criteria', criteriaStepChecked)">
<span class="fas fa-filter"></span>
</div>
Search criteria
{{ instance.progress_bar_step_criteria_title }}
</a>
<a *ngIf="!datasetSelected" class="nav-link" [ngClass]="{'disabled': !datasetSelected}" [ngStyle]="getNavItemAStyle('criteria', criteriaStepChecked)" data-toggle="tab">
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('criteria', criteriaStepChecked)">
<span class="fas fa-filter"></span>
</div>
Search criteria
{{ instance.progress_bar_step_criteria_title }}
</a>
</li>
<li class="nav-item" [ngClass]="{'active': currentStep === 'output', 'checked': outputStepChecked}">
......@@ -48,13 +48,13 @@
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('output', outputStepChecked)">
<span class="fas fa-eye"></span>
</div>
Output columns
{{ instance.progress_bar_step_output_title }}
</a>
<a *ngIf="!datasetSelected" class="nav-link" [ngClass]="{'disabled': !datasetSelected}" [ngStyle]="getNavItemAStyle('output', outputStepChecked)" data-toggle="tab">
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('output', outputStepChecked)">
<span class="fas fa-eye"></span>
</div>
Output columns
{{ instance.progress_bar_step_output_title }}
</a>
</li>
<li class="nav-item" [ngClass]="{'active': currentStep === 'result', 'checked': resultStepChecked}">
......@@ -63,13 +63,13 @@
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('result', resultStepChecked)">
<span class="fas fa-table"></span>
</div>
Result table
{{ instance.progress_bar_step_result_title }}
</a>
<a *ngIf="!datasetSelected" class="nav-link" [ngClass]="{'disabled': !datasetSelected}" [ngStyle]="getNavItemAStyle('result', resultStepChecked)" data-toggle="tab">
<div class="icon-circle" [ngStyle]="getNavItemIconCircleStyle('result', resultStepChecked)">
<span class="fas fa-table"></span>
</div>
Result table
{{ instance.progress_bar_step_result_title }}
</a>
</li>
</ul>
......
client/src/app/instance/search/components/progress-bar.component.spec.ts
+ 8
− 0
View file @ a4efbc58
......@@ -83,6 +83,10 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......@@ -160,6 +164,10 @@ describe('[Instance][Search][Component] ProgressBarComponent', () => {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......
client/src/app/instance/store/effects/search-multiple.effects.spec.ts
+ 8
− 0
View file @ a4efbc58
......@@ -165,6 +165,10 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......@@ -285,6 +289,10 @@ describe('[Instance][Store] SearchMultipleEffects', () => {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......
client/src/app/metamodel/models/instance.model.ts
+ 4
− 0
View file @ a4efbc58
......@@ -50,6 +50,10 @@ export interface Instance {
progress_bar_title_color: string;
progress_bar_subtitle: string;
progress_bar_subtitle_color: string;
progress_bar_step_dataset_title: string;
progress_bar_step_criteria_title: string;
progress_bar_step_output_title: string;
progress_bar_step_result_title: string;
progress_bar_color: string;
progress_bar_active_color: string;
progress_bar_circle_color: string;
......
client/src/test-data.ts
+ 12
− 0
View file @ a4efbc58
......@@ -80,6 +80,10 @@ export const INSTANCE_LIST: Instance[] = [
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......@@ -151,6 +155,10 @@ export const INSTANCE_LIST: Instance[] = [
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......@@ -224,6 +232,10 @@ export const INSTANCE: Instance = {
progress_bar_title_color: '#000000',
progress_bar_subtitle: 'Select a dataset, add criteria, select output columns and display the result.',
progress_bar_subtitle_color: '#6C757D',
progress_bar_step_dataset_title: 'Dataset selection',
progress_bar_step_criteria_title: 'Search criteria',
progress_bar_step_output_title: 'Output columns',
progress_bar_step_result_title: 'Result table',
progress_bar_color: '#E9ECEF',
progress_bar_active_color: '#7AC29A',
progress_bar_circle_color: '#FFFFFF',
......
conf-dev/create-db.sh
+ 1
− 1
View file @ a4efbc58
......@@ -8,7 +8,7 @@ set -e
curl -d '{"label":"Test","dbname":"anis_test","dbtype":"pdo_pgsql","dbhost":"db","dbport":5432,"dblogin":"anis","dbpassword":"anis"}' --header 'Content-Type: application/json' -X POST http://localhost/database
# Add default instance
curl -d '{"name":"default","label":"Default instance","description":"Instance for the test","scientific_manager":"M. Durand","instrument":"Multiple","wavelength_domain":"Visible imaging / Spectroscopy","display":10,"data_path":"\/DEFAULT","files_path":"\/INSTANCE_FILES","public":true,"portal_logo":"","design_color":"#7AC29A","design_background_color":"#ffffff","design_logo":"/logo.png","design_favicon":"/favicon.ico","navbar_background_color":"#F8F9FA","navbar_border_bottom_color":"#DEE2E6","navbar_color_href":"#000000","navbar_font_family":"Roboto, sans-serif","navbar_sign_in_btn_color":"#28A745","navbar_user_btn_color":"#7AC29A","footer_background_color":"#F8F9FA","footer_border_top_color":"#DEE2E6","footer_text_color":"#000000","footer_logos":[{"href":"http:\/\/lam.fr","title":"Laboratoire d'\''Astrophysique de Marseille","file":"\/logo_lam_s.png","display":20},{"href":"http:\/\/www.univ-amu.fr","title":"Aix*Marseille Universit\u00e9","file":"\/logo_amu_s.png","display":30},{"href":"http:\/\/anis.lam.fr","title":"AstroNomical Information System","file":"\/cesam_anis40.png","display":50},{"href":"http:\/\/cesam.lam.fr","title":"Centre de donn\u00e9es Astrophysique de Marseille","file":"\/logo_cesam_s.png","display":10},{"href":"http:\/\/www.insu.cnrs.fr","title":"Institut National des Sciences de l'\''Univers","file":"\/logo_insu_s.png","display":40}],"family_border_color":"#DFDFDF","family_header_background_color":"#F7F7F7","family_title_color":"#007BFF","family_title_bold":false,"family_background_color":"#FFFFFF","family_color":"#212529","progress_bar_title":"Dataset search","progress_bar_title_color":"#000000","progress_bar_subtitle":"Select a dataset, add criteria, select output columns and display the result.","progress_bar_subtitle_color":"#6C757D","progress_bar_color":"#E9ECEF","progress_bar_active_color":"#7AC29A","progress_bar_circle_color":"#FFFFFF","progress_bar_circle_icon_color":"#CCCCCC","progress_bar_circle_icon_active_color":"#FFFFFF","progress_bar_text_color":"#91B2BF","result_header_background_color":"#E9ECEF","result_header_text_color":"#000000","result_header_btn_color":"#007BFF","result_header_btn_hover_color":"#0069D9","result_header_btn_text_color":"#FFFFFF","result_datatable_bordered":true,"result_datatable_border_color":"#DEE2E6","result_datatable_header_background_color":"#FFFFFF","result_datatable_header_text_color":"#000000","result_datatable_rows_background_color":"#FFFFFF","result_datatable_rows_text_color":"#000000","result_datatable_sorted_color":"#C5C5C5","result_datatable_sorted_active_color":"#000000","result_datatable_link_color":"#007BFF","result_datatable_link_hover_color":"#0056B3","result_datatable_rows_selected_color":"#7AC29A","samp_enabled":true,"back_to_portal":true,"user_menu_enabled":true,"search_by_criteria_allowed":true,"search_by_criteria_label":"Search","search_multiple_allowed":false,"search_multiple_label":"Search multiple","search_multiple_all_datasets_selected":false,"documentation_allowed":false,"documentation_label":"Documentation"}' --header 'Content-Type: application/json' -X POST http://localhost/instance
curl -d '{"name":"default","label":"Default instance","description":"Instance for the test","scientific_manager":"M. Durand","instrument":"Multiple","wavelength_domain":"Visible imaging / Spectroscopy","display":10,"data_path":"\/DEFAULT","files_path":"\/INSTANCE_FILES","public":true,"portal_logo":"","design_color":"#7AC29A","design_background_color":"#ffffff","design_logo":"/logo.png","design_favicon":"/favicon.ico","navbar_background_color":"#F8F9FA","navbar_border_bottom_color":"#DEE2E6","navbar_color_href":"#000000","navbar_font_family":"Roboto, sans-serif","navbar_sign_in_btn_color":"#28A745","navbar_user_btn_color":"#7AC29A","footer_background_color":"#F8F9FA","footer_border_top_color":"#DEE2E6","footer_text_color":"#000000","footer_logos":[{"href":"http:\/\/lam.fr","title":"Laboratoire d'\''Astrophysique de Marseille","file":"\/logo_lam_s.png","display":20},{"href":"http:\/\/www.univ-amu.fr","title":"Aix*Marseille Universit\u00e9","file":"\/logo_amu_s.png","display":30},{"href":"http:\/\/anis.lam.fr","title":"AstroNomical Information System","file":"\/cesam_anis40.png","display":50},{"href":"http:\/\/cesam.lam.fr","title":"Centre de donn\u00e9es Astrophysique de Marseille","file":"\/logo_cesam_s.png","display":10},{"href":"http:\/\/www.insu.cnrs.fr","title":"Institut National des Sciences de l'\''Univers","file":"\/logo_insu_s.png","display":40}],"family_border_color":"#DFDFDF","family_header_background_color":"#F7F7F7","family_title_color":"#007BFF","family_title_bold":false,"family_background_color":"#FFFFFF","family_color":"#212529","progress_bar_title":"Dataset search","progress_bar_title_color":"#000000","progress_bar_subtitle":"Select a dataset, add criteria, select output columns and display the result.","progress_bar_subtitle_color":"#6C757D","progress_bar_step_dataset_title":"Dataset selection","progress_bar_step_criteria_title":"Search criteria","progress_bar_step_output_title":"Output columns","progress_bar_step_result_title":"Result table","progress_bar_color":"#E9ECEF","progress_bar_active_color":"#7AC29A","progress_bar_circle_color":"#FFFFFF","progress_bar_circle_icon_color":"#CCCCCC","progress_bar_circle_icon_active_color":"#FFFFFF","progress_bar_text_color":"#91B2BF","result_header_background_color":"#E9ECEF","result_header_text_color":"#000000","result_header_btn_color":"#007BFF","result_header_btn_hover_color":"#0069D9","result_header_btn_text_color":"#FFFFFF","result_datatable_bordered":true,"result_datatable_border_color":"#DEE2E6","result_datatable_header_background_color":"#FFFFFF","result_datatable_header_text_color":"#000000","result_datatable_rows_background_color":"#FFFFFF","result_datatable_rows_text_color":"#000000","result_datatable_sorted_color":"#C5C5C5","result_datatable_sorted_active_color":"#000000","result_datatable_link_color":"#007BFF","result_datatable_link_hover_color":"#0056B3","result_datatable_rows_selected_color":"#7AC29A","samp_enabled":true,"back_to_portal":true,"user_menu_enabled":true,"search_by_criteria_allowed":true,"search_by_criteria_label":"Search","search_multiple_allowed":false,"search_multiple_label":"Search multiple","search_multiple_all_datasets_selected":false,"documentation_allowed":false,"documentation_label":"Documentation"}' --header 'Content-Type: application/json' -X POST http://localhost/instance
# Add dataset families
curl -d '{"label":"Default dataset family","display":10,"opened":true}' --header 'Content-Type: application/json' -X POST http://localhost/instance/default/dataset-family
......
server/doctrine-proxy/__CG__AppEntityInstance.php
+ 112
− 2
View file @ a4efbc58
......@@ -67,10 +67,10 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
public function __sleep()
{
if ($this->__isInitialized__) {
return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
}
return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
return ['__isInitialized__', 'name', 'label', 'description', 'scientificManager', 'instrument', 'wavelengthDomain', 'display', 'dataPath', 'filesPath', 'public', 'portalLogo', 'designColor', 'designBackgroundColor', 'designLogo', 'designFavicon', 'navbarBackgroundColor', 'navbarBorderBottomColor', 'navbarColorHref', 'navbarFontFamily', 'navbarSignInBtnColor', 'navbarUserBtnColor', 'footerBackgroundColor', 'footerBorderTopColor', 'footerTextColor', 'footerLogos', 'familyBorderColor', 'familyHeaderBackgroundColor', 'familyTitleColor', 'familyTitleBold', 'familyBackgroundColor', 'familyColor', 'progressBarTitle', 'progressBarTitleColor', 'progressBarSubtitle', 'progressBarSubtitleColor', 'progressBarStepDatasetTitle', 'progressBarStepCriteriaTitle', 'progressBarStepOutputTitle', 'progressBarStepResultTitle', 'progressBarColor', 'progressBarActiveColor', 'progressBarCircleColor', 'progressBarCircleIconColor', 'progressBarCircleIconActiveColor', 'progressBarTextColor', 'resultHeaderBackgroundColor', 'resultHeaderTextColor', 'resultHeaderBtnColor', 'resultHeaderBtnHoverColor', 'resultHeaderBtnTextColor', 'resultDatatableBordered', 'resultDatatableBorderColor', 'resultDatatableHeaderBackgroundColor', 'resultDatatableHeaderTextColor', 'resultDatatableRowsBackgroundColor', 'resultDatatableRowsTextColor', 'resultDatatableSortedColor', 'resultDatatableSortedActiveColor', 'resultDatatableLinkColor', 'resultDatatableLinkHoverColor', 'resultDatatableRowsSelectedColor', 'sampEnabled', 'backToPortal', 'userMenuEnabled', 'searchByCriteriaAllowed', 'searchByCriteriaLabel', 'searchMultipleAllowed', 'searchMultipleLabel', 'searchMultipleAllDatasetsSelected', 'documentationAllowed', 'documentationLabel', 'datasetFamilies'];
}
/**
......@@ -698,6 +698,28 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
return parent::setFooterTextColor($footerTextColor);
}
/**
* {@inheritDoc}
*/
public function getFooterLogos()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getFooterLogos', []);
return parent::getFooterLogos();
}
/**
* {@inheritDoc}
*/
public function setFooterLogos($footerLogos)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setFooterLogos', [$footerLogos]);
return parent::setFooterLogos($footerLogos);
}
/**
* {@inheritDoc}
*/
......@@ -918,6 +940,94 @@ class Instance extends \App\Entity\Instance implements \Doctrine\ORM\Proxy\Proxy
return parent::setProgressBarSubtitleColor($progressBarSubtitleColor);
}
/**
* {@inheritDoc}
*/
public function getProgressBarStepDatasetTitle()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getProgressBarStepDatasetTitle', []);
return parent::getProgressBarStepDatasetTitle();
}
/**
* {@inheritDoc}
*/
public function setProgressBarStepDatasetTitle($progressBarStepDatasetTitle)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setProgressBarStepDatasetTitle', [$progressBarStepDatasetTitle]);
return parent::setProgressBarStepDatasetTitle($progressBarStepDatasetTitle);
}
/**
* {@inheritDoc}
*/
public function getProgressBarStepCriteriaTitle()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getProgressBarStepCriteriaTitle', []);
return parent::getProgressBarStepCriteriaTitle();
}
/**
* {@inheritDoc}
*/
public function setProgressBarStepCriteriaTitle($progressBarStepCriteriaTitle)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setProgressBarStepCriteriaTitle', [$progressBarStepCriteriaTitle]);
return parent::setProgressBarStepCriteriaTitle($progressBarStepCriteriaTitle);
}
/**
* {@inheritDoc}
*/
public function getProgressBarStepOutputTitle()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getProgressBarStepOutputTitle', []);
return parent::getProgressBarStepOutputTitle();
}
/**
* {@inheritDoc}
*/
public function setProgressBarStepOutputTitle($progressBarStepOutputTitle)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setProgressBarStepOutputTitle', [$progressBarStepOutputTitle]);
return parent::setProgressBarStepOutputTitle($progressBarStepOutputTitle);
}
/**
* {@inheritDoc}
*/
public function getProgressBarStepResultTitle()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getProgressBarStepResultTitle', []);
return parent::getProgressBarStepResultTitle();
}
/**
* {@inheritDoc}
*/
public function setProgressBarStepResultTitle($progressBarStepResultTitle)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setProgressBarStepResultTitle', [$progressBarStepResultTitle]);
return parent::setProgressBarStepResultTitle($progressBarStepResultTitle);
}
/**
* {@inheritDoc}
*/
......
server/src/Action/InstanceAction.php
+ 8
− 0
View file @ a4efbc58
......@@ -98,6 +98,10 @@ final class InstanceAction extends AbstractAction
'progress_bar_title_color',
'progress_bar_subtitle',
'progress_bar_subtitle_color',
'progress_bar_step_dataset_title',
'progress_bar_step_criteria_title',
'progress_bar_step_output_title',
'progress_bar_step_result_title',
'progress_bar_color',
'progress_bar_active_color',
'progress_bar_circle_color',
......@@ -199,6 +203,10 @@ final class InstanceAction extends AbstractAction
$instance->setProgressBarTitleColor($parsedBody['progress_bar_title_color']);
$instance->setProgressBarSubtitle($parsedBody['progress_bar_subtitle']);
$instance->setProgressBarSubtitleColor($parsedBody['progress_bar_subtitle_color']);
$instance->setProgressBarStepDatasetTitle($parsedBody['progress_bar_step_dataset_title']);
$instance->setProgressBarStepCriteriaTitle($parsedBody['progress_bar_step_criteria_title']);
$instance->setProgressBarStepOutputTitle($parsedBody['progress_bar_step_output_title']);
$instance->setProgressBarStepResultTitle($parsedBody['progress_bar_step_result_title']);
$instance->setProgressBarColor($parsedBody['progress_bar_color']);
$instance->setProgressBarActiveColor($parsedBody['progress_bar_active_color']);
$instance->setProgressBarCircleColor($parsedBody['progress_bar_circle_color']);
......
server/src/Action/InstanceListAction.php
+ 8
− 0
View file @ a4efbc58
......@@ -98,6 +98,10 @@ final class InstanceListAction extends AbstractAction
'progress_bar_title_color',
'progress_bar_subtitle',
'progress_bar_subtitle_color',
'progress_bar_step_dataset_title',
'progress_bar_step_criteria_title',
'progress_bar_step_output_title',
'progress_bar_step_result_title',
'progress_bar_color',
'progress_bar_active_color',
'progress_bar_circle_color',
......@@ -193,6 +197,10 @@ final class InstanceListAction extends AbstractAction
$instance->setProgressBarTitleColor($parsedBody['progress_bar_title_color']);
$instance->setProgressBarSubtitle($parsedBody['progress_bar_subtitle']);
$instance->setProgressBarSubtitleColor($parsedBody['progress_bar_subtitle_color']);
$instance->setProgressBarStepDatasetTitle($parsedBody['progress_bar_step_dataset_title']);
$instance->setProgressBarStepCriteriaTitle($parsedBody['progress_bar_step_criteria_title']);
$instance->setProgressBarStepOutputTitle($parsedBody['progress_bar_step_output_title']);
$instance->setProgressBarStepResultTitle($parsedBody['progress_bar_step_result_title']);
$instance->setProgressBarColor($parsedBody['progress_bar_color']);
$instance->setProgressBarActiveColor($parsedBody['progress_bar_active_color']);
$instance->setProgressBarCircleColor($parsedBody['progress_bar_circle_color']);
......
server/src/Entity/Instance.php
+ 80
− 0
View file @ a4efbc58
......@@ -271,6 +271,42 @@ class Instance implements \JsonSerializable
*/
protected $progressBarSubtitleColor;
/**
* @var string
*
* @Column(type="string", name="progress_bar_step_dataset_title", nullable=false, options={
* "default" : "Dataset selection"
* })
*/
protected $progressBarStepDatasetTitle;
/**
* @var string
*
* @Column(type="string", name="progress_bar_step_criteria_title", nullable=false, options={
* "default" : "Search criteria"
* })
*/
protected $progressBarStepCriteriaTitle;
/**
* @var string
*
* @Column(type="string", name="progress_bar_step_output_title", nullable=false, options={
* "default" : "Output columns"
* })
*/
protected $progressBarStepOutputTitle;
/**
* @var string
*
* @Column(type="string", name="progress_bar_step_result_title", nullable=false, options={
* "default" : "Result table"
* })
*/
protected $progressBarStepResultTitle;
/**
* @var string
*
......@@ -870,6 +906,46 @@ class Instance implements \JsonSerializable
$this->progressBarSubtitleColor = $progressBarSubtitleColor;
}
public function getProgressBarStepDatasetTitle()
{
return $this->progressBarStepDatasetTitle;
}
public function setProgressBarStepDatasetTitle($progressBarStepDatasetTitle)
{
$this->progressBarStepDatasetTitle = $progressBarStepDatasetTitle;
}
public function getProgressBarStepCriteriaTitle()
{
return $this->progressBarStepCriteriaTitle;
}
public function setProgressBarStepCriteriaTitle($progressBarStepCriteriaTitle)
{
$this->progressBarStepCriteriaTitle = $progressBarStepCriteriaTitle;
}
public function getProgressBarStepOutputTitle()
{
return $this->progressBarStepOutputTitle;
}
public function setProgressBarStepOutputTitle($progressBarStepOutputTitle)
{
$this->progressBarStepOutputTitle = $progressBarStepOutputTitle;
}
public function getProgressBarStepResultTitle()
{
return $this->progressBarStepResultTitle;
}
public function setProgressBarStepResultTitle($progressBarStepResultTitle)
{
$this->progressBarStepResultTitle = $progressBarStepResultTitle;
}
public function getProgressBarColor()
{
return $this->progressBarColor;
......@@ -1242,6 +1318,10 @@ class Instance implements \JsonSerializable
'progress_bar_title_color' => $this->getProgressBarTitleColor(),
'progress_bar_subtitle' => $this->getProgressBarSubtitle(),
'progress_bar_subtitle_color' => $this->getProgressBarSubtitleColor(),
'progress_bar_step_dataset_title' => $this->getProgressBarStepDatasetTitle(),
'progress_bar_step_criteria_title' => $this->getProgressBarStepCriteriaTitle(),
'progress_bar_step_output_title' => $this->getProgressBarStepOutputTitle(),
'progress_bar_step_result_title' => $this->getProgressBarStepResultTitle(),
'progress_bar_color' => $this->getProgressBarColor(),
'progress_bar_active_color' => $this->getProgressBarActiveColor(),
'progress_bar_circle_color' => $this->getProgressBarCircleColor(),
......
server/tests/Action/InstanceActionTest.php
+ 4
− 0
View file @ a4efbc58
......@@ -112,6 +112,10 @@ final class InstanceActionTest extends TestCase
'progress_bar_title_color' => '#000000',
'progress_bar_subtitle' => 'Select a dataset, add criteria, select output columns and display the result.',
'progress_bar_subtitle_color' => '#6C757D',
'progress_bar_step_dataset_title' => 'Dataset selection',
'progress_bar_step_criteria_title' => 'Search criteria',
'progress_bar_step_output_title' => 'Output columns',
'progress_bar_step_result_title' => 'Result table',
'progress_bar_color' => '#E9ECEF',
'progress_bar_active_color' => '#7AC29A',
'progress_bar_circle_color' => '#FFFFFF',
......
server/tests/Action/InstanceListActionTest.php
+ 4
− 0
View file @ a4efbc58
......@@ -96,6 +96,10 @@ final class InstanceListActionTest extends TestCase
'progress_bar_title_color' => '#000000',
'progress_bar_subtitle' => 'Select a dataset, add criteria, select output columns and display the result.',
'progress_bar_subtitle_color' => '#6C757D',
'progress_bar_step_dataset_title' => 'Dataset selection',
'progress_bar_step_criteria_title' => 'Search criteria',
'progress_bar_step_output_title' => 'Output columns',
'progress_bar_step_result_title' => 'Result table',
'progress_bar_color' => '#E9ECEF',
'progress_bar_active_color' => '#7AC29A',
'progress_bar_circle_color' => '#FFFFFF',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment