zet-lib 1.5.20 → 1.5.22

package/lib/zRoute.js

@@ -1447,7 +1447,7 @@ zRoute.resetPassword = async (req, res) => {
 zRoute.loginAuth = async (username, fields) => {
   let results = await connection.results({
     table: "zuser",
-    where: { username: username },
+    where: { email: username },
   });
   if (results.length) {
     await connection.update({
@@ -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.20",
+  "version": "1.5.22",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"