Add name attribute for every dataKey

bps-statistics · Aug 10, 2022 · a664f16 · a664f16
1 parent 25b8b21
commit a664f16
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -74,6 +74,7 @@
 		"media": []
 	}
 	```
+- Add name atribut for every dataKey
 
 ### Fixed
 - Fix cannot delete nestedNumber

diff --git a/src/Form.tsx b/src/Form.tsx
@@ -392,9 +392,9 @@ const Form: Component<{
       ) {
         let enableFalse = referenceEnableFalse().findIndex(obj => obj.parentIndex.toString() === element.index.slice(0, -2).toString());
         if (enableFalse == -1){      
-          (element.type == 32 || element.type == 36) && dataMedia.push({ dataKey: element.dataKey, answer: element.answer });
+          (element.type == 32 || element.type == 36) && dataMedia.push({ dataKey: element.dataKey, name: element.name, answer: element.answer });
 
-          dataForm.push({ dataKey: element.dataKey, answer: element.answer })
+          dataForm.push({ dataKey: element.dataKey, name: element.name, answer: element.answer })
 
           // uncomment when media.json implementation is ready for production
           // if(element.type == 32){
@@ -424,6 +424,7 @@ const Form: Component<{
           if (element.principal !== undefined) {
             dataPrincipal.push({
               dataKey: element.dataKey,
+              name: element.name,
               answer: element.answer,
               principal: element.principal,
               columnName: element.columnName

diff --git a/src/FormGear.tsx b/src/FormGear.tsx
@@ -261,6 +261,7 @@ export function FormGear(referenceFetch, templateFetch, presetFetch, responseFet
                       let sideListLen = sideList[j].length;
                       sideList[j][sideListLen] = {
                           dataKey: element[i].dataKey,
+                          name: element[i].name,
                           label: element[i].label,
                           description: element[i].description,
                           level: level,
@@ -277,6 +278,7 @@ export function FormGear(referenceFetch, templateFetch, presetFetch, responseFet
                     nestedList[nestedLen] = []
                     nestedList[nestedLen][0] = {
                         dataKey: element[i].dataKey,
+                        name: element[i].name,
                         label: element[i].label,
                         description: element[i].description,
                         level: level,
@@ -314,6 +316,7 @@ export function FormGear(referenceFetch, templateFetch, presetFetch, responseFet
                   let refListLen = refList[j].length;
                   refList[j][refListLen] = {         
                       dataKey: element[i].dataKey,
+                      name: element[i].name,
                       label: element[i].label,
                       hint: (element[i].hint) ? element[i].hint : '',
                       description: element[i].description !== undefined ? element[i].description : undefined,
@@ -377,6 +380,7 @@ export function FormGear(referenceFetch, templateFetch, presetFetch, responseFet
 
               sideList[j][0] = {
                   dataKey: element[j].dataKey,
+                  name: element[j].name,
                   label: element[j].label,
                   description: element[j].description,
                   level: 0,
@@ -391,6 +395,7 @@ export function FormGear(referenceFetch, templateFetch, presetFetch, responseFet
               // insert section
               refList[j][0] = {         
                 dataKey: element[j].dataKey,
+                name: element[j].name,
                 label: element[j].label,
                 hint: (element[j].hint) ? element[j].hint : '',
                 description: element[j].description !== undefined ? element[j].description : undefined,

diff --git a/src/FormInput.tsx b/src/FormInput.tsx
@@ -15,6 +15,7 @@ import { template, setTemplate, Questionnaire } from './stores/TemplateStore';
 import { locale, setLocale} from './stores/LocaleStore';
 import { useLoaderDispatch } from "./loader/FormLoaderProvider";
 import { referenceEnableFalse, setReferenceEnableFalse } from './stores/ReferenceStore';
+import { media, setMedia } from "./stores/MediaStore";
 
 import dayjs from 'dayjs';
 import Toastify from 'toastify-js'
@@ -61,7 +62,9 @@ const FormInput: FormComponentBase = props => {
 
   const setData = () => {
     const dataForm = [];
+    const dataMedia = [];
     const dataPrincipal = [];
+
     reference.details.forEach((element) => {
       if(
         (element.type > 3)
@@ -70,17 +73,21 @@ const FormInput: FormComponentBase = props => {
         && ( element.answer !== '') 
         && ( element.answer !== null)
       ) {
-        dataForm.push({
-          dataKey: element.dataKey,
-          answer: element.answer
-        })
-        if(element.principal !== undefined){
-          dataPrincipal.push({
-            dataKey: element.dataKey,
-            answer: element.answer,
-            principal: element.principal,
-            columnName: element.columnName
-          })
+        let enableFalse = referenceEnableFalse().findIndex(obj => obj.parentIndex.toString() === element.index.slice(0, -2).toString());
+        if (enableFalse == -1){      
+          (element.type == 32 || element.type == 36) && dataMedia.push({ dataKey: element.dataKey, name: element.name, answer: element.answer });
+
+          dataForm.push({ dataKey: element.dataKey, name: element.name, answer: element.answer })
+
+          if (element.principal !== undefined) {
+            dataPrincipal.push({
+              dataKey: element.dataKey,
+              name: element.name,
+              answer: element.answer,
+              principal: element.principal,
+              columnName: element.columnName
+            })
+          }
         }
       }
     })      

diff --git a/src/GlobalFunction.tsx b/src/GlobalFunction.tsx
@@ -67,6 +67,7 @@ export const createComponent = (dataKey: string, nestedPosition: number, compone
 
     let newComp = JSON.parse(JSON.stringify(components));
     newComp.dataKey = newComp.dataKey + '#' + nestedPosition;
+    newComp.name = newComp.name + '#' + nestedPosition;
 
     let tmp_type = newComp.type;
     newComp.answer = (tmp_type === 21 || tmp_type === 22) ? [{ "label": "lastId#0", "value": 0 }] : newComp.answer ? newComp.answer : ''

diff --git a/src/stores/PresetStore.tsx b/src/stores/PresetStore.tsx
@@ -2,6 +2,7 @@ import { createStore } from "solid-js/store";
 
 type Predata = {
     dataKey: string;
+    name: string
     answer: any;
 }
 

diff --git a/src/stores/PrincipalStore.tsx b/src/stores/PrincipalStore.tsx
@@ -3,6 +3,7 @@ import { Auxiliary } from "./ResponseStore";
 
 type Principal = {
     dataKey: string
+    name: string
     answer: any
     principal: number //start with 1
     columnName: string

diff --git a/src/stores/ReferenceStore.tsx b/src/stores/ReferenceStore.tsx
@@ -12,6 +12,7 @@ export type Validations = {
 
 type Detail = {
     dataKey: string
+    name: string
     label: string
     hint: string
     description: string

diff --git a/src/stores/RemarkStore.tsx b/src/stores/RemarkStore.tsx
@@ -9,6 +9,7 @@ type Comment = {
 
 type Note = {
     dataKey: string
+    name: string
     comments: Comment[]
 }
 

diff --git a/src/stores/ResponseStore.tsx b/src/stores/ResponseStore.tsx
@@ -2,8 +2,9 @@ import { createStore } from "solid-js/store";
 import { Summary } from "./SummaryStore";
 
 export type Answer = {
-    dataKey: string;
-    answer: any;
+    dataKey: string
+    name: string
+    answer: any
 }
 
 export type Auxiliary = {    

diff --git a/src/stores/SidebarStore.tsx b/src/stores/SidebarStore.tsx
@@ -3,6 +3,7 @@ import { Component } from "./TemplateStore";
 
 export type Detail = {
     dataKey: string
+    name: string
     label: string
     description: string
     level: number,

diff --git a/src/stores/TemplateStore.tsx b/src/stores/TemplateStore.tsx
@@ -6,6 +6,7 @@ import { Language } from "./LocaleStore";
 export type Component = {
     label: string
     dataKey: string
+    name: string
     type: string
     currency?: string
     source?: string

diff --git a/src/stores/ValidationStore.tsx b/src/stores/ValidationStore.tsx
@@ -3,6 +3,7 @@ import { Validations } from "./ReferenceStore";
 
 type TestFunction = {
     dataKey: string;
+    name: string
     validations?: Validations[]
     componentValidation?: string[]
 }