zet-lib 1.5.21 → 1.5.23

package/lib/views/router.txt

@@ -91,9 +91,12 @@ router.get('/preview/:token', async (req, res) => {
         let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
         data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
         template = data.template;
+        let title = data.title || ""
         for (var key in data2) {
             template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
+            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
         }
+        data.title = title;
         var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
         if (details.length) {
             footers = await zRoute.approversFooter(details);

package/lib/zAppRouter.js

@@ -647,8 +647,10 @@ router.post("/zzapproval", async (req, res) => {
       "id"
   );
   try {
+    //console.log(req.body)
     let userId = res.locals.userId;
     let data = zRoute.post(req, res, MYMODEL)[MYMODEL.table];
+    //console.log(data)
     let validator = zRoute.validator(data, MYMODEL);
     if (validator.status == 0) return res.json(validator.message);
     if (data.status == 2) {
@@ -754,10 +756,9 @@ router.post("/zzapproval", async (req, res) => {
           token: Util.uuid(),
         };
         await zRoute.insertSQL(req, res, "zapprovals_details", post);
-        let link =
-            env == "production"
-                ? process.env.APP_URL + "/za/" + post.token
-                : `http://localhost:${port}/za/${post.token}`;
+        let link = env == "production"
+            ? process.env.APP_URL + "/za/" + post.token
+            : `http://localhost:${port}/za/${post.token}`;
         let email = users[post.user_id].email;
 
         post.subject = `Need Approve ${data.title}`;
@@ -767,10 +768,8 @@ router.post("/zzapproval", async (req, res) => {
         post.link = link;
         post.url = process.env.APP_URL;
         post.description = `Hai ${users[post.user_id].fullname} <br>
-
-                
-                We have some document for you.<br>
-                Please click the link above to view the document.`;
+          We have some document for you.<br>
+          Please click the link above to view the document.`;
 
         post.note = `If you click the link, it's will be automatically acknowledged`;
         Mail.approval(req, res, post, email);
@@ -803,10 +802,8 @@ router.post("/zzapproval", async (req, res) => {
         post.link = link;
         post.url = process.env.APP_URL;
         post.description = `Hai ${users[post.user_id].fullname} <br>
-
-                
-                We have some document for you.<br>
-                Please click the link above to view the document.`;
+            We have some document for you.<br>
+            Please click the link above to view the document.`;
 
         post.note = `If you click the link, it's will be automatically acknowledged`;
         Mail.approval(req, res, post, email);
@@ -818,6 +815,7 @@ router.post("/zzapproval", async (req, res) => {
       });
     }
   } catch (err) {
+    console.log(err)
     if (Object.prototype.hasOwnProperty.call(err, "sqlMessage")) {
       json = Util.flashError(err.sqlMessage);
     } else {
@@ -935,10 +933,13 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
       where: { id: result.id_data },
     });
     data = await zRoute.viewTable(req, res, MYMODEL, row);
+    let title = result.title || ""
     template = result.template;
     for (var key in data) {
       template = Util.replaceAll(template, "{{" + key + "}}", data[key]);
+      title = Util.replaceAll(title, "{{" + key + "}}", data[key])
     }
+    result.title = title;
     footers = await zRoute.approversFooter(details);
 
     //send activity
@@ -1058,30 +1059,38 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
     if (status == 4) {
       post.status = 4;
     }
+    //{ comments: 'yyyyy', status: '6' }
+    let approval_history = result.approval_history || [];
+    approval_history.push({comments:req.body.comments, status:req.body.status, user_id:result.user_id})
+    post.approval_history = Util.array_to_jsonb(approval_history)
     await connection.update({
       table: "zapprovals",
       data: post,
       where: { id: result.ide },
     });
+    // 6 comment 4 reject
+    //update ke table data yang dipakai
+    let status_approval_table = 2
+    if(req.body.status == 4){
+      status_approval_table = 22
+    } else {
+      if(result.approvers.length ==1){
+        status_approval_table =21;
+      } else {
+        status_approval_table =11;
+      }
+    }
 
-    /* //send activity
-     await connection.insert({
-       table: "zactivity",
-       data: {
-         company_id: result.company_id,
-         created_at: Util.now(),
-         created_by: result.user_id,
-         updated_by: result.user_id,
-         user_id: result.user_id,
-         table: MYMODEL.table,
-         id_data: result.ide,
-         status: status,
-         status_label: MYMODEL.widgets.status.fields[status],
-         title: MYMODEL.widgets.status.fields[status],
-         description: comments,
-         data: JSON.stringify(post),
-       },
-     });*/
+    await connection.update({
+      table : result.table,
+      data:{
+        approval_history:Util.array_to_jsonb(approval_history),
+        approval_status:status_approval_table
+      },
+      where : {
+        id: result.id_data
+      }
+    })
 
     //send notification
     if (status == 3 || status == 4) {
@@ -1184,25 +1193,6 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
               },
             });
 
-            //send todolist
-            /*await connection.insert({
-              table: "ztodolist",
-              data: {
-                company_id: result.company_id,
-                created_at: Util.now(),
-                created_by: employee_user[result.user_id].user_id,
-                updated_by: employee_user[result.user_id].user_id,
-                user_id: item,
-                table: MYMODEL.table,
-                id_data: result.ide,
-                status: 1,
-                link: "/za/" + post.token,
-                status_label: "Unread",
-                title: `Need Approve`,
-                description: result.title,
-                users: JSON.stringify(approvers),
-              },
-            });*/
 
             //send toastr using socket.io
             io.to(users[item].token).emit(

package/lib/zRoute.js

@@ -5548,43 +5548,43 @@ zRoute.approversFooter = async (results, noActivity) => {
   const MYMODELS = myCache.get("MYMODELS");
   let MYMODEL = MYMODELS.zapprovals_details;
   let users = Util.arrayToObject(
-    await connection.results({ table: "zuser" }),
-    "id"
+      await connection.results({ table: "zuser" }),
+      "id"
   );
   let html = "";
   let id = 0;
-  let knowings = [],
-    approvals = [];
+  let knowings = [];
+  let approvals = [];
   results.forEach(function (result) {
     if (result.type == 2) {
       let html = "";
       html += `<span class="status-approver">${
-        MYMODEL.widgets.status.fields[result.status]
+          MYMODEL.widgets.status.fields[result.status]
       }</span>`;
       html += `<p > <span style="text-decoration: underline;">${
-        users[result.user_id].fullname
+          users[result.user_id].fullname
       }</span><span class="small-time"> ${
-        users[result.user_id].position
+          users[result.user_id].position ? users[result.user_id].position : ''
       }</span></p>`;
       knowings.push(html);
     }
     if (result.type == 1) {
       let html = "";
       let sign =
-        users[result.user_id].verify_signed && result.status == 3
-          ? `<img src="${process.env.APP_URL}/uploads/zuser/${
-              users[result.user_id].verify_signed
-            }" width="200">`
-          : MYMODEL.widgets.status.fields[result.status];
+          users[result.user_id].verify_signed && result.status == 3
+              ? `<img src="${process.env.APP_URL}/uploads/zuser/${
+                  users[result.user_id].verify_signed
+              }" width="200">`
+              : MYMODEL.widgets.status.fields[result.status];
       //var sign = "";
       html += `<span class="status-approver">${sign}</span>`;
       html += `<p class="footer-title"> <span style="text-decoration: underline;">${
-        users[result.user_id].fullname
+          users[result.user_id].fullname
       }</span><span class="small-time"> ${
-        users[result.user_id].position
+          users[result.user_id].position ? users[result.user_id].position : ''
       } <br>  ${Util.dateFormat(
-        result.updated_at,
-        "DD MMM YYYY HH:mm"
+          result.updated_at,
+          "DD MMM YYYY HH:mm"
       )}</span></p>
 `;
       approvals.push(html);
@@ -5611,7 +5611,7 @@ zRoute.approversFooter = async (results, noActivity) => {
     return div;
   };
 
-  html += `<div class="row"><div class="col-12 text-center "><h5 class="knowing">Menyetujui</h5></div></div>`;
+  html += `<div class="row"><div class="col-12 text-center "><h5 class="knowing">Approve</h5></div></div>`;
   html += `<div class="row d-flex justify-content-start align-items-end">`;
   let divClass = divColumn(approvals.length);
   approvals.forEach(function (item) {
@@ -5623,7 +5623,7 @@ zRoute.approversFooter = async (results, noActivity) => {
 
   const knowingDiv = divColumn(knowings.length);
   if (knowings.length) {
-    html += `<div class="row align-items-end"><div class="col-12 text-center mt-5"><h5 class="knowing">Mengetahui</h5></div></div>`;
+    html += `<div class="row align-items-end"><div class="col-12 text-center mt-5"><h5 class="knowing">Acknowledge</h5></div></div>`;
     html += `<div class="row">`;
     knowings.forEach(function (item) {
       html += `<div class="${knowingDiv}">`;
@@ -5635,6 +5635,7 @@ zRoute.approversFooter = async (results, noActivity) => {
   return html;
 };
 
+
 /*
 cache models in so it's no need call database repeatly
  */

package/package.json

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