zet-lib 1.2.55 → 1.2.57

package/lib/Form.js

@@ -423,6 +423,14 @@ Form.field = (obj) => {
       displayForm += `<textarea   ${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}`
+      break
+
+    case 'array':
+      displayForm += `<textarea   ${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}`
       break

package/lib/Util.js

@@ -1137,6 +1137,18 @@ Util.attributeOptions = (obj = {}, defaultObj = {}) => {
   return html
 }
 
+Util.array_to_jsonb = (arr = []) => {
+  let value = ''
+  let myarr = []
+  if (arr.length > 0) {
+    arr.map((item) => {
+      myarr.push(JSON.stringify(item))
+    })
+  }
+  value = JSON.stringify(myarr).replace('[', '{').replaceAll(']', '}')
+  return value
+}
+
 Util.userAvatar = (img = '') => {
   return img ? (img.includes('http') ? img : `/uploads/user/${img}`) : `/img/user.png`
 }

package/lib/zRoute.js

@@ -295,6 +295,16 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
       case 'numeric':
         post[routeName][key] = val ? val : null
         break
+      case 'json_array':
+        let myval = null
+        if (val) {
+          let myarr = JSON.parse(val) || []
+          if (myarr.length > 0) {
+            myval = Util.array_to_jsonb(myarr)
+          }
+        }
+        post[routeName][key] = myval
+        break
     }
   }
   //check if widget have a tag default null
@@ -896,7 +906,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
           break
 
         case 'datetime':
-          myvalue = Util.timeSql(moment(value).utc(false))
+          myvalue = Util.timeSql(value)
           break
 
         case 'datepicker':
@@ -927,6 +937,10 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
           myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
           break
 
+        case 'json_array':
+          myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
+          break
+
         default:
           value = value || ''
           myvalue = value.length > 50 ? value.substring(0, 50) : value
@@ -1842,6 +1856,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
     const select = Util.selectParser(fields, MYMODEL)
     const asDate = []
     const asJSONb = []
+    const asJSONbArr = []
     for (let key in MYMODEL.widgets) {
       if (MYMODEL.widgets[key].name == 'datetime') {
         asDate.push(key)
@@ -1855,6 +1870,9 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
       if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
         asJSONb.push(key)
       }
+      if (MYMODEL.widgets[key].name == 'json_array') {
+        asJSONbArr.push(key)
+      }
     }
     let whereArray = []
     const columns = body.columns
@@ -1875,6 +1893,9 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         if (asJSONb.includes(fields[item.data])) {
           astype = 'jsonb'
         }
+        if (asJSONbArr.includes(fields[item.data])) {
+          astype = 'json_array'
+        }
         if (astype === 'jsonb') {
           whereArray.push({
             field: fields[item.data],
@@ -1883,6 +1904,14 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
             operator: 'AND',
             type: 'inline',
           })
+        } else if (astype === 'json_array') {
+          whereArray.push({
+            field: '',
+            option: '',
+            value: ` ${fields[item.data]}::text ILIKE  '${item.search.value}' `,
+            operator: 'AND',
+            type: 'inline',
+          })
         } else {
           whereArray.push({
             field: fields[item.data],
@@ -2099,8 +2128,8 @@ zRoute.formUser = (relations = {}, data = {}) => {
     if (relations.hasOwnProperty('created_byObject')) {
       obj.created_by = relations.created_byObject[data['created_by']]
       obj.updated_by = relations.updated_byObject[data['updated_by']]
-      obj.created_at = Util.timeSql(moment(data['created_at']).utc(false))
-      obj.updated_at = Util.timeSql(moment(data['updated_at']).utc(false))
+      obj.created_at = Util.timeSql(data['created_at'])
+      obj.updated_at = Util.timeSql(data['updated_at'])
     }
   }
   obj.isUser = isUser
@@ -2346,6 +2375,12 @@ zRoute.forms = (req, res, MYMODEL, relations, data = {}) => {
           obj.type = 'json'
           obj.data = relations[key]
           break
+        case 'json_array':
+          obj.type = 'json_array'
+          break
+        case 'array':
+          obj.type = 'array'
+          break
         case 'virtual':
           obj.type = 'virtual'
           break

package/package.json

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