From 2c45254e53010a37b4323bbacce738a0b7963d6e Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Thu, 16 Nov 2017 11:46:31 +0200
Subject: [PATCH] fieldset with multiplicity

---
 .../src/app/datasets/dataset.component.ts     |  4 ++
 .../app/services/dataModelBuilder.service.ts  | 42 ++++++++++---------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/dmp-frontend/src/app/datasets/dataset.component.ts b/dmp-frontend/src/app/datasets/dataset.component.ts
index bfef384a2..fd8746660 100644
--- a/dmp-frontend/src/app/datasets/dataset.component.ts
+++ b/dmp-frontend/src/app/datasets/dataset.component.ts
@@ -159,6 +159,7 @@ export class DatasetsComponent implements OnInit {
   }
 
   getDatasets(muted?: boolean){
+    this.spinnerService.show();
     this.serverService.getDatasetForDmp({ "id": this.dmpIdforDatasets }).subscribe(
       response => {
         this.tableData = response;
@@ -167,6 +168,9 @@ export class DatasetsComponent implements OnInit {
       },
       error => {
         simple_notifier("danger",null,"Could not update datasets table");
+      },
+      () =>{
+        this.spinnerService.hide();
       }
     );
   }
diff --git a/dmp-frontend/src/app/services/dataModelBuilder.service.ts b/dmp-frontend/src/app/services/dataModelBuilder.service.ts
index 74f8a1578..734c25ea0 100644
--- a/dmp-frontend/src/app/services/dataModelBuilder.service.ts
+++ b/dmp-frontend/src/app/services/dataModelBuilder.service.ts
@@ -181,26 +181,28 @@ export class dataModelBuilder {
                     } else {
                         //this.dataModel.fields.push(field);
                     }
-                    if (dataValues[fieldGroup._id][field.key] != undefined){
-                        let keys = new Array<string>();
-                        Object.keys(dataValues[fieldGroup._id]).forEach(key=>{if(key.startsWith(field.key+"_"))keys.push(key)})
-                        if (keys.length)
-                            if (field.controlType == "textbox") {
-                                let newfield: FieldBase<any>;
-                                let rule = new Rule();
-                                newfield = new TextboxField({
-                                    label: field.label+"_"+ 1,
-                                    key: keys[0],
-                                    value: dataValues[fieldGroup._id][keys[0]].value,
-                                    order: field.order,
-                                    rules: field.rules,
-                                    visible: field.visible,
-                                    group: field.group,
-                                    description: field.description
-                                });debugger;
-                                newfldGroup.groupFields.push(newfield);
-                            }
-                    }
+                    //TO DO FIELDSET WITH MULTIPLICITY
+                    // if (dataValues != "")
+                    //     if (dataValues[fieldGroup._id][field.key] != undefined){
+                    //         let keys = new Array<string>();
+                    //         Object.keys(dataValues[fieldGroup._id]).forEach(key=>{if(key.startsWith(field.key+"_"))keys.push(key)})
+                    //         if (keys.length)
+                    //             if (field.controlType == "textbox") {
+                    //                 let newfield: FieldBase<any>;
+                    //                 let rule = new Rule();
+                    //                 newfield = new TextboxField({
+                    //                     label: field.label+"_"+ 1,
+                    //                     key: keys[0],
+                    //                     value: dataValues[fieldGroup._id][keys[0]].value,
+                    //                     order: field.order,
+                    //                     rules: field.rules,
+                    //                     visible: field.visible,
+                    //                     group: field.group,
+                    //                     description: field.description
+                    //                 });debugger;
+                    //                 newfldGroup.groupFields.push(newfield);
+                    //             }
+                    //     }