zet-lib 3.3.3 → 3.3.5

package/lib/Form.js

@@ -508,7 +508,9 @@ Form.field = (obj) => {
       });
       value = value || [];
       value.map((item, index) => {
-        leftButtons += `<li><button class="btn btn-primary boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='${obj.name}[]' value="${item}"></button></li>`;
+        if (obj.dataObject && item in obj.dataObject) {
+          leftButtons += `<li><button class="btn btn-primary boxy" type="button">${obj.dataObject[item]}<input type="hidden" name='${obj.name}[]' value="${item}"></button></li>`;
+        }
       });
 
       displayForm += `<div id="dragdrop_${obj.id}" class="row contentfields">

package/lib/views/zgenerator/routerApp.ejs

@@ -1,359 +1,359 @@
-const router = require('express').Router();
-const {csrf} = require('zet-lib');
-const csrfProtection = csrf({cookie: true});
-const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
-const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
-
-router.get('/', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    let dataTable = new zDataTable(res.locals);
-    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
-    const levels = zRole.myLevel(req, res, MYMODEL.table);
-    dataTable.levels = levels;
-    res.render(`layouts/${layout}`, {
-        dataTable: dataTable,
-        levels : levels,
-        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
-        breadcrumb : zForm.breadcrumbIndex(),
-        myModal : zForm.modal({
-        attributeData: res.locals.attributeData,
-        visibles: res.locals.visibles,
-        invisibles: res.locals.invisibles,
-        routeName: MYMODEL.table,
-        }, LANGUAGE),
-        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
-        renderBody: `${MYMODEL.routeName}/index.ejs`,
-        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
-    });
-});
-
-router.post('/list', async (req, res) => {
-    const data = await zRoute.listData(req, res, MYMODEL, zRole);
-    res.json(data);
-});
-
-router.get('/create', csrfProtection, async(req, res) => {
-    let data = MYMODEL.datas;
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/create.ejs`,
-        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
-    });
-});
-
-router.post('/create', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
-        json.data=result;
-    } catch (err) {
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err);
-    }
-    res.json(json);
-});
-
-router.get('/update/:id', csrfProtection, async (req, res) => {
-    const id = parseInt(req.params.id);
-    const results = await connection.results({
-        select:zRoute.selectData(MYMODEL),
-        table: MYMODEL.table,
-        where: {
-            id: id,
-            company_id: res.locals.companyId
-        }
-    });
-    if (results.length == 0) {
-        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-        return res.redirect('/' + MYMODEL.routeName);
-    }
-    let data = results[0];
-    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
-    res.render(`layouts/${layout}`, {
-        data: data,
-        zForms: zForms,
-        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/update.ejs`,
-        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
-    });
-});
-
-router.post('/update/:id', csrfProtection, async (req, res) => {
-    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
-    try {
-        const id = parseInt(req.params.id);
-        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
-        const validator = zRoute.validator(data, MYMODEL);
-        if(validator.status == 0) return res.json(validator.message);
-        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
-        json.data=result;
-    } catch (err) {
-        console.log(err)
-        if(Object.hasOwn(err,"sqlMessage")){
-            json = Util.flashError(err.sqlMessage);
-        } else {
-            json = Util.flashError(err.toString());
-        }
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.delete('/delete', async (req, res) => {
-    const id = req.body.id;
-    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
-    try {
-        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
-    } catch (err) {
-        json = Util.flashError(err.toString());
-        zDebug(req, res, err)
-    }
-    res.json(json);
-});
-
-router.get('/view/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let zForms = {};
-    try {
-        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data = results[0];
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
-    } catch (err){
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        data: data,
-        Util:Util,
-        zForms:zForms,
-        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        renderBody: `${MYMODEL.routeName}/view.ejs`
-    });
-});
-
-router.get('/excel-query', async (req,res) => {
-    await zRoute.excelQuery(req, res, MYMODEL);
-});
-
-router.get('/excel', async (req, res) => {
-    const fields = MYMODEL.keysExcel;
-    const results = await connection.results({
-        table: MYMODEL.table,
-        where: {company_id: res.locals.companyId},
-        orderBy: ['id', 'DESC']
-    });
-    await zRoute.excel(req, res, MYMODEL, fields, results);
-});
-
-router.get('/sample', async (req, res) => {
-    let fields = [];
-    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
-        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
-            fields.push(MYMODEL.keysExcel[i]);
-        }
-    }
-    const results = await connection.results({
-        table:MYMODEL.table,
-        where:{
-            company_id:res.locals.companyId
-        },
-        orderBy:["id","desc"], limit:10
-    });
-    let callback=(result,field)=> {
-        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
-    };
-    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
-});
-
-router.get('/import',csrfProtection, async (req, res) => {
-    const room = res.locals.token;
-    res.render(`layouts/${layout}`, {
-        room: room,
-        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
-        csrfToken: req.csrfToken(),
-        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
-        renderBody: `${MYMODEL.routeName}/import.ejs`,
-        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
-    });
-});
-
-
-router.post('/import', async(req, res) => {
-    res.json(await zRoute.import(req,res,MYMODEL));
-});
-
-router.get('/approval/:id', async (req, res) => {
-    await zRoute.attributeData(res, MYMODEL);
-    const id = req.params.id;
-    let data = {};
-    let data2 = {};
-    let zForms = {};
-    let zForms2 = {};
-    let result = {};
-    try {
-        result = await connection.result({table: MYMODEL.table, where: {id: id}});
-        if (!result.id) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        data=result;
-        moduleLib.editor(req, res);
-        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
-        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-            if (data.status == 0) {
-                toastr.error(data.message, data.title);
-            } else {
-                toastr.success(data.title, data.message);
-            }
-        });});
-        $("#submit").on("click", function () {
-            $('[name="zapprovals[status]"]').val(2);
-            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
-                if (data.status == 0) {
-                    toastr.error(data.message, data.title);
-                } else {
-                    toastr.success(data.title, data.message);
-                    location.href = "";
-                }
-            });
-        });
-    `;
-        await moduleLib.addScript(req, res, contentScript);
-        const MODEL_APROVALS = require("./../models/zapprovals");
-        const rows = await connection.results({
-            table: "zapprovals",
-            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
-        });
-        if (rows.length) {
-            data2 = rows[0];
-        } else {
-            let obj = {};
-            obj.token = Util.uuid();
-            obj.status = 1;
-            obj.table = MYMODEL.table;
-            obj.company_id = res.locals.companyId;
-            obj.id_data = id;
-            obj.created_by = res.locals.userId;
-            obj.updated_by = res.locals.userId;
-            obj.created_at = Util.now();
-            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-            let jsonApproval = zfields.approval_json || {}
-            obj.template = jsonApproval.content || {}
-            let title = jsonApproval.title;
-            if (title) {
-                let titleData = title;
-                for (var key in data) {
-                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
-                }
-                obj.title = titleData
-            }
-            if (jsonApproval.hasOwnProperty("approvers")) {
-                obj.approvers = JSON.stringify(jsonApproval.approvers);
-                obj.knowings = JSON.stringify(jsonApproval.knowings);
-                obj.type = 1;
-            }
-            //insert default data
-            await connection.insert({table: "zapprovals", data: obj});
-            data2 = obj;
-        }
-        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/${layout}`, {
-        zForms: zForms,
-        zForms2: zForms2,
-        data: result,
-        result:result,
-        data2: data2,
-        Util: Util,
-        levels: zRole.myLevel(req, res, MYMODEL.table),
-        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
-        renderBody: `${MYMODEL.routeName}/approval.ejs`
-    });
-});
-
-router.get('/preview/:token', async (req, res) => {
-    let token = req.params.token;
-    let data = {}, data2 = {};
-    let template = "";
-    let footers = "";
-    try {
-        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-        let jsonApproval = zfields.approval_json || {}
-        let mytemplate = jsonApproval.content || {}
-        let results = await connection.results({table: "zapprovals", where: {token: token}});
-        if (results.length == 0) {
-            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
-            return res.redirect('/' + MYMODEL.routeName);
-        }
-        if(results[0].status == 1){
-            await connection.update({
-                table : "zapprovals",
-                data: {
-                    template : mytemplate
-                },
-                where : {
-                    token:token
-                }
-            })
-            results = await connection.results({table: "zapprovals", where: {token: token}});
-        }
-        let MYMODEL2 = require("./../models/zapprovals")
-        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
-        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
-        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
-        template = data.template;
-        let title = data.title || ""
-        for (var key in data2) {
-            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
-            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
-        }
-        data.title = title;
-        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
-        if (details.length) {
-            footers = await zRoute.approversFooter(details);
-        }
-    } catch (err) {
-        zDebug(req, res, err);
-        res.send("Err");
-    }
-    res.render(`layouts/blank`, {
-        template: template,
-        data: data,
-        footers: footers,
-        Util: Util,
-        details: details,
-        renderBody: 'index/zapprovals_preview.ejs'
-    });
-});
-
-router.post('/grid', access, zRoute.postGrid);
-router.post('/reload', access, zRoute.postGridReload);
-router.post('/chains', access, zRoute.chains);
-router.post('/get_attributes',access, zRoute.getAttributes);
-
-module.exports = router;
+const router = require('express').Router();
+const {csrf} = require('zet-lib');
+const csrfProtection = csrf({cookie: true});
+const {Util, access, connection, moduleLib, zDebug, zRoute, zRole, zDataTable, zForm} = require('zet-lib');
+const MYMODEL = require('./../models/[[[TABLE_NAME]]]');
+
+router.get('/', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    let dataTable = new zDataTable(res.locals);
+    dataTable.filterMODEL = await zRoute.dataTableFilterSync(req,res, MYMODEL, res.locals.gridFilter);
+    const levels = zRole.myLevel(req, res, MYMODEL.table);
+    dataTable.levels = levels;
+    res.render(`layouts/${layout}`, {
+        dataTable: dataTable,
+        levels : levels,
+        titleHeader: `<strong class="text text-info">${MYMODEL.title}</strong>`,
+        breadcrumb : zForm.breadcrumbIndex(),
+        myModal : zForm.modal({
+        attributeData: res.locals.attributeData,
+        visibles: res.locals.visibles,
+        invisibles: res.locals.invisibles,
+        routeName: MYMODEL.table,
+        }, LANGUAGE),
+        renderHead: `${MYMODEL.routeName}/indexcss.ejs`,
+        renderBody: `${MYMODEL.routeName}/index.ejs`,
+        renderEnd: `${MYMODEL.routeName}/indexjs.ejs`
+    });
+});
+
+router.post('/list', async (req, res) => {
+    const data = await zRoute.listData(req, res, MYMODEL, zRole);
+    res.json(data);
+});
+
+router.get('/create', csrfProtection, async(req, res) => {
+    let data = MYMODEL.datas;
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_create']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbCreate(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/create.ejs`,
+        renderEnd: `${MYMODEL.routeName}/createjs.ejs`
+    });
+});
+
+router.post('/create', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.insertSQL(req, res, MYMODEL.table, data);
+        json.data=result;
+    } catch (err) {
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err);
+    }
+    res.json(json);
+});
+
+router.get('/update/:id', csrfProtection, async (req, res) => {
+    const id = parseInt(req.params.id);
+    const results = await connection.results({
+        select:zRoute.selectData(MYMODEL),
+        table: MYMODEL.table,
+        where: {
+            id: id,
+            company_id: res.locals.companyId
+        }
+    });
+    if (results.length == 0) {
+        req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+        return res.redirect('/' + MYMODEL.routeName);
+    }
+    let data = results[0];
+    const zForms = await zRoute.formsFieldSync(req, res, MYMODEL, data);
+    res.render(`layouts/${layout}`, {
+        data: data,
+        zForms: zForms,
+        titleHeader: `${LANGUAGE['form_update']} : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbUpdate(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/update.ejs`,
+        renderEnd: `${MYMODEL.routeName}/updatejs.ejs`,
+    });
+});
+
+router.post('/update/:id', csrfProtection, async (req, res) => {
+    let json = Util.jsonSuccess(LANGUAGE['data_saved']);
+    try {
+        const id = parseInt(req.params.id);
+        let data = zRoute.post(req,res, MYMODEL)[MYMODEL.routeName];
+        const validator = zRoute.validator(data, MYMODEL);
+        if(validator.status == 0) return res.json(validator.message);
+        const result = await zRoute.updateSQL(req, res,MYMODEL.table, data, {id:id});
+        json.data=result;
+    } catch (err) {
+        console.log(err)
+        if(Object.hasOwn(err,"sqlMessage")){
+            json = Util.flashError(err.sqlMessage);
+        } else {
+            json = Util.flashError(err.toString());
+        }
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.delete('/delete', async (req, res) => {
+    const id = req.body.id;
+    let json = Util.jsonSuccess(LANGUAGE['data_delete']);
+    try {
+        await zRoute.deleteSQL(MYMODEL.table, id, res.locals.companyId);
+    } catch (err) {
+        json = Util.flashError(err.toString());
+        zDebug(req, res, err)
+    }
+    res.json(json);
+});
+
+router.get('/view/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let zForms = {};
+    try {
+        const results = await connection.results({select:zRoute.selectData(MYMODEL),table:MYMODEL.table,where:{id:id}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data = results[0];
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, data);
+    } catch (err){
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        data: data,
+        Util:Util,
+        zForms:zForms,
+        titleHeader: `View : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        breadcrumb : zForm.breadcrumbView(MYMODEL.routeName),
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        renderBody: `${MYMODEL.routeName}/view.ejs`
+    });
+});
+
+router.get('/excel-query', async (req,res) => {
+    await zRoute.excelQuery(req, res, MYMODEL);
+});
+
+router.get('/excel', async (req, res) => {
+    const fields = MYMODEL.keysExcel;
+    const results = await connection.results({
+        table: MYMODEL.table,
+        where: {company_id: res.locals.companyId},
+        orderBy: ['id', 'DESC']
+    });
+    await zRoute.excel(req, res, MYMODEL, fields, results);
+});
+
+router.get('/sample', async (req, res) => {
+    let fields = [];
+    for (let i = 0; i < MYMODEL.keysExcel.length; i++) {
+        if (!Util.in_array(MYMODEL.keysExcel[i], Util.nots)) {
+            fields.push(MYMODEL.keysExcel[i]);
+        }
+    }
+    const results = await connection.results({
+        table:MYMODEL.table,
+        where:{
+            company_id:res.locals.companyId
+        },
+        orderBy:["id","desc"], limit:10
+    });
+    let callback=(result,field)=> {
+        return MYMODEL.widgets[field] && MYMODEL.widgets[field].name == 'datepicker' ? Util.dateSql(result[field]) : result[field];
+    };
+    await zRoute.excel(req, res, MYMODEL, fields, results, callback);
+});
+
+router.get('/import',csrfProtection, async (req, res) => {
+    const room = res.locals.token;
+    res.render(`layouts/${layout}`, {
+        room: room,
+        titleHeader: `Import / Upload data : <strong><a href="/${MYMODEL.routeName}">${MYMODEL.title}</a></strong>`,
+        csrfToken: req.csrfToken(),
+        breadcrumb : zForm.breadcrumbImport(MYMODEL.routeName),
+        renderBody: `${MYMODEL.routeName}/import.ejs`,
+        renderEnd: `${MYMODEL.routeName}/importjs.ejs`
+    });
+});
+
+
+router.post('/import', async(req, res) => {
+    res.json(await zRoute.import(req,res,MYMODEL));
+});
+
+router.get('/approval/:id', async (req, res) => {
+    await zRoute.attributeData(res, MYMODEL);
+    const id = req.params.id;
+    let data = {};
+    let data2 = {};
+    let zForms = {};
+    let zForms2 = {};
+    let result = {};
+    try {
+        result = await connection.result({table: MYMODEL.table, where: {id: id}});
+        if (!result.id) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        data=result;
+        moduleLib.editor(req, res);
+        zForms = await zRoute.viewFormsSync(req, res, MYMODEL, result);
+        const contentScript = `$("#submit_draft").on("click", function () {$("#status").val(1);ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+            if (data.status == 0) {
+                toastr.error(data.message, data.title);
+            } else {
+                toastr.success(data.title, data.message);
+            }
+        });});
+        $("#submit").on("click", function () {
+            $('[name="zapprovals[status]"]').val(2);
+            ajaxPost("/zzapproval",$("#form-group").serializeArray(), function (data) {
+                if (data.status == 0) {
+                    toastr.error(data.message, data.title);
+                } else {
+                    toastr.success(data.title, data.message);
+                    location.href = "";
+                }
+            });
+        });
+    `;
+        await moduleLib.addScript(req, res, contentScript);
+        const MODEL_APROVALS = require("./../models/zapprovals");
+        const rows = await connection.results({
+            table: "zapprovals",
+            where: {table: MYMODEL.table, company_id: res.locals.companyId, id_data: id}
+        });
+        if (rows.length) {
+            data2 = rows[0];
+        } else {
+            let obj = {};
+            obj.token = Util.uuid();
+            obj.status = 1;
+            obj.table = MYMODEL.table;
+            obj.company_id = res.locals.companyId;
+            obj.id_data = id;
+            obj.created_by = res.locals.userId;
+            obj.updated_by = res.locals.userId;
+            obj.created_at = Util.now();
+            let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+            let jsonApproval = zfields.approval_json || {}
+            obj.template = jsonApproval.content || {}
+            let title = jsonApproval.title;
+            if (title) {
+                let titleData = title;
+                for (var key in data) {
+                    titleData = Util.replaceAll(titleData, "{{" + key + "}}", data[key])
+                }
+                obj.title = titleData
+            }
+            if (jsonApproval.hasOwnProperty("approvers")) {
+                obj.approvers = JSON.stringify(jsonApproval.approvers);
+                obj.knowings = JSON.stringify(jsonApproval.knowings);
+                obj.type = 1;
+            }
+            //insert default data
+            await connection.insert({table: "zapprovals", data: obj});
+            data2 = obj;
+        }
+        zForms2 = await zRoute.formsFieldSync(req, res, MODEL_APROVALS, data2);
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/${layout}`, {
+        zForms: zForms,
+        zForms2: zForms2,
+        data: result,
+        result:result,
+        data2: data2,
+        Util: Util,
+        levels: zRole.myLevel(req, res, MYMODEL.table),
+        breadcrumb : zForm.breadcrumbApproval(MYMODEL.routeName, id),
+        renderBody: `${MYMODEL.routeName}/approval.ejs`
+    });
+});
+
+router.get('/preview/:token', async (req, res) => {
+    let token = req.params.token;
+    let data = {}, data2 = {};
+    let template = "";
+    let footers = "";
+    try {
+        let zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
+        let jsonApproval = zfields.approval_json || {}
+        let mytemplate = jsonApproval.content || {}
+        let results = await connection.results({table: "zapprovals", where: {token: token}});
+        if (results.length == 0) {
+            req.session.sessionFlash = Util.flashError(LANGUAGE['data_not_found']);
+            return res.redirect('/' + MYMODEL.routeName);
+        }
+        if(results[0].status == 1){
+            await connection.update({
+                table : "zapprovals",
+                data: {
+                    template : mytemplate
+                },
+                where : {
+                    token:token
+                }
+            })
+            results = await connection.results({table: "zapprovals", where: {token: token}});
+        }
+        let MYMODEL2 = require("./../models/zapprovals")
+        data = await zRoute.viewTable(req, res, MYMODEL2, results[0], true);
+        let row = await connection.result({table: results[0].table, where: {id: results[0].id_data}});
+        data2 = await zRoute.viewTable(req, res, MYMODEL, row, true);
+        template = data.template;
+        let title = data.title || ""
+        for (var key in data2) {
+            template = Util.replaceAll(template, "{{" + key + "}}", data2[key])
+            title = Util.replaceAll(title, "{{" + key + "}}", data2[key])
+        }
+        data.title = title;
+        var details = await connection.results({table: "zapprovals_details", where: {title_id: results[0].id}});
+        if (details.length) {
+            footers = await zRoute.approversFooter(details);
+        }
+    } catch (err) {
+        zDebug(req, res, err);
+        res.send("Err");
+    }
+    res.render(`layouts/blank`, {
+        template: template,
+        data: data,
+        footers: footers,
+        Util: Util,
+        details: details,
+        renderBody: 'index/zapprovals_preview.ejs'
+    });
+});
+
+router.post('/grid', access, zRoute.postGrid);
+router.post('/reload', access, zRoute.postGridReload);
+router.post('/chains', access, zRoute.chains);
+router.post('/get_attributes',access, zRoute.getAttributes);
+
+module.exports = router;

package/lib/zAppRouter.js

@@ -628,10 +628,24 @@ router.get("/session/:id", access, async (req, res) => {
 // Ubah layout backend (per user / personalized: tiap user punya preferensi sendiri)
 router.get("/layout_changes/:layout", access, async (req, res) => {
   const selectedLayout = String(req.params.layout || "").replace(/\.ejs$/i, "");
-  const backURL = req.header("Referer") || "/";
+  // Prioritaskan redirect dari query param (lebih reliable daripada Referer header)
+  let backURL = req.query.redirect;
+  if (!(backURL && typeof backURL === "string" && backURL.startsWith("/") && !backURL.startsWith("//"))) {
+    backURL = req.header("Referer") || "/";
+  }
   try {
     if (req.session && req.session.user) {
       req.session.user.layout = selectedLayout;
+      // Simpan ke database agar preferensi layout tetap setelah logout/login
+      try {
+        await connection.update({
+          table: "zuser",
+          data: { layout: selectedLayout },
+          where: { id: res.locals.userId },
+        });
+      } catch (dbErr) {
+        debug(req, res, dbErr);
+      }
     }
     res.locals.layout = selectedLayout;
   } catch (err) {

package/lib/zRoute.js

@@ -5321,22 +5321,26 @@ zRoute.updateSQL = async (req, res, table, data, whereData) => {
         data: data,
       });
       //save to history
-      connection.insert({
-        table: "zhistory",
-        data: {
-          module_id: result.id,
-          module: MYMODEL.table,
-          data_1: JSON.stringify(result),
-          data_2: JSON.stringify(myresult),
-          data_1_date: result.updated_at,
-          data_2_date: data.updated_at,
-          created_by: userId,
-          updated_by: userId,
-          created_at: Util.now(),
-          updated_at: Util.now(),
-          company_id: res.locals.companyId,
-        },
-      });
+      try {
+        connection.insert({
+          table: "zhistory",
+          data: {
+            module_id: result.id,
+            module: MYMODEL.table,
+            data_1: JSON.stringify(result),
+            data_2: JSON.stringify(myresult),
+            data_1_date: result.updated_at,
+            data_2_date: data.updated_at,
+            created_by: userId,
+            updated_by: userId,
+            created_at: Util.now(),
+            updated_at: Util.now(),
+            company_id: res.locals.companyId,
+          },
+        });
+      } catch (e) {
+        console.log(e)
+      }
       zRoute.modelsCacheRenew(table, res.locals.companyId);
       return myresult;
     } else {

package/lib/zapp.js

@@ -68,6 +68,8 @@ module.exports = (req, res, next) => {
     }
     // Default layout jika user belum pilih; tiap user bisa punya layout berbeda
     res.locals.layout = res.locals.layout || "admin";
+    // Sinkronkan ke global.layout agar route yang pakai variabel layout (tanpa res.locals) dapat preferensi user
+    global.layout = res.locals.layout;
     global.COMPANY_ID = res.locals.companyId;
     global.USER_ID = res.locals.userId;
     res.locals.LANGUAGE = global.LANGUAGE;

package/package.json

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