zet-lib 1.0.95 → 1.0.97

package/lib/moduleLib.js

@@ -265,22 +265,21 @@ m.typeahead = (req, res, elem, data) => {
   let elemData = elem.replace('.', '')
   elemData = elemData.replace('#', '')
   let element = elem.replace('Typeahead', '')
-
   // var script using existing cache
-  script += `$("body").on("change", "${elem}", function(){
-            var current = $("${elem}").typeahead("getActive");
-            if(current){
-                $("${element}").val(current.id);
-                $("${element}").change();
-            }
-    });${Util.newLine}`
   script += `$("body").on("click", "${element}Clear", function(){
             $("${elem}").val("");
             $("${element}").val("");
-            $("${elem}").change();
+            $("${element}").change();
     });${Util.newLine}`
-  script += '$("' + elem + '").typeahead({source: ' + elemData + 'Data ,items: 50, displayText: function(item){  return item.zname.toString();}});' + newLine
-
+  script += `$("${elem}").typeahead({highlight: true,source:${elemData}Data, 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,

package/lib/zRoute.js

@@ -633,6 +633,7 @@ 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)
   const dataTable = zRoute.dataTableFilter(MYMODEL, relations, filter)
   return dataTable
 }
@@ -643,6 +644,10 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
   let filterObject = {}
   let filterKey = ''
   let isFilter = false
+  let hasTypeahed = false
+  let typeaheads = []
+  let hasDatePicker = false
+  let datepickers = []
   filterColumns.forEach(function (item) {
     var value = item.search.value
     if (value) {
@@ -664,7 +669,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
     const value = filterObject.hasOwnProperty(key) ? filterObject[key] : ''
     if (key == 'id') {
       types[key] = 'input'
-      dataTable[key] = `<input type="number" placeholder="${fields[key].title}" value="${value}" id="data_table_${key}" >`
+      dataTable[key] = `<input type="number" class="search" placeholder="${fields[key].title}" value="${value}" id="data_table_${key}" >`
     } else {
       if (widgets.hasOwnProperty(key)) {
         const widgetName = widgets[key].name
@@ -674,12 +679,17 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
               var selected = value === item.id ? ' selected ' : ''
               return result + `<option value="${item.id}" ${selected}>${item.name}</option>`
             }, '')
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select" >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
           case 'color':
-            dataTable[key] = `<input type="color"  class="form-control form-control-color" value="${value}" id="data_table_${key}" >`
+            dataTable[key] = `<input type="color"  class="form-control form-control-color search" value="${value}" id="data_table_${key}" >`
+            types[key] = 'input'
+            break
+
+          case 'datepicker':
+            dataTable[key] = `<input type="text"  class="form-control search datepicker" value="${value}" id="data_table_${key}" >`
             types[key] = 'input'
             break
 
@@ -688,7 +698,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
               var selected = value === item.id ? ' selected ' : ''
               return result + `<option value="${item.id}" ${selected}>${item.zname}</option>`
             }, '')
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select " >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
@@ -697,7 +707,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
               var selected = value == item.id ? ' selected ' : ''
               return result + `<option value="${item.id}" ${selected} >${item.zname}</option>`
             }, '')
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select " >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
@@ -706,7 +716,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
               var selected = value == item.id ? ' selected ' : ''
               return result + `<option value="${item.id}" ${selected}>${item.zname}</option>`
             }, '')
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select " >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
@@ -722,7 +732,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
               const selected = value === k ? ' selected ' : ''
               options += `<option value="${k}" ${selected}>${relations[key][k]}</option>`
             }
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select " >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
@@ -740,26 +750,28 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
                 options += `<option value="${k}" ${selected}>${relations[key][k]}</option>`
               }
             }
-            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select " >${options}</select>`
+            dataTable[key] = `<select id="data_table_${key}" class="form-control form-select search" >${options}</select>`
             types[key] = 'select'
             break
 
           case 'typeahead':
-            options = relations[key].reduce((result, item) => {
-              var selected = value === item.id ? ' selected ' : ''
-              return result + `<option value="${item.id}" ${selected}>${item.zname}</option>`
-            }, '')
-            dataTable[key] = `<select id="data_table_${key}"  class="form-control form-select "  >${options}</select>`
-            types[key] = 'select'
+            dataTable[key] = `<div class="input-group">
+                <input type="text" class="form-control"  id="${key}Typeahead"  autocomplete="off" data-provide="typeahead" id="${key}Typeahead"   placeholder="Please type a word"  >
+<input type="hidden" id="${key}" class="search" required="" value="">
+<span id="${key}Clear" class="input-group-addon input-group-text dropdownadd" title="Clear"  style="cursor: pointer;" title=" Add Data "><img src="/assets/icons/ban.svg" class="icons-bg-black" ></span>
+</div>`
+            types[key] = 'input'
+            hasTypeahed = true
+            typeaheads.push(key)
             break
 
           case 'number':
-            dataTable[key] = `<input type="text"  class="form-control " value="${value}" id="data_table_${key}" >`
+            dataTable[key] = `<input type="text"  class="form-control search" value="${value}" id="data_table_${key}" >`
             types[key] = 'input'
             break
 
           case 'integer':
-            dataTable[key] = `<input type="number"  class="form-control " value="${value}" id="data_table_${key}" >`
+            dataTable[key] = `<input type="number"  class="form-control search" value="${value}" id="data_table_${key}" >`
             types[key] = 'input'
             break
 
@@ -773,7 +785,7 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
             break
 
           default:
-            dataTable[key] = `<input type="text" class="form-control "  value="${value}" id="data_table_${key}" >`
+            dataTable[key] = `<input type="text" class="form-control search"  value="${value}" id="data_table_${key}" >`
             types[key] = 'input'
             break
         }
@@ -783,6 +795,15 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
     }
   }
 
+  /*  if(hasTypeahed) {
+    typeaheads.map((item) => {
+      moduleLib.typeahead(req,res,`#${item}`)
+    })
+  }
+  if(hasDatePicker) {
+    moduleLib.datepicker(req,res);
+  }*/
+
   dataTable.MYMODEL = MYMODEL
   dataTable.RELATIONS = relations
   dataTable.TYPES = types

package/lib/zdataTable.js

@@ -9,7 +9,7 @@ class dataTable {
     this.setColumns = ''
     this.setTable = ''
     this.srcScript = 'https://cdn.datatables.net/v/bs5/dt-1.11.3/date-1.1.1/fc-4.0.1/fh-3.2.1/r-2.2.9/rg-1.1.4/sc-2.0.5/sl-1.3.4/datatables.min.js'
-    this.dataTableScript = '/js/datatable-default.js'
+    this.dataTableScript = '/js/datatable-grids.js'
     this.dataTableButtons = '/js/datatable-buttons.min.js'
     this.customButtons = ''
     this.MYMODEL = null

package/package.json

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