+
{{step.label}}
@@ -259,7 +259,7 @@
-
+
@@ -299,11 +299,11 @@
-
+
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
index 4dd2f079b..d91264828 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.scss
@@ -16,6 +16,7 @@
.stepper{
background-color: transparent;
+ min-height: 500px;
}
.content-displayer{
background-color: #fff;
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
index df9ccb933..5db3683de 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/dataset-profile-editor.component.ts
@@ -178,12 +178,13 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
// this.addSection();
// this.addPage();
this.visibilityRulesService.buildVisibilityRules([],this.form);
+ setTimeout(() => {
+ this.steps = this.stepper.steps;
+ });
}
});
+
- setTimeout(() => {
- this.steps = this.stepper.steps;
- });
}
prepareForm() {
@@ -201,6 +202,15 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
// });
});
this.form.updateValueAndValidity();
+ setTimeout(() => {
+ this.steps = this.stepper.steps;
+ });
+
+ //SHOW THE FIRST PAGE
+ const tocentries = this.getTocEntries();
+ if(tocentries && tocentries.length){
+ this.selectedTocEntry = tocentries[0];
+ }
//this.getPreview();
@@ -674,6 +684,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
section.id = Guid.create().toString();
let sectionsArray:FormArray;
+ //TODO CHECK FOR FORM.ROOT ERROR
if (parent.type === ToCEntryType.Page) {
//FIRST LEVEL SECTION
@@ -709,8 +720,9 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
//create one field form fieldset
const field: FieldEditorModel = new FieldEditorModel(); //to ask
field.id = Guid.create().toString();
- field.ordinal = fieldSet.fields.length;
+ field.ordinal = 0;//first filed in the fields list
fieldSet.fields.push(field);
+ // field.ordinal = fieldSet.fields.length-1;
//give fieldset id and ordinal
fieldSet.id = Guid.create().toString();
@@ -1016,7 +1028,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
//first level is always pages
- model.pages = toCentries.map(entry=>{
+ model.pages = toCentries.map((entry,idx)=>{
if( !(entry.type == ToCEntryType.Page)){
return null;
}
@@ -1034,17 +1046,17 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
sectionModel.description = section.form.get('description').value;
sectionModel.page = entry.form.get('ordinal').value;
sectionModel.title = section.label;
- sectionModel.numbering = section.numbering;
+ sectionModel.numbering = (idx+1).toString();
if(section.subEntriesType == ToCEntryType.Section){
- sectionModel.sections = this._buildSectionsRecursively(section.subEntries);
+ sectionModel.sections = this._buildSectionsRecursively(section.subEntries, sectionModel.numbering);
}else{
- sectionModel.compositeFields = this._buildFormFields(section.subEntries)
+ sectionModel.compositeFields = this._buildFormFields(section.subEntries, sectionModel.numbering)
}
return sectionModel;
- })
+ });
};
return pageModel;
@@ -1080,7 +1092,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
}
visibilityRules:Rule[];
- private _buildSectionsRecursively( tocentries: ToCEntry[]): DatasetDescriptionSectionEditorModel[]{
+ private _buildSectionsRecursively( tocentries: ToCEntry[], parentNumbering:string): DatasetDescriptionSectionEditorModel[]{
if(!tocentries) return null;
@@ -1088,7 +1100,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
const result: Array
= [];
- tocentries.forEach(tocentry=>{
+ tocentries.forEach((tocentry, idx)=>{
const sectionModel = new DatasetDescriptionSectionEditorModel();
sectionModel.id = tocentry.id;
@@ -1096,13 +1108,14 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
sectionModel.description = tocentry.form.get('description').value;
// sectionModel.page = entry.form.get('ordinal').value;
sectionModel.title = tocentry.label;
- sectionModel.numbering = tocentry.numbering;
+ // sectionModel.numbering = tocentry.numbering;
+ sectionModel.numbering = parentNumbering+"."+(idx+1);;
if(tocentry.subEntriesType == ToCEntryType.Section){
- sectionModel.sections = this._buildSectionsRecursively(tocentry.subEntries);
+ sectionModel.sections = this._buildSectionsRecursively(tocentry.subEntries, sectionModel.numbering);
}else{
- sectionModel.compositeFields = this._buildFormFields(tocentry.subEntries);
+ sectionModel.compositeFields = this._buildFormFields(tocentry.subEntries, sectionModel.numbering);
}
result.push(sectionModel);
@@ -1111,12 +1124,12 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
return result;
}
- private _buildFormFields(tocentries: ToCEntry[]):DatasetDescriptionCompositeFieldEditorModel[]{
+ private _buildFormFields(tocentries: ToCEntry[], parentNumbering: string):DatasetDescriptionCompositeFieldEditorModel[]{
if(!tocentries) return null;
const fieldsets:DatasetDescriptionCompositeFieldEditorModel[] = [];
- tocentries.forEach(fs=>{
+ tocentries.forEach((fs, idx)=>{
const fieldset = new DatasetDescriptionCompositeFieldEditorModel();
@@ -1126,7 +1139,8 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
fieldset.multiplicity = fs.form.get('multiplicity').value;
fieldset.additionalInformation = fs.form.get('additionalInformation').value;
fieldset.ordinal = fs.form.get('ordinal').value;
- fieldset.numbering = fs.numbering;
+ // fieldset.numbering = fs.numbering;
+ fieldset.numbering = parentNumbering+"."+(idx+1);
fieldset.hasCommentField = fs.form.get('hasCommentField').value;
fieldset.title = fs.label;
// fieldset.fields = (fs.form.get('fields') as FormArray).getRawValue();
@@ -1139,6 +1153,7 @@ export class DatasetProfileEditorComponent extends BaseComponent implements OnIn
fieldModel.viewStyle = (field.get('viewStyle') as FormGroup).getRawValue();
// fieldModel.defaultValue = (field.get('defaultValue') as FormGroup).getRawValue();
fieldModel.value = (field.get('defaultValue') as FormGroup).get('value').value;
+ fieldModel.defaultValue = fieldModel.value;
fieldModel.page = field.get('page').value;
fieldModel.validations = field.get('validations').value;
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html
index debdc0551..bc6b9b984 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents-internal-section/table-of-contents-internal-section.html
@@ -16,48 +16,53 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-->
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
index 8c47f497c..c9a1868dc 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/table-of-contents/table-of-contents.html
@@ -11,7 +11,8 @@
(createFooEntry)="createNewEntry($event)"
[parentLink]="{ subEntriesType: tocEntryType.Page, subEntries : links }"
[itemSelected]="itemSelected"
- [viewOnly]="viewOnly">
+ [viewOnly]="viewOnly"
+ >
+
+
+
\ No newline at end of file