zet-lib 1.2.57 → 1.2.59

package/lib/Form.js

@@ -868,7 +868,7 @@ Form.modal = (obj, LANGUAGE = {}) => {
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h1 class="modal-title fs-5" id="exampleModalLabel">Lock/Unlock</h1>
+        <h1 class="modal-title fs-5">Lock/Unlock</h1>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
@@ -877,9 +877,21 @@ Form.modal = (obj, LANGUAGE = {}) => {
       </div>
     </div>
   </div>
+</div>`
+  let modalFields3 = `
+<div class="modal fade" id="grid-approval" tabindex="-1" aria-labelledby="grid-approval-label" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <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>
+  </div>
 </div>`
   try {
-    return modalFields + modalFields2
+    return modalFields + modalFields2 + modalFields3
   } catch (err) {
     console.log(err)
   }

package/lib/Util.js

@@ -1137,6 +1137,9 @@ Util.attributeOptions = (obj = {}, defaultObj = {}) => {
   return html
 }
 
+/*
+array to update json array at postgresql
+ */
 Util.array_to_jsonb = (arr = []) => {
   let value = ''
   let myarr = []
@@ -1149,6 +1152,17 @@ Util.array_to_jsonb = (arr = []) => {
   return value
 }
 
+/*
+array to update array at postgresql
+ */
+Util.array_to_arraypg = (arr = []) => {
+  let value = null
+  if (arr.length > 0) {
+    value = JSON.stringify(arr).replace('[', '{').replaceAll(']', '}')
+  }
+  return value
+}
+
 Util.userAvatar = (img = '') => {
   return img ? (img.includes('http') ? img : `/uploads/user/${img}`) : `/img/user.png`
 }

package/lib/zAppRouter.js

@@ -1298,7 +1298,7 @@ router.get('/zdownload/zgenerator/:table', async (req, res) => {
 
 router.post('/zlock-unlock/:table', async (req, res) => {
   let json = Util.jsonSuccess('Success')
-  var table = req.params.table
+  let table = req.params.table
   let cacheRoles = myCache.get('ROLES')
   let roleId = res.locals.roleId
   let myrole = cacheRoles[roleId]
@@ -1330,6 +1330,67 @@ router.post('/zlock-unlock/:table', async (req, res) => {
   res.json(json)
 })
 
+router.post('/zapproval-update/:table', async (req, res) => {
+  let json = Util.jsonSuccess('Success')
+  let table = req.params.table
+  let value = req.body.value
+  let datas = req.body.datas || []
+  console.log(datas)
+  let myaccess = res.locals.zuser.level_approval || []
+  let hasAccess = myaccess.includes(value) ? true : false
+  let canUpdate = true
+  let dataStatus = []
+  if (hasAccess) {
+    if (datas.length > 0) {
+      for (const data of datas) {
+        let id = data.name.replace('ck[', '').replace(']', '')
+        let result = await connection.result({
+          select: 'id,approval_status,approval_history',
+          table: table,
+          where: {
+            id: id,
+          },
+        })
+        let approval_history = result.approval_history || []
+        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(),
+          })
+          let mydata = {
+            approval_status: value,
+            approval_history: Util.array_to_jsonb(approval_history),
+          }
+          await connection.update({
+            table: table,
+            where: {
+              id: id,
+            },
+            data: mydata,
+          })
+        } else {
+          dataStatus.push(`${id} -> Status has been delivered`)
+        }
+      }
+    } else {
+      json = Util.flashError('No Data')
+    }
+  } else {
+    json = Util.flashError('No Access')
+  }
+  json.dataStatus = dataStatus
+  res.json(json)
+})
+
 router.get('/addlock-fields', async (req, res) => {
   let tables = await connection.query(connection.showTables)
   for (const table of tables) {
@@ -1374,4 +1435,56 @@ router.get('/addlock-models', async (req, res) => {
   res.send(text)
 })
 
+router.get('/addapprovals-data', async (req, res) => {
+  let tables = await connection.query(connection.showTables)
+  for (const table of tables) {
+    let tablename = table.tablename
+    let sql = `ALTER TABLE ${tablename}  ADD COLUMN "approval_status" smallint DEFAULT NULL`
+    let sql2 = `ALTER TABLE ${tablename}  ADD COLUMN "approval_history" jsonb[] DEFAULT NULL `
+    try {
+      await connection.query(sql)
+    } catch (e) {
+      console.log(e)
+    }
+    try {
+      await connection.query(sql2)
+    } catch (e) {
+      console.log(e)
+    }
+  }
+  res.send(tables)
+})
+
+router.get('/addapproval-models', async (req, res) => {
+  let text = ''
+  let results = await connection.results({
+    table: 'zfields',
+  })
+  for (const result of results) {
+    let labels = result.labels
+    let arr = Object.keys(labels)
+    if (!Util.in_array('approval_status', arr)) {
+      text += result.id + ' tidak ada'
+      //approval_status_id : "Approval Status",
+      labels.approval_status = 'Approval Status'
+      labels.approval_history = 'Approval History'
+      try {
+        await connection.update({
+          table: 'zfields',
+          data: {
+            labels: JSON.stringify(labels),
+          },
+          where: {
+            id: result.id,
+          },
+        })
+      } catch (err) {
+        console.log(err)
+      }
+    }
+  }
+
+  res.send(text)
+})
+
 module.exports = router

package/lib/zCache.js

@@ -19,6 +19,7 @@ zCache.KEYS = {
   ZFUNCTIONS: 'ZFUNCTIONS',
   VERSIONS: 'VERSIONS',
   MODELS_RELATIONS: 'MODELS_RELATIONS',
+  APPROVAL_LEVELS : 'APPROVAL_LEVELS'
 }
 
 zCache.STATICS = zCache.KEYS
@@ -85,6 +86,11 @@ const cache = async () => {
   } else {
     await zCache.ZFUNCTIONS()
   }
+  if (myCache.has('APPROVAL_LEVELS')) {
+    //i = i + 1;
+  } else {
+    await zCache.APPROVAL_LEVELS()
+  }
   //await zCache.CURRENCIES();
   //console.log(i)
   if (i < 5) {
@@ -105,6 +111,7 @@ zCache.renew = async () => {
   await zCache.MYMODELS()
   await zCache.MENU_SYSTEMS()
   await zCache.MODELS_RELATIONS()
+  await zCache.APPROVAL_LEVELS()
 }
 
 zCache.ROUTES = () => {
@@ -233,14 +240,14 @@ zCache.MENU_SYSTEMS = () => {
       text: 'LANGUAGE.users',
       href: 'zuser',
     },
-    {
-      text: 'LANGUAGE.company',
-      href: 'zcompany',
-    },
     {
       text: 'LANGUAGE.user_access',
       href: 'zuser_company',
     },
+    {
+      text: 'LANGUAGE.company',
+      href: 'zcompany',
+    },
     {
       text: 'LANGUAGE.access_role',
       href: 'zrole',
@@ -315,4 +322,18 @@ zCache.MODELS_RELATIONS = async () => {
   }
 }
 
+zCache.APPROVAL_LEVELS = async() => {
+  if (myCache.has('APPROVAL_LEVELS')) {
+    return myCache.get('APPROVAL_LEVELS')
+  } else {
+    let results = await connection.results({
+      select:'id,name,color',
+      table:'zapproval_type'
+    })
+    let obj = Util.arrayToObject(results,"id");
+    myCache.set('APPROVAL_LEVELS', obj)
+    return obj
+  }
+}
+
 module.exports = zCache

package/lib/zRoute.js

@@ -147,6 +147,7 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
   let widgets = MYMODEL.widgets
   let tags = []
   let val
+  let myval
   for (let key in post[routeName]) {
     let widgetName = widgets[key].name
     val = post[routeName][key]
@@ -295,8 +296,9 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
       case 'numeric':
         post[routeName][key] = val ? val : null
         break
+
       case 'json_array':
-        let myval = null
+        myval = null
         if (val) {
           let myarr = JSON.parse(val) || []
           if (myarr.length > 0) {
@@ -305,6 +307,17 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
         }
         post[routeName][key] = myval
         break
+
+      case 'array':
+        myval = null
+        if (val) {
+          let myarr = JSON.parse(val) || []
+          if (myarr.length > 0) {
+            myval = Util.array_to_arraypg(myarr)
+          }
+        }
+        post[routeName][key] = myval
+        break
     }
   }
   //check if widget have a tag default null
@@ -855,6 +868,19 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
   return dataTable
 }
 
+zRoute.approval_history_data = (arr = []) => {
+  let myvalue = ''
+  let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')
+  let USERS = Util.arrayToObject(myCache.get('zuser_created_by_1'), 'id')
+  myvalue = ''
+  if (arr && arr.length > 0) {
+    arr.map((item) => {
+      myvalue += `[${APPROVAL_LEVELS[item.status].name} By:${USERS[item.user_id].zname}(${item.created_at})] `
+    })
+  }
+  return myvalue
+}
+
 zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
   relations = relations || {}
   var keyFields = key + 'Fields'
@@ -863,6 +889,8 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
   var widgetName = MYMODEL.widgets[key] ? MYMODEL.widgets[key].name : ''
   if (key == 'lock') {
     myvalue = value == 1 ? 'Lock' : 'Unlock'
+  } else if (key == 'approval_history') {
+    myvalue = zRoute.approval_history_data(myvalue)
   } else {
     if (widgetName) {
       switch (widgetName) {
@@ -941,6 +969,10 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
           myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
           break
 
+        case 'array':
+          myvalue = value ? JSON.stringify(value).replaceAll('","', '", "') : ''
+          break
+
         default:
           value = value || ''
           myvalue = value.length > 50 ? value.substring(0, 50) : value
@@ -1856,7 +1888,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
     const select = Util.selectParser(fields, MYMODEL)
     const asDate = []
     const asJSONb = []
-    const asJSONbArr = []
+    const asArray = []
     for (let key in MYMODEL.widgets) {
       if (MYMODEL.widgets[key].name == 'datetime') {
         asDate.push(key)
@@ -1870,8 +1902,8 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
       if (MYMODEL.widgets[key].name == 'dropdown_checkbox') {
         asJSONb.push(key)
       }
-      if (MYMODEL.widgets[key].name == 'json_array') {
-        asJSONbArr.push(key)
+      if (MYMODEL.widgets[key].name == 'json_array' || MYMODEL.widgets[key].name == 'array') {
+        asArray.push(key)
       }
     }
     let whereArray = []
@@ -1893,8 +1925,8 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
         if (asJSONb.includes(fields[item.data])) {
           astype = 'jsonb'
         }
-        if (asJSONbArr.includes(fields[item.data])) {
-          astype = 'json_array'
+        if (asArray.includes(fields[item.data])) {
+          astype = 'array'
         }
         if (astype === 'jsonb') {
           whereArray.push({
@@ -1904,7 +1936,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
             operator: 'AND',
             type: 'inline',
           })
-        } else if (astype === 'json_array') {
+        } else if (astype === 'array') {
           whereArray.push({
             field: '',
             option: '',
@@ -2492,6 +2524,21 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     }
     forms.build[key] = cForm.build(forms.obj[key])
   }
+
+  let approval_history_table = ``
+  if (data.approval_status != null) {
+    let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')
+    let USERS = Util.arrayToObject(myCache.get('zuser_created_by_1'), 'id')
+    approval_history_table += `<div class="dropdown"><button class="btn boxy dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">Approval Status : ${APPROVAL_LEVELS[data.approval_status].name}</button>`
+    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 += `</ul></div>`
+  }
+
+  forms.approval_history_table = approval_history_table
   return forms
 }
 

package/lib/zdataTable.js

@@ -2,10 +2,11 @@
  * Created by sintret dev on 1/6/2022.
  */
 const Util = require('./Util')
+const myCache = require('./cache')
 
 class dataTable {
-  constructor(visibles) {
-    this.visibles = visibles //array object
+  constructor(datas) {
+    this.visibles = datas.visiblesObj //array object
     this.setColumns = ''
     this.setTable = ''
     this.srcScript = '/modules/datatables.min.js'
@@ -18,7 +19,8 @@ class dataTable {
     this.routeName
     this.types = {}
     this.levels = {}
-    this.visiblesKey = visibles.map((item) => item.key)
+    this.level_approval = datas.zuser && datas.zuser.level_approval ? datas.zuser.level_approval : []
+    this.visiblesKey = this.visibles.map((item) => item.key)
   }
 
   // for filter html
@@ -92,6 +94,9 @@ 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) {
+      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>`
     html += `<button class="btn refresh gridreload boxy-small dimens2x image-button" title="${LANGUAGE.grid_refresh}" tabindex="0" aria-controls="DataTables_Table_0" type="button"><img src="/assets/icons/refresh.svg" class="icons-bg-black"></button>`
     if (this.levels.export) {
@@ -120,13 +125,16 @@ class dataTable {
       html += `<button title="${LANGUAGE.create_info}" class="btn create gridadd image-button boxy-small dimens2x" tabindex="0" aria-controls="DataTables_Table_0" type="button"><img src="/assets/icons/plus.svg" class="icons-bg-black"> ${LANGUAGE.create}</button>`
     }
     if (this.levels.import) {
-      html += `<button title="${LANGUAGE.import_info}" class="btn buttons-copy buttons-html5 copy gridimport boxy-small dimens2x image-button" tabindex="0"  type="button"><img src="/assets/icons/database-import.svg" class="icons-bg-black"> ${LANGUAGE.import}</span></span></button>`
+      html += `<button title="${LANGUAGE.import_info}" class="btn buttons-copy buttons-html5 copy gridimport boxy-small dimens2x image-button" type="button"><img src="/assets/icons/database-import.svg" class="icons-bg-black"> ${LANGUAGE.import}</span></span></button>`
     }
     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" tabindex="0"  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>`
+      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>`
     }
-    html += `<button title="${LANGUAGE.settings}" class="btn buttons-excel buttons-html5 setting gridsettings boxy-small dimens2x image-button" tabindex="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>`
-    html += `<button class="btn refresh gridreload boxy-small dimens2x image-button" title="${LANGUAGE.grid_refresh}" tabindex="0" aria-controls="DataTables_Table_0" type="button"><img src="/assets/icons/refresh.svg" class="icons-bg-black"></button>`
+    if (this.level_approval && this.level_approval.length) {
+      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>`
+    html += `<button class="btn refresh gridreload boxy-small dimens2x image-button" title="${LANGUAGE.grid_refresh}" aria-controls="DataTables_Table_0" type="button"><img src="/assets/icons/refresh.svg" class="icons-bg-black"></button>`
     if (this.levels.export) {
       html += `<div class="btn-group" role="group">
                             <button id="dropdownExport" type="button" class="btn dropdown-toggle boxy-small dimens2x image-button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -182,6 +190,49 @@ class dataTable {
     if (typeaheadScript) {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }
+    if (this.level_approval && this.level_approval.length) {
+      //modal-body-approval
+      let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')
+      let approvalButtonHtml = ``
+      this.level_approval.map((item) => {
+        let imageapproval = 'brand-bunpo'
+        if (item == 12) {
+          imageapproval = 'rubber-stamp-off'
+        } else if (item == 0) {
+          imageapproval = 'list-check'
+        } 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> `
+      })
+      script += `<script type="text/javascript">$(function () {
+    $(".modal-body-approval").html('${approvalButtonHtml}');
+    $(".btn-approval-levels").on("click", function () {
+    ajaxPost('/zapproval-update/${this.MYMODEL.table}', {
+        value : $(this).attr('data-value'),
+        datas: $(".ck").serializeArray()
+    }, function (data) {
+        toastrForm(data);
+        if(data.dataStatus.length > 0) {
+            data.dataStatus.map((item) => {
+                toastr.error(item);
+            });
+            setTimeout(function() {
+              if(data.status ==1) {
+                location.href='';
+            }
+            },4000);
+        } else {
+            if(data.status ==1) {
+                location.href='';
+            }
+        }
+        
+    })
+})
+})</script>${Util.newLine}`
+    }
+
     script += `<script type="text/javascript">
 $(function () {
     $("#ck_all").on('click', function () {

package/package.json

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