diff --git a/dmp-admin/src/app/app.module.ts b/dmp-admin/src/app/app.module.ts index fd7dd5a74..1d56beb33 100644 --- a/dmp-admin/src/app/app.module.ts +++ b/dmp-admin/src/app/app.module.ts @@ -1,4 +1,4 @@ -import { BrowserModule } from '@angular/platform-browser'; +import { BrowserModule } from '@angular/platform-browser'; import { RouterModule, Routes } from '@angular/router'; import { NgModule } from '@angular/core'; //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 { DatasetProfileGUIEditorComponent } from './dataset-profile-gui-editor/dataset-profile-gui-editor.component'; -import { FieldFormComponent } from './field-form/field-form.component'; -import { FormComponent } from './form/form.component'; -import { GroupFieldFormComponent } from './groupfield-form/groupfield-form.component'; -import { RuleFormComponent } from './rule-component/rule.component'; -import { SectionFormComponent } from './section-form/section-form.component'; -import { CompositeFieldFormComponent } from './compositefield-form/compositefield-form.component'; +import { FieldFormComponent } from './dataset-profile-form/field-form/field-form.component'; +import { FormComponent } from './dataset-profile-form/form/form.component'; +import { GroupFieldFormComponent } from './dataset-profile-form/groupfield-form/groupfield-form.component'; +import { RuleFormComponent } from './dataset-profile-form/rule-component/rule.component'; +import { SectionFormComponent } from './dataset-profile-form/section-form/section-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 { AutocompleteComponent } from './autocomplete/autocomplete-component'; import { WordlistComponent } from './wordlist/wordlist-component'; @@ -93,7 +94,8 @@ import { RadioBoxComponent } from './radiobox/radiobox-component'; FormComponent, GroupFieldFormComponent, RuleFormComponent, - SectionFormComponent, + SectionFormComponent, + PageFormComponent, CompositeFieldFormComponent, ComboboxComponent, AutocompleteComponent, diff --git a/dmp-admin/src/app/autocomplete/autocomplete-component.ts b/dmp-admin/src/app/autocomplete/autocomplete-component.ts index 01c75b904..c4021147e 100644 --- a/dmp-admin/src/app/autocomplete/autocomplete-component.ts +++ b/dmp-admin/src/app/autocomplete/autocomplete-component.ts @@ -1,9 +1,9 @@ -import { FormGroup } from '@angular/forms'; -import { Field } from '../models/Field'; +import { FormGroup } from '@angular/forms'; +import { Field } from 'app/models/DataSetProfile/Field'; 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 { JsonSerializer } from '../utilities/JsonSerializer'; +import { JsonSerializer } from 'app/utilities/JsonSerializer'; @Component({ selector: 'autocomplete-component', diff --git a/dmp-admin/src/app/combobox/combobox-component.ts b/dmp-admin/src/app/combobox/combobox-component.ts index 9441f28be..2a1a99000 100644 --- a/dmp-admin/src/app/combobox/combobox-component.ts +++ b/dmp-admin/src/app/combobox/combobox-component.ts @@ -1,5 +1,5 @@ -import { FormGroup } from '@angular/forms'; -import { Field } from '../models/Field'; +import { FormGroup } from '@angular/forms'; +import { Field } from 'app/models/DataSetProfile/Field'; import { Component, Input, OnInit } from '@angular/core'; @Component({ diff --git a/dmp-admin/src/app/compositefield-form/compositefield-form.component.html b/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.html similarity index 100% rename from dmp-admin/src/app/compositefield-form/compositefield-form.component.html rename to dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.html diff --git a/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts b/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts similarity index 89% rename from dmp-admin/src/app/compositefield-form/compositefield-form.component.ts rename to dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts index c7f8345da..3ae8ef3f5 100644 --- a/dmp-admin/src/app/compositefield-form/compositefield-form.component.ts +++ b/dmp-admin/src/app/dataset-profile-form/compositefield-form/compositefield-form.component.ts @@ -1,7 +1,7 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { CompositeField } from '../models/CompositeField'; -import { Field } from '../models/Field'; +import { CompositeField } from 'app/models/DataSetProfile/CompositeField'; +import { Field } from 'app/models/DataSetProfile/Field'; import { FormArray, FormControl } from '@angular/forms/src/model'; @Component({ diff --git a/dmp-admin/src/app/field-form/field-form.component.html b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html similarity index 100% rename from dmp-admin/src/app/field-form/field-form.component.html rename to dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.html diff --git a/dmp-admin/src/app/field-form/field-form.component.ts b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts similarity index 80% rename from dmp-admin/src/app/field-form/field-form.component.ts rename to dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts index bb07b5f19..1c3738fd0 100644 --- a/dmp-admin/src/app/field-form/field-form.component.ts +++ b/dmp-admin/src/app/dataset-profile-form/field-form/field-form.component.ts @@ -1,10 +1,10 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { FormGroup, FormControl } from '@angular/forms'; -import { Field } from '../models/Field'; -import { Rule } from '../models/Rule'; -import { Multiplicity } from '../models/Multiplicity'; +import { Field } from 'app/models/DataSetProfile/Field'; +import { Rule } from 'app/models/DataSetProfile/Rule'; +import { Multiplicity } from 'app/models/DataSetProfile/Multiplicity'; import { FormArray } from '@angular/forms/src/model'; -import { ComboboxComponent } from '../combobox/combobox-component'; +import { ComboboxComponent } from 'app/combobox/combobox-component'; @Component({ selector: 'field-form', diff --git a/dmp-admin/src/app/form/form.component.html b/dmp-admin/src/app/dataset-profile-form/form/form.component.html similarity index 58% rename from dmp-admin/src/app/form/form.component.html rename to dmp-admin/src/app/dataset-profile-form/form/form.component.html index cb6ccdda2..9d62ee778 100644 --- a/dmp-admin/src/app/form/form.component.html +++ b/dmp-admin/src/app/dataset-profile-form/form/form.component.html @@ -1,4 +1,4 @@ -