zet-lib 1.0.89 → 1.0.91

package/lib/connection.js

@@ -48,7 +48,7 @@ const orderByFn = (obj) => {
 
 const whereFn = (obj) => {
   const where = obj.where || {}
-  //[{field:"your_field",option:"=>",value:"12",operator:"AND",isJSON : false}]
+  //[{field:"your_field",option:"=>",value:"12",operator:"AND",type:"text,json,date"}]
   const whereArray = obj.whereArray || []
   let increment = 1
   let arr = [],
@@ -61,30 +61,43 @@ const whereFn = (obj) => {
   wherequery = arr.length ? wherequery.join(' AND ') : ''
   if (whereArray.length) {
     let andOr = wherequery ? ' AND ' : ''
-    whereArray.forEach((item, index) => {
-      if (index > 0) andOr = ''
+    whereArray.map((item, index) => {
+      let type = !item.type ? 'text' : item.type
+      if (index > 0) {
+        andOr = ''
+      }
       let operator = !item.operator ? ' AND ' : item.operator
-      if (index == whereArray.length - 1) operator = ''
-      const field = item.field.indexOf('.') > -1 ? item.field : ` "${item.field}" `
+      if (index == whereArray.length - 1) {
+        operator = ''
+      }
+      let fields = ''
+      if (type == 'date') {
+        field = item.field.indexOf('.') > -1 ? item.field + '::text ' : ` ${item.field}::text `
+      } else {
+        field = item.field.indexOf('.') > -1 ? item.field : ` "${item.field}" `
+      }
       //is JSON is field is JSON
       //JSON_CONTAINS(color, '"Red"' ,'$')
       if (item.isJSON) {
         wherequery += andOr + ` JSON_CONTAINS(${field}, '"${item.value}"' ,'$')  ${operator}`
       } else {
-        if (item.option.includes('{{value}}')) {
-          item.option = item.option.replace('{{value}}', `$${increment}`)
-          wherequery += `${andOr} ${field} ${item.option} ${operator}`
-        } else if (item.option.includes('$')) {
-          wherequery += `${andOr} ${field} ${item.option} ${operator}`
+        if (type == 'json') {
+          wherequery += andOr + ` JSON_CONTAINS(${field}, '"${item.value}"' ,'$')  ${operator}`
         } else {
-          wherequery += `${andOr} ${field} ${item.option} $${increment} ${operator}`
-        }
-
-        let itemValue = item.value
-        if (item.option == '=') {
-          itemValue = Util.replaceAll(itemValue, '%', '')
+          if (item.option.includes('{{value}}')) {
+            item.option = item.option.replace('{{value}}', `$${increment}`)
+            wherequery += `${andOr} ${field} ${item.option} ${operator}`
+          } else if (item.option.includes('$')) {
+            wherequery += `${andOr} ${field} ${item.option} ${operator}`
+          } else {
+            wherequery += `${andOr} ${field} ${item.option} $${increment} ${operator}`
+          }
+          let itemValue = item.value
+          if (item.option == '=') {
+            itemValue = Util.replaceAll(itemValue, '%', '')
+          }
+          arr.push(itemValue)
         }
-        arr.push(itemValue)
       }
       increment++
     })
@@ -101,7 +114,7 @@ const whereFn = (obj) => {
 connection.results = async (obj) => {
   const select = obj.select || '*'
   const table = obj.table || ''
-  //[{field:"your_field",option:"=>",value:"12",operator:"AND",isJSON : false}]
+  //[{field:"your_field",option:"=>",value:"12",operator:"AND",type:"text,json,date"}]
   const statement = obj.statement || ''
   const limit = obj.limit ? ` LIMIT ${obj.limit} ` : ''
   const offset = obj.hasOwnProperty('offset') ? ` OFFSET ${obj.offset} ` : obj.limit ? 'OFFSET 0' : ''

package/lib/zRoute.js

@@ -1196,6 +1196,9 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
     if (!zall) {
       obj.limit = body.length
       obj.offset = body.start
+    } else {
+      obj.limit = 50000
+      obj.offset = 0
     }
     rows = await connection.results(obj)
   } else {
@@ -1614,6 +1617,15 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectParser(fields, MYMODEL)
   const columns = Object.prototype.hasOwnProperty.call(objData, 'columns') ? objData.columns : body.columns
+  const asDate = []
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'datetime') {
+      asDate.push(key)
+    }
+    if (MYMODEL.widgets[key].name == 'datepicker') {
+      asDate.push(key)
+    }
+  }
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
     whereArray.push(objData['whereArray'])
@@ -1624,13 +1636,19 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
     value: res.locals.companyId,
     operator: 'AND',
   })
+
   columns.forEach(function (item) {
     if (item.search.value) {
+      let astype = 'text'
+      if (asDate.includes(fields[item.data])) {
+        astype = 'date'
+      }
       whereArray.push({
         field: fields[item.data],
         option: MYMODEL.options[fields[item.data]],
         value: item.search.value,
         operator: 'AND',
+        type: astype,
       })
     }
   })
@@ -1688,6 +1706,15 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const body = req.body
   const fields = body.fields
   const select = Util.selectParser(fields, MYMODEL)
+  const asDate = []
+  for (let key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'datetime') {
+      asDate.push(key)
+    }
+    if (MYMODEL.widgets[key].name == 'datepicker') {
+      asDate.push(key)
+    }
+  }
   let whereArray = []
   const columns = body.columns
   if (MYMODEL.keys.includes('company_id')) {
@@ -1700,11 +1727,16 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   }
   columns.forEach(function (item) {
     if (item.search.value) {
+      let astype = 'text'
+      if (asDate.includes(fields[item.data])) {
+        astype = 'date'
+      }
       whereArray.push({
         field: fields[item.data],
         option: MYMODEL.options[fields[item.data]],
         value: item.search.value,
         operator: 'AND',
+        type: astype,
       })
     }
   })

package/package.json

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