diff --git a/dmp-admin/src/app/services/rest-base.ts b/dmp-admin/src/app/services/rest-base.ts index 039c1f877..057c0e0bb 100644 --- a/dmp-admin/src/app/services/rest-base.ts +++ b/dmp-admin/src/app/services/rest-base.ts @@ -18,7 +18,7 @@ export class RestBase { /* */ protocol: string = "http"; - hostname: string = "192.168.32.171"; + hostname: string = "192.168.32.96"; port: number = 8080; webappname: string = ""; restpath: string = ""; diff --git a/dmp-frontend/src/app/datasets/dataset-listing.component.scss b/dmp-frontend/src/app/datasets/dataset-listing.component.scss index 988f94bd2..7ef472931 100644 --- a/dmp-frontend/src/app/datasets/dataset-listing.component.scss +++ b/dmp-frontend/src/app/datasets/dataset-listing.component.scss @@ -35,5 +35,5 @@ mat-row:hover { // } mat-row:nth-child(odd){ - background-color: #f1f1f1; + background-color:#eef0fb; } \ No newline at end of file diff --git a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts index 9c2ef8c34..e338d8880 100644 --- a/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts +++ b/dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts @@ -23,16 +23,6 @@ export class DynamicFormCompositeFieldComponent implements OnInit { ngOnInit() { console.log(this.form); - if (this.compositeField.hasCommentField == true) { - let newfield: Field = new Field(); - newfield.id = 'comment_' + this.compositeField.id; - newfield.data = {label: "Comments"}; - newfield.viewStyle = {renderStyle: 'freetext', cssClass: ''}; - newfield.validations = ["None"] - - this.compositeField.fields.push(newfield); - (this.form.get("fields")).push(newfield.buildForm()); - } } addMultipleField(fieldIndex: number) { diff --git a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html index 4138caa48..25d62b9ab 100644 --- a/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html +++ b/dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html @@ -38,7 +38,7 @@ - {{path}} {{section.title}} + {{path}} {{section.title}}

{{section.description}}

@@ -65,6 +65,12 @@ [pathName]="pathName+'.compositeFields.'+i+'.multiplicityItems.'+j"> +
+ + + + +
diff --git a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts index 02651743b..58f757f96 100644 --- a/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts +++ b/dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts @@ -44,7 +44,7 @@ export class ProgressBarComponent implements OnInit { value += this.countFormControlsWithValue(formArray.get("" + i)) } } - else if (key === "value" && control.value != null) value++; + else if (key === "value" && control.value != null && control.value != "") value++; }); return value; } diff --git a/dmp-frontend/src/app/models/CompositeField.ts b/dmp-frontend/src/app/models/CompositeField.ts index a59fb2cc5..c91f9f504 100644 --- a/dmp-frontend/src/app/models/CompositeField.ts +++ b/dmp-frontend/src/app/models/CompositeField.ts @@ -14,6 +14,7 @@ export class CompositeField extends BaseModel implements Serializable();