zet-lib 1.2.44 → 1.2.46

package/lib/Form.js

@@ -864,22 +864,8 @@ Form.modal = (obj, LANGUAGE = {}) => {
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        <form>
-            <fieldset>
-              <div class="mb-3">
-                <div class="form-check">
-                  <input class="form-check-input" type="checkbox" id="check-all-grid">
-                  <label class="form-check-label" for="check-all-grid">
-                    Lock/UnLock All
-                  </label>
-                </div>
-              </div>
-            </fieldset>
-        </form>
-       
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary btn-save-lock"> ${LANGUAGE.apply || 'Apply'}</button>
+        <button title="Lock" style="background-color: #DC4C64; color:white" class="btn  btn-save-lock boxy-small dimens2x image-button" type="button"><img src="/assets/icons/lock.svg" class="icons-bg-white"> Lock</button>
+        <button title="Unlock" style="background-color: #14A44D; color:white" class="btn  btn-save-unlock boxy-small dimens2x image-button" type="button"><img src="/assets/icons/lock-open.svg" class="icons-bg-white"> Unlock</button>
       </div>
     </div>
   </div>

package/lib/zAppRouter.js

@@ -1305,15 +1305,15 @@ router.post('/zlock-unlock/:table', async (req, res) => {
   let tableRole = myrole.params[table] || []
   let hasAccess = tableRole.includes('lock') ? true : false
   if (hasAccess) {
+    let type = req.body.type
     let datas = req.body.datas || []
     if (datas.length > 0) {
       for (const data of datas) {
-        let id = data.name.replace('lock[', '').replace(']', '')
-        let value = data.value
+        let id = data.name.replace('ck[', '').replace(']', '')
         await connection.update({
           table: table,
           data: {
-            lock: value,
+            lock: type,
           },
           where: {
             id: id,

package/lib/zRoute.js

@@ -662,24 +662,6 @@ 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
 }
@@ -716,6 +698,9 @@ zRoute.dataTableFilter = (MYMODEL, relations, filter) => {
     if (key == 'id') {
       types[key] = 'input'
       dataTable[key] = `<input type="number" class="search" placeholder="${fields[key].title}" value="${value}" id="data_table_${key}" >`
+    } else if (key == 'no') {
+      types[key] = 'input'
+      dataTable[key] = `<input type="checkbox" class="form-check-input" id="ck_all" >`
     } else {
       if (widgets.hasOwnProperty(key)) {
         const widgetName = widgets[key].name
@@ -866,9 +851,7 @@ zRoute.dataTableData = (key, value, MYMODEL, relations, myid = '') => {
   let myvalue = value
   var widgetName = MYMODEL.widgets[key] ? MYMODEL.widgets[key].name : ''
   if (key == 'lock') {
-    let selected1 = value != 1 ? 'selected' : ''
-    let selected2 = value == 1 ? 'selected' : ''
-    myvalue = `<select name="lock[${myid}]" class="lockdatagrid" id="lock${myid}"><option value="0" ${selected1}>Unlock</option><option value="1" ${selected2}>Lock</option></select>`
+    myvalue = value == 1 ? 'Lock' : 'Unlock'
   } else {
     if (widgetName) {
       switch (widgetName) {
@@ -1930,7 +1913,7 @@ zRoute.listData = async (req, res, MYMODEL, zRole, actionButtonsFn) => {
       let arr = []
       fields.forEach(function (item) {
         if (item == 'no') {
-          arr.push(index + 1 + parseInt(body.start))
+          arr.push(index + 1 + parseInt(body.start) + ` <input type="checkbox" name="ck[${row.id}]" id="ck_${row.id}" class="form-check-input ck">`)
         } else if (item == 'actionColumn') {
           let buttons = !actionButtonsFn(levels, row, MYMODEL.table) ? zRoute.actionButtons(levels, row, MYMODEL.table) : actionButtonsFn(levels, row, MYMODEL.table)
           arr.push(buttons)
@@ -2484,7 +2467,7 @@ zRoute.viewForm = (req, res, MYMODEL, relations, data = {}) => {
   let value = ''
   for (let key in obj) {
     if (widgets.hasOwnProperty(key)) {
-      let className = 'form-control-plaintext '
+      let className = 'form-control form-control-plaintext '
       if (widgets[key].float) {
         className += ` boxy-small`
       } else {

package/lib/zdataTable.js

@@ -123,7 +123,7 @@ class dataTable {
       html += `<button title="${LANGUAGE.import_info}" class="btn buttons-copy buttons-html5 copy gridimport boxy-small dimens2x image-button" tabindex="0"  type="button"><img src="/assets/icons/database-import.svg" class="icons-bg-black"> ${LANGUAGE.import}</span></span></button>`
     }
     if (this.levels.lock) {
-      html += `<button title="Lock/Unlock" style="background-color: #3B71CA; color:white" class="btn btn-danger buttons-lock buttons-html5 copy gridlock boxy-small dimens2x image-button" tabindex="0"  data-bs-toggle="modal" data-bs-target="#grid-lock" type="button"><img src="/assets/icons/cloud-lock.svg" class="icons-bg-white"> Lock/Unlock</span></span></button>`
+      html += `<button title="Lock/Unlock" style="background-color: #332D2D; color:white" class="btn btn-danger buttons-lock buttons-html5 copy gridlock boxy-small dimens2x image-button" tabindex="0"  data-bs-toggle="modal" data-bs-target="#grid-lock" type="button"><img src="/assets/icons/cloud-lock.svg" class="icons-bg-white"> Lock/Unlock</span></span></button>`
     }
     html += `<button title="${LANGUAGE.settings}" class="btn buttons-excel buttons-html5 setting gridsettings boxy-small dimens2x image-button" tabindex="0"  type="button" data-bs-toggle="modal" data-bs-target="#grid-modal"><img src="/assets/icons/settings.svg" class="icons-bg-black"> ${LANGUAGE.settings}</button>`
     html += `<button class="btn refresh gridreload boxy-small dimens2x image-button" title="${LANGUAGE.grid_refresh}" tabindex="0" aria-controls="DataTables_Table_0" type="button"><img src="/assets/icons/refresh.svg" class="icons-bg-black"></button>`
@@ -183,25 +183,40 @@ class dataTable {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }
     script += `<script type="text/javascript">
-        function checkthisgrid() {$(".lockdatagrid").val("1");}
-        function uncheckthisgrid() {$(".lockdatagrid").val("0");}
-$(function () {$("#check-all-grid").on('click', function () {
-    if($(this).is(':checked')) {
-        checkthisgrid();
-    } else {
-        uncheckthisgrid();
-    }
-})
+$(function () {
+    $("#ck_all").on('click', function () {
+      if($(this).is(':checked')) {
+          $(".ck").prop('checked',true)
+      } else {
+          $(".ck").prop('checked',false)
+      }
+    })
+    
 $(".btn-save-lock").on("click", function () {
     ajaxPost('/zlock-unlock/${this.MYMODEL.table}', {
-        datas: $(".lockdatagrid").serializeArray()
+        type : 1,
+        datas: $(".ck").serializeArray()
     }, function (data) {
         toastrForm(data);
         if(data.status ==1) {
             location.href='';
         }
     })
-})})</script>${Util.newLine}`
+})
+
+$(".btn-save-unlock").on("click", function () {
+    ajaxPost('/zlock-unlock/${this.MYMODEL.table}', {
+        type : 0,
+        datas: $(".ck").serializeArray()
+    }, function (data) {
+        toastrForm(data);
+        if(data.status ==1) {
+            location.href='';
+        }
+    })
+})
+
+})</script>${Util.newLine}`
 
     return script
   }

package/package.json

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