From 1ade912e64246197780e6354e18cdb260915a6f9 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Mon, 3 Aug 2020 21:32:19 +0100 Subject: [PATCH] [AAE-2378] Add tooltip to Form Cloud Widgets (#5947) --- .../widgets/amount/amount.widget.html | 3 ++ .../widgets/checkbox/checkbox.widget.html | 7 ++-- .../widgets/core/form-field.model.ts | 2 ++ .../widgets/date-time/date-time.widget.html | 5 ++- .../display-text/display-text.widget.html | 3 +- .../widgets/hyperlink/hyperlink.widget.html | 5 +-- .../multiline-text/multiline-text.widget.html | 5 ++- .../widgets/number/number.widget.html | 5 ++- .../widgets/people/people.widget.html | 5 ++- .../radio-buttons/radio-buttons.widget.html | 3 ++ .../components/widgets/text/text.widget.html | 5 ++- .../attach-file-cloud-widget.component.html | 32 ++++++++---------- .../attach-file/upload-cloud.widget.html | 33 ++++++++----------- .../widgets/date/date-cloud.widget.html | 5 ++- .../dropdown/dropdown-cloud.widget.html | 5 ++- 15 files changed, 72 insertions(+), 51 deletions(-) diff --git a/lib/core/form/components/widgets/amount/amount.widget.html b/lib/core/form/components/widgets/amount/amount.widget.html index 01da119dfa..bb5deb6c51 100644 --- a/lib/core/form/components/widgets/amount/amount.widget.html +++ b/lib/core/form/components/widgets/amount/amount.widget.html @@ -3,6 +3,9 @@ {{ currency }} + (ngModelChange)="onFieldChanged(field)" + [matTooltip]="field.tooltip" + matTooltipPosition="right" + matTooltipShowDelay="1000"> {{field.name | translate }} - * + * diff --git a/lib/core/form/components/widgets/core/form-field.model.ts b/lib/core/form/components/widgets/core/form-field.model.ts index 57c6a931d8..897c83d8a6 100644 --- a/lib/core/form/components/widgets/core/form-field.model.ts +++ b/lib/core/form/components/widgets/core/form-field.model.ts @@ -48,6 +48,7 @@ export class FormFieldModel extends FormWidgetModel { rowspan: number = 1; colspan: number = 1; placeholder: string = null; + tooltip: string = null; minLength: number = 0; maxLength: number = 0; minValue: string; @@ -169,6 +170,7 @@ export class FormFieldModel extends FormWidgetModel { this.dateDisplayFormat = json.dateDisplayFormat || this.getDefaultDateFormat(json); this._value = this.parseValue(json); this.validationSummary = new ErrorMessageModel(); + this.tooltip = json.tooltip; if (json.placeholder && json.placeholder !== '' && json.placeholder !== 'null') { this.placeholder = json.placeholder; diff --git a/lib/core/form/components/widgets/date-time/date-time.widget.html b/lib/core/form/components/widgets/date-time/date-time.widget.html index 7422e56934..b8e094507f 100644 --- a/lib/core/form/components/widgets/date-time/date-time.widget.html +++ b/lib/core/form/components/widgets/date-time/date-time.widget.html @@ -12,7 +12,10 @@ [max]="maxDate" (focusout)="onDateChanged($event.srcElement.value)" (dateChange)="onDateChanged($event)" - [placeholder]="field.placeholder"> + [placeholder]="field.placeholder" + [matTooltip]="field.tooltip" + matTooltipPosition="above" + matTooltipShowDelay="1000"> diff --git a/lib/core/form/components/widgets/display-text/display-text.widget.html b/lib/core/form/components/widgets/display-text/display-text.widget.html index 581e8e9c5a..6770760e46 100644 --- a/lib/core/form/components/widgets/display-text/display-text.widget.html +++ b/lib/core/form/components/widgets/display-text/display-text.widget.html @@ -1 +1,2 @@ -
{{field.value | translate}}
+
{{field.value | translate}}
diff --git a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.html b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.html index 89648813be..05e6d61eb3 100644 --- a/lib/core/form/components/widgets/hyperlink/hyperlink.widget.html +++ b/lib/core/form/components/widgets/hyperlink/hyperlink.widget.html @@ -1,6 +1,7 @@