zet-lib 1.5.22 → 1.5.24

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) {
@@ -705,6 +707,18 @@ router.post("/zzapproval", async (req, res) => {
       table: MYMODEL.table,
       where: { table: data.table, id_data: data.id_data },
     });
+
+    //change title for subject for email
+    let titleEmail = data.title || ""
+    let rowData = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
+    data2 = await zRoute.viewTable(req, res, MYMODEL, rowData, true);
+    for (var key in data2) {
+      titleEmail = Util.replaceAll(titleEmail, "{{" + key + "}}", data2[key])
+    }
+    //console.log(titleEmail)
+    //end
+
+
     if (results.length) {
       let query = await zRoute.updateSQL(req, res, MYMODEL.table, data, {
         id: results[0].id,
@@ -754,30 +768,27 @@ 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}`;
+        post.subject = `Need Approve ${titleEmail}`;
         post.buttonTitle = `Approve Now`;
         post.caption = `NEED APPROVE DOCUMENT`;
-        post.title = data.title;
+        post.title = titleEmail;
         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);
 
         //send notification
         //send toastr using socket.io
-        io.to(users[item].token).emit("message", "Need Approve " + data.title);
+        io.to(users[item].token).emit("message", "Need Approve " + titleEmail);
       });
 
       knowings.map(async (item) => {
@@ -795,29 +806,28 @@ router.post("/zzapproval", async (req, res) => {
                 : `http://localhost:${port}/za/${post.token}`;
         let email = users[post.user_id].email;
 
-        post.subject = `Need acknowledge ${data.title}`;
+        post.subject = `Need acknowledge ${titleEmail}`;
         post.buttonTitle = `Acknowledge Now`;
-        post.title = data.title
+        post.title = titleEmail
         post.caption = `NEED ACKNOWLEDGE DOCUMENT`;
 
         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);
 
         io.to(users[item].token).emit(
             "message",
-            "Need Acknowledge " + data.title
+            "Need Acknowledge " + titleEmail
         );
       });
     }
   } catch (err) {
+    console.log(err)
     if (Object.prototype.hasOwnProperty.call(err, "sqlMessage")) {
       json = Util.flashError(err.sqlMessage);
     } else {
@@ -858,6 +868,11 @@ router.get("/za/:token", csrfProtection, async (req, res) => {
       ],
       where: { "zapprovals_details.token": token },
     });
+
+    if(!result.length){
+      return res.send("Not Found");
+    }
+    result = result[0];
     let approvers = result.approvers;
     knowings = result.knowings ? result.knowings : [];
 
@@ -935,10 +950,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
@@ -1008,6 +1026,15 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
     }
 
     var result = results[0];
+    //change title for subject for email
+    let titleEmail = result.title || ""
+    let rowData = await connection.result({table: result.table, where: {id: result.id_data}});
+    data2 = await zRoute.viewTable(req, res, MYMODEL, rowData, true);
+    for (var key in data2) {
+      titleEmail = Util.replaceAll(titleEmail, "{{" + key + "}}", data2[key])
+    }
+    //end
+
     if (result.approvers_status == 3 || result.approvers_status == 4) {
       return res.json(Util.jsonError("You have submited."));
     }
@@ -1058,34 +1085,42 @@ 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, time:Util.now()})
+    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) {
-      let message = `Document ${result.title} has ${MYMODEL.widgets.status[status]};`;
+      let message = `Document ${titleEmail} has ${MYMODEL.widgets.status[status]};`;
       approvers.forEach(function (item) {
         io.to(users[item].token).emit("message", message);
       });
@@ -1095,7 +1130,6 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
         //approversSigned
         if (result.typee == 2) {
           //get approvers has already sign
-
           approversSigned.push(result.user_id);
           var newApprovers = approvers.filter((item) => {
             return !approversSigned.includes(item);
@@ -1122,7 +1156,7 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
             let link = process.env.APP_URL + "/za/" + post.token;
             let email = users[item].username;
 
-            post.subject = `Need Approve ${result.title}`;
+            post.subject = `Need Approve ${titleEmail}`;
             post.buttonTitle = `Approve Now`;
             post.title = result.title;
             post.link = link;
@@ -1179,35 +1213,16 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
                 link: "/za/" + post.token,
                 status_label: "Unread",
                 title: `Need Approve`,
-                description: data.title,
+                description: titleEmail,
                 token: post.token,
               },
             });
 
-            //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(
                 "message",
-                "Need Approve for document : " + result.title
+                "Need Approve for document : " + titleEmail
             );
           }
         }
@@ -1221,6 +1236,55 @@ router.post("/za/:token", csrfProtection, async (req, res) => {
   res.json(json);
 });
 
+router.post('/get_approval_comments', async(req,res) => {
+  let data = []
+  try {
+    //console.log(req.body);
+    let token = req.body.token;
+    let row = await connection.result({
+      select:"title_id",
+      table : "zapprovals_details",
+      where : {
+        token: token
+      }
+    })
+
+    let result = await connection.result({
+      select:"approval_history",
+      table : "zapprovals",
+      where : {
+        id: row.title_id
+      }
+    })
+
+    //{"{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"yayayay\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"kurang\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"oke\"}","{\"status\": \"4\", \"user_id\": \"192\", \"comments\": \"reject\"}","{\"status\": \"6\", \"user_id\": \"192\", \"comments\": \"dsfsdf\"}"}
+    let zuser = myCache.get('zuser') || {};
+    let approval_history = result.approval_history || [];
+    approval_history.forEach((item) => {
+      // Safe access dengan optional chaining dan fallback
+      const user = zuser[item.user_id];
+      let name = (user && (user.fullname || user.username)) || 'Unknown User';
+      let statusName = ''
+      if(item.status === 6){
+        statusName = 'Comment'
+      } else if(item.status === 4){
+        statusName = 'Reject'
+      } else {
+        statusName = 'Approve'
+      }
+      item.statusName = statusName;
+      item.name = name
+      data.push(item)
+    })
+
+
+  } catch (e) {
+    console.log(e)
+  }
+
+  res.json(data)
+})
+
 router.get("/zdownload/zgenerator/:table", async (req, res) => {
   var table = req.params.table;
   var path = `${dirRoot}/public/uploads/zgenerator/${table}.json`;

package/package.json

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