zet-lib 1.2.60 → 1.2.62

package/lib/zAppRouter.js

@@ -1360,7 +1360,7 @@ router.post('/zapproval-update/:table', async (req, res) => {
         let approval_history = result.approval_history || []
         if (approval_status == null) {
           canUpdate = true
-        } else if (approval_status == 12) {
+        } else if (approval_status == 22) {
           canUpdate = true
         } else {
           if (+value > +approval_status) {

package/lib/zRoleRouter.js

@@ -209,11 +209,12 @@ router.post('/approval-access', async (req, res) => {
     html += `<form id="approvalform">`
     html += `<table class="table table-hover"><thead><tr><th>Name </th><th>Level <input type="checkbox" onclick="tabApprovals(this)" id="checkapprovals" /></th></tr></thead><tbody></tbody>`
     results.map((item) => {
-      html += `<tr>
+      if (item.id != 1) {
+        html += `<tr>
                 <td>${item.name}</td>
                 <td><input type="checkbox" class="checkapproval" name="approval_${item.id}"  ${checkedFn(myapprovalsRole, item.id)} /></td>
-              
                 </tr>`
+      }
     })
     html += `</tbody></table>`
     html += `</form>`

package/lib/zRoute.js

@@ -3639,19 +3639,21 @@ zRoute.import = async (req, res, MYMODEL) => {
       columnCut++
     }
     try {
+      delete data.lock
+      delete data.approval_status
+      delete data.approval_history
       if (isInsert) {
         if (Util.in_array('company_id', fields)) data.company_id = res.locals.companyId
         if (Util.in_array('created_at', fields)) data.created_at = Util.now()
         if (Util.in_array('created_by', fields)) data.created_by = res.locals.userId
         if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
         if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
-        delete data.lock
+
         await connection.insert({ table: MYMODEL.table, data: data })
         hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
       } else {
         if (Util.in_array('updated_at', fields)) data.updated_at = Util.now()
         if (Util.in_array('updated_by', fields)) data.updated_by = res.locals.userId
-        delete data.lock
         //check data is lock
         let mydatas = await connection.result({
           select: 'id,lock',

package/lib/zdataTable.js

@@ -194,17 +194,21 @@ class dataTable {
     if (this.hasLevels) {
       //modal-body-approval
       let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')
+      console.log(APPROVAL_LEVELS)
       let approvalButtonHtml = ``
       for (let item in this.level_approval) {
+        console.log(item)
         let imageapproval = 'brand-bunpo'
-        if (item == 12) {
+        if (item == 22) {
           imageapproval = 'rubber-stamp-off'
-        } else if (item == 0) {
+        } else if (item == 2) {
           imageapproval = 'list-check'
-        } else if (item == 11) {
+        } else if (item == 21) {
           imageapproval = 'rubber-stamp'
         }
-        approvalButtonHtml += ` <button title="${APPROVAL_LEVELS[item].name}" data-value="${item}" style="background-color: ${APPROVAL_LEVELS[item].color}; color:white" class="btn btn-approval-levels boxy-small dimens2x image-button mb-3" type="button"><img src="/assets/icons/${imageapproval}.svg" class="icons-bg-white"> ${APPROVAL_LEVELS[item].name}</button> `
+        let name = APPROVAL_LEVELS.hasOwnProperty(item) ? APPROVAL_LEVELS[item].name : ''
+        let color = APPROVAL_LEVELS.hasOwnProperty(item) ? APPROVAL_LEVELS[item].color : ''
+        approvalButtonHtml += ` <button title="${name}" data-value="${item}" style="background-color: ${color}; color:white" class="btn btn-approval-levels boxy-small dimens2x image-button mb-3" type="button"><img src="/assets/icons/${imageapproval}.svg" class="icons-bg-white"> ${name}</button> `
       }
       approvalButtonHtml += `<div class="row"><div class="col-md-10"><textarea class="form-control boxy purple-border" id="zapproval_message" placeholder="tulis alasan..." rows="2"></textarea></div><div class="col-md-1"></div></div>`
 

package/package.json

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