zet-lib 3.1.6 → 3.2.0

package/lib/Model.js

@@ -1042,9 +1042,6 @@ Model.number = {
         "defaultValue",
         "inputGroupLeft",
         "inputGroupRight",
-        "digitDecimal",
-        "decimalPlaces",
-        "thousandSeparator",
         "information",
     ],
     attributes: ["min", "max"],
@@ -1058,9 +1055,6 @@ Model.number = {
         defaultValue: "Default Value",
         inputGroupLeft: "Input Group Left",
         inputGroupRight: "Input Group Right",
-        digitDecimal:"Digit Decimal",
-        decimalPlaces:"Decimal Places",
-        thousandSeparator:"Use 1000 Separator",
         information: "Additional Information",
     },
     defaultValues: {
@@ -1073,9 +1067,6 @@ Model.number = {
         defaultValue: null,
         inputGroupLeft: "",
         inputGroupRight: "",
-        digitDecimal: 0,
-        decimalPlaces:",",
-        thousandSeparator:".",
         information: "",
     },
     typies: {
@@ -1115,18 +1106,6 @@ Model.number = {
             tag: "input",
             type: "text",
         },
-        digitDecimal: {
-            tag: "input",
-            type: "number",
-        },
-        decimalPlaces: {
-            tag: "input",
-            type: "text",
-        },
-        thousandSeparator: {
-            tag: "input",
-            type: "text",
-        },
         information: {
             tag: "textarea",
             type: "",
@@ -2418,7 +2397,8 @@ Model.relation = {
         "hidden",
         "isSearch",
         "order_by",
-        "import_field"
+        "import_field",
+        "relation_info"
     ],
     labels: {
         required: "Required",
@@ -2435,7 +2415,8 @@ Model.relation = {
         hidden: "Hidden",
         isSearch:"Auto complete Search",
         order_by : "Order By",
-        import_field :"Default Import Field (id)"
+        import_field :"Default Import Field (id)",
+        relation_info : "Relation Data"
     },
     defaultValues: {
         required: false,
@@ -2452,7 +2433,8 @@ Model.relation = {
         hidden: false,
         isSearch:false,
         order_by : "",
-        import_field :"id"
+        import_field :"id",
+        relation_info : "",
     },
     typies: {
         required: {
@@ -2515,6 +2497,10 @@ Model.relation = {
             tag: "input",
             type: "text",
         },
+        relation_info : {
+            tag: "textarea",
+            rows: "3",
+        },
     },
     comment: (obj) => {
         return `select`;

package/lib/generatorModel.js

@@ -392,6 +392,16 @@ me.prepare = (MYMODEL) => {
                 widgets[key].please_select = property.values.please_select;
                 widgets[key].order_by = property.values.order_by;
                 widgets[key].import_field = property.values.import_field || "id";
+                widgets[key].relation_info = property.values.relation_info ? true : false;
+                if(widgets[key].relation_info) {
+                    //create file info to runtime
+                    let dirInfo = `${dirRoot}/public/runtime/info/${MYMODEL.table}`
+                    //Util.writeFile(`${dirRoot}/runtime/info/${MYMODEL.tab}`)
+                    if(!fs.existsSync(dirInfo)) {
+                        fs.mkdirSync(dirInfo, { recursive: true });
+                    }
+                    fs.writeFileSync(`${dirInfo}/${key}.txt`, property.values.relation_info);
+                }
                 break;
             case "dragdrop":
                 widgets[key].table = property.values.table;

package/lib/zAppRouter.js

@@ -2269,4 +2269,90 @@ router.post("/zcompress-dropbox", async (req, res) => {
   res.json(Util.jsonSuccess("Compress all images completed..."));
 });
 
+router.post('/zcall-information_info', async(req,res) => {
+  let data = ''
+  try {
+    const {table, elementId, myvalue} = req.body;
+    let content = Util.readFile(`${dirRoot}/public/runtime/info/${table}/${elementId}.txt`)
+    data = content;
+
+    // Fungsi untuk mengekstrak semua field dari template
+    const extractFields = (template) => {
+      const regex = /\{\{([^}]+)\}\}/g;
+      const fields = [];
+      let match;
+      while ((match = regex.exec(template)) !== null) {
+        fields.push(match[1].trim());
+      }
+      return [...new Set(fields)]; // Remove duplicates
+    };
+
+    if(content){
+      let others = {}
+      const MYMODELS = myCache.get("MYMODELS");
+      let mymodel = MYMODELS[table];
+      let mytable = mymodel.widgets[elementId].table;
+      //console.log(mymodel);
+      const result = await connection.result({
+        table: mytable,
+        where: {
+          id: myvalue,
+        },
+      });
+      //others = Object.assign({}, result);
+      let fields = extractFields(content);
+      fields.map((item) => {
+        if(item.includes(".")){
+          let name = item.split(".")[0];
+          others[name] = {};
+        }
+      })
+
+      for(let key in others){
+        let modelkey = MYMODELS[mytable].widgets[key].table;
+        const resultkey = await connection.result({
+          table: modelkey,
+          where: {
+            id: result[key],
+          },
+        });
+        others[key] = resultkey;
+        ///disini saya ingin replace content dengan format {{}}
+        //data = data.replace(`{{${key}}}`, resultkey[key]);
+
+      }
+      let dataReplace = result;
+      for(let key in others){
+        dataReplace[key] = others[key];
+      }
+      console.log(dataReplace);
+
+      //saya ingin replace data dengan dataReplace
+      // Fungsi untuk mendapatkan nilai dari path nested object
+      const getNestedValue = (obj, path) => {
+        const keys = path.split('.');
+        let value = obj;
+        for (const key of keys) {
+          if (value && typeof value === 'object' && key in value) {
+            value = value[key];
+          } else {
+            return ''; // Return empty string if path not found
+          }
+        }
+        return value !== null && value !== undefined ? String(value) : '';
+      };
+
+      // Replace semua placeholder {{field}} dengan nilai dari dataReplace
+      data = content.replace(/\{\{([^}]+)\}\}/g, (match, fieldPath) => {
+        const trimmedPath = fieldPath.trim();
+        return getNestedValue(dataReplace, trimmedPath);
+      });
+
+    }
+  } catch (e) {
+    console.log(e)
+  }
+  res.json(data)
+})
+
 module.exports = router;

package/lib/zRoute.js

@@ -4175,6 +4175,8 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
   let joinsFields = [];
   let selectize = [];
   let moneys = [];
+  let hasRelationInfo = false;
+  let relationInfos = [];
   if (MYMODEL.joins) {
     joinsFields = MYMODEL.joins.list;
   }
@@ -4267,6 +4269,11 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
           selectize.push(key);
           hasSelectize = true;
         }
+        if (widgets[key].relation_info) {
+          hasRelationInfo = true;
+          relationInfos.push(key);
+        }
+
       }
     }
   }
@@ -4276,6 +4283,27 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     headObj.datepicker = datePickerObj.head;
     endObj.datepicker = datePickerObj.end;
   }
+  if(hasRelationInfo){
+    scriptForm += `function callRelationInfo(table, elementId, myvalue) {
+        ajaxPost('/zcall-information_info',{table: table, elementId: elementId, myvalue: myvalue}, function (data) {
+            let elemclass = 'information_' + elementId;
+            if($("."+elemclass).length > 0){
+                $("."+elemclass).html(data);
+            } else {
+                $(".div"+elementId).append('<div class="' + elemclass + ' mt-2 boxy">' + data + '</div>');
+            }
+        })
+    } \r\n`
+    let infoScript = '';
+    relationInfos.map((relationInfo) => {
+      infoScript += `$("#${relationInfo}").on('change', function () {
+            callRelationInfo('${MYMODEL.table}','${relationInfo}', $(this).val())
+        })
+        callRelationInfo('${MYMODEL.table}','${relationInfo}', $("#${relationInfo}").val()) \r\n`
+    })
+
+    scriptForm += `$(function() {${infoScript}});`;
+  }
   if (hasNumber) {
     let numberObj = moduleLib.number(req, res);
     scriptForm += numberObj.script;
@@ -6178,84 +6206,211 @@ zRoute.history = async (
     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]];
+  try {
+    //html
+    let html = "";
+
+    // Validasi input parameter
+    if (!MYMODEL || !MYMODEL.widgets || !MYMODEL.labels) {
+      return "Invalid model configuration";
+    }
+
+    if (!users || typeof users !== 'object') {
+      users = {};
+    }
+
+    if (!Array.isArray(results)) {
+      results = [];
+    }
+
+    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) {
+        try {
+          if (!result || typeof result !== 'object') {
+            continue;
+          }
+
+          let obj = {};
+          let data1 = result.data_1 || {};
+          let data2 = result.data_2 || {};
+
+          if (!data1 || typeof data1 !== 'object') {
+            data1 = {};
+          }
+          if (!data2 || typeof data2 !== 'object') {
+            data2 = {};
+          }
+
+          for (const key in data1) {
+            try {
+              if (!unhistories.includes(key)) {
+                if (fields.includes(key)) {
+                  if (data1[key] || data2[key]) {
+                    // Validasi widget exists
+                    if (!MYMODEL.widgets[key] || !MYMODEL.widgets[key].name) {
+                      continue;
+                    }
+
+                    let name = MYMODEL.widgets[key].name;
+                    if (objectType.includes(name)) {
+                      try {
+                        if (JSON.stringify(data1[key]) != JSON.stringify(data2[key])) {
+                          obj[key] = [data1[key], data2[key]];
+                        }
+                      } catch (jsonError) {
+                        // Jika JSON.stringify error, gunakan perbandingan biasa
+                        if (data1[key] != data2[key]) {
+                          obj[key] = [data1[key], data2[key]];
+                        }
+                      }
+                    } else {
+                      if (data1[key] != data2[key]) {
+                        obj[key] = [data1[key], data2[key]];
+                      }
+                    }
+                  }
                 }
               }
+            } catch (keyError) {
+              // Skip key yang error, lanjut ke key berikutnya
+              console.error(`Error processing key ${key}:`, keyError);
+              continue;
             }
           }
+
+          if (Object.keys(obj).length > 0) {
+            arrHistories.push(obj);
+            arrDataAttributes.push({
+              date1: result.data_1_date || null,
+              date2: result.data_2_date || null,
+              by1: (result.data_1 && result.data_1.updated_by) || null,
+              by2: result.created_by || null,
+            });
+          }
+        } catch (resultError) {
+          // Skip result yang error, lanjut ke result berikutnya
+          console.error('Error processing result:', resultError);
+          continue;
         }
       }
-      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.updated_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];
-      }
+      let index = 0;
+      for (const item of arrHistories) {
+        try {
+          if (!item || typeof item !== 'object') {
+            index++;
+            continue;
+          }
+
+          let obj1 = {};
+          let obj2 = {};
+          for (let key in item) {
+            if (Array.isArray(item[key]) && item[key].length >= 2) {
+              obj1[key] = item[key][0];
+              obj2[key] = item[key][1];
+            }
+          }
+
+          let viewFormsSync1, viewFormsSync2;
+          try {
+            viewFormsSync1 = await zRoute.viewFormsSync(req, res, MYMODEL, obj1);
+            viewFormsSync2 = await zRoute.viewFormsSync(req, res, MYMODEL, obj2);
+          } catch (viewFormsError) {
+            console.error('Error in viewFormsSync:', viewFormsError);
+            index++;
+            continue;
+          }
+
+          if (!viewFormsSync1 || !viewFormsSync1.build) {
+            viewFormsSync1 = { build: {} };
+          }
+          if (!viewFormsSync2 || !viewFormsSync2.build) {
+            viewFormsSync2 = { build: {} };
+          }
+
+          let html1 = "";
+          let html2 = "";
+          for (let key in item) {
+            html1 += (viewFormsSync1.build[key] || '');
+            html2 += (viewFormsSync2.build[key] || '');
+          }
+
+          // Validasi arrDataAttributes[index]
+          const dataAttr = arrDataAttributes[index] || {};
+          const date1 = dataAttr.date1 || null;
+          const date2 = dataAttr.date2 || null;
+          const by1 = dataAttr.by1 || null;
+          const by2 = dataAttr.by2 || null;
 
-      html += `<div class="row">
+          // Validasi users sebelum mengakses fullname
+          let user1Fullname = '';
+          let user2Fullname = '';
+
+          try {
+            if (by1 && users[by1] && users[by1].fullname) {
+              user1Fullname = users[by1].fullname;
+            } else {
+              user1Fullname = by1 || 'Unknown';
+            }
+          } catch (user1Error) {
+            user1Fullname = by1 || 'Unknown';
+          }
+
+          try {
+            if (by2 && users[by2] && users[by2].fullname) {
+              user2Fullname = users[by2].fullname;
+            } else {
+              user2Fullname = by2 || 'Unknown';
+            }
+          } catch (user2Error) {
+            user2Fullname = by2 || 'Unknown';
+          }
+
+          // Format date dengan error handling
+          let formattedDate1 = '';
+          let formattedDate2 = '';
+
+          try {
+            if (date1 && Util && Util.dateFormat) {
+              formattedDate1 = Util.dateFormat(date1, "DD MMM YYYY HH:mm") || "";
+            }
+          } catch (date1Error) {
+            formattedDate1 = '';
+          }
+
+          try {
+            if (date2 && Util && Util.dateFormat) {
+              formattedDate2 = Util.dateFormat(date2, "DD MMM YYYY HH:mm") || "";
+            }
+          } catch (date2Error) {
+            formattedDate2 = '';
+          }
+
+          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">
@@ -6276,15 +6431,7 @@ zRoute.history = async (
                                     <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>
+                                                <div class="float-end text-muted text-end">${formattedDate1}<br><small>${user1Fullname}</small></div>
                                                 <h4 class="card-title text-muted">Semula</h4>
                                                 <div class="card-text">${html1}</div>
                                             </div>
@@ -6293,15 +6440,7 @@ zRoute.history = async (
                                     <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>
+                                                <div class="float-end text-muted  text-end">${formattedDate2} <br><small>${user2Fullname}</small></div>
                                                 <h4 class="card-title text-success">Menjadi  </h4>
                                                 <div class="card-text">${html2}</div>
                                             </div>
@@ -6311,10 +6450,20 @@ zRoute.history = async (
                             </div>
                         </div>`;
 
-      index++;
+          index++;
+        } catch (itemError) {
+          // Skip item yang error, lanjut ke item berikutnya
+          console.error(`Error processing history item at index ${index}:`, itemError);
+          index++;
+          continue;
+        }
+      }
     }
+    return html;
+  } catch (error) {
+    console.error('Error in zRoute.history:', error);
+    return "Error loading history. Please try again later.";
   }
-  return html;
 };
 
 zRoute.tableBody = (

package/package.json

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