diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html index 11666f82f6..6a964fc524 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html @@ -39,7 +39,7 @@ (blur)="key.isFocused = false; inputChanged(source, key)"> {{key.settings.icon}} - {{ getErrorMessageText(key.settings.requiredErrorMessage, '') }} + {{ getErrorMessageText(key.settings, 'required') }} @@ -59,17 +59,13 @@ (blur)="key.isFocused = false; inputChanged(source, key)"> {{key.settings.icon}} - {{ getErrorMessageText(key.settings.requiredErrorMessage, '') }} + {{ getErrorMessageText(key.settings,'required') }} - {{ getErrorMessageText(key.settings.minValueErrorMessage, - 'widgets.input-widgets.min-value-error', - {value: key.settings.minValue}) }} + {{ getErrorMessageText(key.settings,'min') }} - {{ getErrorMessageText(key.settings.maxValueErrorMessage, - 'widgets.input-widgets.max-value-error', - {value: key.settings.maxValue}) }} + {{ getErrorMessageText(key.settings,'max') }} @@ -101,10 +97,10 @@ (blur)="key.isFocused = false;" (dateChange)="inputChanged(source, key)"> - {{ getErrorMessageText(key.settings.requiredErrorMessage, '') }} + {{ getErrorMessageText(key.settings, 'required') }} - {{ getErrorMessageText(key.settings.invalidDateErrorMessage, 'widgets.input-widgets.invalid-date') }} + {{ getErrorMessageText(key.settings, 'invalidDate') }} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts index 63b461cc24..0403f2844c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts @@ -361,7 +361,40 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni return this.utils.customTranslation(groupTitle, groupTitle); } - public getErrorMessageText(errorMessage, defaultMessage, messageValues?): string { + public getErrorMessageText(keySettings: MultipleInputWidgetDataKeySettings, errorType: string): string { + let errorMessage; + let defaultMessage; + let messageValues; + switch (errorType) { + case 'required': + errorMessage = keySettings.requiredErrorMessage; + defaultMessage = ''; + break; + case 'min': + errorMessage = keySettings.minValueErrorMessage; + defaultMessage = 'widgets.input-widgets.min-value-error'; + messageValues = { + value: keySettings.minValue + }; + break; + case 'max': + errorMessage = keySettings.maxValueErrorMessage; + defaultMessage = 'widgets.input-widgets.max-value-error'; + messageValues = { + value: keySettings.maxValue + }; + break; + case 'invalidDate': + errorMessage = keySettings.invalidDateErrorMessage; + defaultMessage = 'widgets.input-widgets.invalid-date'; + break; + default: + return ''; + } + return this.getTranslatedErrorText(errorMessage, defaultMessage, messageValues); + } + + public getTranslatedErrorText(errorMessage: string, defaultMessage: string, messageValues?: object): string { let messageText; if (errorMessage && errorMessage.length) { messageText = this.utils.customTranslation(errorMessage, errorMessage);