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

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development 

# Conflicts:
#	dmp-admin/src/app/services/rest-base.ts
This commit is contained in:
annabakouli 2017-12-01 16:22:34 +02:00
parent 07acb08bea 0741504473
commit 0a83a274d8
19 changed files with 350 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-admin/src/app/app.module.ts
View File

@ -62,7 +62,7 @@ import { DatasetprofileEditorComponent } from './managers/datasetprofile-editor/
import { DatasetProfileGUIEditorComponent } from './dataset-profile-gui-editor/dataset-profile-gui-editor.component'; import { DatasetProfileGUIEditorComponent } from './dataset-profile-gui-editor/dataset-profile-gui-editor.component';
import { FieldFormComponent } from './field-form/field-form.component'; import { FieldFormComponent } from './field-form/field-form.component';
import { FormComponent } from './formBuilder/form.component'; import { FormComponent } from './form/form.component';
import { GroupFieldFormComponent } from './groupfield-form/groupfield-form.component'; import { GroupFieldFormComponent } from './groupfield-form/groupfield-form.component';
import { RuleFormComponent } from './rule-component/rule.component'; import { RuleFormComponent } from './rule-component/rule.component';
import { SectionFormComponent } from './section-form/section-form.component'; import { SectionFormComponent } from './section-form/section-form.component';

16
dmp-admin/src/app/compositefield-form/compositefield-form.component.html
View File

@ -2,9 +2,19 @@
<div [formGroup]="form"> <div [formGroup]="form">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div class="form-group col-md-4"> <div formGroupName="multiplicity">
<label>Multiplicity</label> <div class="form-group">
<input type="nymber" class="form-control" formControlName="multiplicity"> <h5 style="margin-left:15px; font-weight:bold;">Multiplicity</h5>
<div class="col-md-2">
<label>Min</label>
<input type="number" class="form-control" formControlName="min">
</div>
<div class="col-md-2">
<label>Max</label>
<input type="number" class="form-control" formControlName="max">
</div>
</div>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>Ordinal</label> <label>Ordinal</label>

61
dmp-admin/src/app/field-form/field-form.component.html
View File

@ -1,4 +1,4 @@
<div> <div>
<div [formGroup]="form"> <div [formGroup]="form">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
@ -10,16 +10,19 @@
<input type="text" class="form-control" formControlName="id"> <input type="text" class="form-control" formControlName="id">
</div> </div>
<div class="form-row col-md-3"> <div class="form-row col-md-3">
<div class="form-group"> <div formGroupName="viewStyle">
<label>View style</label> <div class="form-group">
<select class="form-control" formControlName="viewStyle"> <label>View style</label>
<option>textarea</option> <select class="form-control" formControlName="renderStyle">
<option>booleanDesicion</option> <option>textarea</option>
<option>combobox</option> <option>booleanDesicion</option>
<option>checkBox</option> <option>combobox</option>
<option>freetext</option> <option>checkBox</option>
</select> <option>freetext</option>
</select>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -31,52 +34,56 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label>extendedDescription</label> <label>extendedDescription</label>
<input type="text" class="form-control" formControlName="extendedDescription"> <input type="text" class="form-control" formControlName="extendedDescription">
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div formGroupName="multiplicity"> <div formGroupName="multiplicity">
<div class="form-group"> <div class="form-group">
<h5 style="margin-left:15px; font-weight:bold;">Multiplicity</h5>
<div class="col-md-2"> <div class="col-md-2">
<label>Multiplicity</label> <label>Min</label>
<input type="number" class="form-control" formControlName="min" placeholder="Min"> <input type="number" class="form-control" formControlName="min">
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<!-- <label>Multiplicity</label> --> <label>Max</label>
<input type="number" class="form-control" formControlName="max" placeholder="Max"> <input type="number" class="form-control" formControlName="max">
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Ordinal</label> <label>Ordinal</label>
<input type="number" class="form-control" formControlName="ordinal"> <input type="number" class="form-control" formControlName="ordinal">
</div>
<div class="form-group col-md-4">
<label>Default Value</label>
<input type="text" class="form-control" formControlName="value">
</div> </div>
<div class="form-group col-md-2"> <div formGroupName="defaultValue">
<div class="form-group col-md-4">
<label>Default Value</label>
<input type="text" class="form-control" formControlName="value">
</div>
</div>
<div class="form-group col-md-2">
<label class="radio control-label">Default Visibility</label> <label class="radio control-label">Default Visibility</label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="defaultVisibility" id="inlineRadio1" value="true" formControlName="defaultVisibility"> true <input type="radio" [value]="true" formControlName="defaultVisibility"> true
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="defaultVisibility" id="inlineRadio2" value="false" formControlName="defaultVisibility"> false <input type="radio" [value]="false" formControlName="defaultVisibility"> false
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<!-- <div *ngFor="let rule of dataModel.rules let i=index;"> <!-- <div *ngFor="let rule of dataModel.visible.rules let i=index;">
<h4 style="text-decoration: underline;">Rules <button type="button" class="btn btn-sm" style="margin-left:5px;" (click)="DeleteRule(i);"><span class="glyphicon glyphicon-erase"></span></button></h4> <h4 style="text-decoration: underline;">Rules <button type="button" class="btn btn-sm" style="margin-left:5px;" (click)="DeleteRule(i);"><span class="glyphicon glyphicon-erase"></span></button></h4>
<rule-form [form]="form.get('rules').get(''+i)" [dataModel]="rule"></rule-form> <rule-form [form]="form.get('visible').get('rules').get(''+i)" [dataModel]="rule"></rule-form>
<div> <div>
<a (click)="addNewRule(form)" style="cursor: pointer"> <a (click)="addNewRule(form)" style="cursor: pointer">
Add another rule + Add another rule +
</a> </a>
</div> </div>
</div> </div>
<div *ngIf="dataModel.rules.length == 0;"> <div *ngIf="dataModel.visible.rules.length == 0;">
<a (click)="addNewRule(form)" style="cursor: pointer"> <a (click)="addNewRule(form)" style="cursor: pointer">
Add another rule + Add another rule +
</a> </a>

8
dmp-admin/src/app/field-form/field-form.component.ts
View File

@ -24,13 +24,13 @@ ngOnInit(){
addNewRule(){ addNewRule(){
let rule: Rule = new Rule(); let rule: Rule = new Rule();
this.dataModel.rules.push(rule); this.dataModel.visible.rules.push(rule);
(<FormArray>this.form.get("rules")).push(rule.buildForm()); (<FormArray>this.form.get("visible").get("rules")).push(rule.buildForm());
} }
DeleteRule(index){ DeleteRule(index){
this.dataModel.rules.splice(index); this.dataModel.visible.rules.splice(index);
(<FormArray>this.form.get("rules")).removeAt(index); (<FormArray>this.form.get("visible").get("rules")).removeAt(index);
} }
} }

0
dmp-admin/src/app/formBuilder/form.component.html → dmp-admin/src/app/form/form.component.html
View File

7
dmp-admin/src/app/formBuilder/form.component.ts → dmp-admin/src/app/form/form.component.ts
View File

@ -43,6 +43,9 @@ export class FormComponent {
this.addSection(); this.addSection();
} }
// this.dataModel = new JsonSerializer<DatasetProfileModel>().fromJSONObject(TestModel, DatasetProfileModel);
// this.form = this.dataModel.buildForm();
} }
addSection() { addSection() {
@ -57,12 +60,12 @@ export class FormComponent {
} }
updateForm(data) { updateForm(data) {
return this.restBase.post("", data); return this.restBase.post("/admin/addDmp", data);
} }
onSubmit() { onSubmit() {
debugger; debugger;
let data = JSON.stringify(this.form.value); let data = this.form.value;
this.updateForm(data).subscribe(); this.updateForm(data).subscribe();
} }

10
dmp-admin/src/app/groupfield-form/groupfield-form.component.html
View File

@ -15,12 +15,12 @@
<input type="text" class="form-control" formControlName="ordinal"> <input type="text" class="form-control" formControlName="ordinal">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="radio control-label">DefaultVisibility</label> <label class="radio control-label">Default Visibility</label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" id="defaultVisibility" value="true" formControlName="defaultVisibility"> true <input type="radio" [value]="true" formControlName="defaultVisibility"> true
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" id="defaultVisibility" value="false" formControlName="defaultVisibility"> false <input type="radio" [value]="false" formControlName="defaultVisibility"> false
</label> </label>
</div> </div>
</div> </div>
@ -44,7 +44,7 @@
<compositefield-form [form]="form.get('compositeFields').get(''+i)" [dataModel]="field"></compositefield-form> <compositefield-form [form]="form.get('compositeFields').get(''+i)" [dataModel]="field"></compositefield-form>
<div> <div>
<a (click)="addNewField()" style="cursor: pointer"> <a (click)="addNewFieldSet()" style="cursor: pointer">
Add another field Set (CompositeField) + Add another field Set (CompositeField) +
</a> </a>
</div> </div>
@ -52,7 +52,7 @@
</div> </div>
<div *ngIf="dataModel.compositeFields.length == 0;"> <div *ngIf="dataModel.compositeFields.length == 0;">
<a (click)="addNewField()" style="cursor: pointer"> <a (click)="addNewFieldSet()" style="cursor: pointer">
Add another field Set (CompositeField) + Add another field Set (CompositeField) +
</a> </a>
</div> </div>

10
dmp-admin/src/app/groupfield-form/groupfield-form.component.ts
View File

@ -3,6 +3,7 @@ import { FormGroup } from '@angular/forms';
import { FieldGroup } from '../models/FieldGroup'; import { FieldGroup } from '../models/FieldGroup';
import { CompositeField } from '../models/CompositeField'; import { CompositeField } from '../models/CompositeField';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { Field } from '../models/Field';
@Component({ @Component({
selector: 'groupfield-form', selector: 'groupfield-form',
@ -21,10 +22,17 @@ export class GroupFieldFormComponent {
//this.addNewField(); //this.addNewField();
} }
addNewField(){ addNewFieldSet(){
let compositeField: CompositeField = new CompositeField(); let compositeField: CompositeField = new CompositeField();
let field: Field = new Field(); //create field at the same time
compositeField.fields.push(field);
//(<FormArray>this.form.get("compositeFields").get("fields")).push(field.buildForm());
this.dataModel.compositeFields.push(compositeField); this.dataModel.compositeFields.push(compositeField);
(<FormArray>this.form.get("compositeFields")).push(compositeField.buildForm()); (<FormArray>this.form.get("compositeFields")).push(compositeField.buildForm());
} }
DeleteFieldSet(index){ DeleteFieldSet(index){

9
dmp-admin/src/app/models/CompositeField.ts
View File

@ -3,16 +3,18 @@ import { JsonSerializer } from '../utilities/JsonSerializer';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from './interfaces/Serializable';
import { BaseModel } from './BaseModel'; import { BaseModel } from './BaseModel';
import {Field} from './Field' import {Field} from './Field'
import {Multiplicity} from './Multiplicity'
export class CompositeField extends BaseModel implements Serializable<CompositeField> { export class CompositeField extends BaseModel implements Serializable<CompositeField> {
public fields:Array<Field> = new Array<Field>(); public fields:Array<Field> = new Array<Field>();
public multiplicity:number;
public id:string; public id:string;
public ordinal:number; public ordinal:number;
public multiplicity: Multiplicity = new Multiplicity();
fromJSONObject(item:any):CompositeField{ fromJSONObject(item:any):CompositeField{
this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field); this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field);
this.multiplicity = item.multiplicity; this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
this.id = item.id; this.id = item.id;
this.ordinal = item.ordinal; this.ordinal = item.ordinal;
return this; return this;
@ -20,7 +22,6 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
buildForm():FormGroup{ buildForm():FormGroup{
let formGroup = this.formBuilder.group({ let formGroup = this.formBuilder.group({
multiplicity:[this.multiplicity],
id:[this.id], id:[this.id],
ordinal:[this.ordinal] ordinal:[this.ordinal]
}); });
@ -31,6 +32,8 @@ export class CompositeField extends BaseModel implements Serializable<CompositeF
fieldsFormArray.push(form) fieldsFormArray.push(form)
}) })
formGroup.addControl('fields', this.formBuilder.array(fieldsFormArray)); formGroup.addControl('fields', this.formBuilder.array(fieldsFormArray));
formGroup.addControl("multiplicity", this.multiplicity.buildForm());
return formGroup; return formGroup;
} }
} }

24
dmp-admin/src/app/models/DefaultValue.ts Normal file
View File

@ -0,0 +1,24 @@
import { BaseModel } from './BaseModel';
import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable';
export class DefaultValue extends BaseModel implements Serializable<DefaultValue>,FormGenerator<FormGroup>{
public type:string;
public value:string;
fromJSONObject(item:any):DefaultValue{
this.type = item.type;
this.value = item.value;
return this;
}
buildForm():FormGroup{
let formGroup = this.formBuilder.group({
type: [this.type],
value: [this.value]
});
return formGroup;
}
}

42
dmp-admin/src/app/models/Field.ts
View File

@ -3,35 +3,38 @@ import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from './interfaces/FormGenerator';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from '../utilities/JsonSerializer';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from './interfaces/Serializable';
import {Rule} from './Rule' import {Rule} from './Rule';
import {Multiplicity} from './Multiplicity' import {Multiplicity} from './Multiplicity';
import {DefaultValue} from './DefaultValue';
import {ViewStyle} from './ViewStyle';
import {Visibility} from './Visibility';
export class Field extends BaseModel implements Serializable<Field>,FormGenerator<FormGroup>{ export class Field extends BaseModel implements Serializable<Field>,FormGenerator<FormGroup>{
public id:string; public id:string;
public title:string; public title:string;
public value:string; public defaultValue:DefaultValue = new DefaultValue;
public description:string; public description:string;
public extendedDescription:string; public extendedDescription:string;
public viewStyle:string; public viewStyle:ViewStyle = new ViewStyle();
public defaultVisibility:boolean; public defaultVisibility:boolean;
public page:number; public page:number;
public multiplicity: Multiplicity = new Multiplicity(); public multiplicity: Multiplicity = new Multiplicity();
public ordinal: number; public ordinal: number;
public rules: Array<Rule> = new Array<Rule>(); public visible: Visibility = new Visibility();
fromJSONObject(item:any):Field{ fromJSONObject(item:any):Field{
this.id = item.id; this.id = item.id;
this.title = item.title; this.title = item.title;
this.value = item.value; this.defaultValue = new JsonSerializer<DefaultValue>().fromJSONObject(item.defaultValue, DefaultValue);
this.description = item.description; this.description = item.description;
this.extendedDescription = item.extendedDescription; this.extendedDescription = item.extendedDescription;
this.viewStyle = item.viewStyle;
this.defaultVisibility = item.defaultVisibility; this.defaultVisibility = item.defaultVisibility;
this.page = item.page; this.page = item.page;
this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity); this.multiplicity = new JsonSerializer<Multiplicity>().fromJSONObject(item.multiplicity, Multiplicity);
this.ordinal = item.ordinal; this.ordinal = item.ordinal;
this.rules = new JsonSerializer<Rule>().fromJSONArray(item.rule, Rule); this.viewStyle = new JsonSerializer<ViewStyle>().fromJSONObject(item.viewStyle, ViewStyle);
this.visible = new JsonSerializer<Visibility>().fromJSONObject(item.visible, Visibility);
return this; return this;
} }
@ -39,27 +42,18 @@ export class Field extends BaseModel implements Serializable<Field>,FormGenerato
let formGroup = this.formBuilder.group({ let formGroup = this.formBuilder.group({
id: [this.id], id: [this.id],
title: [this.title], title: [this.title],
value: [this.value],
description: [this.description], description: [this.description],
extendedDescription:[this.extendedDescription], extendedDescription:[this.extendedDescription],
viewStyle: [this.viewStyle],
defaultVisibility:[this.defaultVisibility], defaultVisibility:[this.defaultVisibility],
page:[this.page] , page:[this.page] ,
ordinal:[this.ordinal] ordinal:[this.ordinal]
}); });
let rulesFormArray = new Array<FormGroup>();
if (this.rules){
this.rules.forEach(rule =>{
let form:FormGroup = rule.buildForm();
rulesFormArray.push(form);
});
}
formGroup.addControl("multiplicity", this.multiplicity.buildForm()); formGroup.addControl("multiplicity", this.multiplicity.buildForm());
formGroup.addControl("rules", this.formBuilder.array(rulesFormArray)); formGroup.addControl("defaultValue", this.defaultValue.buildForm());
formGroup.addControl("viewStyle", this.viewStyle.buildForm());
//formGroup.addControl("visible", this.visible.buildForm());
return formGroup; return formGroup;
} }

25
dmp-admin/src/app/models/Rule.ts
View File

@ -4,25 +4,30 @@ import { FormGenerator } from './interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from './interfaces/Serializable';
export class Rule extends BaseModel implements Serializable<Rule>,FormGenerator<FormGroup>{ export class Rule extends BaseModel implements Serializable<Rule>,FormGenerator<FormGroup>{
public sourceField:string; public sourceField:string;
public targetField:string; public target:string;
public requiredValue; public value: string;
public type: string; public ruleType: string;
public ruleStyle: string;
public valueType: string;
fromJSONObject(item:any):Rule{ fromJSONObject(item:any):Rule{
this.sourceField = item.sourceField; this.sourceField = item.sourceField;
this.targetField = item.targetField; this.target = item.target;
this.requiredValue = item.requiredValue; this.value = item.value;
this.type = item.type; this.ruleType = item.ruleType;
this.ruleStyle = item.ruleStyle;
this.valueType = item.valueType;
return this; return this;
} }
buildForm():FormGroup{ buildForm():FormGroup{
let formGroup = this.formBuilder.group({ let formGroup = this.formBuilder.group({
sourceField: [this.sourceField], sourceField: [this.sourceField],
targetField: [this.targetField], target: [this.target],
requiredValue: [this.requiredValue], ruleStyle: [this.ruleStyle],
type: [this.type] value: [this.value],
ruleType: [this.ruleType],
valueType: [this.valueType]
}); });
return formGroup; return formGroup;
} }

24
dmp-admin/src/app/models/ViewStyle.ts Normal file
View File

@ -0,0 +1,24 @@
import { BaseModel } from './BaseModel';
import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable';
export class ViewStyle extends BaseModel implements Serializable<ViewStyle>,FormGenerator<FormGroup>{
public cssClass:string;
public renderStyle:string;
fromJSONObject(item:any):ViewStyle{
this.cssClass = item.cssClass;
this.renderStyle = item.renderStyle;
return this;
}
buildForm():FormGroup{
let formGroup = this.formBuilder.group({
cssClass: [this.cssClass],
renderStyle: [this.renderStyle]
});
return formGroup;
}
}

37
dmp-admin/src/app/models/Visibility.ts Normal file
View File

@ -0,0 +1,37 @@
import { BaseModel } from './BaseModel';
import { Rule } from "./Rule";
import { FormGenerator } from "./interfaces/FormGenerator";
import { FormGroup } from '@angular/forms';
import { Serializable } from './interfaces/Serializable';
import { JsonSerializer } from '../utilities/JsonSerializer';
export class Visibility extends BaseModel implements Serializable<Visibility>, FormGenerator<FormGroup>{
public rules: Array<Rule> = new Array<Rule>();
public style:string;
fromJSONObject(item:any):Visibility{
this.rules = new JsonSerializer<Rule>().fromJSONArray(item.rules, Rule);
this.style = item.style;
return this;
}
buildForm():FormGroup{
let formGroup = this.formBuilder.group({
style:[this.style]
})
let rulesFormArray = new Array<FormGroup>();
if (this.rules){
this.rules.forEach(rule =>{
let form:FormGroup = rule.buildForm();
rulesFormArray.push(form);
});
}
formGroup.addControl("rules", this.formBuilder.array(rulesFormArray));
return formGroup;
}
}

24
dmp-admin/src/app/models/data.ts Normal file
View File

@ -0,0 +1,24 @@
import { BaseModel } from './BaseModel';
import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable';
export class Data extends BaseModel implements Serializable<Data>,FormGenerator<FormGroup>{
public type:string;
public url:string;
fromJSONObject(item:any):Data{
this.type = item.type;
this.url = item.url;
return this;
}
buildForm():FormGroup{
let formGroup = this.formBuilder.group({
type: [this.type],
url: [this.url]
});
return formGroup;
}
}

7
dmp-admin/src/app/routes.ts
View File

@ -1,4 +1,4 @@
import { FormComponent } from './formBuilder/form.component'; import { FormComponent } from './form/form.component';
import { ModuleWithProviders } from '@angular/core'; import { ModuleWithProviders } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
@ -79,9 +79,14 @@ export const routes: Routes = [
{ {
path: 'form/:id', path: 'form/:id',
component: FormComponent component: FormComponent
},
{
path: 'form',
component: FormComponent
} }
]; ];

8
dmp-admin/src/app/rule-component/rule.component.html
View File

@ -3,13 +3,13 @@
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>Rule Type</label> <label>Rule Type</label>
<select class="form-control" formControlName="type"> <select class="form-control" formControlName="ruleType">
<option>field value</option> <option>field value</option>
</select> </select>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>Target</label> <label>Target</label>
<input type="text" class="form-control" placeholder="field id" formControlName="targetField"> <input type="text" class="form-control" placeholder="field id" formControlName="target">
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label>Rule style</label> <label>Rule style</label>
@ -22,11 +22,11 @@
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label>Value Type</label> <label>Value Type</label>
<input type="text" class="form-control"> <input type="text" class="form-control" formControlName="valueType">
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label>Value</label> <label>Value</label>
<input type="text" class="form-control" formControlName="requiredValue"> <input type="text" class="form-control" formControlName="value">
</div> </div>
</div> </div>
</div> </div>

12
dmp-admin/src/app/section-form/section-form.component.html
View File

@ -15,12 +15,12 @@
<input type="text" class="form-control" formControlName="ordinal"> <input type="text" class="form-control" formControlName="ordinal">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label class="radio control-label">defaultVisibility</label> <label class="radio control-label">Default Visibility</label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="defaultVisibility" id="inlineRadio1" value="true" formControlName="defaultVisibility"> true <input type="radio" [value]="true" formControlName="defaultVisibility"> true
</label> </label>
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="defaultVisibility" id="inlineRadio2" value="false" formControlName="defaultVisibility"> false <input type="radio" [value]="false" formControlName="defaultVisibility"> false
</label> </label>
</div> </div>
</div> </div>
@ -48,5 +48,11 @@
</div> </div>
</div> </div>
<div>
<a (click)="addGroupField()" style="cursor: pointer">
Add another group +
</a>
</div>
</div> </div>

408
dmp-frontend/src/app/testModel/testmodel.ts
View File

@ -94,38 +94,13 @@ export const TestModel = {
"renderStyle": "checkBox", "renderStyle": "checkBox",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [ "type":"any",
{ "value":""
"ruleType": "fieldValue",
"target": "metadataStandarsA211",
"ruleStyle": "boolean",
"value": "true",
"valueType": "boolean"
},
{
"ruleType": "fieldValue",
"target": "freeOfChargeGroupCommentA213",
"ruleStyle": "boolean",
"value": "true",
"valueType": "boolean"
},
{
"ruleType": "fieldValue",
"target": "standardisedVocabulariesA212",
"ruleStyle": "boolean",
"value": "true",
"valueType": "boolean"
}
]
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
@ -141,16 +116,13 @@ export const TestModel = {
"renderStyle": "radiobox", "renderStyle": "radiobox",
"cssClass": "" "cssClass": ""
}, },
"defaultValue": { "defaultValue":{
"type": "any", "type":"any",
"value": "" "value":""
}, },
"visible": { "multiplicity":{
"rules": [] "min":"1",
}, "max":"1"
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
"options": [ "options": [
@ -160,12 +132,7 @@ export const TestModel = {
] ]
} }
} }
],"multiplicity": { ]
"min": "1",
"max": "1"
},
"id":"useMetadataQ211fs",
"ordinal":1
} }
] ]
} }
@ -209,36 +176,19 @@ export const TestModel = {
"renderStyle": "booleanDecision", "renderStyle": "booleanDecision",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [ "type":"any",
{ "value":""
"ruleType": "fieldValue",
"target": "noMetadata",
"ruleStyle": "boolean",
"value": "true",
"valueType": "boolean"
}
]
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }
], ]
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"useMetadataQ211fs",
"ordinal":1
}, },
{ {
"fields": "fields":
@ -253,29 +203,19 @@ export const TestModel = {
"renderStyle": "combobox", "renderStyle": "combobox",
"cssClass": "" "cssClass": ""
}, },
"defaultValue": { "defaultValue":{
"type": "any", "type":"any",
"value": "" "value":""
}, },
"visible": { "multiplicity":{
"rules": [] "min":"1",
}, "max":"1"
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
"type": "autocomplete", "type": "autocomplete",
"url": "http://dionysus.di.uoa.gr:8080/dmp-backend/rest/external/datarepos?query=gree" "url": "http://dionysus.di.uoa.gr:8080/dmp-backend/rest/external/datarepos?query=gree"
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"metadataStandarsA211fs",
"ordinal":1
}, },
{ {
"fields": "fields":
@ -290,36 +230,19 @@ export const TestModel = {
"renderStyle": "checkBox", "renderStyle": "checkBox",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [ "type":"any",
{ "value":""
"ruleType": "fieldValue",
"target": "",
"ruleStyle": "boolean",
"value": "",
"valueType": "boolean"
}
]
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }
], ]
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedA211fs",
"ordinal":1
}, },
{ {
"fields": "fields":
@ -334,28 +257,18 @@ export const TestModel = {
"renderStyle": "freetext", "renderStyle": "freetext",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedUrlA211fs",
"ordinal":1
}, },
{ {
"fields": "fields":
@ -370,28 +283,18 @@ export const TestModel = {
"renderStyle": "freetext", "renderStyle": "freetext",
"cssClass": "" "cssClass": ""
}, },
"defaultValue": { "defaultValue":{
"type": "any", "type":"any",
"value": "" "value":""
}, },
"visible": { "multiplicity":{
"rules": [] "min":"1",
}, "max":"1"
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedCommentA211fs",
"ordinal":1
}, },
{ {
"fields": "fields":
@ -406,28 +309,19 @@ export const TestModel = {
"renderStyle": "checkBox", "renderStyle": "checkBox",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }
], ]
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"noMetadatafs",
"ordinal":1
} }
] ]
}, },
@ -452,28 +346,18 @@ export const TestModel = {
"renderStyle": "booleanDesicion", "renderStyle": "booleanDesicion",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"nuseVocabulariesQ212fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -487,16 +371,13 @@ export const TestModel = {
"renderStyle": "combobox", "renderStyle": "combobox",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
"type": "wordlist", "type": "wordlist",
@ -506,14 +387,7 @@ export const TestModel = {
{ "label": "Panagiotis", "value": "mpotis" } { "label": "Panagiotis", "value": "mpotis" }
] ]
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"standardisedVocabulariesA212fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -527,28 +401,18 @@ export const TestModel = {
"renderStyle": "checkBox", "renderStyle": "checkBox",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedVocabularyA212fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -562,28 +426,18 @@ export const TestModel = {
"renderStyle": "freetext", "renderStyle": "freetext",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedVocUrlA212fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -597,28 +451,18 @@ export const TestModel = {
"renderStyle": "freetext", "renderStyle": "freetext",
"cssClass": "" "cssClass": ""
}, },
"defaultValue": { "defaultValue":{
"type": "any", "type":"any",
"value": "" "value":""
}, },
"visible": { "multiplicity":{
"rules": [] "min":"1",
}, "max":"1"
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"notlistedVocCommentA212fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -628,32 +472,23 @@ export const TestModel = {
"title": "The metadata will not make use of any vocabulary", "title": "The metadata will not make use of any vocabulary",
"description": "", "description": "",
"extendedDescription": "", "extendedDescription": "",
"viewStyle": { "viewStyle": {
"renderStyle": "checkBox", "renderStyle": "checkBox",
"cssClass": "" "cssClass": ""
}, },
"defaultValue": { "defaultValue":{
"type": "any", "type":"any",
"value": "" "value":""
}, },
"visible": { "multiplicity":{
"rules": [] "min":"1",
}, "max":"1"
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }
], ]
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"noMetadataVocabularyA212fs",
"ordinal":1
} }
] ]
}, },
@ -678,28 +513,18 @@ export const TestModel = {
"renderStyle": "booleanDesicion", "renderStyle": "booleanDesicion",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }]
],
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"freeOfChargeGroupQ213fs",
"ordinal":1
}, },
{ {
"fields": [ "fields": [
@ -713,28 +538,19 @@ export const TestModel = {
"renderStyle": "freetext", "renderStyle": "freetext",
"cssClass": "" "cssClass": ""
}, },
"visible": { "defaultValue":{
"rules": [] "type":"any",
"value":""
}, },
"defaultValue": { "multiplicity":{
"type": "any", "min":"1",
"value": "" "max":"1"
},
"multiplicity": {
"min": "1",
"max": "1"
}, },
"data": { "data": {
} }
} }
], ]
"multiplicity": {
"min": "1",
"max": "1"
},
"id":"freeOfChargeGroupCommentA213fs",
"ordinal":1
} }
] ]
} }