zet-lib 1.0.49 → 1.0.51

package/lib/zRoute.js

@@ -1078,7 +1078,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     let result = results[0]
     body = result.filter
     fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
-    select = Util.selectMysql(fields)
+    select = Util.selectParser(fields, MYMODEL)
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
       arr = [...fields, ...difference]
@@ -1115,7 +1115,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     rows = await connection.results(obj)
   } else {
     rows = await connection.results({
-      select: Util.selectMysql(fields),
+      select: Util.selectParser(fields, MYMODEL),
       table: MYMODEL.table,
       limit: reqQuery.pageSize,
       offset: parseInt(reqQuery.pageSize) - 1,
@@ -1524,7 +1524,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   const MYMODEL = objData.MYMODEL || {}
   const fields = Object.prototype.hasOwnProperty.call(objData, 'fields') ? objData.fields : req.body.fields
   const relations = await zRoute.relations(req, res, MYMODEL.table)
-  const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectMysql(fields, relations)
+  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
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
@@ -1604,7 +1604,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   const body = req.body
   const fields = body.fields
-  const select = Util.selectMysql(fields, relations)
+  const select = Util.selectParser(fields, MYMODEL)
   let whereArray = []
   const columns = body.columns
   whereArray.push({
@@ -3036,8 +3036,8 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   //convert to table header
   let hd = '<tr>'
+  let i = 0
   for (let prop in result[1]) {
-    let i = 0
     keys[prop] = result[1][prop]
     hd += `<th>${result[0][prop]}</th>`
     headers.push({ i: i, prop: prop, value: result[0][prop] })
@@ -3045,20 +3045,38 @@ 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;
+  }
   //convert to table header
   io.to(room).emit('import', hd)
-  let isInsert = true
-  hd += `<tr>`
+  let isInsert = true;
+
   for (let i = 3; i < result.length; i++) {
+    hd = '';
+    hd += `<tr>`
     const data = {}
     hd += `${i - 2}`
+    //column cut tidak penting hanya jika kebanyakan dipotong
+    let columnCut = 0;
     for (var prop in keys) {
       let value = result[i][prop]
       if (value) {
         data[keys[prop]] = value
       }
-      hd += `<td>${value}</td>`
+      if(isCut) {
+        console.log('cut and column cut')
+          if(columnCut < 10) {
+              hd += `<td>${value || ''}</td>`
+          }
+      } else {
+        hd += `<td>${value || ''}</td>`
+      }
       if (keys[prop] == 'id') isInsert = false
+      columnCut++;
     }
     try {
       if (isInsert) {
@@ -3081,13 +3099,14 @@ zRoute.import = async (req, res, MYMODEL) => {
       }
       hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
     } catch (err) {
-      hd += `<td class='text text-danger'>${err.toString()}</td>`
+      hd += `<td class='text text-danger'>${err+''}</td>`
+        io.to(room).emit('error', err + '' + ' ')
     }
     hd += '</tr>'
     io.to(room).emit('import', hd)
   }
-  hd += ''
-  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.49",
+  "version": "1.0.51",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -49,4 +49,4 @@
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   }
-}
+}