zet-lib 1.2.23 → 1.2.25

package/lib/moduleLib.js

@@ -254,7 +254,51 @@ m.number = (req, res, elem) => {
   }
 }
 
-m.typeahead = (req, res, elem, data) => {
+m.typeahead = (req, res, table, elem) => {
+  let script = ''
+  let head = ``
+  let end = ``
+  elem = elem || '.typeahead'
+  end += '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' + newLine
+
+  let elemData = elem.replace('.', '').replace('#', '')
+  let element = elem.replace('Typeahead', '')
+  let key = element.replace('#', '').replace('.', '')
+  // var script using existing cache
+  script += `$("body").on("click", "${element}Clear", function(){
+            $("${elem}").val("");
+            $("${element}").val("");
+            $("${element}").change();
+    });${Util.newLine}`
+  script += `$("${elem}").typeahead({highlight: true,source: function (query, asyncprocess) {
+        jQuery.ajax({
+            url : "/ztypeahead/${table}/${key}",
+            type : 'GET',
+            data : {
+                "query" : query
+            },
+            dataType : 'json',
+            success : function(json) {
+                asyncprocess(json);
+            }
+        });
+    }, items: 50, displayText: function (item) {
+        return item.zname.toString();
+    },
+    updater:function (item) {
+        $("${element}").val(item.id);
+        $("${element}").change();
+        return item;
+    }
+    }); ${Util.newLine}`
+  return {
+    head: head,
+    end: end,
+    script: script,
+  }
+}
+
+m.typeaheadFile = (req, res, elem, data) => {
   let script = ''
   let head = ``
   let end = ``

package/lib/zRoute.js

@@ -662,6 +662,24 @@ zRoute.relations = async (req, res, table) => {
 zRoute.dataTableFilterSync = async (req, res, MYMODEL, filter) => {
   const relations = await zRoute.relations(req, res, MYMODEL.table)
   zRoute.moduleLib(req, res, MYMODEL, relations)
+  /*let typeaheads = [];
+  let scriptForm = '';
+  let head = '';
+  let end ='';
+  for(let key in MYMODEL.widgets){
+    if(MYMODEL.widgets[key].name == "typeahead") {
+      typeaheads.push(key)
+      let typeaheadObj = moduleLib.typeahead(req, res, `#${key}Typeahead`)
+      scriptForm += typeaheadObj.script
+      head = typeaheadObj.head
+      end = typeaheadObj.end
+    }
+  }
+  if(typeaheads.length > 0) {
+    res.locals.moduleHead = head
+    res.locals.moduleEnd = end
+    moduleLib.addScript(req,res,scriptForm)
+  }*/
   const dataTable = zRoute.dataTableFilter(MYMODEL, relations, filter)
   return dataTable
 }
@@ -2760,8 +2778,8 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
       }
     } else if (MYMODEL.widgets[keys].name == 'typeahead') {
       //employee_payroll_salary___employee_id_1
-      let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`
-      scriptTemp += `<script>const ${keys}TypeaheadData = ${JSON.stringify(myCache.get(name))}</script>`
+      //let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`
+      //scriptTemp += `<script>const ${keys}TypeaheadData = ${JSON.stringify(myCache.get(name))}</script>`
     }
   }
 
@@ -2825,7 +2843,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = '', data = {}) => {
       headObj.switch = switchObj.head
       endObj.switch = switchObj.end
     } else if (widgets[key].name == 'typeahead') {
-      let typeaheadObj = moduleLib.typeahead(req, res, `#${key}Typeahead`, relations[key])
+      let typeaheadObj = moduleLib.typeahead(req, res, MYMODEL.table, `#${key}Typeahead`)
       scriptForm += typeaheadObj.script
       headObj.typeahead = typeaheadObj.head
       endObj.typeahead = typeaheadObj.end
@@ -3843,4 +3861,17 @@ module.exports = (req, res, next) => {`
   }
 }
 
+zRoute.typeahead = async (req, res) => {
+  let table = req.params.table
+  let keys = req.params.field
+  const MYMODELS = myCache.get('MYMODELS')
+  let MYMODEL = MYMODELS[table]
+  let WIDGET = MYMODEL.widgets
+  let query = {}
+  //employee_payroll_salary___employee_id_1
+  let name = `${MYMODEL.widgets[keys].table}_${MYMODEL.table}___${keys}_${res.locals.companyId}`
+  let json = myCache.get(name)
+  res.json(json)
+}
+
 module.exports = zRoute

package/lib/zdataTable.js

@@ -154,6 +154,17 @@ class dataTable {
     }
     script += `<script type="text/javascript" src="${this.dataTableButtons}"></script>${Util.newLine}`
 
+    //additional script for typeahead in grid
+    let typeaheadScript = ''
+    for (let key in this.MYMODEL.widgets) {
+      if (this.MYMODEL.widgets[key].name == 'typeahead') {
+        typeaheadScript += `if($("#${key}").val()){setTimeout(()=>{$("#${key}").change();},1000)};`
+      }
+    }
+    if (typeaheadScript) {
+      script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
+    }
+
     return script
   }
 }

package/package.json

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