diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.html index cc7bfc7e9..b5547d2e0 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.html @@ -1,6 +1,3 @@
- -
{{field.extendedDescription}}
-
\ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts index 1e95a360e..6f57b24ef 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-autocomplete/autocomplete-remote.component.ts @@ -1,5 +1,5 @@ import { Field } from '../../../models/Field'; -import { Component, OnInit, Input, Output, EventEmitter, forwardRef } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter, forwardRef, ViewEncapsulation } from '@angular/core'; import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms'; import { ServerService } from '../../../services/server.service'; @@ -12,7 +12,8 @@ declare var $: any; @Component({ selector: 'df-autocomplete', templateUrl: './autocomplete-remote.component.html', - styleUrls: ['./autocomplete-remote.component.css'] + styleUrls: ['./autocomplete-remote.component.css'], + encapsulation: ViewEncapsulation.None }) @@ -23,11 +24,11 @@ export class AutocompleteRemoteComponent implements OnInit/* , ControlValueAcces @Input() field: Field; @Input() form: FormGroup; - private textFormGroup = new FormGroup({text:new FormControl("")}); + private textFormGroup = new FormGroup({ text: new FormControl("") }); private loading: boolean; values: any[] = new Array(); typeaheadMS: number = 1400; - + constructor(private serverService: ServerService) { } diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.css new file mode 100644 index 000000000..f7be5b613 --- /dev/null +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.css @@ -0,0 +1,3 @@ +.radio-label { + margin-left: 10px; +} \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html index 011d7b413..21392c66a 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.html @@ -1,6 +1,5 @@
- -
{{field.extendedDescription}}
- Yes
- No + +
+
\ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.ts index 3366c2912..1535432af 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-boolean-decision/dynamic-field-boolean-decision.component.ts @@ -1,11 +1,15 @@ import { FormGroup } from '@angular/forms'; import { Field } from '../../../models/Field'; -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { FieldBase } from '../field-base'; @Component({ selector: 'df-booleanDecision', - templateUrl: './dynamic-field-boolean-decision.component.html' + templateUrl: './dynamic-field-boolean-decision.component.html', + styleUrls: [ + './dynamic-field-boolean-decision.component.css' + ], + encapsulation: ViewEncapsulation.None }) export class DynamicFieldBooleanDecisionComponent implements OnInit{ @Input() field: Field; diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.css index bf67b66d0..f947dfb22 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.css +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.css @@ -1 +1,7 @@ -@CHARSET "UTF-8"; \ No newline at end of file +.checkbox-label { + margin-left: 10px; +} + +.checkbox-icon { + margin-left: 0px; +} \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html index df499a335..6fb8d5d5e 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.html @@ -1,6 +1,4 @@ - -
- -
{{field.extendedDescription}}
- +
+ +
\ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts index 0d5060d29..33f1bf6eb 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-checkbox/dynamic-field-checkbox.ts @@ -1,14 +1,18 @@ import { Field } from '../../../models/Field'; import { FormGroup } from '@angular/forms'; -import { Component, Input } from '@angular/core'; -import {FieldBase} from '../field-base'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; +import { FieldBase } from '../field-base'; @Component({ selector: 'df-checkbox', - templateUrl: './dynamic-field-checkbox.html' + templateUrl: './dynamic-field-checkbox.html', + styleUrls: [ + './dynamic-field-checkbox.css' + ], + encapsulation: ViewEncapsulation.None }) -export class DynamicFieldCheckBoxComponent{ - @Input() field:Field; - @Input() form:FormGroup; - +export class DynamicFieldCheckBoxComponent { + @Input() field: Field; + @Input() form: FormGroup; + } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html index 45208ee16..a44884360 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html @@ -1,6 +1,4 @@
- -
{{field.extendedDescription}}
diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts index 902c56fb4..d18c78f35 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.ts @@ -1,17 +1,21 @@ import { FormGroup } from '@angular/forms'; import { Field } from '../../../models/Field'; -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { FieldBase } from '../field-base'; @Component({ selector: 'df-dropdown', - templateUrl: './dynamic-field-dropdown.html' + templateUrl: './dynamic-field-dropdown.html', + styleUrls: [ + './dynamic-field-dropdown.css' + ], + encapsulation: ViewEncapsulation.None }) -export class DynamicFieldDropdownComponent implements OnInit{ +export class DynamicFieldDropdownComponent implements OnInit { @Input() field: Field; @Input() form: FormGroup; - ngOnInit(){ + ngOnInit() { } } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css new file mode 100644 index 000000000..f7be5b613 --- /dev/null +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.css @@ -0,0 +1,3 @@ +.radio-label { + margin-left: 10px; +} \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html index d89f0b684..328e47ce4 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.html @@ -1,7 +1,6 @@
- -
{{field.extendedDescription}}
-
- {{option.label}}
+
+ +
\ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts index fd3a4e1fc..c107b156d 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/dynamic-field-radiobox.component.ts @@ -1,17 +1,21 @@ import { FormGroup } from '@angular/forms'; import { Field } from '../../../models/Field'; -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'; import { FieldBase } from '../field-base'; @Component({ selector: 'df-radiobox', - templateUrl: './dynamic-field-radiobox.component.html' + templateUrl: './dynamic-field-radiobox.component.html', + styleUrls: [ + './dynamic-field-radiobox.component.css' + ], + encapsulation: ViewEncapsulation.None }) -export class DynamicFieldRadioBoxComponent implements OnInit{ +export class DynamicFieldRadioBoxComponent implements OnInit { @Input() field: Field; @Input() form: FormGroup; - ngOnInit(){ + ngOnInit() { } } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css deleted file mode 100644 index bf67b66d0..000000000 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-field-radiobox/field-radiobox.css +++ /dev/null @@ -1 +0,0 @@ -@CHARSET "UTF-8"; \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css new file mode 100644 index 000000000..ad1e6a6d6 --- /dev/null +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.css @@ -0,0 +1,18 @@ +.full-width { + width: 100%; +} + +.field-component { + border:1px solid grey; + border-radius: 2px; + padding: 10px; + margin-bottom: 10px; +} + +.field-extended-desc { + color: lightslategray; +} + +.content-left-margin { + margin-left: 10px; +} \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html index 5e6a7e85b..b0f325df7 100644 --- a/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html +++ b/dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html @@ -1,50 +1,53 @@ -
+
+
{{path + ' ' + field.title}}
+
{{field.description}}
+
+ {{field.extendedDescription}} +
- - -
- -
{{field.extendedDescription}}
- -
- -
- -
- +
+
+
-
- + +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+
The field "{{field.label}}" is required
+
The field {{field.label}} must match a regular expression {{field.regex}}
+
The field {{field.label}} custom Validation
+
+
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
-
The field "{{field.label}}" is required
-
The field {{field.label}} must match a regular expression {{field.regex}}
-
The field {{field.label}} custom Validation
-
- -