zet-lib 1.5.25 → 1.5.26

package/lib/zRoute.js

@@ -1152,19 +1152,35 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
 };
 
 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}) (${item.text})] `;
-    });
+  try {
+    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 = arr.reverse();
+      arr.map((item) => {
+        let statusName = ' '
+        if (item.status == 6) {
+          statusName = "Comment"
+        } else if (item.status == 4) {
+          statusName = "Reject"
+        } else if (item.status == 3) {
+          statusName = "Approve"
+        } else {
+          statusName = APPROVAL_LEVELS[item.status] ? APPROVAL_LEVELS[item.status].name : ''
+        }
+        myvalue += `${statusName} By:${
+            USERS[item.user_id].zname || ''
+        }&nbsp;-&nbsp;(${item.time ? Util.dateFormat(item.time, "DD MMM YYYY HH:mm") : ''}) (${item.comments ? item.comments : item.text || ''}) <br>`;
+      });
+    }
+    return myvalue;
+  } catch (e) {
+    console.log(e)
+    return '';
   }
-  return myvalue;
-};
+}
 
 zRoute.dataTableData = (
     key,

package/package.json

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