zet-lib 1.0.48 → 1.0.51

package/lib/zRoute.js

@@ -1078,7 +1078,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     let result = results[0]
     body = result.filter
     fields = body.fields.filter((item) => item != 'no' && item != 'actionColumn')
-    select = Util.selectMysql(fields)
+    select = Util.selectParser(fields, MYMODEL)
     if (zall) {
       let difference = allfields.filter((x) => !fields.includes(x))
       arr = [...fields, ...difference]
@@ -1115,7 +1115,7 @@ zRoute.excelQuery = async (req, res, MYMODEL) => {
     rows = await connection.results(obj)
   } else {
     rows = await connection.results({
-      select: Util.selectMysql(fields),
+      select: Util.selectParser(fields, MYMODEL),
       table: MYMODEL.table,
       limit: reqQuery.pageSize,
       offset: parseInt(reqQuery.pageSize) - 1,
@@ -1524,7 +1524,7 @@ zRoute.listDataTable = async (req, res, objData = {}) => {
   const MYMODEL = objData.MYMODEL || {}
   const fields = Object.prototype.hasOwnProperty.call(objData, 'fields') ? objData.fields : req.body.fields
   const relations = await zRoute.relations(req, res, MYMODEL.table)
-  const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectMysql(fields, relations)
+  const select = Object.prototype.hasOwnProperty.call(objData, 'select') ? objData.select : Util.selectParser(fields, MYMODEL)
   const columns = Object.prototype.hasOwnProperty.call(objData, 'columns') ? objData.columns : body.columns
   let whereArray = []
   if (objData.hasOwnProperty('whereArray')) {
@@ -1604,7 +1604,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   const body = req.body
   const fields = body.fields
-  const select = Util.selectMysql(fields, relations)
+  const select = Util.selectParser(fields, MYMODEL)
   let whereArray = []
   const columns = body.columns
   whereArray.push({
@@ -2738,32 +2738,14 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
         let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
         //let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table);
         //relations[key + "TABLE"]
-        let MODEL_TABLE_RELATIONS = relations[keys + 'TABLE']
+        let MODEL_TABLE_RELATIONS = relations && relations.hasOwnProperty(keys + 'TABLE') ? relations[keys + 'TABLE'] : {}
         let zForm = zRoute.formField(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS)
         zRoute.moduleLib(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS, zForms)
         let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
-        let trtd = ''
-        for (let key in relations[keys]) {
-          obj = zForm.obj[key] || {}
-          let name = MYMODEL.table + '[' + keys + '][${increment}][' + key + ']'
-          obj.name = name
-          //obj.class = MYMODEL.table + "_" + keys + "_" + key;
-          obj.class = `${MYMODEL.table}_${keys}_${key} form-control`
-          obj.id = key
-          obj.options = {
-            'data-name': key,
-            'data-id': obj.class,
-          }
-          trtd += `<td  class="td_${key}_${MYMODEL.widgets[keys].table}">${cForm.field(obj)}</td>`
-        }
-
-        trtd += `<td style="vertical-align:top"><span class="icon-small icons-danger ${trash}" title="Delete"><img class="icons-bg-white griddelete icon-image" src="/assets/icons/trash-filled.svg"></span></td></tr>`
         let subname = MYMODEL.table + '_' + keys
-        scriptForm += `$("table").on("click", ".${trash}", function () {$(this).closest('tr').remove();});`
-        scriptForm += Util.newLine
-        scriptForm += 'var append' + keys + ' = function (increment) {return `<tr data-id="${increment}"  data-name="' + MYMODEL.table + '[' + keys + ']">'
-        scriptForm += trtd
-        scriptForm += '`}'
+        let relationsWithKeys = relations ? relations[keys] : {}
+
+        scriptForm += `var append${keys} = (increment, callback) => { buildform(increment,'${MYMODEL.table}','${keys}','${JSON.stringify(relationsWithKeys)}', (data) => callback(data)) } `
         scriptForm += Util.newLine
         scriptForm += `var append${keys}Max = $('tbody#body-${keys}>tr').length;${Util.newLine}`
         scriptForm += `function ${keys}Handler(){ 
@@ -2804,36 +2786,38 @@ $("#body-${keys}>tr").each(function (index, tr) {
 
         scriptForm += ` $(function () {
         $('#add${keys}').on('click',function(){
-            $('#body-${keys}').append(append${keys}(append${keys}Max));
+            append${keys}(append${keys}Max, (data) => $('#body-${keys}').append(data));
             append${keys}Max++;
             ${keys}Handler();
         });
     var ${keys} = $("#body-${keys}").data("value") ? $("#body-${keys}").data("value") : [];
     ${keys}.forEach(function (myobj, index) {
-            $("#body-${keys}").append(append${keys}(index));
-            ${keys}Handler();
-            for(var key in myobj){
-                if($(".${subname}_" + key).eq(index).attr("type") == "checkbox" && myobj[key] == 1){
-                    $(".${subname}_" + key).eq(index).prop("checked", true);
-                     $(".${subname}_" + key).eq(index).val(myobj[key] ? myobj[key] : '');
-                } else if($(".${subname}_" + key).eq(index).attr("type") == "file"){
-                    var myimg = myobj[key] ? myobj[key] : '';
-                    var pathName = "/uploads/${MYMODEL.table}/${keys}/";
-                    if(myimg) {
-                        var filename = filenamex = pathName+myimg;
-                        if (!myimg.match(/\\.(jpg|jpeg|png|gif|svg|jiff)$/i)) {
-                            filename = "/img/file.png";
+            append${keys}(index, (data) => {
+                $("#body-${keys}").append(data);
+                ${keys}Handler();
+                for(var key in myobj){
+                    if($(".${subname}_" + key).eq(index).attr("type") == "checkbox" && myobj[key] == 1){
+                        $(".${subname}_" + key).eq(index).prop("checked", true);
+                         $(".${subname}_" + key).eq(index).val(myobj[key] ? myobj[key] : '');
+                    } else if($(".${subname}_" + key).eq(index).attr("type") == "file"){
+                        var myimg = myobj[key] ? myobj[key] : '';
+                        var pathName = "/uploads/${MYMODEL.table}/${keys}/";
+                        if(myimg) {
+                            var filename = filenamex = pathName+myimg;
+                            if (!myimg.match(/\\.(jpg|jpeg|png|gif|svg|jiff)$/i)) {
+                                filename = "/img/file.png";
+                            }
+                            $(".${subname}_" + key).eq(index).closest("TD").find("img").attr("src",filename).addClass("boxy");
+                            $(".${subname}_" + key).eq(index).closest("TD").append('<a href="'+filenamex+'" target="_blank" style="font-size: 12px">'+myimg+'</a>');
                         }
-                        $(".${subname}_" + key).eq(index).closest("TD").find("img").attr("src",filename).addClass("boxy");
-                        $(".${subname}_" + key).eq(index).closest("TD").append('<a href="'+filenamex+'" target="_blank" style="font-size: 12px">'+myimg+'</a>');
+                    } else {
+                        $(".${subname}_" + key).eq(index).val(myobj[key] ? myobj[key] : '');
                     }
-                } else {
-                    $(".${subname}_" + key).eq(index).val(myobj[key] ? myobj[key] : '');
                 }
-                
-            }
-        append${keys}Max = index + 1;
+                append${keys}Max = index + 1;
+            });
     });
+    
 });${Util.newLine}`
         break
 
@@ -3052,8 +3036,8 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   //convert to table header
   let hd = '<tr>'
+  let i = 0
   for (let prop in result[1]) {
-    let i = 0
     keys[prop] = result[1][prop]
     hd += `<th>${result[0][prop]}</th>`
     headers.push({ i: i, prop: prop, value: result[0][prop] })
@@ -3061,20 +3045,38 @@ zRoute.import = async (req, res, MYMODEL) => {
   }
   hd += `<th>${LANGUAGE['noted']}</th>`
   hd += `</tr>`
+
+  let isCut = false;
+  if(i > 20 && result.length > 2000) {
+    io.to(room).emit('message', 'short display data!');
+    isCut = true;
+  }
   //convert to table header
   io.to(room).emit('import', hd)
-  let isInsert = true
-  hd += `<tr>`
+  let isInsert = true;
+
   for (let i = 3; i < result.length; i++) {
+    hd = '';
+    hd += `<tr>`
     const data = {}
     hd += `${i - 2}`
+    //column cut tidak penting hanya jika kebanyakan dipotong
+    let columnCut = 0;
     for (var prop in keys) {
       let value = result[i][prop]
       if (value) {
         data[keys[prop]] = value
       }
-      hd += `<td>${value}</td>`
+      if(isCut) {
+        console.log('cut and column cut')
+          if(columnCut < 10) {
+              hd += `<td>${value || ''}</td>`
+          }
+      } else {
+        hd += `<td>${value || ''}</td>`
+      }
       if (keys[prop] == 'id') isInsert = false
+      columnCut++;
     }
     try {
       if (isInsert) {
@@ -3097,13 +3099,14 @@ zRoute.import = async (req, res, MYMODEL) => {
       }
       hd += `<td class='text text-success'>${LANGUAGE['success']}</td>`
     } catch (err) {
-      hd += `<td class='text text-danger'>${err.toString()}</td>`
+      hd += `<td class='text text-danger'>${err+''}</td>`
+        io.to(room).emit('error', err + '' + ' ')
     }
     hd += '</tr>'
     io.to(room).emit('import', hd)
   }
-  hd += ''
-  io.to(room).emit('import', hd)
+
+
   fs.removeSync(filename)
   //cache for uploading excel
   zRoute.modelsCacheRenew(MYMODEL.table, res.locals.companyId)
@@ -3111,6 +3114,43 @@ zRoute.import = async (req, res, MYMODEL) => {
   res.json(json)
 }
 
+/*
+This is post data return form with tr td htmlform
+ */
+zRoute.buildForm = async (req, res) => {
+  const MYMODELS = myCache.get('MYMODELS')
+  let increment = req.body.increment
+  let table = req.body.table
+  let keys = req.body.keys
+  let relations = JSON.parse(req.body.relations)
+  let MYMODEL = MYMODELS[table] || require(`${dirRoot}/models/${table}`)
+  let MODEL_TABLE = MYMODELS[MYMODEL.widgets[keys].table] || require(`${dirRoot}/models/${MYMODEL.widgets[keys].table}`)
+  let MODEL_TABLE_RELATIONS = await zRoute.relations(req, res, MODEL_TABLE.table)
+  let dataName = `${MYMODEL.table}[${keys}]`
+
+  let forms = zRoute.formField(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS)
+  zRoute.moduleLib(req, res, MODEL_TABLE, MODEL_TABLE_RELATIONS, forms)
+  let trash = `trash_${keys}_${MYMODEL.widgets[keys].table}`
+  let trtd = ''
+  for (let key in relations) {
+    let obj = forms.obj[key] || {}
+    let name = `${table}[${keys}][${increment}][${key}]`
+    obj.name = name
+    obj.class = `${MYMODEL.table}_${keys}_${key} form-control`
+    obj.id = key
+    obj.options = {
+      'data-name': key,
+      'data-id': obj.class,
+    }
+    trtd += `<td  class="td_${key}_${MYMODEL.widgets[keys].table}">${cForm.field(obj)}</td>`
+  }
+  trtd += `<td style="vertical-align:top"><span class="icon-small icons-danger ${trash}"  onclick="$(this).closest('tr').remove()" title="Delete"><img class="icons-bg-white griddelete icon-image" src="/assets/icons/trash-filled.svg"></span></td></tr>`
+  let tabledata = `<tr data-id="${increment}"  data-name="${dataName}" >`
+  tabledata += trtd
+
+  res.send(tabledata)
+}
+
 zRoute.buildFileModel = (json, index = 0) => {
   //let text = `module.exports = { ${Util.newLine}`;
   let text = ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.0.48",
+  "version": "1.0.51",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -8,7 +8,7 @@
   "homepage": "https://github.com/sintret/zet",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sintret/zet"
+    "url": "git+https://github.com/sintret/zet.git"
   },
   "keywords": [
     "expressjs"
@@ -49,4 +49,4 @@
     "uuid": "^9.0.0",
     "xlsx": "^0.18.5"
   }
-}
+}