zet-lib 3.0.1 → 3.0.3

package/lib/moduleLib.js

@@ -147,9 +147,8 @@ m.location = function (req, res, key) {
   let script = ``;
   let head = ``;
   let end = ``;
-  end =+ `<script src="https://maps.googleapis.com/maps/api/js?key=${process.env.GOOGLE_KEY}&callback=initAutocompleteZmap&libraries=places,marker&language=ID&loading=async" defer></script>`
+  end += `<script src="https://maps.googleapis.com/maps/api/js?key=${process.env.GOOGLE_KEY}&callback=initAutocompleteZmap&libraries=places,marker&language=ID&loading=async" defer></script>`
   script += `let searchAddressMap, autocompleteMap, marker, map;
-
 function initAutocompleteZmap() {
     if (mapLocationJSON && mapLocationJSON.lat) {
         $("#search_map_location").val(mapLocationJSON.address1);

package/lib/zAppRouter.js

@@ -606,6 +606,29 @@ router.get("/session/:id", access, async (req, res) => {
   res.redirect(backURL);
 });
 
+// change backend layout preference
+router.get("/layout_changes/:layout", access, async (req, res) => {
+  const selectedLayout = req.params.layout;
+  const backURL = req.header("Referer") || "/";
+  try {
+    // persist user preference
+    await connection.update({
+      table: "zuser",
+      data: { layout: selectedLayout },
+      where: { id: res.locals.userId },
+    });
+    // update session + locals for next requests
+    if (req.session && req.session.user) {
+      req.session.user.layout = selectedLayout;
+    }
+    res.locals.layout = selectedLayout;
+    global.layout = selectedLayout;
+  } catch (err) {
+    debug(req, res, err);
+  }
+  res.redirect(backURL);
+});
+
 //RESTART
 router.get("/restart", access, async (req, res) => {
   var room = res.locals.user.token;

package/lib/zCache.js

@@ -85,6 +85,11 @@ const cache = async () => {
   } else {
     await zCache.APPROVAL_LEVELS();
   }
+  if (myCache.has("BACKEND_LAYOUTS")) {
+    i = i + 1;
+  } else {
+    await zCache.BACKEND_LAYOUTS();
+  }
   //await zCache.CURRENCIES();
   //console.log(i)
   if (i < 5) {
@@ -106,6 +111,7 @@ zCache.renew = async () => {
   await zCache.MENU_SYSTEMS();
   await zCache.MODELS_RELATIONS();
   await zCache.APPROVAL_LEVELS();
+  await zCache.BACKEND_LAYOUTS();
 };
 
 zCache.ROUTES = () => {
@@ -139,6 +145,19 @@ zCache.ROLES = async () => {
   return r;
 };
 
+
+zCache.BACKEND_LAYOUTS = async () => {
+  let results = await connection.results({
+    select: 'id,name',
+    table: "zlayout",
+    where: {
+      type:2
+    }
+  });
+  await myCache.set("BACKEND_LAYOUTS", results);
+  return results;
+};
+
 zCache.ZFUNCTIONS = async () => {
   let query = await connection.results({
     table: "zfunction",
@@ -274,7 +293,7 @@ zCache.updateVersions = (name) => {
 
 zCache.MODELS_RELATIONS = async () => {
   if (process.env.APP_IS_CACHE == 1) {
-    console.log("cache models");
+    console.log("cache MODELS_RELATIONS");
     if (myCache.has("MODELS_RELATIONS")) {
       return myCache.get("MODELS_RELATIONS");
     } else {

package/lib/zapp.js

@@ -1,4 +1,6 @@
+const myCache = require("./cache");
 module.exports = (req,res,next) => {
+  res.locals.BACKEND_LAYOUTS = myCache.get("BACKEND_LAYOUTS");
   res.locals.renderHead = "";
   res.locals.renderBody = "";
   res.locals.renderEnd = "";
@@ -28,8 +30,10 @@ module.exports = (req,res,next) => {
   global.LANGUAGE = require('./languages/lang_en');
   res.locals.socketUrl = process.env.APP_URL;
   res.locals.zcompanies = [];
+  res.locals.backend_layouts = [];
   res.locals.isLogin = false;
   res.locals.objectStores = {};
+  global.layout = "backend";
   if (req.session) {
     let reqSession = req.session;
     if (reqSession.hasOwnProperty('user')) {
@@ -53,7 +57,11 @@ module.exports = (req,res,next) => {
           };
           global.LANGUAGE = require(`./languages/${objLanguage[tUser.language]}`);
         }
-        global.layout = "two";
+        if(tUser.layout){
+          res.locals.layout = tUser.layout;
+          //global.layout = tUser.layout;
+        }
+        console.log(global.layout)
       }
     }
   }
@@ -62,4 +70,5 @@ module.exports = (req,res,next) => {
   res.locals.LANGUAGE = global.LANGUAGE;
 
   next();
-};
+
+};

package/package.json

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