zet-lib 1.2.114 → 1.2.115

package/lib/Form.js

@@ -79,6 +79,7 @@ Form.field = (obj) => {
     form_css = !obj.form_css ? 'bootstrap' : obj.form_css,
     attributes = !obj.attributes ? {} : obj.attributes,
     style = !obj.style ? '' : ` style=${obj.style} `,
+    additional_attributes = !obj.additional_attributes ? '' : obj.additional_attributes,
     information = !obj.information ? '' : `<div id="information-${obj.id}" class="form-text">${Util.replaceAll(obj.information.substring(1, obj.information.length - 1), '\r\n', '<br>')}</div>`
   //replaceAll("\r\n","<br>")
   let attributeDate = ''
@@ -109,12 +110,12 @@ Form.field = (obj) => {
     selects = ''
   switch (type) {
     case 'text':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" ${disabled} ${readonly} autofocus="" ${tabindex}  type="${type}" ${classview}  ${id} ${name} ${placeholder}  ${style}    ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" ${disabled} ${readonly} autofocus="" ${tabindex} ${additional_attributes}  type="${type}" ${classview}  ${id} ${name} ${placeholder}  ${style}    ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break
 
     case 'checkbox':
       checked = value == 1 ? 'checked' : ''
-      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${tabindex} ${disabled} ${readonly}  ${style}  type="checkbox" class="form-check-input ${obj.class}"  ${id} ${name}  ${checked}  ${htmlOptions}>${information}${append}`
+      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${tabindex} ${disabled} ${readonly}  ${additional_attributes}   ${style}  type="checkbox" class="form-check-input ${obj.class}"  ${id} ${name}  ${checked}  ${htmlOptions}>${information}${append}`
       break
 
     case 'tags':
@@ -131,7 +132,7 @@ Form.field = (obj) => {
           datahtml += `<option value="${item}" selected="selected">${item}</option>`
         })
       }
-      displayForm = `${prepend}<select ${classview} ${id} ${name} ${placeholder}  multiple data-allow-new="true">${datahtml}</select>${information}${append}`
+      displayForm = `${prepend}<select ${classview} ${id} ${name}  ${additional_attributes}   ${placeholder}  multiple data-allow-new="true">${datahtml}</select>${information}${append}`
       break
 
     case 'range':
@@ -141,11 +142,11 @@ Form.field = (obj) => {
       break
 
     case 'hidden':
-      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${tabindex}  type="${type}"  ${style}  ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${append}`
+      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${tabindex}  type="${type}"   ${additional_attributes}   ${style}  ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${append}`
       break
 
     case 'textarea':
-      displayForm = `${prepend}${inputGroupLeft}<textarea ${tabindex} ${disabled} ${classview} ${id} ${name} ${placeholder}  ${readonly}   ${style}  ${htmlOptions}  rows="4">${value}</textarea>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<textarea ${tabindex} ${disabled} ${classview} ${id} ${name}  ${additional_attributes}   ${placeholder}  ${readonly}   ${style}  ${htmlOptions}  rows="4">${value}</textarea>${inputGroupRight}${information}${append}`
       break
 
     case 'image':
@@ -171,32 +172,32 @@ Form.field = (obj) => {
       break
 
     case 'email':
-      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${readonly} ${disabled}  ${tabindex}  ${style}  type="email" ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${information}${append}`
+      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${readonly} ${disabled}  ${additional_attributes} ${tabindex}  ${style}  type="email" ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${information}${append}`
       break
 
     case 'number':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}   ${tabindex}  ${style}  type="text" class="form-control number ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}    ${tabindex}  ${style}  type="text" class="form-control number ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break
 
     case 'integer':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}   ${tabindex}  ${style}  type="number" class="form-control  ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}   ${tabindex}  ${style}  type="number" class="form-control  ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break
 
     case 'datepicker':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}   ${tabindex}  ${style}  type="text"  class="form-control datepicker ${obj.class}"  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}    ${tabindex}  ${style}  type="text"  class="form-control datepicker ${obj.class}"  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break
 
     case 'datetimepicker':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}   ${tabindex}  type="text"  ${style}  class="form-control datetimepicker ${obj.class}"  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}    ${tabindex}  type="text"  ${style}  class="form-control datetimepicker ${obj.class}"  ${id} ${name} ${placeholder}   ${required} value="${value}" data-t="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`
       break
 
     case 'password':
-      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}  ${tabindex}  ${style}  type="password" ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}><span toggle="#password" class="bx bi-eye field-icon toggle-password"></span>${inputGroupRight}${information}${append}`
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly}  ${additional_attributes}   ${tabindex}  ${style}  type="password" ${classview}  ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}><span toggle="#password" class="bx bi-eye field-icon toggle-password"></span>${inputGroupRight}${information}${append}`
       break
 
     case 'switch':
       checked = value == 1 ? ' checked ' : ''
-      displayForm = `${prepend}<p><input ${tabindex} type="checkbox" ${classview} ${readonly}  ${style}  ${id} ${name} ${checked} ></p>${information}${append}`
+      displayForm = `${prepend}<p><input ${tabindex} type="checkbox" ${classview} ${readonly}  ${style}  ${id}  ${additional_attributes}   ${name} ${checked} ></p>${information}${append}`
       break
 
     case 'lexical':
@@ -205,7 +206,7 @@ Form.field = (obj) => {
 
     case 'checkbox':
       checked = value == 1 ? ' checked ' : ''
-      displayForm = `${prepend}<input  ${tabindex}  type="${type}" ${classview}   ${readonly}   ${style}  ${id} ${name} ${checked} >${information}${append}`
+      displayForm = `${prepend}<input ${tabindex} type="${type}" ${classview}   ${readonly}   ${style} ${id} ${additional_attributes}   ${name} ${checked} >${information}${append}`
       break
 
     case 'dropdown_checkbox':
@@ -273,7 +274,7 @@ Form.field = (obj) => {
       if (form_css == 'material_design') {
         classview = Form.addProperty('class', ['selectpicker', obj.class])
       }
-      displayForm = `${prepend}<select ${tabindex}  ${style} ${disabled}  ${readonly}  class="form-control form-select ${obj.class}"  ${id} ${name} ${placeholder} ${required} ${htmlOptions} >${selects}</select>${information}${append}`
+      displayForm = `${prepend}<select ${tabindex}  ${style}  ${additional_attributes}  ${disabled}  ${readonly} class="form-control form-select ${obj.class}"  ${id} ${name} ${placeholder} ${required} ${htmlOptions} >${selects}</select>${information}${append}`
       break
 
     case 'radio':
@@ -283,7 +284,7 @@ Form.field = (obj) => {
         //var selected = item.value == value ? ' selected ' : '';
         const checked = item.value == value ? ' checked ' : ''
         radios += `<div class="form-check">
-                        <input class="form-check-input" type="radio" name="${obj.name}" value="${item.value}" id="${obj.id}${index}" ${checked}>
+                        <input class="form-check-input" type="radio" name="${obj.name}"  ${additional_attributes} value="${item.value}" id="${obj.id}${index}" ${checked}>
                           <label class="form-check-label" for="${obj.id}${index}">
                             ${item.label}
                           </label>
@@ -366,7 +367,7 @@ Form.field = (obj) => {
 
     case 'table':
       let html = ''
-      /*console.log(`table : ${obj.data}`)
+      /*console.log(`table : ${JSON.stringify(obj.data)}`)
             console.log(JSON.stringify(obj.data))
             console.log(JSON.stringify(obj.properties));*/
       for (let key in obj.data) {
@@ -399,7 +400,7 @@ Form.field = (obj) => {
                                     ${obj.btnAdd}
                                 </tr>
                             </thead>
-                            <tbody id="body-${obj.id}"  data-value='${datavalue}'>${obj.table}</tbody>
+                            <tbody id="body-${obj.id}"  data-value='${datavalue}'>${obj.bodyTable}</tbody>
                         </table></div>`
       displayForm = Form.card(frameworkcss, obj)
       break
@@ -416,23 +417,23 @@ Form.field = (obj) => {
 
     case 'ide_editor':
       displayForm = `<div class="ide_editor" id="editor_${obj.id}"></div>`
-      displayForm += `<textarea hidden  ${classview} ${id} ${name} ${placeholder}   ${readonly}   ${style}  ${htmlOptions}  rows="4"></textarea>${information}${append}`
+      displayForm += `<textarea hidden  ${classview} ${id} ${name} ${placeholder} ${readonly} ${style} ${htmlOptions}  rows="4"></textarea>${information}${append}`
       break
 
     case 'json':
-      displayForm += `<textarea   ${classview} ${id} ${name} ${placeholder}  ${readonly}   ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
+      displayForm += `<textarea  ${additional_attributes} ${classview} ${id} ${name} ${placeholder} ${readonly} ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
       break
 
     case 'json_array':
-      displayForm += `<textarea   ${classview} ${id} ${name} ${placeholder}  ${readonly}   ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
+      displayForm += `<textarea  ${additional_attributes} ${classview} ${id} ${name} ${placeholder}  ${readonly} ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
       break
 
     case 'array':
-      displayForm += `<textarea   ${classview} ${id} ${name} ${placeholder}  ${readonly}   ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
+      displayForm += `<textarea  ${additional_attributes} ${classview} ${id} ${name} ${placeholder} ${readonly} ${style}  ${htmlOptions}  rows="4">${JSON.stringify(obj.value)}</textarea>${information}${append}`
       break
 
     case 'virtual':
-      displayForm = `${prepend}<input autocomplete="off" autofocus=""  ${tabindex}  ${style}  type="text" ${classview} readonly ${id}  ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${information}${append}`
+      displayForm = `${prepend}<input  ${additional_attributes} autocomplete="off" autofocus="" ${tabindex} ${style} type="text" ${classview} readonly ${id}  ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${information}${append}`
       break
 
     //additionals for form view in view

package/lib/zRoute.js

@@ -2250,7 +2250,14 @@ zRoute.formField = (req, res, MYMODEL, relations, data = {}) => {
 
 zRoute.formsFieldSync = async (req, res, MYMODEL, data = {}) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
-  let forms = zRoute.forms(req, res, MYMODEL, relations, data)
+  let tableRelations = {}
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'table') {
+      tableRelations[key] = await zRoute.relations(req, res, MYMODEL.widgets[key].table)
+      //console.log("tabelrelations", JSON.stringify(tableRelations[key]))
+    }
+  }
+  let forms = zRoute.forms(req, res, MYMODEL, relations, data, tableRelations)
   let obj = forms.obj
   for (let key in obj) {
     forms.build[key] = cForm.build(obj[key])
@@ -2269,8 +2276,9 @@ zRoute.formFieldSync = async (req, res, MYMODEL, relations, data = {}) => {
   return forms
 }
 
-zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
+zRoute.forms = (req, res, MYMODEL, relations, data = {}, tableRelations = {}) => {
   relations = relations || {}
+  let MYMODELS = zRoute.MYMODELS()
   let fields = MYMODEL.fields
   let dropdowns = MYMODEL.dropdowns || {}
   let modules = MYMODEL.modules || {}
@@ -2498,7 +2506,11 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
         case 'table':
           obj.type = 'table'
           obj.data = relations[key]
+          //console.log(obj.data)
           obj.properties = relations[`properties_${key}`]
+          //console.log(obj.properties)
+          //(req, res, relations, dataObject, parentTable, fieldName, MYMODEL, datas = [])
+          obj.bodyTable = zRoute.tableBody(req, res, tableRelations[key], obj.data, MYMODEL.table, key, MYMODELS[MYMODEL.widgets[key].table], obj.value)
           break
         case 'multi_line_editor':
           obj.type = 'multi_line_editor'
@@ -3578,12 +3590,12 @@ $("#body-${keys}>tr").each(function (index, tr) {
         }
         `
 
-        scriptForm += ` $(function () {
+        /*  scriptForm += ` $(function () {
 var ${keys} = $("#body-${keys}").data("value") ? $("#body-${keys}").data("value") : [];
 ${keys}.forEach(function (myobj, index) {
   build${keys}form(index, myobj);
   });  
-});${Util.newLine}`
+});${Util.newLine}`*/
 
         break
 
@@ -4435,6 +4447,7 @@ zRoute.typeahead = async (req, res) => {
   let json = myCache.get(name)
   res.json(json)
 }
+
 zRoute.typeaheadpost = async (req, res) => {
   let table = req.params.table
   let keys = req.params.field
@@ -4561,4 +4574,34 @@ zRoute.history = async (req, res, relations, id, MYMODEL, users, results = []) =
   }
   return html
 }
+
+zRoute.tableBody = (req, res, relations, dataObject, parentTable, fieldName, MYMODEL, datas = []) => {
+  let html = ''
+  try {
+    if (datas.length > 0) {
+      datas.map((data, index) => {
+        let forms = zRoute.forms(req, res, MYMODEL, relations, data)
+        let obj = forms.obj
+        if (index == 0) {
+          //zRoute.moduleLib(req, res, MYMODEL, relations, forms);
+        }
+        html += `<tr data-id="${index}" data-name="${parentTable}[${fieldName}]">`
+        for (let key in dataObject) {
+          let myobj = obj[key]
+          myobj.value = data[key]
+          myobj.class = `${parentTable}_${fieldName}_${key}`
+          myobj.name = `ztest_aja[${fieldName}][${index}][${key}]`
+          myobj.additional_attributes = ` data-name="${key}"  data-id="${parentTable}_${fieldName}_${key}" `
+          html += `<td class="td_${key}_${MYMODEL.table}">${cForm.field(myobj)}</td>`
+        }
+        html += `<td style="vertical-align:top"><span class="icon-small icons-danger trash_${fieldName}_${MYMODEL.table}" onclick="$(this).closest('tr').remove()" title="Delete"><img class="icons-bg-white griddelete icon-image" src="/assets/icons/trash-filled.svg"></span></td>`
+        html += `</tr>`
+      })
+    }
+    return html
+  } catch (e) {
+    console.log(e)
+  }
+  return html
+}
 module.exports = zRoute

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.114",
+  "version": "1.2.115",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"