zet-lib 1.0.51 → 1.0.52

package/lib/zRoute.js

@@ -1050,6 +1050,12 @@ zRoute.handleSession = async (req, user) => {
 }
 
 zRoute.excelQuery = async (req, res, MYMODEL) => {
+  let virtuals = []
+  for (var key in MYMODEL.widgets) {
+    if (MYMODEL.widgets[key].name === 'virtual') {
+      virtuals.push(key)
+    }
+  }
   //check directory for import not export
   const dir = `${dirRoot}/public/excel/tmp`
   if (!fs.existsSync(dir)) {
@@ -1079,9 +1085,10 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     body = result.filter
     fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
     select = Util.selectParser(fields, MYMODEL)
+    console.log(virtuals)
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
-      arr = [...fields, ...difference]
+      arr = [...fields, ...difference].filter((x) => !virtuals.includes(x))
       select = `"${arr.join('","')}"`
     }
     let whereArray = []
@@ -1125,6 +1132,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
   if (zall) {
     fields = arr
   }
+  console.log(select)
 
   const ztype = reqQuery.ztype == 1 ? true : false
   if (ztype) {
@@ -3046,37 +3054,43 @@ zRoute.import = async (req, res, MYMODEL) => {
   hd += `<th>${LANGUAGE['noted']}</th>`
   hd += `</tr>`
 
-  let isCut = false;
-  if(i > 20 && result.length > 2000) {
-    io.to(room).emit('message', 'short display data!');
-    isCut = true;
+  let isCut = false
+  if (i > 20 && result.length > 2000) {
+    io.to(room).emit('message', 'short display data!')
+    isCut = true
   }
   //convert to table header
   io.to(room).emit('import', hd)
-  let isInsert = true;
+  let isInsert = true
 
   for (let i = 3; i < result.length; i++) {
-    hd = '';
+    hd = ''
     hd += `<tr>`
     const data = {}
     hd += `${i - 2}`
     //column cut tidak penting hanya jika kebanyakan dipotong
-    let columnCut = 0;
+    let columnCut = 0
     for (var prop in keys) {
       let value = result[i][prop]
       if (value) {
-        data[keys[prop]] = value
+        if (MYMODEL.widgets[keys[prop]].name === 'integer') {
+          data[keys[prop]] = parseInt(value) || null
+        } else if (MYMODEL.widgets[keys[prop]].name === 'virtual') {
+          //empty
+        } else {
+          data[keys[prop]] = value
+        }
       }
-      if(isCut) {
+      if (isCut) {
         console.log('cut and column cut')
-          if(columnCut < 10) {
-              hd += `<td>${value || ''}</td>`
-          }
+        if (columnCut < 10) {
+          hd += `<td>${value || ''}</td>`
+        }
       } else {
         hd += `<td>${value || ''}</td>`
       }
       if (keys[prop] == 'id') isInsert = false
-      columnCut++;
+      columnCut++
     }
     try {
       if (isInsert) {
@@ -3099,14 +3113,13 @@ zRoute.import = async (req, res, MYMODEL) => {
       }
       hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
     } catch (err) {
-      hd += `<td class='text text-danger'>${err+''}</td>`
-        io.to(room).emit('error', err + '' + ' ')
+      hd += `<td class='text text-danger'>${err + ''}</td>`
+      io.to(room).emit('error', err + '' + ' ')
     }
     hd += '</tr>'
     io.to(room).emit('import', hd)
   }
 
-
   fs.removeSync(filename)
   //cache for uploading excel
   zRoute.modelsCacheRenew(MYMODEL.table, res.locals.companyId)

package/package.json

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