Fix export data acquisition

eapp/modules/data-collection/js/dc-form-2.js

@@ -104,7 +104,7 @@ $('#btn-subjDCSave').click(function(e){
     for (let i=0; i< subjectDataCollection.length; i++) {
         if (subjectDataCollection[i]['status'] !== 'completed') {
             console.log("subject" + i + "data---" , subjectDataCollection[i]['status'])
-            saveDCFormData(e, subjectDataCollection[i])
+            saveDCFormData(e, subjectDataCollection[i]) // save non-complete tasks
         }
     }
     window.location.href = serverURL+"/data-collection/html/dc-list.html"

eapp/modules/instrument-editor/js/ie.js

@@ -132,7 +132,7 @@ function setTerm(schema, key, field,position){
     term['filterElement'] = termsIndex[termId].filterElement
     term['position'] = termsIndex[termId].position
     term['dataElementId'] = termsIndex[termId].dataElementId
-    term['name'] = key
+    term['name'] = field.label
     term['type'] = termsIndex[termId].type
     term['renderType'] = field.type
     term['size'] = termsIndex[termId].size
@@ -161,9 +161,9 @@ function setTerm(schema, key, field,position){
     term['position'] = position
     term['dataElementId'] = position
     if(field.hasOwnProperty('name')){
-      term['name'] = field.name
+      term['name'] = field.label
     }else{
-      term['name'] = termId
+      term['name'] = field.label
     }
     term['description'] = field.label
     if(schema.properties[key].enum === undefined){

eapp/modules/nda-editor/js/form-builder.js

@@ -680,6 +680,7 @@ var setup = function(){
         else if (parentField.getType() === "object")
         {
             itemKey = "new" + new Date().getTime();
+            console.log(" --this is the culprit key ---",itemKey)
         }
 
         var insertAfterId = null;