+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts
new file mode 100644
index 000000000..c5f844075
--- /dev/null
+++ b/dmp-admin/src/app/components/booleanDecision/booleanDecision-component.ts
@@ -0,0 +1,19 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+ selector: 'booleanDecision-component',
+ templateUrl: './booleanDecision-component.html'
+})
+export class BooleanDecisionComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data:BooleanDecisionData = new BooleanDecisionData();
+
+ ngOnInit(){
+ this.form.addControl("data", this.data.buildForm());
+ }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/checkbox/checkbox-component.html b/dmp-admin/src/app/components/checkbox/checkbox-component.html
new file mode 100644
index 000000000..2411edac1
--- /dev/null
+++ b/dmp-admin/src/app/components/checkbox/checkbox-component.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/checkbox/checkbox-component.ts b/dmp-admin/src/app/components/checkbox/checkbox-component.ts
new file mode 100644
index 000000000..d8553c086
--- /dev/null
+++ b/dmp-admin/src/app/components/checkbox/checkbox-component.ts
@@ -0,0 +1,20 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+ selector: 'checkbox-component',
+ templateUrl: './checkbox-component.html'
+})
+export class CheckBoxComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data:CheckBoxData = new CheckBoxData();
+
+ ngOnInit(){
+ this.form.addControl("data", this.data.buildForm());
+ }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/combobox/combobox-component.html b/dmp-admin/src/app/components/combobox/combobox-component.html
new file mode 100644
index 000000000..a3eb851a1
--- /dev/null
+++ b/dmp-admin/src/app/components/combobox/combobox-component.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/combobox/combobox-component.ts b/dmp-admin/src/app/components/combobox/combobox-component.ts
new file mode 100644
index 000000000..661018b15
--- /dev/null
+++ b/dmp-admin/src/app/components/combobox/combobox-component.ts
@@ -0,0 +1,25 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'combobox-component',
+ templateUrl: './combobox-component.html'
+})
+export class ComboboxComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ type: string;
+ options = [{id:"autocomplete", value: "autocomplete"}, {id:"wordlist", value: "wordlist"}];
+
+ ngOnInit(){
+ if (this.dataModel.data){
+ this.type = this.form.get("data").get("type").value;
+ }
+
+ }
+
+ onchangeCombo(){
+ if (this.form.get("data")) this.form.removeControl("data");
+ }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/freetext/freetext-component.html b/dmp-admin/src/app/components/freetext/freetext-component.html
new file mode 100644
index 000000000..2411edac1
--- /dev/null
+++ b/dmp-admin/src/app/components/freetext/freetext-component.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/freetext/freetext-component.ts b/dmp-admin/src/app/components/freetext/freetext-component.ts
new file mode 100644
index 000000000..0e1077469
--- /dev/null
+++ b/dmp-admin/src/app/components/freetext/freetext-component.ts
@@ -0,0 +1,21 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { FreeTextData } from '../../models/DataField/FreeTextData';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+ selector: 'freetext-component',
+ templateUrl: './freetext-component.html'
+})
+export class FreeTextComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data:FreeTextData = new FreeTextData();
+
+ ngOnInit(){
+ this.form.addControl("data", this.data.buildForm());
+ }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/radiobox/radiobox-component.html b/dmp-admin/src/app/components/radiobox/radiobox-component.html
new file mode 100644
index 000000000..7e309f987
--- /dev/null
+++ b/dmp-admin/src/app/components/radiobox/radiobox-component.html
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/radiobox/radiobox-component.ts b/dmp-admin/src/app/components/radiobox/radiobox-component.ts
new file mode 100644
index 000000000..e7064d84c
--- /dev/null
+++ b/dmp-admin/src/app/components/radiobox/radiobox-component.ts
@@ -0,0 +1,32 @@
+import { FormGroup } from '@angular/forms';
+import { Field } from '../../models/DataSetProfile/Field';
+import { Component, Input, OnInit } from '@angular/core';
+import { RadioBoxData } from '../../models/DataField/RadioBoxData';
+import { FormArray } from '@angular/forms/src/model';
+import { ListingItem } from '../../models/Commons/ListingItem';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+
+@Component({
+ selector: 'radiobox-component',
+ templateUrl: './radiobox-component.html'
+})
+export class RadioBoxComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data: RadioBoxData = new RadioBoxData();
+ private options = new Array
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/textarea/textarea-component.ts b/dmp-admin/src/app/components/textarea/textarea-component.ts
new file mode 100644
index 000000000..2a04a5566
--- /dev/null
+++ b/dmp-admin/src/app/components/textarea/textarea-component.ts
@@ -0,0 +1,22 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { TextArea } from '../../models/DataField/TextArea';
+import { FreeTextData } from '../../models/DataField/FreeTextData';
+import { CheckBoxData } from '../../models/DataField/CheckBoxData';
+import { BooleanDecisionData } from '../../models/DataField/BooleanDecisionData';
+import { FormGroup } from '@angular/forms';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormArray } from '@angular/forms/src/model';
+
+@Component({
+ selector: 'textarea-component',
+ templateUrl: './textarea-component.html'
+})
+export class TextAreaComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data:TextArea = new TextArea();
+
+ ngOnInit(){
+ this.form.addControl("data", this.data.buildForm());
+ }
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/wordlist/wordlist-component.html b/dmp-admin/src/app/components/wordlist/wordlist-component.html
new file mode 100644
index 000000000..73da25ad7
--- /dev/null
+++ b/dmp-admin/src/app/components/wordlist/wordlist-component.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/components/wordlist/wordlist-component.ts b/dmp-admin/src/app/components/wordlist/wordlist-component.ts
new file mode 100644
index 000000000..00c33f8b9
--- /dev/null
+++ b/dmp-admin/src/app/components/wordlist/wordlist-component.ts
@@ -0,0 +1,34 @@
+import { FormGroup } from '@angular/forms';
+import { Field } from '../../models/DataSetProfile/Field';
+import { Component, Input, OnInit } from '@angular/core';
+import { WordListData } from '../../models/DataField/WordListData';
+import { FormArray } from '@angular/forms/src/model';
+import { ListingItem } from '../../models/Commons/ListingItem';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+
+@Component({
+ selector: 'wordlist-component',
+ templateUrl: './wordlist-component.html'
+})
+export class WordlistComponent implements OnInit{
+ @Input() dataModel: Field;
+ @Input() form: FormGroup;
+ private data: WordListData = new WordListData();
+ private options = new Array
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Add +
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts b/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts
new file mode 100644
index 000000000..0ee11f88a
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts
@@ -0,0 +1,57 @@
+import { Component, Input } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { FieldSet } from 'app/models/DataSetProfile/FieldSet';
+import { Field } from 'app/models/DataSetProfile/Field';
+import { FormArray, FormControl } from '@angular/forms/src/model';
+
+@Component({
+ selector: 'compositefield-form',
+ templateUrl: './compositefield-form.component.html',
+ styleUrls: []
+})
+
+export class CompositeFieldFormComponent {
+ @Input() form: FormGroup;
+ @Input() dataModel: FieldSet;
+ @Input() indexPath: string;
+
+ isComposite: boolean = false;
+ isMultiplicityEnabled: boolean = false;
+
+ constructon() { }
+
+ ngOnInit() {
+ //this.addNewField();
+ if(this.form.get("multiplicity"))
+ if (this.form.get("multiplicity").value.min >1 || this.form.get("multiplicity").value.max >1 )
+ this.isMultiplicityEnabled= true;
+ this.isComposite = this.dataModel.fields.length > 1;
+ }
+
+ onIsCompositeChange(isComposite: boolean) {
+ if (!isComposite && (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Multiplicity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i + 1}}. {{form.get('fields').get(''+i).get('title').value}}
+ {{i + 1}}. Child Field {{i + 1}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
new file mode 100644
index 000000000..41c89f1dd
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts
@@ -0,0 +1,53 @@
+import { Field } from '../../models/DataSetProfile/Field';
+import { Rule } from '../../models/DataSetProfile/Rule';
+import { Component, Input } from '@angular/core';
+import { FormGroup, FormControl, FormArray } from '@angular/forms';
+import { ValidationTypes } from 'app/common/validationTypes';
+
+@Component({
+ selector: 'field-form',
+ templateUrl: './field-form.component.html',
+ styleUrls: []
+})
+
+export class FieldFormComponent {
+ @Input() form: FormGroup;
+ @Input() dataModel: Field;
+ @Input() showMultiplicity: boolean = true;
+ @Input() indexPath: string;
+ validationsOptions: Array
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Multiplicity
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i + 1}}. Rule {{i + 1}}
+
+
+
+
+
+
+
+
+
+
+
+ Add Rule +
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/form/form.component.ts b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts
new file mode 100644
index 000000000..b16ca40e2
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.ts
@@ -0,0 +1,94 @@
+import { Section } from '../../models/DataSetProfile/Section';
+import { JsonSerializer } from '../../utilities/JsonSerializer';
+import { DatasetProfileService } from '../../services/dataset-profile.service';
+import { RestBase } from '../../services/rest-base';
+import { DatasetProfileModel } from '../../models/DataSetProfile/DatasetProfileModel';
+import { Page } from '../../models/DataSetProfile/Page';
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormControl } from '@angular/forms';
+import { SectionFormComponent } from '../section-form/section-form.component';
+import { FormArray } from '@angular/forms/src/model';
+import { Router, ActivatedRoute, ParamMap, Params } from '@angular/router';
+import { PageFormComponent } from '../page-form/page-component'
+
+@Component({
+ selector: 'form-comp',
+ templateUrl: './form.component.html',
+ styleUrls: []
+})
+
+export class FormComponent {
+
+ dataModel: DatasetProfileModel;
+ form: FormGroup;
+ private profileID: string;
+
+ constructor(public restBase: RestBase, private datasetProfileService: DatasetProfileService, private route: ActivatedRoute) {
+ this.profileID = route.snapshot.params['id'];
+
+ }
+
+ ngOnInit() {
+
+ this.dataModel = new JsonSerializer
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/groupfield-form/groupfield-form.component.ts b/dmp-admin/src/app/dataset-profile-form/groupfield-form/groupfield-form.component.ts
new file mode 100644
index 000000000..266de2f0e
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/groupfield-form/groupfield-form.component.ts
@@ -0,0 +1,43 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
+import { FieldSet } from 'app/models/DataSetProfile/FieldSet';
+import { FormArray } from '@angular/forms/src/model';
+import { Field } from 'app/models/DataSetProfile/Field';
+
+@Component({
+ selector: 'groupfield-form',
+ templateUrl: './groupfield-form.component.html',
+ styleUrls: []
+})
+
+export class GroupFieldFormComponent {
+ @Input() form: FormGroup;
+ @Input() dataModel: FieldGroup;
+ @Input() indexPath: string;
+
+ constructor(){}
+
+ ngOnInit(){
+ //this.addNewField();
+ }
+
+ addNewFieldSet(){
+ let compositeField: FieldSet = new FieldSet();
+
+ let field: Field = new Field(); //create field at the same time
+ compositeField.fields.push(field);
+ //(
+
+
+
+
+
+
+ {{i + 1}}. Field {{i + 1}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/page-form/page-component.ts b/dmp-admin/src/app/dataset-profile-form/page-form/page-component.ts
new file mode 100644
index 000000000..5924b408a
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/page-form/page-component.ts
@@ -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() {
+ }
+
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.html b/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.html
new file mode 100644
index 000000000..7ddb10c84
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.ts b/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.ts
new file mode 100644
index 000000000..01b70230f
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/rule-component/rule.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { FormGroup } from '@angular/forms'
+import { Rule } from 'app/models/DataSetProfile/Rule'
+
+@Component({
+ selector: 'rule-form',
+ templateUrl: './rule.component.html',
+ styleUrls: []
+})
+
+export class RuleFormComponent {
+@Input() form: FormGroup;
+@Input() dataModel: FormGroup;
+
+TargetValidation(){
+}
+
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.css b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.css
new file mode 100644
index 000000000..1ded10469
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.css
@@ -0,0 +1,5 @@
+.section-container {
+ background-color: #f5f5f5;
+ border: 1px solid #e3e3e3;
+ padding: 24px;
+}
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.html b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.html
new file mode 100644
index 000000000..1d3730e4f
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.html
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
new file mode 100644
index 000000000..ffa4723ac
--- /dev/null
+++ b/dmp-admin/src/app/dataset-profile-form/section-form/section-form.component.ts
@@ -0,0 +1,79 @@
+import { Component, OnInit, Input, ViewEncapsulation } from '@angular/core';
+import { FormGroup } from '@angular/forms';
+import { Section } from 'app/models/DataSetProfile/Section';
+import { FieldGroup } from 'app/models/DataSetProfile/FieldGroup';
+import { FormArray } from '@angular/forms/src/model';
+import { DatasetProfileModel } from 'app/models/DataSetProfile/DatasetProfileModel';
+import { FieldSet } from 'app/models/DataSetProfile/FieldSet';
+import { Field } from 'app/models/DataSetProfile/Field';
+import { Page } from 'app/models/DataSetProfile/Page';
+import { JsonSerializer } from 'app/utilities/JsonSerializer';
+
+@Component({
+ selector: 'section-form',
+ templateUrl: './section-form.component.html',
+ styleUrls: ['./section-form.component.css'],
+ encapsulation: ViewEncapsulation.None
+})
+
+export class SectionFormComponent {
+ @Input() form: FormGroup;
+ @Input() dataModel: Section;
+ @Input() indexPath: string;
+
+ constructor() { }
+
+ ngOnInit() {
+ var self = this;
+
+ this.form.root.get("pages").valueChanges.subscribe(function(value) {
+ self.keepPageSelectionValid(value);
+ });
+ }
+
+ // addGroupField() {
+ // let fieldGroup: FieldGroup = new FieldGroup();
+ // if (this.dataModel.fieldGroups)
+ // this.dataModel.fieldGroups.push(fieldGroup);
+ // (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Page is required
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i + 1}}. {{form.get('sections').get(''+i).get('title').value}}
+ {{i + 1}}. Section {{i + 1}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{i + 1}}. Field {{i + 1}}
+
+
+
+
+
+
+
+
+
+
+
+ Add Field +
+
+
+
+Manage Datasets
-
+
diff --git a/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts b/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
index dac20db7a..d98a5b343 100644
--- a/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
+++ b/dmp-admin/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
@@ -23,7 +23,7 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit {
ngOnInit() {
}
- private clientId:string = '1010962018903-glegmqudqtl1lub0150vacopbu06lgsg.apps.googleusercontent.com';
+ private clientId:string = '524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com';
private scope = [
'profile',
diff --git a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
index 660c3348b..c6a336722 100644
--- a/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
+++ b/dmp-admin/src/app/login/main-sign-in/main-sign-in.component.html
@@ -3,7 +3,7 @@
- 
+ 
+