From 82ee275424e21e0b8127c4c8878ef4e93e379cd3 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 28 Jan 2025 10:57:49 +0100 Subject: [PATCH 1/3] fix: add a placeholder for textarea. Add shorter description. --- .../metric-form-builder/metric-form-builder.service.ts | 1 + .../resultlist-form-builder.service.ts | 6 +++++- .../config-form-control/config-form-control.component.html | 1 + src/app/shared/models/config-form.ts | 1 + src/assets/i18n/en.json | 2 ++ src/assets/i18n/fr.json | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/modules/analytics-config/services/metric-form-builder/metric-form-builder.service.ts b/src/app/modules/analytics-config/services/metric-form-builder/metric-form-builder.service.ts index 5d9291db..4a33b70a 100644 --- a/src/app/modules/analytics-config/services/metric-form-builder/metric-form-builder.service.ts +++ b/src/app/modules/analytics-config/services/metric-form-builder/metric-form-builder.service.ts @@ -80,6 +80,7 @@ export class MetricFormGroup extends WidgetConfigFormGroup { '', marker('Function'), marker('metric function description'), + '', undefined, { optional: true, diff --git a/src/app/modules/analytics-config/services/resultlist-form-builder/resultlist-form-builder.service.ts b/src/app/modules/analytics-config/services/resultlist-form-builder/resultlist-form-builder.service.ts index 554875fe..d4f57a84 100644 --- a/src/app/modules/analytics-config/services/resultlist-form-builder/resultlist-form-builder.service.ts +++ b/src/app/modules/analytics-config/services/resultlist-form-builder/resultlist-form-builder.service.ts @@ -200,6 +200,7 @@ export class ResultlistConfigForm extends WidgetConfigFormGroup { '', marker('Transformation title'), marker('Transformation title description'), + '', 1, { optional: true, @@ -232,6 +233,7 @@ export class ResultlistConfigForm extends WidgetConfigFormGroup { '', marker('Transformation tooltip'), marker('Transformation tooltip description'), + '', 1, { optional: true, @@ -453,6 +455,7 @@ export class ResultlistColumnFormGroup extends CollectionConfigFormGroup { '', marker('Transformation'), '', + '', 1, { optional: true, @@ -589,8 +592,9 @@ export class ResultlistDetailFieldFormGroup extends FormGroup { ), process: new TextareaFormControl( '', - marker('Transformation'), + marker('Apply a calculation in javascript'), '', + marker('e.g : result+\'$\''), 1, { optional: true, diff --git a/src/app/shared/components/config-form-control/config-form-control.component.html b/src/app/shared/components/config-form-control/config-form-control.component.html index aab37ebe..0c5b8cfc 100644 --- a/src/app/shared/components/config-form-control/config-form-control.component.html +++ b/src/app/shared/components/config-form-control/config-form-control.component.html @@ -473,6 +473,7 @@ {{ typedControl.label | translate}} {{ 'Process error message' | translate }} diff --git a/src/app/shared/models/config-form.ts b/src/app/shared/models/config-form.ts index 1aff6254..5577884c 100644 --- a/src/app/shared/models/config-form.ts +++ b/src/app/shared/models/config-form.ts @@ -1032,6 +1032,7 @@ export class TextareaFormControl extends ConfigFormControl { formState: any, label: string, description: string, + public placeHolder: string = '', public nbRows?: number, optionalParams?: ControlOptionalParams ) { diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9056be5c..8471a762 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -144,6 +144,8 @@ "Column field": "Column field", "Unit of the column": "Unit (optional)", "Transformation": "Apply a calculation in javascript (e.g : result*1000).\n'result' being the javascript variable to transform", + "Apply a calculation in javascript": "Apply a calculation in javascript.", + "e.g : result+'$'": "e.g : result+'$'. 'result' will be replaced", "Colorize": "Colorize", "At least one column is required": "At least one column is required", "Add a column": "Add a column", diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index e0e77206..39d0eeac 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -144,6 +144,8 @@ "Column field": "Champ de la colonne", "Unit of the column": "Unité (optionnel)", "Transformation": "Calcul en javascript ( ex: result*1000).\n'result' étant la variable javascript à transformer", + "Apply a calculation in javascript": "Appliquer un calcul en javascript.", + "e.g : result+'$'": "ex: result+'€'. 'result' sera remplacer", "Colorize": "Colorer", "At least one column is required": "Au moins une colonne est nécessaire", "Add a column": "Ajouter une colonne", From 9411f27d04cabe62c4ac7498ff47fb9687ab2b03 Mon Sep 17 00:00:00 2001 From: MAudelGisaia Date: Tue, 28 Jan 2025 11:17:47 +0100 Subject: [PATCH 2/3] fix: improve css selector --- .../components/tabs/tabs.component.html | 2 +- .../components/tabs/tabs.component.scss | 18 ++++++++---------- .../global-result-list.component.html | 2 +- .../global-result-list.component.scss | 4 +--- src/assets/i18n/fr.json | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/app/modules/analytics-config/components/tabs/tabs.component.html b/src/app/modules/analytics-config/components/tabs/tabs.component.html index dc0fddf0..d994312e 100644 --- a/src/app/modules/analytics-config/components/tabs/tabs.component.html +++ b/src/app/modules/analytics-config/components/tabs/tabs.component.html @@ -35,7 +35,7 @@ - +