zet-lib 1.2.59 → 1.2.61

package/lib/Form.js

@@ -762,7 +762,7 @@ Form.build = (obj) => {
   let view_only = Object.prototype.hasOwnProperty.call(obj, 'view_only') ? obj.view_only : false
   if (!view_only) {
     if (attributes && Object.prototype.hasOwnProperty.call(attributes, 'name')) {
-      if (obj.attributes.name == 'relation') {
+      if (obj.attributes.name == 'relation' || obj.attributes.name == 'typeahead' || obj.attributes.name == 'dropdown_multi') {
         relation = `<a target="_blank" href="/${obj.attributes.table}"> > </a>`
       }
     }
@@ -886,7 +886,9 @@ Form.modal = (obj, LANGUAGE = {}) => {
         <h1 class="modal-title fs-5" >Approvals</h1>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
-      <div class="modal-body" style="height: 140px"><div class="row"><div class="col-md-11 modal-body-approval"></div></div></div>
+      <div class="modal-body" style="min-height: 150px">
+        <div class="row"><div class="col-md-12 modal-body-approval"></div></div>
+        </div>
     </div>
   </div>
 </div>`

package/lib/zAppRouter.js

@@ -1334,12 +1334,17 @@ router.post('/zapproval-update/:table', async (req, res) => {
   let json = Util.jsonSuccess('Success')
   let table = req.params.table
   let value = req.body.value
+  let text = req.body.text
   let datas = req.body.datas || []
-  console.log(datas)
-  let myaccess = res.locals.zuser.level_approval || []
-  let hasAccess = myaccess.includes(value) ? true : false
+  let roles = myCache.get('ROLES')[res.locals.roleId] || {}
+  let myaccess = roles.approvals[table]
+  let hasAccess = myaccess.hasOwnProperty(value) ? true : false
   let canUpdate = true
   let dataStatus = []
+  if (text == '') {
+    res.json(Util.flashError('please type a message'))
+    return false
+  }
   if (hasAccess) {
     if (datas.length > 0) {
       for (const data of datas) {
@@ -1351,20 +1356,33 @@ router.post('/zapproval-update/:table', async (req, res) => {
             id: id,
           },
         })
+        let approval_status = result.approval_status || null
         let approval_history = result.approval_history || []
-        if (approval_history.length > 0) {
+        if (approval_status == null) {
+          canUpdate = true
+        } else if (approval_status == 12) {
+          canUpdate = true
+        } else {
+          if (+value > +approval_status) {
+            canUpdate = true
+          } else {
+            canUpdate = false
+          }
+        }
+        /*if (approval_history.length > 0) {
           let lastStatus = +approval_history[approval_history.length - 1].status
           canUpdate = lastStatus > +value ? false : true
           let history = approval_history.filter((item) => item.status == value && item.user_id == res.locals.userId)
           if (history.length > 0) {
             canUpdate = false
           }
-        }
+        }*/
         if (canUpdate) {
           approval_history.push({
             status: value,
             user_id: res.locals.userId,
             created_at: Util.now(),
+            text: text,
           })
           let mydata = {
             approval_status: value,

package/lib/zRoleRouter.js

@@ -185,6 +185,44 @@ router.post('/tab-access', async (req, res) => {
   res.send(html)
 })
 
+router.post('/approval-access', async (req, res) => {
+  let json = Util.jsonSuccess()
+  let html = ''
+  const checkedFn = (obj, name) => {
+    return obj.hasOwnProperty(name) && obj[name] ? 'checked' : ''
+  }
+  try {
+    const table = req.body.table
+    const id = req.body.id
+    let tabRole = await connection.result({
+      table: 'zrole',
+      where: {
+        id: id,
+      },
+    })
+    let myapprovals = tabRole.approvals || {}
+    let myapprovalsRole = myapprovals[table] || {}
+    let results = await connection.results({
+      table: 'zapproval_type',
+      order_by: ['id asc'],
+    })
+    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>
+                <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>`
+  } catch (e) {
+    json = Util.flashError(e.toString())
+  }
+  res.send(html)
+})
+
 router.post('/post-access', async (req, res) => {
   let json = Util.jsonSuccess()
   let table = req.body.table || ''
@@ -239,6 +277,50 @@ router.post('/post-access', async (req, res) => {
   res.json(json)
 })
 
+router.post('/post-approval', async (req, res) => {
+  let json = Util.jsonSuccess()
+  let table = req.body.table || ''
+  if (table == '') {
+    res.json(Util.flashError('Table is empty!'))
+    return false
+  }
+  let datas = req.body.datas || []
+  console.log(datas)
+  let id = req.body.id
+  if (datas.length == 0) {
+    res.json(Util.flashError('Data is empty!'))
+    return false
+  }
+  let myapprovals = {}
+  try {
+    let result = await connection.result({
+      table: 'zrole',
+      where: {
+        id: id,
+      },
+    })
+    myapprovals = result.approvals || {}
+    let obj = {}
+    datas.map((item) => {
+      let id = item.name.replace('approval_', '')
+      obj[id] = true
+    })
+    myapprovals[table] = obj
+    await connection.update({
+      table: 'zrole',
+      data: {
+        approvals: JSON.stringify(myapprovals),
+      },
+      where: {
+        id: id,
+      },
+    })
+  } catch (err) {
+    json = Util.jsonError(err + '')
+  }
+  res.json(json)
+})
+
 router.delete('/delete/:id', async (req, res) => {
   let json = Util.jsonSuccess()
   let id = parseInt(req.params.id)
@@ -300,6 +382,7 @@ const body = `<div class="">
                             <% for(var i = 0;i < actions.length;i++) { %>
                                 <th><%= actions[i] %> <input onclick='checkthis("<%= actions[i] %>")' type="checkbox" id="all<%= actions[i] %>"></th>
                             <% } %>
+                            <th>Approve Level</th>
                             <th>Tabs</th>
                         </tr>
                         </thead>
@@ -308,8 +391,10 @@ const body = `<div class="">
                             <tr>
                                 <td>
                                     <% var ename = routes[i]; 
-                                    var handleTag = "handleAccess('"+routes[i]+"')";
-                                    var spanRole =  tabs.includes(routes[i]) ? '<span class="handle-access icon-small icons-light" onclick="'+handleTag+'" data-bs-toggle="modal" data-bs-target="#tabaccess" ><img class="icons-bg-blue gridview icon-image" src="/assets/icons/lock-access.svg"></span>' : '' %>
+                                    const handleTag = "handleAccess('"+routes[i]+"')";
+                                    const handleApproval = "handleApproval('"+routes[i]+"')";
+                                    const spanApproval =  '<span class="handle-access icon-small icons-light" onclick="'+handleApproval+'" data-bs-toggle="modal" data-bs-target="#modalapproval" ><img class="icons-bg-blue gridview icon-image" src="/assets/icons/lock-access.svg"></span>';
+                                    const spanRole =  tabs.includes(routes[i]) ? '<span class="handle-access icon-small icons-light" onclick="'+handleTag+'" data-bs-toggle="modal" data-bs-target="#tabaccess" ><img class="icons-bg-blue gridview icon-image" src="/assets/icons/lock-access.svg"></span>' : '' %>
                                     <a href="/<%- ename %>" target="_blank"><%- ename %></a>
                                     </td>
                                 <% for(var x = 0;x < actions.length;x++) { %>
@@ -317,6 +402,7 @@ const body = `<div class="">
                                         <% if(json && json.hasOwnProperty(ename) && json[ename].indexOf(actions[x]) >= 0) { %> <%= 'checked="checked"' %> <% } %> title="Role for <%= routes[i] %> <%= actions[x] %>" type="checkbox">
                                     </td>
                                 <% } %>
+                                <td><%- spanApproval %></td>
                                 <td><%- spanRole %></td>
                             </tr>
                         <% } %>
@@ -376,9 +462,7 @@ const body = `<div class="">
             <div class="modal-header"><h5 class="modal-title" id="tabaccesstitle">Tab Access <span id="titleaccess"></span></h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
-            <div class="modal-body body-access">
-                
-            </div>
+            <div class="modal-body body-access"></div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
                 <button type="button" class="btn btn-primary btn-save-tab">Save changes</button>
@@ -386,6 +470,20 @@ const body = `<div class="">
         </div>
     </div>
 </div>
+<div class="modal fade" id="modalapproval" tabindex="-1" aria-labelledby="tabapprovalModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header"><h5 class="modal-title">Approval Level <span id="approvalname"></span> </h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div class="modal-body body-approval"></div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary btn-save-approval">Save changes</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 
 `
@@ -405,6 +503,14 @@ const js = `<script>
             $("input." + elm).prop("checked", false);
         }
     }
+    function tabApprovals(that) {
+        let elm = 'checkapproval';
+         if ($(that).is(":checked")) {
+            $("input." + elm).prop("checked", true);
+        } else {
+            $("input." + elm).prop("checked", false);
+        }
+    }
     $("#roleName").on('change', function () {
         location.href = "/zrole?id=" + $(this).val();
     });
@@ -452,7 +558,13 @@ const js = `<script>
             })
         }
     }
-    
+    function handleApproval(table) {
+        $(".btn-save-approval").attr("data-table", table);
+        $("#approvalname").html(table);
+        ajaxPost('/zrole/approval-access',{table:table, id: "<%- id %>"}, ((data) => {
+            $(".body-approval").html(data);
+        }))
+    }
     function handleAccess(table) {
         $(".btn-save-tab").attr("data-table", table);
         ajaxPost('/zrole/tab-access',{table:table, id: "<%- id %>"}, ((data) => {
@@ -471,6 +583,18 @@ const js = `<script>
             $(".btn-close").click();
         }))
     })
+    
+    $(".btn-save-approval").on("click",(e) => {
+        let queryform = $("#approvalform").serializeArray();
+        ajaxPost('/zrole/post-approval', {
+            datas: queryform,
+            id: "<%- id %>",
+            table : e.target.getAttribute('data-table')
+            },((data) => {
+            toastrForm(data);
+            $(".btn-close").click();
+        }))
+    })
 </script>
 `
 

package/lib/zRoute.js

@@ -875,7 +875,7 @@ zRoute.approval_history_data = (arr = []) => {
   myvalue = ''
   if (arr && arr.length > 0) {
     arr.map((item) => {
-      myvalue += `[${APPROVAL_LEVELS[item.status].name} By:${USERS[item.user_id].zname}(${item.created_at})] `
+      myvalue += `[${APPROVAL_LEVELS[item.status].name} By:${USERS[item.user_id].zname}(${item.created_at}) (${item.text})] `
     })
   }
   return myvalue
@@ -2533,7 +2533,7 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     approval_history_table += `<ul class="dropdown-menu" aria-labelledby="viewApproval">`
     let arr = data.approval_history || []
     arr.map((item, index) => {
-      approval_history_table += `<li><a class="dropdown-item" href="#">${index + 1}. ${APPROVAL_LEVELS[item.status].name} ${USERS[item.user_id].zname} ${Util.timeSql(data.created_at)}</a></li>`
+      approval_history_table += `<li><a class="dropdown-item" href="#">${index + 1}. ${APPROVAL_LEVELS[item.status].name} (${item.text}) ${USERS[item.user_id].zname} ${Util.timeSql(data.created_at)}</a></li>`
     })
     approval_history_table += `</ul></div>`
   }
@@ -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

@@ -18,8 +18,9 @@ class dataTable {
     this.relations
     this.routeName
     this.types = {}
-    this.levels = {}
-    this.level_approval = datas.zuser && datas.zuser.level_approval ? datas.zuser.level_approval : []
+    this.roles = myCache.get('ROLES')[datas.zuser.role_id] || {}
+    this.level_approval = this.roles.approvals && this.roles.approvals[datas.routeName] ? this.roles.approvals[datas.routeName] : {}
+    this.hasLevels = Object.keys(this.level_approval).length == 0 ? false : true
     this.visiblesKey = this.visibles.map((item) => item.key)
   }
 
@@ -94,7 +95,7 @@ class dataTable {
     if (this.levels.lock) {
       html += `<button title="Lock/Unlock" style="background-color: #3B71CA; color:white" class="btn btn-danger buttons-lock buttons-html5 copy gridlock boxy-small dimens2x image-button" tabindex="0" style="color: "  type="button"><img src="/assets/icons/cloud-lock.svg" class="icons-bg-white"> Lock/Unlock</span></span></button>`
     }
-    if (this.level_approval && this.level_approval.length) {
+    if (this.hasLevels) {
       html += `<button title="Approval" style="background-color: #3B71CA; color:white" class="btn buttons-html5 boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-approval" type="button"><img src="/assets/icons/rubber-stamp.svg" class="icons-bg-white"> Approval</span></span></button>`
     }
     html += `<button title="${LANGUAGE.settings}" class="btn buttons-excel buttons-html5 setting gridsettings boxy-small dimens2x image-button" tabindex="0" aria-controls="DataTables_Table_0" type="button" data-bs-toggle="modal" data-bs-target="#grid-modal"><img src="/assets/icons/settings.svg" class="icons-bg-black"> ${LANGUAGE.settings}</button>`
@@ -130,7 +131,7 @@ class dataTable {
     if (this.levels.lock) {
       html += `<button title="Lock/Unlock" style="background-color: #332D2D; color:white" class="btn btn-danger buttons-lock buttons-html5 copy gridlock boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-lock" type="button"><img src="/assets/icons/cloud-lock.svg" class="icons-bg-white"> Lock/Unlock</span></span></button>`
     }
-    if (this.level_approval && this.level_approval.length) {
+    if (this.hasLevels) {
       html += `<button title="Approval" style="background-color: #E4A11B; color:white" class="btn buttons-html5 boxy-small dimens2x image-button"  data-bs-toggle="modal" data-bs-target="#grid-approval" type="button"><img src="/assets/icons/rubber-stamp.svg" class="icons-bg-white"> Approval</span></span></button>`
     }
     html += `<button title="${LANGUAGE.settings}" class="btn buttons-excel buttons-html5 setting gridsettings boxy-small dimens2x image-button" type="button" data-bs-toggle="modal" data-bs-target="#grid-modal"><img src="/assets/icons/settings.svg" class="icons-bg-black"> ${LANGUAGE.settings}</button>`
@@ -190,11 +191,11 @@ class dataTable {
     if (typeaheadScript) {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }
-    if (this.level_approval && this.level_approval.length) {
+    if (this.hasLevels) {
       //modal-body-approval
       let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')
       let approvalButtonHtml = ``
-      this.level_approval.map((item) => {
+      for (let item in this.level_approval) {
         let imageapproval = 'brand-bunpo'
         if (item == 12) {
           imageapproval = 'rubber-stamp-off'
@@ -203,17 +204,21 @@ class dataTable {
         } else if (item == 11) {
           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" type="button"><img src="/assets/icons/${imageapproval}.svg" class="icons-bg-white"> ${APPROVAL_LEVELS[item].name}</button> `
-      })
+        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> `
+      }
+      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>`
+
       script += `<script type="text/javascript">$(function () {
     $(".modal-body-approval").html('${approvalButtonHtml}');
     $(".btn-approval-levels").on("click", function () {
     ajaxPost('/zapproval-update/${this.MYMODEL.table}', {
+        text : $("#zapproval_message").val(),
         value : $(this).attr('data-value'),
         datas: $(".ck").serializeArray()
     }, function (data) {
         toastrForm(data);
-        if(data.dataStatus.length > 0) {
+        if(data.status == 1) {
+            if(data.dataStatus.length > 0) {
             data.dataStatus.map((item) => {
                 toastr.error(item);
             });
@@ -227,7 +232,7 @@ class dataTable {
                 location.href='';
             }
         }
-        
+        }
     })
 })
 })</script>${Util.newLine}`

package/package.json

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