From 584a2521198e9561db86ae328ced93ad163c3eb9 Mon Sep 17 00:00:00 2001
From: annabakouli <annabakouli@gmail.com>
Date: Wed, 6 Dec 2017 12:41:11 +0200
Subject: [PATCH] no message

---
 dmp-frontend/src/app/form/dynamic-form.component.ts       | 5 +----
 .../tableOfContents/base-table-of-content.component.ts    | 8 ++++++--
 dmp-frontend/src/app/models/CompositeField.ts             | 7 +++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index fa82fee99..c5e130a81 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -68,7 +68,7 @@ export class DynamicFormComponent implements OnInit {
 
   private progressbar:boolean = false;
 
-
+  private fragment:string;
   constructor(private qcs: FieldControlService, private serverService: ServerService, private router: Router, private pdfService: PDFService,
     private _location: Location, private route: ActivatedRoute, private pagerService: PaginationService, private tokenService: TokenService, private visibilityRulesService: VisibilityRulesService) {
       this.datasetId = route.snapshot.params['id'];
@@ -80,8 +80,6 @@ export class DynamicFormComponent implements OnInit {
 
 
   ngOnInit() {
-    //this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(new DatasetModel(), DatasetModel);
-    //this.form = this.dataModel.buildForm();
 
     this.stepperItems = [{
       label: 'Personal',
@@ -109,7 +107,6 @@ export class DynamicFormComponent implements OnInit {
   }
 ];
 
-
       this.serverService.getDmp(this.datasetId).subscribe(
         response => {
           this.dataModel = new JsonSerializer<DatasetModel>().fromJSONObject(response, DatasetModel);
diff --git a/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts b/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
index a4304868a..2bace6c66 100644
--- a/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
+++ b/dmp-frontend/src/app/form/tableOfContents/base-table-of-content.component.ts
@@ -1,9 +1,13 @@
 import { ActivatedRouteSnapshot,Router,ActivatedRoute } from '@angular/router';
 
 export class BaseTableOfContent{
-    constructor(public router: Router,public route:ActivatedRoute){}
+    constructor(public router: Router,public route:ActivatedRoute){
+        this.route.fragment.subscribe((fragment: string) => {
+            if(fragment)document.querySelector('#' + fragment).scrollIntoView();            
+        })
+    }
     
     scrollToId(elementId) {
       this.router.navigate([this.route.snapshot.url[0]+"/"+this.route.snapshot.url[1]], { fragment: elementId });    
-    } 
+    }   
 }
\ No newline at end of file
diff --git a/dmp-frontend/src/app/models/CompositeField.ts b/dmp-frontend/src/app/models/CompositeField.ts
index 4de8a6122..6362821f3 100644
--- a/dmp-frontend/src/app/models/CompositeField.ts
+++ b/dmp-frontend/src/app/models/CompositeField.ts
@@ -5,16 +5,19 @@ import { BaseModel } from './BaseModel';
 import {Field} from './Field' 
 export class CompositeField extends BaseModel implements Serializable<CompositeField> {
     public fields:Array<Field> = new Array<Field>();
-    
+    public ordinal:number
 
     fromJSONObject(item:any):CompositeField{
         
         this.fields = new JsonSerializer<Field>().fromJSONArray(item.fields,Field);
+        this.ordinal = item.ordinal;
         return this;
     }
 
     buildForm():FormGroup{
-        let formGroup = this.formBuilder.group({});
+        let formGroup = this.formBuilder.group({
+            ordinal:this.ordinal
+        });
 
         let fieldsFormArray = new Array<FormGroup>();        
         this.fields.forEach(item => {