zet-lib 1.0.88 → 1.0.90

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",isJSON : false, type:"text,json,date"}]
   const whereArray = obj.whereArray || []
   let increment = 1
   let arr = [],
@@ -61,11 +61,21 @@ 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) {
@@ -79,7 +89,6 @@ const whereFn = (obj) => {
         } else {
           wherequery += `${andOr} ${field} ${item.option} $${increment} ${operator}`
         }
-
         let itemValue = item.value
         if (item.option == '=') {
           itemValue = Util.replaceAll(itemValue, '%', '')

package/lib/zRoute.js

@@ -1104,15 +1104,28 @@ zRoute.selectAllowedField = (req, res, MYMODEL, arr = []) => {
     arr = fixedArr
   }
 
+  let customs = []
+  for (var key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name == 'custom') {
+      customs.push(key)
+    }
+  }
+  if (customs.length > 0) {
+    arr = arr.filter((item) => !customs.includes(item))
+  }
   return arr
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
   let virtuals = []
+  let customs = []
   for (var key in MYMODEL.widgets) {
     if (MYMODEL.widgets[key].name === 'virtual') {
       virtuals.push(key)
     }
+    if (MYMODEL.widgets[key].name === 'custom') {
+      customs.push(key)
+    }
   }
   //check directory for import not export
   const dir = `${dirRoot}/public/excel/tmp`
@@ -1146,6 +1159,7 @@ zRoute.excelQuery = async (req, res, MYMODEL, paramsObject = {}) => {
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
       arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
+      arr = arr.filter((item) => !customs.includes(item))
       select = `"${arr.join('","')}"`
     }
     let whereArray = []
@@ -1182,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 {
@@ -1600,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'])
@@ -1610,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,
       })
     }
   })
@@ -1674,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')) {
@@ -1686,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.88",
+  "version": "1.0.90",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"