zet-lib 1.2.6 → 1.2.8

package/lib/connection.js

@@ -94,20 +94,21 @@ const whereFn = (obj) => {
           if (item.option.includes('{{value}}')) {
             item.option = item.option.replace('{{value}}', `$${increment}`)
             wherequery += `${andOr} ${field} ${item.option} ${operator}`
+            increment++
           } else if (item.option.includes('$')) {
             wherequery += `${andOr} ${field} ${item.option} ${operator}`
+            increment++
           } else {
             wherequery += `${andOr} ${field} ${item.option} $${increment} ${operator}`
+            increment++
           }
           let itemValue = item.value
           if (item.option == '=') {
             itemValue = Util.replaceAll(itemValue + '', '%', '')
           }
-
           arr.push(itemValue)
         }
       }
-      increment++
     })
     //console.log(arr)
   }

package/lib/zRoute.js

@@ -1437,131 +1437,135 @@ zRoute.excel = async (req, res, MYMODEL, fields, rows, callback, fileName) => {
 
 //for pdf
 zRoute.pdf = async (req, res, MYMODEL, fields, rows, callback) => {
-  io.to(res.locals.token).emit('message', 'Please wait, compiling..')
-  callback = callback || function () {}
-  let labels = MYMODEL.labels
-  let html = ``
-  html += `<h2>${MYMODEL.title}</h2>`
-  html += `<br>`
-  html += `<div class="container">`
-  html += `<table class="table">`
-  html += `<thead><tr>`
-  for (var i = 0; i < fields.length; i++) {
-    html += `<td>${labels[fields[i]]}</td>`
-  }
-  html += `</tr></thead>`
-  //check relations
-  let isRelations = false
-  let relations = [],
-    tableObj = {},
-    obj = {},
-    dropdowns = [],
-    passwords = []
-  let usersObj = await zRoute.getUsers()
-  if (Object.prototype.hasOwnProperty.call(MYMODEL, 'widgets')) {
-    for (let key in MYMODEL.widgets) {
-      let widget = MYMODEL.widgets[key]
-      if (widget.name == 'password') {
-        passwords.push(key)
-      } else if (widget.name == 'select') {
-        tableObj[key] = widget.fields
-      } else if (widget.name == 'switch') {
-        tableObj[key] = widget.fields
-      } else if (widget.name == 'relation') {
-        const rowsarr = await connection.results({
-          table: widget.table,
-          select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
-        })
-        //save to object
-        relations[key] = Util.arrayToObject(rowsarr, 'id')
+  try {
+    io.to(res.locals.token).emit('message', 'Please wait, compiling..')
+    callback = callback || function () {}
+    let labels = MYMODEL.labels
+    let html = ``
+    html += `<h2>${MYMODEL.title}</h2>`
+    html += `<br>`
+    html += `<div class="container">`
+    html += `<table class="table">`
+    html += `<thead><tr>`
+    for (var i = 0; i < fields.length; i++) {
+      html += `<td>${labels[fields[i]]}</td>`
+    }
+    html += `</tr></thead>`
+    //check relations
+    let isRelations = false
+    let relations = [],
+      tableObj = {},
+      obj = {},
+      dropdowns = [],
+      passwords = []
+    let usersObj = await zRoute.getUsers()
+    if (Object.prototype.hasOwnProperty.call(MYMODEL, 'widgets')) {
+      for (let key in MYMODEL.widgets) {
+        let widget = MYMODEL.widgets[key]
+        if (widget.name == 'password') {
+          passwords.push(key)
+        } else if (widget.name == 'select') {
+          tableObj[key] = widget.fields
+        } else if (widget.name == 'switch') {
+          tableObj[key] = widget.fields
+        } else if (widget.name == 'relation') {
+          const rowsarr = await connection.results({
+            table: widget.table,
+            select: widget.fields[0] + ',' + widget.fields[1] + ' as zname ',
+          })
+          //save to object
+          relations[key] = Util.arrayToObject(rowsarr, 'id')
+        }
       }
     }
-  }
-  html += `<tbody>`
-  rows.forEach(function (result) {
-    html += `<tr>`
-    fields.forEach((field, i) => {
-      var t
-      if (field == 'company_id') {
-        t = !callback(result, field) ? result.company_id : callback(result, field)
-      } else if (field == 'created_at' || field == 'created_at') {
-        t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
-      } else if (field == 'updated_at' || field == 'updated_at') {
-        t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
-      } else if (Util.in_array(field, ['created_by', 'updated_by'])) {
-        t = !callback(result, field) ? usersObj[result[field]] : callback(result, field)
-      } else {
-        // callback will call if you have
-        if (Util.in_array(field, relations)) {
-          const objectData = tableObj[field] || {}
-          if (!callback(result, field)) {
-            if (result[field] && Object.hasOwn(objectData[result[field]], 'zname')) {
-              t = objectData[result[field]]['zname']
+    html += `<tbody>`
+    rows.forEach(function (result) {
+      html += `<tr>`
+      fields.forEach((field, i) => {
+        var t
+        if (field == 'company_id') {
+          t = !callback(result, field) ? result.company_id : callback(result, field)
+        } else if (field == 'created_at' || field == 'created_at') {
+          t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
+        } else if (field == 'updated_at' || field == 'updated_at') {
+          t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
+        } else if (Util.in_array(field, ['created_by', 'updated_by'])) {
+          t = !callback(result, field) ? usersObj[result[field]] : callback(result, field)
+        } else {
+          // callback will call if you have
+          if (Util.in_array(field, relations)) {
+            const objectData = tableObj[field] || {}
+            if (!callback(result, field)) {
+              if (result[field] && Object.hasOwn(objectData[result[field]], 'zname')) {
+                t = objectData[result[field]]['zname']
+              } else {
+                t = result[field]
+              }
             } else {
-              t = result[field]
+              t = callback(result, field)
+            }
+          } else if (Util.in_array(field, dropdowns)) {
+            t = !callback(result, field) ? MYMODEL.dropdowns[field].fields[result[field]] : callback(result, field)
+          } else if (Util.in_array(field, passwords)) {
+            t = 'xxxxxx'
+          } else if (MYMODEL.widgets[field].name == 'select') {
+            t = !callback(result, field) ? (Object.hasOwn(tableObj[field], result[field]) ? tableObj[field][result[field]] : result[field]) : callback(result, field)
+          } else if (MYMODEL.widgets[field].name == 'datetime') {
+            t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
+          } else if (MYMODEL.widgets[field].name == 'datepicker') {
+            t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field)
+          } else if (MYMODEL.widgets[field].name == 'switch') {
+            t = !callback(result, field) ? tableObj[field][result[field]] || '' : callback(result, field)
+          } else if (MYMODEL.widgets[field].name == 'relation') {
+            if (relations[field][result[field]]) {
+              t = !callback(result, field) ? relations[field][result[field]].zname || '' : callback(result, field)
             }
           } else {
-            t = callback(result, field)
+            t = !callback(result, field) ? result[field] || '' : callback(result, field)
           }
-        } else if (Util.in_array(field, dropdowns)) {
-          t = !callback(result, field) ? MYMODEL.dropdowns[field].fields[result[field]] : callback(result, field)
-        } else if (Util.in_array(field, passwords)) {
-          t = 'xxxxxx'
-        } else if (MYMODEL.widgets[field].name == 'select') {
-          t = !callback(result, field) ? (Object.hasOwn(tableObj[field], result[field]) ? tableObj[field][result[field]] : result[field]) : callback(result, field)
-        } else if (MYMODEL.widgets[field].name == 'datetime') {
-          t = !callback(result, field) ? Util.timeSql(result[field]) : callback(result, field)
-        } else if (MYMODEL.widgets[field].name == 'datepicker') {
-          t = !callback(result, field) ? Util.dateFormat(result[field]) : callback(result, field)
-        } else if (MYMODEL.widgets[field].name == 'switch') {
-          t = !callback(result, field) ? tableObj[field][result[field]] || '' : callback(result, field)
-        } else if (MYMODEL.widgets[field].name == 'relation') {
-          if (relations[field][result[field]]) {
-            t = !callback(result, field) ? relations[field][result[field]].zname || '' : callback(result, field)
-          }
-        } else {
-          t = !callback(result, field) ? result[field] || '' : callback(result, field)
         }
-      }
-      //worksheet.getCell(sequence[i] + start).value = t;
-      html += `<td>${t}</td>`
+        //worksheet.getCell(sequence[i] + start).value = t;
+        html += `<td>${t}</td>`
+      })
+      html += `</tr>`
     })
-    html += `</tr>`
-  })
 
-  html += `</tbody></table></div>`
-  let time = Util.timeSql()
-  time = Util.replaceAll(time, ' ', '_')
-  let file = { content: html }
-  let count = fields.length
-  let options = {}
-  if (count > 8) {
-    options = {
-      landscape: true,
-    }
-  } else if (count > 10) {
-    options = {
-      format: 'A3',
-      //landscape:true
-    }
-  } else if (count > 12) {
-    options = {
-      format: 'A3',
-      landscape: true,
-    }
-  } else if (count > 14) {
-    options = {
-      format: 'A2',
-      //landscape:true
-    }
-  } else if (count > 16) {
-    options = {
-      format: 'A0',
-      landscape: true,
-    }
-  }
-  const pdf = await zRoute.generatePDF(file, 'pdf_blank', options)
-  res.download(pdf, MYMODEL.table + time + '.pdf')
+    html += `</tbody></table></div>`
+    let time = Util.timeSql()
+    time = Util.replaceAll(time, ' ', '_')
+    let file = { content: html }
+    let count = fields.length
+    let options = {}
+    if (count > 8) {
+      options = {
+        landscape: true,
+      }
+    } else if (count > 10) {
+      options = {
+        format: 'A3',
+        //landscape:true
+      }
+    } else if (count > 12) {
+      options = {
+        format: 'A3',
+        landscape: true,
+      }
+    } else if (count > 14) {
+      options = {
+        format: 'A2',
+        //landscape:true
+      }
+    } else if (count > 16) {
+      options = {
+        format: 'A0',
+        landscape: true,
+      }
+    }
+    const pdf = await zRoute.generatePDF(file, 'pdf_blank', options)
+    res.download(pdf, MYMODEL.table + time + '.pdf')
+  } catch (err) {
+    res.json(Util.jsonError(err))
+  }
 }
 
 /*
@@ -1598,7 +1602,7 @@ zRoute.generatePDF = async (file, layout = 'pdf_bootstrap', options = {}) => {
   } else {
     await page.goto(file.url, {
       waitUntil: 'load',
-      timeout: 60000, // wait for page to load completely
+      timeout: 300000, // wait for page to load completely
     })
   }
   let fileName = new Date().getTime() + '.pdf'

package/package.json

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