zet-lib 1.2.82 → 1.2.84

package/lib/moduleLib.js

@@ -485,4 +485,14 @@ m.selectpicker = function (req, res, elem) {
   res.locals.moduleEnd = end
 }
 
+m.slugHTML = (req, res, content, at = 'end') => {
+  if (content) {
+    if (at == 'end') {
+      res.locals.moduleEnd = content
+    } else {
+      res.locals.moduleHead = content
+    }
+  }
+}
+
 module.exports = m

package/lib/zAppRouter.js

@@ -1531,7 +1531,10 @@ router.post('/zdropzone', async (req, res) => {
 router.post('/zdropzone-remove', async (req, res) => {
   try {
     let userId = res.locals.userId
-    console.log(req.body)
+    let dir = `${dirRoot}/public/zdropzone/${userId}`
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true })
+    }
     let filename = `${dirRoot}/public/zdropzone/${userId}/${req.body.file}`
     if (Util.fileExist(filename)) {
       await fs.unlink(filename)
@@ -1545,6 +1548,10 @@ router.post('/zdropzone-remove', async (req, res) => {
 router.post('/zdropzone-attributes', async (req, res) => {
   try {
     let userId = res.locals.userId
+    let dir = `${dirRoot}/public/zdropzone/${userId}`
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true })
+    }
     let body = req.body
     let category = body.category
     let name = `dropzone__${userId}__${body.table}__${body.field}__${body.type}`
@@ -1569,4 +1576,31 @@ router.post('/zdropzone-attributes', async (req, res) => {
   }
 })
 
+router.post('/zhistory-data', async (req, res) => {
+  let html = ''
+  try {
+    let id = req.body.id
+    let table = req.body.table
+    const relations = await zRoute.relations(req, res, table)
+    const MYMODELS = zRoute.MYMODELS()
+    const MYMODEL = MYMODELS[table]
+    let results = await connection.results({
+      table: 'zhistory',
+      where: {
+        module: table,
+        module_id: id,
+      },
+      order_by: ['id asc'],
+    })
+    if (results.length > 0) {
+      let users = myCache.get('users')
+      html = await zRoute.history(req, res, relations, id, MYMODEL, users, results)
+    }
+    res.json(html)
+  } catch (e) {
+    console.log(e)
+    res.json(e + '')
+  }
+})
+
 module.exports = router

package/lib/zRoute.js

@@ -2576,8 +2576,37 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
     })
     approval_history_table += `</ul></div>`
   }
-
   forms.approval_history_table = approval_history_table
+
+  //get history / audit trail
+  //add head css
+  let contentModal = `<div class="modal" id="modal-history" tabindex="-1">
+  <div class="modal-dialog modal-xl modal-dialog-scrollable">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">History</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body" id="modal-body-history"></div>
+    </div>
+  </div>
+</div>
+
+<span class="icon-small icons-primary" title="History" style="position: fixed;bottom: 10px;left: 400px" data-bs-toggle="modal" data-bs-target="#modal-history"><img class="icons-bg-white icon-image-large" src="/assets/icons/history.svg"></span>
+`
+
+  moduleLib.slugHTML(req, res, contentModal)
+  let contentScript = `$(function(){
+    ajaxPost("/zhistory-data",{id:${data.id},table:"${MYMODEL.table}"},(data) => {$("#modal-body-history").html(data)});
+        $("#${MYMODEL.table}-delete").on("click", (() => {
+         window.confirm("Sure to remove data ?") && ajaxDelete("/${MYMODEL.table}/delete", {id: "${data.id}"}, (function (e) {
+            toastrForm(e), 1 == e.status && (location.href = "/${MYMODEL.table}")
+        }))
+    }))
+  
+  })`
+  moduleLib.addScript(req, res, contentScript)
+
   return forms
 }
 
@@ -3659,6 +3688,23 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
   delete data.approval_history
   if (result.lock != 1) {
     const myresult = await connection.update({ table: table, where: whereData, data: data })
+    //save to history
+    connection.insert({
+      table: 'zhistory',
+      data: {
+        module_id: result.id,
+        module: MYMODEL.table,
+        data_1: JSON.stringify(result),
+        data_2: JSON.stringify(myresult),
+        data_1_date: result.updated_at,
+        data_2_date: data.updated_at,
+        created_by: userId,
+        updated_by: userId,
+        created_at: Util.now(),
+        updated_at: Util.now(),
+        company_id: res.locals.companyId,
+      },
+    })
     zRoute.modelsCacheRenew(table, res.locals.companyId)
     return myresult
   } else {
@@ -4271,4 +4317,112 @@ zRoute.typeaheadpost = async (req, res) => {
   res.json(result.zname)
 }
 
+zRoute.history = async (req, res, relations, id, MYMODEL, users, results = []) => {
+  //html
+  let html = ''
+  let unhistories = ['created_by', 'updated_by', 'created_at', 'updated_at', 'company_id', 'id']
+  let arrHistories = []
+  let arrDataAttributes = []
+  let objectType = ['dropzone', 'dropdown_multi', 'dropdown_checkbox', 'array', 'json_array', 'table', 'json']
+  const widgets = MYMODEL.widgets
+  let fields = Object.keys(MYMODEL.labels)
+  if (results.length == 0) {
+    html = 'No History...'
+  } else {
+    for (const result of results) {
+      let obj = {}
+      let data1 = result.data_1
+      let data2 = result.data_2
+
+      for (const key in data1) {
+        if (!unhistories.includes(key)) {
+          if (fields.includes(key)) {
+            if (data1[key] || data2[key]) {
+              let name = MYMODEL.widgets[key].name
+              if (objectType.includes(name)) {
+                if (JSON.stringify(data1[key]) != JSON.stringify(data2[key])) {
+                  obj[key] = [data1[key], data2[key]]
+                }
+              } else {
+                if (data1[key] != data2[key]) {
+                  obj[key] = [data1[key], data2[key]]
+                }
+              }
+            }
+          }
+        }
+      }
+      if (Object.keys(obj).length > 0) {
+        arrHistories.push(obj)
+        arrDataAttributes.push({
+          date1: result.data_1_date,
+          date2: result.data_2_date,
+          by1: result.data_1.created_by,
+          by2: result.created_by,
+        })
+      }
+    }
+
+    let index = 0
+    for (const item of arrHistories) {
+      let obj1 = {}
+      let obj2 = {}
+      for (let key in item) {
+        obj1[key] = item[key][0]
+        obj2[key] = item[key][1]
+      }
+      let viewFormsSync1 = await zRoute.viewFormsSync(req, res, MYMODEL, obj1)
+      let viewFormsSync2 = await zRoute.viewFormsSync(req, res, MYMODEL, obj2)
+      let html1 = ''
+      let html2 = ''
+      for (let key in item) {
+        html1 += viewFormsSync1.build[key]
+        html2 += viewFormsSync2.build[key]
+      }
+
+      html += `<div class="row">
+                            <!-- timeline item 1 left dot -->
+                            <div class="col-auto text-center flex-column d-none d-sm-flex">
+                                <div class="row h-50">
+                                    <div class="col border-end">&nbsp;</div>
+                                    <div class="col">&nbsp;</div>
+                                </div>
+                                <h5 class="m-2">
+                                    <span class="badge rounded-pill bg-light border">&nbsp;</span>
+                                </h5>
+                                <div class="row h-50">
+                                    <div class="col border-end order">&nbsp;</div>
+                                    <div class="col">&nbsp;</div>
+                                </div>
+                            </div>
+                            <!-- timeline item 1 event content -->
+                            <div class="col py-2">
+                                <div class="row">
+                                    <div class="col-md-6">
+                                        <div class="card">
+                                            <div class="card-body">
+                                                <div class="float-end text-muted text-end">${Util.dateFormat(arrDataAttributes[index].date1, 'DD MMM YYYY HH:mm') || ''}<br><small>${users[arrDataAttributes[index].by1].fullname}</small></div>
+                                                <h4 class="card-title text-muted">Semula</h4>
+                                                <div class="card-text">${html1}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="card">
+                                            <div class="card-body">
+                                                <div class="float-end text-muted  text-end">${Util.dateFormat(arrDataAttributes[index].date2, 'DD MMM YYYY HH:mm') || ''} <br><small>${users[arrDataAttributes[index].by2].fullname}</small></div>
+                                                <h4 class="card-title text-success">Menjadi  </h4>
+                                                <div class="card-text">${html2}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>`
+
+      index++
+    }
+  }
+  return html
+}
 module.exports = zRoute

package/lib/zdataTable.js

@@ -194,10 +194,8 @@ 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 == 22) {
           imageapproval = 'rubber-stamp-off'

package/package.json

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