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

no message

This commit is contained in:
annabakouli 2018-01-12 11:00:26 +02:00
parent b72ed6eae9
commit 556b1706d6
6 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
dmp-backend/src/main/java/eu/eudat/models/properties/FieldSet.java
View File

@ -1,44 +1,60 @@
package eu.eudat.models.properties;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
public class FieldSet implements PropertiesGenerator{
private List<Field> fields;
private List<FieldSet> multiplicityItems;
public List<FieldSet> getMultiplicityItems() {
return multiplicityItems;
}
public class FieldSet implements PropertiesGenerator {
private String id;
private List<Field> fields;
private List<FieldSet> multiplicityItems;
private String commentFieldValue;
public void setMultiplicityItems(List<FieldSet> multiplicityItems) {
this.multiplicityItems = multiplicityItems;
}
public String getId() {
return id;
}
public List<Field> getFields() {
return fields;
}
public void setId(String id) {
this.id = id;
}
public void setFields(List<Field> fields) {
this.fields = fields;
}
public String getCommentFieldValue() {
return commentFieldValue;
}
@Override
public void toMap(Map<String, Object> fieldValues) {
this.fields.forEach(item->item.toMap(fieldValues));
Map<String,Object> multiplicity = new HashMap<String,Object>();
if(this.multiplicityItems!=null){
this.multiplicityItems.forEach(item->item.toMap(fieldValues,this.multiplicityItems.indexOf(item)));
}
//fieldValues.put(this.id,multiplicity);
}
public void setCommentFieldValue(String commentFieldValue) {
this.commentFieldValue = commentFieldValue;
}
@Override
public void toMap(Map<String, Object> fieldValues, int index) {
this.fields.forEach(item->item.toMap(fieldValues,index));
//this.multiplicityItems.forEach(item->item.toMap(fieldValues,index));
}
public List<FieldSet> getMultiplicityItems() {
return multiplicityItems;
}
public void setMultiplicityItems(List<FieldSet> multiplicityItems) {
this.multiplicityItems = multiplicityItems;
}
public List<Field> getFields() {
return fields;
}
public void setFields(List<Field> fields) {
this.fields = fields;
}
@Override
public void toMap(Map<String, Object> fieldValues) {
fieldValues.put("commentFieldValue" + this.id, this.commentFieldValue);
this.fields.forEach(item -> item.toMap(fieldValues));
Map<String, Object> multiplicity = new HashMap<String, Object>();
if (this.multiplicityItems != null) {
this.multiplicityItems.forEach(item -> item.toMap(fieldValues, this.multiplicityItems.indexOf(item)));
}
//fieldValues.put(this.id,multiplicity);
}
@Override
public void toMap(Map<String, Object> fieldValues, int index) {
this.fields.forEach(item -> item.toMap(fieldValues, index));
//this.multiplicityItems.forEach(item->item.toMap(fieldValues,index));
}
}

1
dmp-backend/src/main/java/eu/eudat/models/user/components/datasetprofile/FieldSet.java
View File

@ -135,6 +135,7 @@ public class FieldSet implements Comparable,PropertiesModelBuilder, ViewStyleDef
@Override
public void fromJsonObject(Map<String, Object> properties) {
this.commentFieldValue = (String) properties.get("commentFieldValue"+this.id);
this.multiplicityItems = new LinkedList<FieldSet>();
this.fields.forEach(item->{
item.fromJsonObject(properties);

1
dmp-frontend/src/app/form/dynamic-fields/dynamic-field-dropdown/dynamic-field-dropdown.html
View File

@ -3,6 +3,7 @@
<mat-select formControlName="value">
<mat-option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}</mat-option>
</mat-select>
<mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field>
</div>

8
dmp-frontend/src/app/form/dynamic-fields/dynamic-form-field.component.html
View File

@ -12,6 +12,7 @@
<div *ngSwitchCase="'freetext'">
<mat-form-field>
<input matInput formControlName="value" placeholder="{{field.data.label}}">
<mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field>
</div>
@ -36,6 +37,7 @@
<button mat-button *ngIf="form.get('value').value" matSuffix mat-icon-button aria-label="Clear" (click)="this.form.patchValue({'value': ''})">
<mat-icon>close</mat-icon>
</button>
<mat-error *ngIf="form.get('value').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field>
</div>
@ -51,12 +53,12 @@
<div *ngSwitchCase="'label'"> </div>
<div [hidden]="isValid">
<!--<div [hidden]="isValid">
<mat-error *ngIf="isValidRequired">The field "{{field.data.label}}" <strong>required</strong></mat-error>
<!-- <div class="invalid-feedbackCustom" *ngIf="isValidRequired">The field "{{field.label}}" is required</div> -->
<div class="invalid-feedbackCustom" *ngIf="isValidRequired">The field "{{field.label}}" is required</div>
<div class="invalid-feedbackCustom" *ngIf="isValidPattern">The field {{field.label}} must match a regular expression {{field.regex}}</div>
<div class="invalid-feedbackCustom" *ngIf="isValidCustom">The field {{field.label}} custom Validation</div>
</div>
</div>-->
</div>
</div>

5
dmp-frontend/src/app/form/dynamic-form.component.ts
View File

@ -13,9 +13,8 @@ import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
import 'rxjs/add/operator/switchMap';
import { Location } from '@angular/common';
import {MatSidenavModule} from '@angular/material/sidenav';
import { BaseHttpService } from '@app/utilities/cite-http-service-module/base-http.service';
import { HostConfiguration } from '@app/app.constants';
import { DatasetWizardService } from '@app/services/dataset-wizard/dataset-wizard.service';
import { BaseHttpService } from '../utilities/cite-http-service-module/base-http.service';
import { DatasetWizardService } from '../services/dataset-wizard/dataset-wizard.service';
declare function simple_notifier(type: string, title: string, message: string): any;

2
dmp-frontend/src/app/models/Section.ts
View File

@ -4,7 +4,7 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
import { JsonSerializer } from '../utilities/JsonSerializer';
import { Serializable } from './interfaces/Serializable';
import { FieldGroup } from './FieldGroup';
import { CompositeField } from '@app/models/CompositeField';
import { CompositeField } from './CompositeField';
export class Section extends BaseModel implements Serializable<Section>, FormGenerator<FormGroup>{
public sections: Array<Section> = new Array<Section>();