zet-lib 1.2.87 → 1.2.89

package/lib/moduleLib.js

@@ -487,10 +487,14 @@ m.selectpicker = function (req, res, elem) {
 
 m.slugHTML = (req, res, content, at = 'end') => {
   if (content) {
+    let head = res.locals.moduleHead
+    let end = res.locals.moduleEnd
     if (at == 'end') {
-      res.locals.moduleEnd = content
+      end += content
+      res.locals.moduleEnd = end
     } else {
-      res.locals.moduleHead = content
+      head += content
+      res.locals.moduleHead = head
     }
   }
 }

package/lib/zCache.js

@@ -19,7 +19,7 @@ zCache.KEYS = {
   ZFUNCTIONS: 'ZFUNCTIONS',
   VERSIONS: 'VERSIONS',
   MODELS_RELATIONS: 'MODELS_RELATIONS',
-  APPROVAL_LEVELS : 'APPROVAL_LEVELS'
+  APPROVAL_LEVELS: 'APPROVAL_LEVELS',
 }
 
 zCache.STATICS = zCache.KEYS
@@ -62,12 +62,6 @@ const cache = async () => {
   } else {
     await zCache.MYMODELS()
   }
-  if (myCache.has('CONFIG')) {
-    i = i + 1
-  } else {
-    //console.log("cache CONFIG not exist " + i)
-    await zCache.CONFIG()
-  }
   if (myCache.has('MENU')) {
     i = i + 1
   } else {
@@ -87,7 +81,7 @@ const cache = async () => {
     await zCache.ZFUNCTIONS()
   }
   if (myCache.has('APPROVAL_LEVELS')) {
-    //i = i + 1;
+    i = i + 1
   } else {
     await zCache.APPROVAL_LEVELS()
   }
@@ -176,38 +170,6 @@ zCache.VERSIONS = () => {
   }
 }
 
-zCache.CONFIG = async () => {
-  let results = async () => {
-    return await connection.results({
-      table: 'zconfig',
-    })
-  }
-  let companies = await connection.results({
-    table: 'zcompany',
-  })
-  let r = await results()
-  let configObj = Util.arrayToObject(r, 'company_id')
-  for (let i = 0; i < companies.length; i++) {
-    let item = companies[i]
-    if (!configObj[item.id]) {
-      await connection.insert({
-        table: 'zconfig',
-        data: {
-          company_id: item.id,
-          layout: 0,
-          json: JSON.stringify(CONFIG),
-          created_at: Util.now(),
-          updated_at: Util.now(),
-        },
-      })
-    }
-  }
-
-  myCache.set(zCache.KEYS.CONFIG, Util.arrayToObject(await results(), 'company_id'))
-  //add to version after set
-  zCache.updateVersions(zCache.KEYS.CONFIG)
-}
-
 zCache.MENU = async () => {
   let results = async () => {
     return await connection.results({
@@ -322,15 +284,15 @@ zCache.MODELS_RELATIONS = async () => {
   }
 }
 
-zCache.APPROVAL_LEVELS = async() => {
+zCache.APPROVAL_LEVELS = async () => {
   if (myCache.has('APPROVAL_LEVELS')) {
     return myCache.get('APPROVAL_LEVELS')
   } else {
     let results = await connection.results({
-      select:'id,name,color',
-      table:'zapproval_type'
+      select: 'id,name,color',
+      table: 'zapproval_type',
     })
-    let obj = Util.arrayToObject(results,"id");
+    let obj = Util.arrayToObject(results, 'id')
     myCache.set('APPROVAL_LEVELS', obj)
     return obj
   }

package/lib/zGeneratorRouter.js

@@ -16,7 +16,7 @@ const ejs = require('ejs')
 var app = express()
 const path = require('path')
 
-const nots = ['index', 'uploads', 'js', 'css', 'log', 'generator', 'zmenu', 'zgenerator', 'zfields', 'zrole', 'zfunction', 'zgrid', 'zgrid_default', 'zreport', 'zpage', 'zlayout', 'zerror', 'zuser_company', 'zconfig']
+const nots = ['index', 'uploads', 'js', 'css', 'log', 'generator', 'zmenu', 'zgenerator', 'zfields', 'zrole', 'zfunction', 'zgrid', 'zgrid_default', 'zreport', 'zpage', 'zlayout', 'zerror', 'zuser_company']
 //const nots = [];
 //const generatorUrl = 'http://localhost:3005';
 const generatorUrl = 'https://generator.cmsqu.com'

package/lib/zRoute.js

@@ -2596,9 +2596,9 @@ zRoute.viewFormsSync = async (req, res, MYMODEL, data = {}) => {
 </div>
 
 <div class="ps-lg-4 my-5 text-lg-start col-lg-3 mb-3 float-end divhistory"><button title="History" class="btn btn-success image-button btn-rounded dimens2x" style="position: fixed;bottom: 100px;right: -40px; transform: rotate(90deg);" data-bs-toggle="modal" data-bs-target="#modal-history"><img src="/assets/icons/history.svg" class="icons-bg-white" alt="Delete"> <span>History Data</span></button></div>
-`
 
-  moduleLib.slugHTML(req, res, contentModal)
+`
+      moduleLib.slugHTML(req, res, contentModal)
   let contentScript = `$(function(){
     ajaxPost("/zhistory-data",{id:${data.id},table:"${MYMODEL.table}"},(data) => {$("#modal-body-history").html(data); if(data == "") {$(".divhistory").remove()}});
         $("#${MYMODEL.table}-delete").on("click", (() => {

package/package.json

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