zet-lib 1.2.96 → 1.2.97

package/lib/zReport.js

@@ -42,7 +42,8 @@ zReport.reportData = (filename, data, sessions = {}) => {
   let excelData = {}
   let excelValue = {}
   let tableModel = {}
-  let dataForExcel = data.excel
+  let excelQuery = data.excel_query || {}
+  let dataForExcel = excelQuery.excel
   let dataCallback = data.callback || []
   let callback = {}
   let objQuery = {}
@@ -577,7 +578,7 @@ zReport.dataHTMLList = async () => {
       if (row.excel) {
         action += `<button title="setup Report" onclick="location.href='/zreports/setup/${row.id}'" data-id="${row.id}" class="btn image-button boxy-small" type="button"><img src="/assets/icons/settings-filled.svg" class="icons-bg-black"></button>`
       }
-      action += `<button title="edit Report" onclick="location.href='/zreports/setup/${row.id}'" data-id="${row.id}" class="btn image-button boxy-small" type="button"><img src="/assets/icons/pencil.svg" class="icons-bg-black"></button>`
+      action += `<button title="edit Report" onclick="location.href='/zreports/update/${row.id}'" class="btn image-button boxy-small" type="button"><img src="/assets/icons/pencil.svg" class="icons-bg-black"></button>`
       action += `<button title="delete Report" onclick="deletereport('${row.id}')" data-id="${row.id}" class="btn image-button boxy-small" type="button"><img src="/assets/icons/trash.svg" class="icons-bg-black"></button>`
       childReport += `<tr><td>${index + 1}. </td><td>${row.title}</td><td><a href="/uploads/zreports/${row.excel}">Excel File</a></td><td>${action}</td></tr>`
     })
@@ -672,16 +673,16 @@ zReport.filterReport = async (req, res) => {
   let data = [],
     rows = []
   if (id == '') {
-    rows = await connection.query('select * from zreport where company_id = ? and parent_id IS NULL', [companyId])
+    rows = await connection.query('select * from zreports where company_id = ? and parent_id IS NULL', [companyId])
   } else {
-    rows = await connection.results({ table: 'zreport', where: { id: id, company_id: companyId } })
+    rows = await connection.results({ table: 'zreports', where: { id: id, company_id: companyId } })
   }
 
   console.log(rows)
   for (var i = 0; i < rows.length; i++) {
     var row = rows[i]
     //rows.forEach(async function (row) {
-    let reportsRow = await connection.results({ table: 'zreport', where: { parent_id: row.id } })
+    let reportsRow = await connection.results({ table: 'zreports', where: { parent_id: row.id } })
     console.log(reportsRow)
     let filterHtml = reportsRow.length > 0 ? `<form  method="post" action="/zreport" >` : ''
     let filters = JSON.parse(row.filter) || []

package/package.json

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