MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

progress bar, comment field

This commit is contained in:
annampak 2018-01-11 18:14:23 +02:00
parent 91eecde080
commit d621ef687d
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-admin/src/app/services/rest-base.ts
View File

@ -18,7 +18,7 @@ export class RestBase {
/* /*
*/ */
protocol: string = "http"; protocol: string = "http";
hostname: string = "192.168.32.171"; hostname: string = "192.168.32.96";
port: number = 8080; port: number = 8080;
webappname: string = ""; webappname: string = "";
restpath: string = ""; restpath: string = "";

2
dmp-frontend/src/app/datasets/dataset-listing.component.scss
View File

@ -35,5 +35,5 @@ mat-row:hover {
// } // }
mat-row:nth-child(odd){ mat-row:nth-child(odd){
background-color: #f1f1f1; background-color:#eef0fb;
} }

10
dmp-frontend/src/app/form/dynamic-form-composite-field/dynamic-form-composite-field.ts
View File

@ -23,16 +23,6 @@ export class DynamicFormCompositeFieldComponent implements OnInit {
ngOnInit() { ngOnInit() {
console.log(this.form); 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);
(<FormArray>this.form.get("fields")).push(newfield.buildForm());
}
} }
addMultipleField(fieldIndex: number) { addMultipleField(fieldIndex: number) {

6
dmp-frontend/src/app/form/dynamic-form-section/dynamic-form-section.html
View File

@ -65,6 +65,12 @@
[pathName]="pathName+'.compositeFields.'+i+'.multiplicityItems.'+j"></df-composite-field> [pathName]="pathName+'.compositeFields.'+i+'.multiplicityItems.'+j"></df-composite-field>
</div> </div>
</div> </div>
<div *ngIf="compositeField.hasCommentField">
<mat-form-field>
<input matInput formControlName="commentFieldValue" placeholder="comment">
</mat-form-field>
</div>
</div> </div>
<div *ngIf="section.sections"> <div *ngIf="section.sections">

2
dmp-frontend/src/app/form/pprogress-bar/progress-bar.component.ts
View File

@ -44,7 +44,7 @@ export class ProgressBarComponent implements OnInit {
value += this.countFormControlsWithValue(<FormGroup>formArray.get("" + i)) value += this.countFormControlsWithValue(<FormGroup>formArray.get("" + i))
} }
} }
else if (key === "value" && control.value != null) value++; else if (key === "value" && control.value != null && control.value != "") value++;
}); });
return value; return value;
} }

5
dmp-frontend/src/app/models/CompositeField.ts
View File

@ -14,6 +14,7 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
public description: string public description: string
public extendedDescription: string public extendedDescription: string
public hasCommentField: boolean; public hasCommentField: boolean;
public commentFieldValue: string;
fromJSONObject(item: any): CompositeField { fromJSONObject(item: any): CompositeField {
@ -24,6 +25,7 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
this.description = item.description; this.description = item.description;
this.extendedDescription = item.extendedDescription; this.extendedDescription = item.extendedDescription;
this.hasCommentField = item.hasCommentField; this.hasCommentField = item.hasCommentField;
this.commentFieldValue = item.commentFieldValue;
this.multiplicity = JsonSerializer.fromJSONObject(item.multiplicity, Multiplicity); this.multiplicity = JsonSerializer.fromJSONObject(item.multiplicity, Multiplicity);
//this.multiplicity = new Multiplicity(); //this.multiplicity = new Multiplicity();
//this.multiplicity.max = 2; //this.multiplicity.max = 2;
@ -38,7 +40,8 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
title: this.title, title: this.title,
description: this.description, description: this.description,
extendedDescription: this.extendedDescription, extendedDescription: this.extendedDescription,
hasCommentField: this.hasCommentField hasCommentField: this.hasCommentField,
commentFieldValue: this.commentFieldValue
}); });
let fieldsFormArray = new Array<FormGroup>(); let fieldsFormArray = new Array<FormGroup>();