zet-lib 1.2.49 → 1.2.51

package/lib/Util.js

@@ -923,6 +923,20 @@ Util.isInteger = (value) => {
   )
 }
 
+Util.isEmptyArray = (arr = []) => {
+  let isArr = false
+  if (Array.isArray(arr)) {
+    if (arr.length === 0) {
+      isArr = true
+    } else {
+      isArr = arr.reduce((a, b) => (b === null ? a + 0 : a + 1), 0) === 0
+    }
+  } else {
+    isArr = true
+  }
+  return isArr
+}
+
 Util.isNumeric = function (value) {
   return /^-?\d+$/.test(value)
 }

package/lib/index.js

@@ -32,4 +32,5 @@ module.exports = {
   Excel: require('exceljs'),
   pm2: require('pm2'),
   nodemailer: require('nodemailer'),
+  readXlsxFile: require('read-excel-file/node')
 }

package/lib/moduleLib.js

@@ -448,7 +448,7 @@ m.highlight = (req, res, elem) => {
   let head = res.locals.moduleHead
   let end = res.locals.moduleEnd
   if (head.indexOf('highlight') < 0) {
-    head += '<link rel="stylesheet" href="/modules/highlight/styles/default.min.css"> ' + newLine
+    head += '<link rel="stylesheet" href="/modules/highlight/default.min.css"> ' + newLine
     end += '<script src="/modules/highlight/highlight.min.js"></script>' + newLine
   }
   end += '<script>$(function(){ document.querySelectorAll("' + elem + '").forEach((block) => {hljs.highlightBlock(block);}); })</script>' + newLine

package/lib/zRoute.js

@@ -19,6 +19,7 @@ const moment = require('moment')
 const debug = require('./debug')
 const moduleLib = require('./moduleLib')
 const cForm = require('./Form')
+const readXlsxFile = require('read-excel-file/node')
 
 const zRoute = {}
 
@@ -3487,33 +3488,26 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   await Util.moveFile(excelFile, filename)
   io.to(room).emit('message', LANGUAGE['import_process'])
-  const toJson = excelToJson({ source: fs.readFileSync(filename) })
-  let result
-  for (let prop in toJson) {
-    let i = 0
-    if (i == 0) result = toJson[prop]
-    i++
-  }
-  if (!result.length) {
-    let message = 'No Data Found!!. Please uploading an excel file into 1 sheet only. Can not Multiple sheets'
-    io.to(room).emit('message', message)
-    res.json(Util.flashError(message))
-    return
-  }
+  let results = await readXlsxFile(filename)
+  let resultsLength = results.length
+  let columnLength = results[1].length
   //convert to table header
   let hd = '<tr>'
   let i = 0
-  for (let prop in result[1]) {
-    keys[prop] = result[1][prop]
-    hd += `<th>${result[0][prop]}</th>`
-    headers.push({ i: i, prop: prop, value: result[0][prop] })
-    i++
-  }
+  results[0].map((item) => {
+    hd += `<th>${item}</th>`
+  })
   hd += `<th>${LANGUAGE['noted']}</th>`
   hd += `</tr>`
 
+  console.log(results)
+  results[1].map((item, index) => {
+    keys[index] = item
+  })
+
+  console.log(keys)
   let isCut = false
-  if (i > 20 && result.length > 2000) {
+  if (columnLength > 20 && resultsLength > 2000) {
     io.to(room).emit('message', 'short display data!')
     isCut = true
   }
@@ -3521,15 +3515,21 @@ zRoute.import = async (req, res, MYMODEL) => {
   io.to(room).emit('import', hd)
   let isInsert = true
   mytables += hd
-  for (let i = 2; i < result.length; i++) {
+  for (let i = 2; i < resultsLength; i++) {
     hd = ''
+    if (Util.isEmptyArray(results[i])) {
+      continue
+    }
     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]
+    let result = results[i]
+    //console.log(JSON.stringify(result))
+    for (let prop in keys) {
+      //console.log(prop)
+      let value = result[prop] ? result[prop] : null
       if (value) {
         if (aliasRelations.includes(keys[prop])) {
           let result_alias = await connection.result({
@@ -3562,9 +3562,6 @@ zRoute.import = async (req, res, MYMODEL) => {
       if (keys[prop] == 'id') isInsert = false
       columnCut++
     }
-    if (Object.keys(data).length == 0) {
-      continue
-    }
     try {
       if (isInsert) {
         if (Util.in_array('company_id', fields)) data.company_id = res.locals.companyId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.2.49",
+  "version": "1.2.51",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -45,6 +45,7 @@
     "puppeteer": "^21.0.1",
     "qs": "^6.11.2",
     "randomstring": "^1.3.0",
+    "read-excel-file": "^5.8.0",
     "socket.io": "^4.7.5",
     "uglify-js": "^3.17.4",
     "uuid": "^9.0.1",