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

This commit is contained in:
annampak 2017-12-20 18:50:26 +02:00
parent f530a2b862 2c4a9c42cf
commit 9da7b637b9
34 changed files with 254 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
//import { HttpModule, Http, Response, RequestOptions, RequestMethod, Headers, URLSearchParams } from '@angular/http'; //import { HttpModule, Http, Response, RequestOptions, RequestMethod, Headers, URLSearchParams } from '@angular/http';
@ -61,12 +61,13 @@ import { DatareposEditorComponent } from './managers/datarepos-editor/datarepos-
import { DatasetprofileEditorComponent } from './managers/datasetprofile-editor/datasetprofile-editor.component'; import { DatasetprofileEditorComponent } from './managers/datasetprofile-editor/datasetprofile-editor.component';
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 './dataset-profile-form/field-form/field-form.component';
import { FormComponent } from './form/form.component'; import { FormComponent } from './dataset-profile-form/form/form.component';
import { GroupFieldFormComponent } from './groupfield-form/groupfield-form.component'; import { GroupFieldFormComponent } from './dataset-profile-form/groupfield-form/groupfield-form.component';
import { RuleFormComponent } from './rule-component/rule.component'; import { RuleFormComponent } from './dataset-profile-form/rule-component/rule.component';
import { SectionFormComponent } from './section-form/section-form.component'; import { SectionFormComponent } from './dataset-profile-form/section-form/section-form.component';
import { CompositeFieldFormComponent } from './compositefield-form/compositefield-form.component'; import { PageFormComponent } from './dataset-profile-form/page-form/page-component';
import { CompositeFieldFormComponent } from './dataset-profile-form/compositefield-form/compositefield-form.component';
import { ComboboxComponent } from './combobox/combobox-component'; import { ComboboxComponent } from './combobox/combobox-component';
import { AutocompleteComponent } from './autocomplete/autocomplete-component'; import { AutocompleteComponent } from './autocomplete/autocomplete-component';
import { WordlistComponent } from './wordlist/wordlist-component'; import { WordlistComponent } from './wordlist/wordlist-component';
@ -94,6 +95,7 @@ import { RadioBoxComponent } from './radiobox/radiobox-component';
GroupFieldFormComponent, GroupFieldFormComponent,
RuleFormComponent, RuleFormComponent,
SectionFormComponent, SectionFormComponent,
PageFormComponent,
CompositeFieldFormComponent, CompositeFieldFormComponent,
ComboboxComponent, ComboboxComponent,
AutocompleteComponent, AutocompleteComponent,

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

@ -1,9 +1,9 @@
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { AutocompleteData } from '../models/DataField/AutocompleteData'; import { AutocompleteData } from 'app/models/DataField/AutocompleteData';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/utilities/JsonSerializer';
@Component({ @Component({
selector: 'autocomplete-component', selector: 'autocomplete-component',

4
dmp-admin/src/app/combobox/combobox-component.ts
View File

@ -1,5 +1,5 @@
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
@Component({ @Component({

0
dmp-admin/src/app/compositefield-form/compositefield-form.component.html → dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.html
View File

6
dmp-admin/src/app/compositefield-form/compositefield-form.component.ts → dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts
View File

@ -1,7 +1,7 @@
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { CompositeField } from '../models/CompositeField'; import { CompositeField } from 'app/models/DataSetProfile/CompositeField';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
import { FormArray, FormControl } from '@angular/forms/src/model'; import { FormArray, FormControl } from '@angular/forms/src/model';
@Component({ @Component({

0
dmp-admin/src/app/field-form/field-form.component.html → dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html
View File

10
dmp-admin/src/app/field-form/field-form.component.ts → dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
View File

@ -1,10 +1,10 @@
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { FormGroup, FormControl } from '@angular/forms'; import { FormGroup, FormControl } from '@angular/forms';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
import { Rule } from '../models/Rule'; import { Rule } from 'app/models/DataSetProfile/Rule';
import { Multiplicity } from '../models/Multiplicity'; import { Multiplicity } from 'app/models/DataSetProfile/Multiplicity';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { ComboboxComponent } from '../combobox/combobox-component'; import { ComboboxComponent } from 'app/combobox/combobox-component';
@Component({ @Component({
selector: 'field-form', selector: 'field-form',

31
dmp-admin/src/app/form/form.component.html → dmp-admin/src/app/dataset-profile-form/form/form.component.html
View File

@ -1,4 +1,4 @@
<div class="container"> <div class="container">
<div style="background-color: #f5f5f5;border: 1px solid #e3e3e3;padding: 24px;"> <div style="background-color: #f5f5f5;border: 1px solid #e3e3e3;padding: 24px;">
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit()"> <form novalidate [formGroup]="form" (ngSubmit)="onSubmit()">
<div class="row"> <div class="row">
@ -29,12 +29,39 @@
</div> </div>
</div> </div>
<div style="margin-top:20px; padding-left: 15px;"> <div class="panel-group" style="margin-top:10px;">
<div *ngFor="let page of dataModel.pages; let i=index;" class="panel panel-default">
<div class="panel-heading clearfix">
<a *ngIf="form.get('pages').at(i).get('title').value" data-toggle="collapse" href="#{{'p' + i}}" class="panel-title pull-left"
style="padding-top: 7.5px;">{{i + 1}}.{{form.get('pages').at(i).get('title').value}}</a>
<a *ngIf="!form.get('pages').at(i).get('title').value" data-toggle="collapse" href="#{{'p' + i}}" class="panel-title pull-left"
style="padding-top: 7.5px;">{{i + 1}}. Page{{i + 1}}</a>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm" style="margin-left:5px;" (click)="DeletePage(i);">
<span class="glyphicon glyphicon-erase"></span>
</button>
</div>
</div>
<div id="{{'p' + i}}" class="panel-collapse collapse in">
<div class="panel-body">
<page-form [form]="form.get('pages').at(i)" [dataModel]="page"></page-form>
</div>
</div>
</div>
</div>
<div style="margin-top:20px; padding-left: 15px;" class="row">
<a (click)="addSection()" style="cursor: pointer"> <a (click)="addSection()" style="cursor: pointer">
Add Section + Add Section +
</a> </a>
</div> </div>
<div style="margin-top:20px; padding-left: 15px;" class="row">
<a (click)="addPage()" style="cursor: pointer">
Add Page +
</a>
</div>
<button class="btn btn-primary" style="margin-top:20px;" type="submit">Save</button> <button class="btn btn-primary" style="margin-top:20px;" type="submit">Save</button>
</form> </form>
</div> </div>

28
dmp-admin/src/app/form/form.component.ts → dmp-admin/src/app/dataset-profile-form/form/form.component.ts
View File

@ -1,15 +1,17 @@
import { DatasetProfileService } from '../services/dataset-profile.service'; import { DatasetProfileService } from 'app/services/dataset-profile.service';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormGroup, FormControl } from '@angular/forms'; import { FormGroup, FormControl } from '@angular/forms';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/utilities/JsonSerializer';
import { SectionFormComponent } from '../section-form/section-form.component'; import { SectionFormComponent } from '../section-form/section-form.component';
import { Section } from '../models/Section'; import { Section } from 'app/models/DataSetProfile/Section';
import { FieldGroup } from '../models/FieldGroup'; import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
import { DatasetProfileModel } from '../models/DatasetProfileModel'; import { DatasetProfileModel } from 'app/models/DataSetProfile/DatasetProfileModel';
import { TestModel } from '../testModel/testModel'; import { TestModel } from 'app/testModel/testModel';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { RestBase } from '../services/rest-base'; import { RestBase } from 'app/services/rest-base';
import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router'; import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
import { Page } from 'app/models/DataSetProfile/Page'
import { PageFormComponent } from '../page-form/page-component'
@Component({ @Component({
selector: 'form-comp', selector: 'form-comp',
@ -42,6 +44,7 @@ export class FormComponent {
else{ else{
this.addSection(); this.addSection();
this.addPage(0);
} }
// this.dataModel = new JsonSerializer<DatasetProfileModel>().fromJSONObject(TestModel, DatasetProfileModel); // this.dataModel = new JsonSerializer<DatasetProfileModel>().fromJSONObject(TestModel, DatasetProfileModel);
@ -61,11 +64,22 @@ export class FormComponent {
(<FormArray>this.form.get("sections")).push(section.buildForm()); (<FormArray>this.form.get("sections")).push(section.buildForm());
} }
addPage(number) {
let page: Page = new Page(this.dataModel.pages.length);
this.dataModel.pages.push(page);
(<FormArray>this.form.get("pages")).push(page.buildForm());
}
DeleteSection(index) { DeleteSection(index) {
this.dataModel.sections.splice(index,1); this.dataModel.sections.splice(index,1);
(<FormArray>this.form.get("sections")).removeAt(index) (<FormArray>this.form.get("sections")).removeAt(index)
} }
DeletePage(index) {
this.dataModel.pages.splice(index, 1);
(<FormArray>this.form.get("pages")).removeAt(index)
}
createForm(data) { createForm(data) {
return this.restBase.post("/admin/addDmp", data); return this.restBase.post("/admin/addDmp", data);
} }

0
dmp-admin/src/app/groupfield-form/groupfield-form.component.html → dmp-admin/src/app/dataset-profile-form/groupfield-form/groupfield-form.component.html
View File

8
dmp-admin/src/app/groupfield-form/groupfield-form.component.ts → dmp-admin/src/app/dataset-profile-form/groupfield-form/groupfield-form.component.ts
View File

@ -1,9 +1,9 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FieldGroup } from '../models/FieldGroup'; import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
import { CompositeField } from '../models/CompositeField'; import { CompositeField } from 'app/models/DataSetProfile/CompositeField';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
@Component({ @Component({
selector: 'groupfield-form', selector: 'groupfield-form',

8
dmp-admin/src/app/dataset-profile-form/page-form/page-component.html Normal file
View File

@ -0,0 +1,8 @@
<div>
<div [formGroup]="form" class="row">
<div class="col-md-4">
<label>Title</label>
<input type="text" class="form-control" formControlName="title">
</div>
</div>
</div>

18
dmp-admin/src/app/dataset-profile-form/page-form/page-component.ts Normal file
View File

@ -0,0 +1,18 @@
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { FormGroup } from '@angular/forms'
import { Page } from 'app/models/DataSetProfile/Page'
@Component({
selector: 'page-form',
templateUrl: './page-component.html',
styleUrls: []
})
export class PageFormComponent {
@Input() form: FormGroup;
@Input() dataModel: Page;
TargetValidation() {
}
}

0
dmp-admin/src/app/rule-component/rule.component.html → dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.html
View File

4
dmp-admin/src/app/rule-component/rule.component.ts → dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Input, Output, EventEmitter } from '@angular/core'; import { Component, Input, Output, EventEmitter } from '@angular/core';
import { FormGroup } from '@angular/forms' import { FormGroup } from '@angular/forms'
import { Rule } from '../models/Rule' import { Rule } from 'app/models/DataSetProfile/Rule'
@Component({ @Component({
selector: 'rule-form', selector: 'rule-form',

0
dmp-admin/src/app/section-form/section-form.component.css → dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.css
View File

7
dmp-admin/src/app/section-form/section-form.component.html → dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.html
View File

@ -1,4 +1,4 @@
<div class="section-container"> <div class="section-container">
<div class="row" [formGroup]="form"> <div class="row" [formGroup]="form">
<div class="row"> <div class="row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -15,7 +15,10 @@
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Page</label> <label>Page</label>
<input type="number" class="form-control" formControlName="page"> <select class="form-control" formControlName="page">
<option *ngFor="let pageGroup of form.root.get('pages').controls;" [value]="pageGroup.get('id').value">{{pageGroup.get('title').value}}</option>
</select>
<div *ngIf="form.get('page').invalid && (form.get('page').dirty || form.get('page').touched)" class="alert alert-danger">Page is required</div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label class="radio control-label">Default Visibility</label> <label class="radio control-label">Default Visibility</label>

27
dmp-admin/src/app/section-form/section-form.component.ts → dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
View File

@ -1,12 +1,13 @@
import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core'; import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Section } from '../models/Section'; import { Section } from 'app/models/DataSetProfile/Section';
import { FieldGroup } from '../models/FieldGroup'; import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';
import { DatasetProfileModel } from '../models/DatasetProfileModel'; import { DatasetProfileModel } from 'app/models/DataSetProfile/DatasetProfileModel';
import { CompositeField } from '../models/CompositeField'; import { CompositeField } from 'app/models/DataSetProfile/CompositeField';
import { Field } from '../models/Field'; import { Field } from 'app/models/DataSetProfile/Field';
import { Page } from 'app/models/DataSetProfile/Page';
import { JsonSerializer } from 'app/utilities/JsonSerializer';
@Component({ @Component({
selector: 'section-form', selector: 'section-form',
@ -23,7 +24,11 @@ export class SectionFormComponent {
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {
//this.addGroupField(); //for new DatasetProfile var self = this;
this.form.root.get("pages").valueChanges.subscribe(function(value) {
self.keepPageSelectionValid(value);
});
} }
addGroupField() { addGroupField() {
@ -60,4 +65,10 @@ export class SectionFormComponent {
(<FormArray>this.form.get("sections")).removeAt(index); (<FormArray>this.form.get("sections")).removeAt(index);
} }
keepPageSelectionValid(pagesJson: Array<any>) {
let selectedPage = this.form.get("page").value as number;
let pages: Array<Page> = new JsonSerializer<Page>().fromJSONArray(pagesJson, Page);
if (!isNaN(selectedPage) && pages.find(elem => elem.id === selectedPage) === undefined)
this.form.get("page").reset();
}
} }

8
dmp-admin/src/app/models/CompositeField.ts → dmp-admin/src/app/models/DataSetProfile/CompositeField.ts
View File

@ -1,7 +1,7 @@
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/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' import {Multiplicity} from './Multiplicity'

43
dmp-admin/src/app/models/DataSetProfile/DatasetProfileModel.ts Normal file
View File

@ -0,0 +1,43 @@
import { BaseModel } from '../BaseModel';
import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
import { FormGenerator } from '../interfaces/FormGenerator';
import { JsonSerializer } from 'app/utilities/JsonSerializer';
import { Section } from './Section';
import { Serializable } from '../interfaces/Serializable';
import { Page } from "./Page";
export class DatasetProfileModel extends BaseModel implements Serializable<DatasetProfileModel>,FormGenerator<FormGroup>{
public sections: Array<Section> = new Array<Section>();
public pages: Array<Page> = new Array<Page>();
public label: string;
fromJSONObject(item:any):DatasetProfileModel{
this.sections = new JsonSerializer<Section>().fromJSONArray(item.sections, Section);
this.pages = new JsonSerializer<Page>().fromJSONArray(item.pages, Page);
this.label = item.label;
return this;
}
buildForm():FormGroup{
let formGroup: FormGroup = new FormBuilder().group({});
let sectionsFormArray = new Array<FormGroup>();
this.sections.forEach(item => {
let form: FormGroup = item.buildForm();
sectionsFormArray.push(form)
})
formGroup.addControl('sections', this.formBuilder.array(sectionsFormArray));
let pagesFormArray = new Array<FormGroup>();
this.pages.forEach(item => {
let form: FormGroup = item.buildForm();
pagesFormArray.push(form)
})
formGroup.addControl('pages', this.formBuilder.array(pagesFormArray));
formGroup.addControl('label', new FormControl(this.label));
return formGroup;
}
}

6
dmp-admin/src/app/models/DefaultValue.ts → dmp-admin/src/app/models/DataSetProfile/DefaultValue.ts
View File

@ -1,7 +1,7 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
export class DefaultValue extends BaseModel implements Serializable<DefaultValue>,FormGenerator<FormGroup>{ export class DefaultValue extends BaseModel implements Serializable<DefaultValue>,FormGenerator<FormGroup>{
public type:string; public type:string;

16
dmp-admin/src/app/models/Field.ts → dmp-admin/src/app/models/DataSetProfile/Field.ts
View File

@ -1,12 +1,12 @@
import { RadioBoxData } from './DataField/RadioBoxData'; import { RadioBoxData } from '../DataField/RadioBoxData';
import { WordListData } from './DataField/WordListData'; import { WordListData } from '../DataField/WordListData';
import { AutocompleteData } from './DataField/AutocompleteData'; import { AutocompleteData } from '../DataField/AutocompleteData';
import { DataField } from './DataField/DataField'; import { DataField } from '../DataField/DataField';
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/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 {DefaultValue} from './DefaultValue';

12
dmp-admin/src/app/models/FieldGroup.ts → dmp-admin/src/app/models/DataSetProfile/FieldGroup.ts
View File

@ -1,11 +1,11 @@
import { CompositeField } from './CompositeField'; import { CompositeField } from './CompositeField';
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { Validation } from './Validation'; import { Validation } from '../Validation';
import { Rule } from './Rule'; import { Rule } from './Rule';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/utilities/JsonSerializer';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
import { Field } from './Field'; import { Field } from './Field';
export class FieldGroup extends BaseModel implements Serializable<FieldGroup>, FormGenerator<FormGroup>{ export class FieldGroup extends BaseModel implements Serializable<FieldGroup>, FormGenerator<FormGroup>{

6
dmp-admin/src/app/models/Multiplicity.ts → dmp-admin/src/app/models/DataSetProfile/Multiplicity.ts
View File

@ -1,7 +1,7 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
export class Multiplicity extends BaseModel implements Serializable<Multiplicity>,FormGenerator<FormGroup>{ export class Multiplicity extends BaseModel implements Serializable<Multiplicity>,FormGenerator<FormGroup>{
public min:number; public min:number;
public max:string; public max:string;

30
dmp-admin/src/app/models/DataSetProfile/Page.ts Normal file
View File

@ -0,0 +1,30 @@
import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms';
import { FormGenerator } from '../interfaces/FormGenerator';
import { Serializable } from '../interfaces/Serializable';
export class Page extends BaseModel implements Serializable<Page>, FormGenerator<FormGroup>{
public title: string;
public id: number;
constructor(id?: number) {
super();
if (isNaN(id)) this.id = 0;
else this.id = id;
}
fromJSONObject(item: any): Page {
this.title = item.title;
this.id = item.id;
return this;
}
buildForm(): FormGroup {
let formGroup = this.formBuilder.group({
title: [this.title],
id: [this.id]
});
return formGroup;
}
}

6
dmp-admin/src/app/models/Rule.ts → dmp-admin/src/app/models/DataSetProfile/Rule.ts
View File

@ -1,7 +1,7 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; 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 target:string; public target:string;

13
dmp-admin/src/app/models/Section.ts → dmp-admin/src/app/models/DataSetProfile/Section.ts
View File

@ -1,9 +1,10 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/utilities/JsonSerializer';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
import { FieldGroup } from './FieldGroup'; import { FieldGroup } from './FieldGroup';
export class Section extends BaseModel implements Serializable<Section>, FormGenerator<FormGroup>{ export class Section extends BaseModel implements Serializable<Section>, FormGenerator<FormGroup>{
public sections: Array<Section> = new Array<Section>(); public sections: Array<Section> = new Array<Section>();
public fieldGroups: Array<FieldGroup> = new Array<FieldGroup>(); public fieldGroups: Array<FieldGroup> = new Array<FieldGroup>();
@ -45,7 +46,7 @@ export class Section extends BaseModel implements Serializable<Section>, FormGen
formGroup.addControl('sections', this.formBuilder.array(sectionsFormArray)); formGroup.addControl('sections', this.formBuilder.array(sectionsFormArray));
formGroup.addControl('fieldGroups', this.formBuilder.array(fieldGroupsFormArray)); formGroup.addControl('fieldGroups', this.formBuilder.array(fieldGroupsFormArray));
formGroup.addControl('defaultVisibility', new FormControl(this.defaultVisibility)); formGroup.addControl('defaultVisibility', new FormControl(this.defaultVisibility));
formGroup.addControl('page', new FormControl(this.page)); formGroup.addControl('page', new FormControl(this.page, [Validators.required]));
formGroup.addControl('id', new FormControl(this.id)); formGroup.addControl('id', new FormControl(this.id));
formGroup.addControl('title', new FormControl(this.title)); formGroup.addControl('title', new FormControl(this.title));
formGroup.addControl('description', new FormControl(this.description)); formGroup.addControl('description', new FormControl(this.description));

6
dmp-admin/src/app/models/ViewStyle.ts → dmp-admin/src/app/models/DataSetProfile/ViewStyle.ts
View File

@ -1,7 +1,7 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator'; import { FormGenerator } from '../interfaces/FormGenerator';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
export class ViewStyle extends BaseModel implements Serializable<ViewStyle>,FormGenerator<FormGroup>{ export class ViewStyle extends BaseModel implements Serializable<ViewStyle>,FormGenerator<FormGroup>{
public cssClass:string; public cssClass:string;

8
dmp-admin/src/app/models/Visibility.ts → dmp-admin/src/app/models/DataSetProfile/Visibility.ts
View File

@ -1,9 +1,9 @@
import { BaseModel } from './BaseModel'; import { BaseModel } from '../BaseModel';
import { Rule } from "./Rule"; import { Rule } from "./Rule";
import { FormGenerator } from "./interfaces/FormGenerator"; import { FormGenerator } from "../interfaces/FormGenerator";
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Serializable } from './interfaces/Serializable'; import { Serializable } from '../interfaces/Serializable';
import { JsonSerializer } from '../utilities/JsonSerializer'; import { JsonSerializer } from 'app/utilities/JsonSerializer';
export class Visibility extends BaseModel implements Serializable<Visibility>, FormGenerator<FormGroup>{ export class Visibility extends BaseModel implements Serializable<Visibility>, FormGenerator<FormGroup>{
public rules: Array<Rule> = new Array<Rule>(); public rules: Array<Rule> = new Array<Rule>();

30
dmp-admin/src/app/models/DatasetProfileModel.ts
View File

@ -1,30 +0,0 @@
import { BaseModel } from './BaseModel';
import { FormBuilder, FormGroup, FormControl } from '@angular/forms';
import { FormGenerator } from './interfaces/FormGenerator';
import { JsonSerializer } from '../utilities/JsonSerializer';
import { Section } from './Section';
import { Serializable } from './interfaces/Serializable';
export class DatasetProfileModel extends BaseModel implements Serializable<DatasetProfileModel>,FormGenerator<FormGroup>{
public sections:Array<Section> = new Array<Section>();
public label: string;
fromJSONObject(item:any):DatasetProfileModel{
this.sections = new JsonSerializer<Section>().fromJSONArray(item.sections,Section);
this.label = item.label;
return this;
}
buildForm():FormGroup{
let formGroup:FormGroup = new FormBuilder().group({});
let sectionsFormArray = new Array<FormGroup>();
this.sections.forEach(item => {
let form: FormGroup = item.buildForm();
sectionsFormArray.push(form)
})
formGroup.addControl('sections', this.formBuilder.array(sectionsFormArray));
formGroup.addControl('label', new FormControl(this.label));
return formGroup;
}
}

4
dmp-admin/src/app/radiobox/radiobox-component.ts
View File

@ -1,5 +1,5 @@
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Field } from '../models/Field'; import { Field } from '../models/DataSetProfile/Field';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { RadioBoxData } from '../models/DataField/RadioBoxData'; import { RadioBoxData } from '../models/DataField/RadioBoxData';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';

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

@ -1,4 +1,4 @@
import { FormComponent } from './form/form.component'; import { FormComponent } from './dataset-profile-form/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';

4
dmp-admin/src/app/wordlist/wordlist-component.ts
View File

@ -1,5 +1,5 @@
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { Field } from '../models/Field'; import { Field } from '../models/DataSetProfile/Field';
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { WordListData } from '../models/DataField/WordListData'; import { WordListData } from '../models/DataField/WordListData';
import { FormArray } from '@angular/forms/src/model'; import { FormArray } from '@angular/forms/src/model';

3
dmp-admin/tsconfig.json
View File

@ -1,7 +1,8 @@
{ {
"compileOnSave": false, "compileOnSave": false,
"compilerOptions": { "compilerOptions": {
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"baseUrl": "src",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"moduleResolution": "node", "moduleResolution": "node",