diff --git a/src/app/_shared/ui-form/types/array.type.scss b/src/app/_shared/ui-form/types/array.type.scss
index 1f9b33548..ac1a6fcf4 100644
--- a/src/app/_shared/ui-form/types/array.type.scss
+++ b/src/app/_shared/ui-form/types/array.type.scss
@@ -2,6 +2,3 @@
display: block;
margin-bottom: 1em;
}
-mat-card {
- margin-bottom: 1em;
-}
diff --git a/src/app/_shared/ui-form/types/countries.component.ts b/src/app/_shared/ui-form/types/countries.component.ts
index bdd4a9973..c51f8c15f 100644
--- a/src/app/_shared/ui-form/types/countries.component.ts
+++ b/src/app/_shared/ui-form/types/countries.component.ts
@@ -27,7 +27,7 @@ import { FormlyFieldConfig } from '@ngx-formly/core';
`,
styleUrls: ['./typeahead.component.scss'],
})
- export class FieldCountriesComponent extends FieldType implements OnDestroy, OnInit {
+ export class FieldCountriesComponent extends FieldType
implements OnDestroy, OnInit {
countries = [{'id': 4, 'name': 'Afghanistan', 'alpha2': 'af', 'alpha3': 'afg'},
{'id': 8, 'name': 'Albania', 'alpha2': 'al', 'alpha3': 'alb'},
{'id': 12, 'name': 'Algeria', 'alpha2': 'dz', 'alpha3': 'dza'},
diff --git a/src/app/_shared/ui-form/types/image-viewer.type.ts b/src/app/_shared/ui-form/types/image-viewer.type.ts
index ed6c73502..fe76018e9 100644
--- a/src/app/_shared/ui-form/types/image-viewer.type.ts
+++ b/src/app/_shared/ui-form/types/image-viewer.type.ts
@@ -1,13 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import { FieldType } from '@ngx-formly/core';
-import { DomSanitizer, SafeResourceUrl, SafeUrl } from '@angular/platform-browser';
@Component({
selector: 'app-thumbnail-viewer',
template: `
-
+
{{to.label}}
@@ -26,8 +25,14 @@ import { DomSanitizer, SafeResourceUrl, SafeUrl } from '@angular/platform-browse
})
export class ImageViewerComponent extends FieldType implements OnInit {
- @Input()
- formControl;
+ @Input()
+ private _formControl: any;
+ public get formControl() {
+ return this._formControl;
+ }
+ public set formControl(value) {
+ this._formControl = value;
+ }
imgId: any;
imgUrl: any;
imgProps: {};
diff --git a/src/app/_shared/ui-form/types/money.component.ts b/src/app/_shared/ui-form/types/money.component.ts
index b314eac19..0876e113e 100644
--- a/src/app/_shared/ui-form/types/money.component.ts
+++ b/src/app/_shared/ui-form/types/money.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
import { FieldType } from '@ngx-formly/core';
import createNumberMask from 'text-mask-addons/dist/createNumberMask';
-
@Component({
selector: 'formly-field-input-money',
template: `
-
+
{{ to.label }}
{{to.errMessage}}
diff --git a/src/app/_shared/ui-form/types/null.type.ts b/src/app/_shared/ui-form/types/null.type.ts
index f99253914..ac5e3bbfb 100644
--- a/src/app/_shared/ui-form/types/null.type.ts
+++ b/src/app/_shared/ui-form/types/null.type.ts
@@ -18,7 +18,13 @@ import { indexOf } from 'lodash-es';
})
export class NullTypeComponent extends FieldType implements OnInit {
@Input()
- formControl;
+ private _formControl: any;
+ public get formControl() {
+ return this._formControl;
+ }
+ public set formControl(value) {
+ this._formControl = value;
+ }
imgId: any;
text: any;
imgProps: {};
diff --git a/src/app/_shared/ui-form/types/password.type.ts b/src/app/_shared/ui-form/types/password.type.ts
index 674eaa7d6..0d14bad29 100644
--- a/src/app/_shared/ui-form/types/password.type.ts
+++ b/src/app/_shared/ui-form/types/password.type.ts
@@ -7,6 +7,7 @@ import { FieldType } from '@ngx-formly/core';
template: `
+ Enter your password
+
{{ to.label }}
-
+
{{ to.description }}
diff --git a/src/app/_shared/ui-form/types/playlists.component.html b/src/app/_shared/ui-form/types/playlists.component.html
index da7b4353c..96b95a90c 100644
--- a/src/app/_shared/ui-form/types/playlists.component.html
+++ b/src/app/_shared/ui-form/types/playlists.component.html
@@ -1,7 +1,7 @@