npm - zet-lib - Versions diffs - 6.0.2 → 6.1.1 - Mend

zet-lib 6.0.2 → 6.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/generatorApp.js CHANGED Viewed

@@ -1,1342 +1,546 @@
 /**
  * Created by sintret dev on 10/1/2021.
  */
-const configGenerator = require("./config_generator");
-const fs = require("fs-extra");
 const path = require("path");
+const fs = require("fs-extra");
+const configGenerator = require("./config_generator");
 const generatorModel = require("./generatorModel");
-const connection = require('./connection');
-const Util = require('./Util');
+const connection = require("./connection");
+const Util = require("./Util");
 const generatorApp = {};
+const asArray = (value) => (Array.isArray(value) ? value : []);
+const isPlainObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
+const hasOwn = (obj, key) => !!obj && Object.prototype.hasOwnProperty.call(obj, key);
+const readFileSafe = (file, fallback = "") => {
+  try {
+    return fs.readFileSync(file, "utf-8");
+  } catch (err) {
+    return fallback;
+  }
+};
+const applyTokens = (content, tokens) => {
+  let out = content == null ? "" : String(content);
+  Object.keys(tokens).forEach((key) => {
+    out = Util.replaceAll(out, key, tokens[key] == null ? "" : String(tokens[key]));
+  });
+  return out;
+};
+const viewSourceKey = (filename) => String(filename).replace("_", "").replace(".", "_");
 generatorApp.DIRECTORY = path.join(__dirname, "views", "zgenerator");
 generatorApp.DIRECTORY_MODELS = path.join(__dirname, "models");
-generatorApp.DIRECTORY_ROUTES =  path.join(__dirname, "routes");
+generatorApp.DIRECTORY_ROUTES = path.join(__dirname, "routes");
 generatorApp.DIRECTORY_VIEWS = path.join(__dirname, "views");
 generatorApp.DIRECTORY_GENERATOR_VIEWS = path.join(generatorApp.DIRECTORY, "views");
-//generate model file
-generatorApp.CREATE_MODEL = async (MYMODEL) => {
-    return generatorModel.create(MYMODEL);
-};
-generatorApp.CREATE_MODEL_API = async (columns, constraintList, MYMODEL) => {
-    return generatorModel.createApi(columns, constraintList, MYMODEL);
+const VIEW_FILES = [
+  "_form.ejs",
+  "create.ejs",
+  "createjs.ejs",
+  "import.ejs",
+  "importjs.ejs",
+  "index.ejs",
+  "indexcss.ejs",
+  "indexjs.ejs",
+  "update.ejs",
+  "updatejs.ejs",
+  "view.ejs",
+  "approval.ejs",
+];
+const splitTabToken = (value) => {
+  if (typeof value !== "string" || !value.includes("___")) return null;
+  const parts = value.split("___");
+  return { name: parts[0], tab: parts[1] };
 };
-//genereate route file
-/*
- [[[TABLE_NAME]]]
- [[[HARDCODE_GRID]]]
- [[[ADDITIONAL_FIELDS_CREATE]]]
- ///additional_fields///
- */
-generatorApp.CREATE_ROUTER = async (MYMODEL, zFields) => {
-    let CONTENT =
-        zFields.router ||
-        fs.readFileSync(path.join(generatorApp.DIRECTORY, "routerApp.ejs"), "utf-8");
-    const zfields = await connection.result({
-        table: "zfields",
-        where: { table: MYMODEL.table },
-    });
-    const ADDITIONAL_FIELDS = generatorApp.ADDITIONAL_FIELDS(MYMODEL);
-    const OBJ = {
-        TABLE_NAME: MYMODEL.table,
-        HARDCODE_GRID: zfields.hardcode_grid,
-        ADDITIONAL_FIELDS_CREATE: ADDITIONAL_FIELDS.CREATE,
-        ADDITIONAL_FIELDS_UPDATE: ADDITIONAL_FIELDS.UPDATE,
-        BEFORE_CREATE: zfields.before_create || "",
-        AFTER_CREATE: zfields.after_create || "",
-        BEFORE_UPDATE: zfields.before_update || "",
-        AFTER_UPDATE: zfields.after_update || "",
-        BEFORE_DELETE: zfields.before_delete || "",
-        AFTER_DELETE: zfields.after_delete || "",
-    };
-    for (let KEY in OBJ) {
-        CONTENT = Util.replaceAll(CONTENT, "[[[" + KEY + "]]]", OBJ[KEY]);
+const findTabKey = (item) => {
+  if (!Array.isArray(item)) return "";
+  for (let i = 0; i < item.length; i++) {
+    const zitems = item[i];
+    if (asArray(zitems).length && typeof zitems[0] === "string" && zitems[0].includes("___")) {
+      return zitems[0].split("___")[1];
     }
-    fs.writeFileSync(
-        path.join(generatorApp.DIRECTORY_ROUTES, MYMODEL.table + ".js"),
-        CONTENT,
-        "utf-8"
-    );
+  }
+  return "";
 };
-generatorApp.CREATE_ROUTER_API = (MYMODEL, zfields) => {
-    let CONTENT =
-        zfields.router ||
-        fs.readFileSync(path.join(generatorApp.DIRECTORY, "routerApp.ejs"), "utf-8");
-    //var zfields = await connection.result({table: "zfields", where: {table: MYMODEL.table}});
-    const ADDITIONAL_FIELDS = generatorApp.ADDITIONAL_FIELDS(MYMODEL);
-    const OBJ = {
-        TABLE_NAME: MYMODEL.table,
-        HARDCODE_GRID: zfields.hardcode_grid,
-        ADDITIONAL_FIELDS_CREATE: ADDITIONAL_FIELDS.CREATE,
-        ADDITIONAL_FIELDS_UPDATE: ADDITIONAL_FIELDS.UPDATE,
-        BEFORE_CREATE: zfields.before_create || "",
-        AFTER_CREATE: zfields.after_create || "",
-        BEFORE_UPDATE: zfields.before_update || "",
-        AFTER_UPDATE: zfields.after_update || "",
-        BEFORE_DELETE: zfields.before_delete || "",
-        AFTER_DELETE: zfields.after_delete || "",
-    };
-    for (let KEY in OBJ) {
-        CONTENT = Util.replaceAll(CONTENT, "[[[" + KEY + "]]]", OBJ[KEY]);
+const stripTabNames = (item) => asArray(item).map((row) =>
+  asArray(row).map((value) => (typeof value === "string" && value.includes("___") ? value.split("___")[0] : value))
+);
+const assignContainerSide = (list, tabObj, used) => {
+  asArray(list).forEach((item) => {
+    if (typeof item === "string") {
+      const parsed = splitTabToken(item);
+      if (!parsed) return;
+      if (!tabObj[parsed.tab]) tabObj[parsed.tab] = [];
+      tabObj[parsed.tab].push(parsed.name);
+      used.push(item);
+      return;
     }
-    //fs.writeFileSync(path.join(generatorApp.DIRECTORY_ROUTES, MYMODEL.table + ".js"), CONTENT, 'utf-8');
-    return {
-        filename: MYMODEL.table + ".js",
-        content: CONTENT,
-    };
-};
-//generate views file
-generatorApp.CREATE_VIEWS = async (MYMODEL, zFields) => {
-    const views = [
-        "_form.ejs",
-        "create.ejs",
-        "createjs.ejs",
-        "import.ejs",
-        "importjs.ejs",
-        "index.ejs",
-        "indexcss.ejs",
-        "indexjs.ejs",
-        "update.ejs",
-        "updatejs.ejs",
-        "view.ejs",
-        "approval.ejs",
-        "preview.ejs",
-    ];
-    const GENERATE_FORM = generatorApp.GENERATE_FORM(MYMODEL, zFields);
-    const GENERATE_INDEXJS = await generatorApp.GENERATE_INDEXJS(MYMODEL);
-    const GENERATE_VIEW = await generatorApp.GENERATE_VIEW(MYMODEL, zFields);
-    // onkeydown="return event.key != 'Enter';"
-    const OBJ = {
-        "[[[NO_VALI_DATE_NOVALIDATE]]]": " ",
-        "[[[GENERATE_FORM]]]": GENERATE_FORM,
-        "[[[GENERATE_INDEXJS]]]": GENERATE_INDEXJS,
-        "[[[GENERATE_VIEW]]]": GENERATE_VIEW,
-    };
-    const DIR_VIEW = path.join(generatorApp.DIRECTORY_VIEWS, MYMODEL.table);
-    if (!fs.existsSync(DIR_VIEW)) {
-        fs.mkdirSync(DIR_VIEW);
+    const keyname = findTabKey(item);
+    if (keyname) {
+      if (!tabObj[keyname]) tabObj[keyname] = [];
+      tabObj[keyname].push(stripTabNames(item));
+      used.push(item);
     }
-    views.forEach(function async(item) {
-        let name = item.replace("_", "");
-        name = name.replace(".", "_");
-        let source = zFields[name];
-        if (source) {
-            fs.writeFileSync(path.join(DIR_VIEW, item), source);
-        } else {
-            source = path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item);
-            fs.copySync(source, path.join(DIR_VIEW, item));
-        }
-        console.log(path.join(DIR_VIEW, item));
-        for (let KEY in OBJ) {
-            generatorApp.MODIFIY(
-                path.join(DIR_VIEW, item),
-                path.join(DIR_VIEW, item),
-                KEY,
-                OBJ[KEY]
-            );
-        }
-    });
+  });
 };
-generatorApp.CREATE_VIEWS_API = (MYMODEL, zFields) => {
-    let datas = {};
-    const views = [
-        "_form.ejs",
-        "create.ejs",
-        "createjs.ejs",
-        "import.ejs",
-        "importjs.ejs",
-        "index.ejs",
-        "indexcss.ejs",
-        "indexjs.ejs",
-        "update.ejs",
-        "updatejs.ejs",
-        "view.ejs",
-        "approval.ejs",
-    ];
-    const GENERATE_FORM = generatorApp.GENERATE_FORM(MYMODEL, zFields);
-    const GENERATE_INDEXJS = generatorApp.GENERATE_INDEXJS(MYMODEL);
-    const GENERATE_VIEW = generatorApp.GENERATE_VIEW(MYMODEL, zFields);
-    const token = `views_${Util.generateUnique(10)}`;
-    // onkeydown="return event.key != 'Enter';"
-    const tabs = zFields.tabs ? zFields.tabs : [];
-    const isTabs = tabs.length > 0 ? true : false;
-    const novalidate = isTabs ? " novalidate " : "";
-    const OBJ = {
-        "[[[NO_VALI_DATE_NOVALIDATE]]]": novalidate,
-        "[[[GENERATE_FORM]]]": GENERATE_FORM,
-        "[[[GENERATE_INDEXJS]]]": GENERATE_INDEXJS,
-        "[[[GENERATE_VIEW]]]": GENERATE_VIEW,
-    };
-    const DIR_VIEW = path.join(dirRoot, "public", "temp", token);
-    if (!fs.existsSync(DIR_VIEW)) {
-        fs.mkdirSync(DIR_VIEW);
-    }
+const containerObject = (left, right, oneColumn, tabs = []) => {
+  const leftObj = {};
+  const rightObj = {};
+  const oneColumnObj = {};
+  const leftUsed = [];
+  const rightUsed = [];
+  const oneUsed = [];
+  asArray(tabs).forEach((_, i) => {
+    const arrName = `arr${i}`;
+    leftObj[arrName] = [];
+    rightObj[arrName] = [];
+    oneColumnObj[arrName] = [];
+  });
+  assignContainerSide(left, leftObj, leftUsed);
+  assignContainerSide(right, rightObj, rightUsed);
+  assignContainerSide(oneColumn, oneColumnObj, oneUsed);
+  return {
+    left: asArray(left).filter((item) => !leftUsed.includes(item)),
+    right: asArray(right).filter((item) => !rightUsed.includes(item)),
+    oneColumn: asArray(oneColumn).filter((item) => !oneUsed.includes(item)),
+    tabLeft: leftObj,
+    tabRight: rightObj,
+    tabOneColumn: oneColumnObj,
+  };
+};
-    for (let i = 0; i < views.length; i++) {
-        let item = views[i];
-        let name = item.replace("_", "");
-        name = name.replace(".", "_");
-        let source = zFields.hasOwnProperty(name)
-            ? zFields[name]
-            : fs.readFileSync(path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item), {
-                encoding: "utf8",
-                flag: "r",
-            });
-        if (source) {
-            fs.writeFileSync(path.join(DIR_VIEW, item), source);
-        } else {
-            source = fs.readFileSync(
-                path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item),
-                { encoding: "utf8", flag: "r" }
-            );
-            fs.copySync(source, path.join(DIR_VIEW, item));
-        }
-        for (let KEY in OBJ) {
-            generatorApp.MODIFIY(
-                path.join(DIR_VIEW, item),
-                path.join(DIR_VIEW, item),
-                KEY,
-                OBJ[KEY]
-            );
-        }
-    }
-    for (let i = 0; i < views.length; i++) {
-        const item = views[i];
-        datas[item] = fs.readFileSync(path.join(DIR_VIEW, item), {
-            encoding: "utf8",
-            flag: "r",
-        });
-    }
-    //remove directory
-    fs.rmSync(DIR_VIEW, { recursive: true, force: true });
-    return datas;
+const splitFlatAndTabbed = (list) => {
+  const flat = [];
+  const tabbed = [];
+  asArray(list).forEach((item) => {
+    if (typeof item === "string") flat.push(item);
+    else tabbed.push(item);
+  });
+  return { flat, tabbed };
 };
-generatorApp.MODIFIY = (SOURCE, TARGET, REPLACE, REPLACE_NEW) => {
-    const data = fs.readFileSync(SOURCE, "utf-8");
-    const newValue = Util.replaceAll(data, REPLACE, REPLACE_NEW);
-    fs.writeFileSync(TARGET, newValue, "utf-8");
-    console.log(TARGET);
+const fieldsForTab = (tabbed, arrName) => {
+  let found = [];
+  asArray(tabbed).forEach((item) => {
+    if (item && item[arrName]) found = item[arrName];
+  });
+  return asArray(found);
 };
-generatorApp.ADDITIONAL_FIELDS = (MYMODEL) => {
-    const bytime = configGenerator.createdUpdatedAt;
-    const byman = configGenerator.createdUpdatedBy;
-    let create = [],
-        update = [],
-        str = "";
-    const fields = MYMODEL.fields || {};
-    for (let key in fields) {
-        if (Util.in_array(key, bytime)) {
-            create.push({ field: key, value: "Util.now()" });
-        }
-        if (Util.in_array(key, byman)) {
-            create.push({ field: key, value: "res.locals.userId" });
-        }
+const formBuild = (arr, properties) => {
+  let out = "";
+  asArray(arr).forEach((item) => {
+    if (typeof item === "string") {
+      const prop = properties && properties[item];
+      if (!prop || !prop.values || prop.values.hidden) return;
+      out += prop.type === "custom"
+        ? `${Util.tabs(3)}<%- ${prop.values.code} %>${Util.newLine}`
+        : `${Util.tabs(3)}<%- zForms.build["${item}"] %>${Util.newLine}`;
+      return;
     }
-    update = create.filter((item) => {
-        return item.field.indexOf("create") < 0;
+    const cols = asArray(item);
+    if (!cols.length) return;
+    const colMd = `col-md-${12 / cols.length}`;
+    out += `${Util.newLine}${Util.tabs(3)}<div class="row">${Util.newLine}`;
+    cols.forEach((myitems) => {
+      out += `${Util.tabs(4)}<div class="${colMd}">${Util.newLine}`;
+      asArray(myitems).forEach((itemX) => {
+        const prop = properties && properties[itemX];
+        if (!prop) return;
+        out += prop.type === "custom"
+          ? `${Util.tabs(3)}<%- ${prop.values && prop.values.code} %>${Util.newLine}`
+          : `${Util.tabs(5)}<%- zForms.build["${itemX}"] %>${Util.newLine}`;
+      });
+      out += `${Util.tabs(4)}</div>${Util.newLine}`;
     });
-    let widgets = MYMODEL.widgets;
-    for (let key in widgets) {
-        if (widgets[key].name == "number") {
-            str += `${Util.tabs(2)}data.${key} = Util.replaceAll(data.${key},'.','')${
-                Util.newLine
-            }`;
-        }
-    }
-    return {
-        CREATE:
-            str +
-            create.reduce((result, item) => {
-                return (
-                    result +
-                    `${Util.tabs(2)}data.${item.field} = ${item.value};${Util.newLine}`
-                );
-            }, ""),
-        UPDATE:
-            str +
-            update.reduce((result, item) => {
-                return (
-                    result +
-                    `${Util.tabs(2)}data.${item.field} = ${item.value};${Util.newLine}`
-                );
-            }, ""),
-    };
+    out += `${Util.tabs(3)}</div>${Util.newLine}`;
+  });
+  return out;
 };
-generatorApp.GENERATE_INDEXJS = (MYMODEL) => {
-    const fields = MYMODEL.fields;
-    const widgets = MYMODEL.widgets;
-    const widgetsArr = Object.keys(widgets) || [];
-    let out = "";
-    let itemTemplate = "";
-    out += Util.newLine;
-    for (const key in fields) {
-        if (key != "company_id") {
-            if (Util.in_array(key, widgetsArr)) {
-                const widgetName = widgets[key].name;
-                switch (widgetName) {
-                    case "text":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", width: 80}, ${Util.newLine} `;
-                        break;
-                    case "color":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"color", width: 50}, ${Util.newLine} `;
-                        break;
-                    case "textarea":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return (value && value.length > 100) ? value.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').substring(0,50) + '...' : value}, width: 90},  ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "number":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return formatNumber(value)}, align: 'right', width: 70},  ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "image":
-                        itemTemplate = `function (value) { return value == null || value == '' ? '' : '<img width="60" height="60" src="/uploads/<%- routeName  %>/'+value+'" class="img-circle" />'; }`;
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: ${itemTemplate}, align: 'right', width: 70}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "file":
-                        itemTemplate =
-                            'function(value) { return value ? `<a href="/uploads/<%- routeName%>/${value}">${value}</a>`:""}';
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: ${itemTemplate}, width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "email":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", width: 80}, ${Util.newLine} `;
-                        break;
-                    case "password":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return "xxxxxx"}, width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "datepicker":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return value ? value == '0000-00-00' ? '' : moment(value).format('YYYY-MM-DD') : '';}, width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "datetime":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return value ? value == '0000-00-00 00:00:00' ? '' : moment(value).format('YYYY-MM-DD HH:mm:ss') : '';}, width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "clockpicker":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text",  width: 80}, ${Util.newLine} `;
-                        break;
-                    case "switch":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", items: ${
-                            Util.ejsOpen
-                        } JSON.stringify(relations.${key}) ${
-                            Util.ejsClose
-                        }, valueField: 'id', textField: 'name', width: 50}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "editor":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return (value && value.length > 100) ? value.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').substring(0,50) + '...' : value}, width: 90},  ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "ide_editor":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return (value && value.length > 100) ? value.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').substring(0,50) + '...' : value}, width: 90},  ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "select":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", items: ${
-                            Util.ejsOpen
-                        } JSON.stringify(relations.${key}Row) ${
-                            Util.ejsClose
-                        }, valueField: "id", textField: "name", width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "relation":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", items: ${
-                            Util.ejsOpen
-                        } JSON.stringify(relations.${key}Row) ${
-                            Util.ejsClose
-                        }, valueField: "${Util.ejsOpen} relations.${key}[0] ${
-                            Util.ejsClose
-                        }", textField: "name", width: 80}, ${Util.newLine} `;
-                        break;
-                    case "typeahead":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", items: ${
-                            Util.ejsOpen
-                        } JSON.stringify(relations.${key}) ${
-                            Util.ejsClose
-                        }, valueField: "id", textField: "name", width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "table":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return (value && value.length > 100) ? value.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').substring(0,50) + '...' : value}, width: 90},  ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "dropdown_multi":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", itemTemplate: function (value) {return gridValues(value,${
-                            Util.ejsOpen
-                        }  JSON.stringify(relations.${key}Row ) ${
-                            Util.ejsClose
-                        })}, items: ${Util.ejsOpen} JSON.stringify(relations.${key}) ${
-                            Util.ejsClose
-                        }, valueField: "id", textField: "name", width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "dropdown_chain":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"select", items: ${
-                            Util.ejsOpen
-                        } JSON.stringify(relations.${key}Row) ${
-                            Util.ejsClose
-                        }, valueField: "id", textField: "name", width: 80}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "dropdown_checkbox":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", itemTemplate: function (value) {return formatString(value)}, width: 90}, ${
-                            Util.newLine
-                        } `;
-                        break;
-                    case "virtual":
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", width: 80}, ${Util.newLine} `;
-                        break;
-                    default:
-                        out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                            Util.ejsOpen
-                        } attributeData.labels['${key}'] ${
-                            Util.ejsClose
-                        }", type:"text", width: 80}, ${Util.newLine} `;
-                        break;
-                }
-            } else {
-                out += `${Util.tabs(2)} ${key} : {name: "${key}", title: "${
-                    Util.ejsOpen
-                } attributeData.labels['${key}'] ${
-                    Util.ejsClose
-                }", type:"text", width: 80}, ${Util.newLine} `;
-            }
-        }
-    }
-    return out;
+const formBuildDiv = (type = 1, obj = {}) => {
+  if (Number(type) === 1) {
+    return `${Util.tab}<div class="row">${Util.newLine}${Util.tabs(2)}<div class="col-md-12">${Util.newLine}` +
+      formBuild(obj.oneColumn, obj.properties) +
+      `${Util.tabs(2)}</div>${Util.newLine}${Util.tab}</div>${Util.newLine}`;
+  }
+  return `${Util.tab}<div class="row">${Util.newLine}` +
+    `${Util.tabs(2)}<div class="col-md-6">${Util.newLine}${formBuild(obj.left, obj.properties)}${Util.tabs(2)}</div>${Util.newLine}` +
+    `${Util.tabs(2)}<div class="col-md-6">${Util.newLine}${formBuild(obj.right, obj.properties)}${Util.tabs(2)}</div>${Util.newLine}` +
+    `${Util.tab}</div>${Util.newLine}`;
 };
-generatorApp.GENERATE_FORM = (MYMODEL, zFields) => {
-    let others = zFields.others || {};
-    if (Object.keys(others).length) {
-        return generatorApp.GENERATE_FORM_WITH_CONTAINER(MYMODEL, zFields);
+const generateForm = (properties, sorting, left = [], right = [], oneColumn = []) => {
+  const tables = [];
+  const oneColumns = [];
+  asArray(oneColumn).forEach((item) => {
+    if (typeof item === "string" && properties && properties[item] && properties[item].type === "table") {
+      tables.push(item);
     } else {
-        return generatorApp.GENERATE_FORM_CLASSIC(MYMODEL, zFields);
+      oneColumns.push(item);
     }
+  });
+  const obj = {
+    left: asArray(left),
+    right: asArray(right),
+    oneColumn,
+    properties,
+    tables,
+  };
+  return asArray(sorting).map((item) => formBuildDiv(item, obj)).join("");
 };
-function containerObject(left, right, oneColumn, tabs = []) {
-    /*
-      For generator helper
-       */
-    let obj = {};
-    let hasTabs = tabs.length;
-    let leftObj = {},
-        rightObj = {},
-        oneColumnObj = {};
-    let leftsNew = [],
-        rightsNew = [],
-        oneColumnsNew = [];
-    if (hasTabs) {
-        tabs.forEach(function (tab, i) {
-            let arrName = `arr${i}`;
-            if (!leftObj.hasOwnProperty(arrName)) {
-                leftObj[arrName] = [];
-            }
-            if (!rightObj.hasOwnProperty(arrName)) {
-                rightObj[arrName] = [];
-            }
-            if (!oneColumnObj.hasOwnProperty(arrName)) {
-                oneColumnObj[arrName] = [];
-            }
-        });
-    }
-    left.forEach(function (item) {
-        if (typeof item == "string") {
-            if (item.includes("___")) {
-                let arr = item.split("___");
-                leftObj[arr[1]].push(arr[0]);
-                leftsNew.push(item);
-            }
-        } else {
-            let keyname = "";
-            for (let i = 0; i < item.length; i++) {
-                let zitems = item[i];
-                if (zitems.length) {
-                    if (zitems[0].includes("___")) {
-                        keyname = zitems[0].split("___")[1];
-                    }
-                }
-            }
-            //console.log(keyname)
-            if (keyname) {
-                let myarr = [];
-                item.forEach(function (myitem) {
-                    let me = [];
-                    myitem.forEach(function (inem) {
-                        if (inem.includes("___")) {
-                            me.push(inem.split("___")[0]);
-                        } else {
-                            me.push(inem);
-                        }
-                    });
-                    myarr.push(me);
-                });
-                leftObj[keyname].push(myarr);
-                leftsNew.push(item);
-            } else {
-                if (item.includes("___")) {
-                    let arr = item.split("___");
-                    leftObj[arr[1]].push(arr[0]);
-                    leftsNew.push(item);
-                }
-            }
-        }
-    });
-    //right
-    right.forEach(function (item) {
-        if (typeof item == "string") {
-            if (item.includes("___")) {
-                let arr = item.split("___");
-                rightObj[arr[1]].push(arr[0]);
-                rightsNew.push(item);
-            }
-        } else {
-            let keyname = "";
-            for (let i = 0; i < item.length; i++) {
-                let zitems = item[i];
-                if (zitems.length) {
-                    if (zitems[0].includes("___")) {
-                        keyname = zitems[0].split("___")[1];
-                    }
-                }
-            }
-            //console.log(keyname)
-            if (keyname) {
-                let myarr = [];
-                item.forEach(function (myitem) {
-                    let me = [];
-                    myitem.forEach(function (inem) {
-                        if (inem.includes("___")) {
-                            me.push(inem.split("___")[0]);
-                        } else {
-                            me.push(inem);
-                        }
-                    });
-                    myarr.push(me);
-                });
-                rightObj[keyname].push(myarr);
-                rightsNew.push(item);
-            } else {
-                if (item.includes("___")) {
-                    let arr = item.split("___");
-                    rightObj[arr[1]].push(arr[0]);
-                    rightsNew.push(item);
-                }
-            }
-        }
-    });
+const renderTabNav = (tabs) => {
+  let out = `<ul class="nav nav-tabs" id="myTab" role="tablist">${Util.newLine}`;
+  asArray(tabs).forEach((tab, i) => {
+    const active = i === 0 ? "active" : "";
+    out += ` <li class="nav-item arr${i}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#arr${i}" type="button" role="tab" aria-controls="arr${i}" aria-selected="true">${tab}</button></li>${Util.newLine}`;
+  });
+  out += `</ul>${Util.newLine}`;
+  return out;
+};
-    //oneColumn
-    oneColumn.forEach(function (item) {
-        if (typeof item == "string") {
-            if (item.includes("___")) {
-                let arr = item.split("___");
-                oneColumnObj[arr[1]].push(arr[0]);
-                oneColumnsNew.push(item);
-            }
-        } else {
-            let keyname = "";
-            for (let i = 0; i < item.length; i++) {
-                let zitems = item[i];
-                if (zitems.length) {
-                    if (zitems[0].includes("___")) {
-                        keyname = zitems[0].split("___")[1];
-                    }
-                }
-            }
-            //console.log(keyname)
-            if (keyname) {
-                let myarr = [];
-                item.forEach(function (myitem) {
-                    let me = [];
-                    myitem.forEach(function (inem) {
-                        if (inem.includes("___")) {
-                            me.push(inem.split("___")[0]);
-                        } else {
-                            me.push(inem);
-                        }
-                    });
-                    myarr.push(me);
-                });
-                oneColumnObj[keyname].push(myarr);
-                oneColumnsNew.push(item);
-            } else {
-                if (item.includes("___")) {
-                    let arr = item.split("___");
-                    oneColumnObj[arr[1]].push(arr[0]);
-                    oneColumnsNew.push(item);
-                }
-            }
-        }
-    });
+const viewCreatedBy = () => `<div class="ps-lg-4 my-5 text-lg-start col-lg-3 mb-3 float-end">
+        <div class="dropdown">
+            <button class="btn boxy dropdown-toggle" type="button" id="viewCreatedBy" data-bs-toggle="dropdown" aria-expanded="false">
+                Last update : <%- zForms.users.updated_by %>
+            </button>
+            <ul class="dropdown-menu" aria-labelledby="viewCreatedBy">
+                <li><a class="dropdown-item" href="#">Updated at <%- zForms.users.updated_at %></a></li>
+                <li><a class="dropdown-item" href="#">Created at <%- zForms.users.created_at %></a></li>
+                <li><a class="dropdown-item" href="#">Created by <%- zForms.users.created_by %></a></li>
+            </ul>
+        </div>
+    </div>`;
-    //caption left or right
-    let datasLeft = left.filter((x) => !leftsNew.includes(x));
-    let datasRight = right.filter((x) => !rightsNew.includes(x));
-    let datasOneColumn = oneColumn.filter((x) => !oneColumnsNew.includes(x));
+const viewApproval = () => `<div class="ps-lg-4 my-5 text-lg-start col-lg-3 mb-3 float-end">
+        <%- zForms.approval_history_table %>
+    </div>`;
-    let myObject = {
-        left: datasLeft || [],
-        right: datasRight || [],
-        oneColumn: datasOneColumn || [],
-        tabLeft: leftObj || [],
-        tabRight: rightObj || [],
-        tabOneColumn: oneColumnObj || [],
-    };
+const ejsTitle = (key) => `${Util.ejsOpen} attributeData.labels['${key}'] ${Util.ejsClose}`;
+const indexCol = (key, body) => `${Util.tabs(2)} ${key} : {name: "${key}", title: "${ejsTitle(key)}", ${body}}, ${Util.newLine}`;
+const truncateTpl = `function (value) {return (value && value.length > 100) ? value.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').substring(0,50) + '...' : value}`;
+const INDEXJS_WIDGET = {
+  text: (key) => indexCol(key, `type:"text", width: 80`),
+  color: (key) => indexCol(key, `type:"color", width: 50`),
+  textarea: (key) => indexCol(key, `type:"text", itemTemplate: ${truncateTpl}, width: 90`),
+  number: (key) => indexCol(key, `type:"text", itemTemplate: function (value) {return formatNumber(value)}, align: 'right', width: 70`),
+  image: (key) => indexCol(key, `type:"text", itemTemplate: function (value) { return value == null || value == '' ? '' : '<img width="60" height="60" src="/uploads/<%- routeName  %>/'+value+'" class="img-circle" />'; }, align: 'right', width: 70`),
+  file: (key) => indexCol(key, `type:"text", itemTemplate: function(value) { return value ? \`<a href="/uploads/<%- routeName%>/\${value}">\${value}</a>\`:""}, width: 80`),
+  email: (key) => indexCol(key, `type:"text", width: 80`),
+  password: (key) => indexCol(key, `type:"text", itemTemplate: function (value) {return "xxxxxx"}, width: 80`),
+  datepicker: (key) => indexCol(key, `type:"text", itemTemplate: function (value) {return value ? value == '0000-00-00' ? '' : moment(value).format('YYYY-MM-DD') : '';}, width: 80`),
+  datetime: (key) => indexCol(key, `type:"text", itemTemplate: function (value) {return value ? value == '0000-00-00 00:00:00' ? '' : moment(value).format('YYYY-MM-DD HH:mm:ss') : '';}, width: 80`),
+  clockpicker: (key) => indexCol(key, `type:"text",  width: 80`),
+  switch: (key) => indexCol(key, `type:"select", items: ${Util.ejsOpen} JSON.stringify(relations.${key}) ${Util.ejsClose}, valueField: 'id', textField: 'name', width: 50`),
+  editor: (key) => indexCol(key, `type:"text", itemTemplate: ${truncateTpl}, width: 90`),
+  ide_editor: (key) => indexCol(key, `type:"text", itemTemplate: ${truncateTpl}, width: 90`),
+  select: (key) => indexCol(key, `type:"select", items: ${Util.ejsOpen} JSON.stringify(relations.${key}Row) ${Util.ejsClose}, valueField: "id", textField: "name", width: 80`),
+  relation: (key) => indexCol(key, `type:"select", items: ${Util.ejsOpen} JSON.stringify(relations.${key}Row) ${Util.ejsClose}, valueField: "${Util.ejsOpen} relations.${key}[0] ${Util.ejsClose}", textField: "name", width: 80`),
+  typeahead: (key) => indexCol(key, `type:"select", items: ${Util.ejsOpen} JSON.stringify(relations.${key}) ${Util.ejsClose}, valueField: "id", textField: "name", width: 80`),
+  table: (key) => indexCol(key, `type:"text", itemTemplate: ${truncateTpl}, width: 90`),
+  dropdown_multi: (key) => indexCol(key, `type:"select", itemTemplate: function (value) {return gridValues(value,${Util.ejsOpen}  JSON.stringify(relations.${key}Row ) ${Util.ejsClose})}, items: ${Util.ejsOpen} JSON.stringify(relations.${key}) ${Util.ejsClose}, valueField: "id", textField: "name", width: 80`),
+  dropdown_chain: (key) => indexCol(key, `type:"select", items: ${Util.ejsOpen} JSON.stringify(relations.${key}Row) ${Util.ejsClose}, valueField: "id", textField: "name", width: 80`),
+  dropdown_checkbox: (key) => indexCol(key, `type:"text", itemTemplate: function (value) {return formatString(value)}, width: 90`),
+  virtual: (key) => indexCol(key, `type:"text", width: 80`),
+};
-    return myObject;
-}
+const routerTokens = (MYMODEL, zfields) => {
+  const extra = generatorApp.ADDITIONAL_FIELDS(MYMODEL);
+  const z = isPlainObject(zfields) ? zfields : {};
+  return {
+    "[[[TABLE_NAME]]]": MYMODEL.table || "",
+    "[[[HARDCODE_GRID]]]": z.hardcode_grid || "",
+    "[[[ADDITIONAL_FIELDS_CREATE]]]": extra.CREATE,
+    "[[[ADDITIONAL_FIELDS_UPDATE]]]": extra.UPDATE,
+    "[[[BEFORE_CREATE]]]": z.before_create || "",
+    "[[[AFTER_CREATE]]]": z.after_create || "",
+    "[[[BEFORE_UPDATE]]]": z.before_update || "",
+    "[[[AFTER_UPDATE]]]": z.after_update || "",
+    "[[[BEFORE_DELETE]]]": z.before_delete || "",
+    "[[[AFTER_DELETE]]]": z.after_delete || "",
+  };
+};
-generatorApp.GENERATE_FORM_WITH_CONTAINER = (MYMODEL, zFields) => {
-    let out = "";
-    let others = zFields.others || {};
-    let properties = zFields.properties || {};
-    let labels = zFields.labels;
-    let tabs = zFields.tabs ? zFields.tabs : [];
-    let leftData = others.LEFT || [];
-    let rightData = others.RIGHT || [];
-    let oneColumnData = others.ONE_COLUMN || [];
-    let sorting = zFields.sorting || [];
-    var isTab = tabs.length ? true : false;
-    let tables = [];
-    let tabLeft = [],
-        tabRight = [],
-        tabOneColumn = [];
-    let ALL_FIELDS = containerObject(leftData, rightData, oneColumnData, tabs);
-    if (isTab) {
-        out += `<ul class="nav nav-tabs" id="myTab" role="tablist">${Util.newLine}`;
-        tabs.forEach(function (tab, i) {
-            let arrName = `arr${i}`;
-            let active = i == 0 ? "active" : "";
-            out += ` <li class="nav-item ${arrName}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#arr${i}" type="button" role="tab" aria-controls="arr${i}" aria-selected="true">${tab}</button></li>${Util.newLine}`;
-        });
-        out += `</ul>${Util.newLine}`;
+const defaultRouterContent = (zfields) =>
+  (zfields && zfields.router) || readFileSafe(path.join(generatorApp.DIRECTORY, "routerApp.ejs"));
-        out += `<div class="tab-content" id="myTabContent">${Util.newLine}`;
-        tabs.forEach(function (tab, i) {
-            let arrName = `arr${i}`;
-            let mytab = "";
-            tabLeft = ALL_FIELDS.tabLeft[arrName];
-            tabRight = ALL_FIELDS.tabRight[arrName];
-            tabOneColumn = ALL_FIELDS.tabOneColumn[arrName];
-            let obj = {
-                left: tabLeft,
-                right: tabRight,
-                oneColumn: tabOneColumn,
-                properties: properties,
-                tables: tables,
-            };
-            sorting.forEach(function (item) {
-                mytab += formBuildDiv(item, obj);
-            });
+const viewTokens = (MYMODEL, zFields, novalidate) => ({
+  "[[[NO_VALI_DATE_NOVALIDATE]]]": novalidate,
+  "[[[GENERATE_FORM]]]": generatorApp.GENERATE_FORM(MYMODEL, zFields) || "",
+  "[[[GENERATE_INDEXJS]]]": generatorApp.GENERATE_INDEXJS(MYMODEL) || "",
+  "[[[GENERATE_VIEW]]]": generatorApp.GENERATE_VIEW(MYMODEL, zFields) || "",
+});
-            //let contentTab = generateForm(properties, sorting, tabLeft, tabRight, tabOneColumn);
-            let contentTab = mytab;
-            let active = i == 0 ? "show active" : "";
-            out += `${Util.tab}<div class="tab-pane fade ${active}" id="arr${i}" role="tabpanel" aria-labelledby="arr${i}"><p></p>${contentTab}</div>${Util.newLine}`;
-        });
-        out += `</div>${Util.newLine}`;
-        out += `<p></p>${Util.newLine}`;
-    }
+generatorApp.containerObject = containerObject;
+generatorApp.readFileSafe = readFileSafe;
+generatorApp.asArray = asArray;
+generatorApp.isPlainObject = isPlainObject;
-    sorting.forEach(function (item) {
-        out += formBuildDiv(item, {
-            left: ALL_FIELDS.left,
-            right: ALL_FIELDS.right,
-            oneColumn: ALL_FIELDS.oneColumn,
-            properties: properties,
-            tables: tables,
-        });
-    });
+generatorApp.CREATE_MODEL = async (MYMODEL) => generatorModel.create(MYMODEL);
+generatorApp.CREATE_MODEL_API = async (columns, constraintList, MYMODEL) =>
+  generatorModel.createApi(columns, constraintList, MYMODEL);
-    return out;
+generatorApp.CREATE_ROUTER = async (MYMODEL, zFields) => {
+  if (!isPlainObject(MYMODEL) || !MYMODEL.table) throw new Error("MYMODEL.table is required");
+  const zfields = await connection.result({ table: "zfields", where: { table: MYMODEL.table } });
+  const content = applyTokens(defaultRouterContent(zFields), routerTokens(MYMODEL, isPlainObject(zfields) ? zfields : zFields));
+  fs.writeFileSync(path.join(generatorApp.DIRECTORY_ROUTES, `${MYMODEL.table}.js`), content, "utf-8");
+  return { filename: `${MYMODEL.table}.js`, content };
 };
-generatorApp.GENERATE_FORM_CLASSIC = (MYMODEL, zFields) => {
-    let out = "";
-    //check if it has a tab
-    let properties = zFields.properties || {};
-    let tabs = zFields.tabs ? zFields.tabs : [];
-    let leftData = zFields.left || [];
-    let sorting = zFields.sorting || [];
-    let rightData = zFields.right || [];
-    let oneColumnData = zFields.one_column || [];
-    const isTab = tabs.length ? true : false;
-    let tables = [];
-    let left = [],
-        right = [],
-        oneColumn = [],
-        leftTab = [],
-        rightTab = [],
-        oneColumnTab = [],
-        lefts = [],
-        rights = [];
-    let tabLeft = [],
-        tabRight = [],
-        tabOneColumn = [];
-    leftData.forEach(function (item) {
-        if (typeof item == "string") {
-            left.push(item);
-        } else {
-            leftTab.push(item);
-        }
-    });
-    rightData.forEach(function (item) {
-        if (typeof item == "string") {
-            right.push(item);
-        } else {
-            rightTab.push(item);
-        }
-    });
-    oneColumnData.forEach(function (item) {
-        if (typeof item == "string") {
-            oneColumn.push(item);
-        } else {
-            oneColumnTab.push(item);
-        }
-    });
-    if (isTab) {
-        out += `<ul class="nav nav-tabs" id="myTab" role="tablist">`;
-        tabs.forEach(function (tab, i) {
-            let arrName = `arr${i}`;
-            let active = i == 0 ? "active" : "";
-            out += ` <li class="nav-item ${arrName}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#arr${i}" type="button" role="tab" aria-controls="arr${i}" aria-selected="true">${tab}</button></li>`;
-        });
-        out += `</ul>`;
-    }
-    if (isTab) {
-        out += `<div class="tab-content" id="myTabContent">`;
-        tabs.forEach(function (tab, i) {
-            let arrName = `arr${i}`;
-            leftTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabLeft = item[key];
-                    }
-                }
-            });
-            rightTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabRight = item[key];
-                    }
-                }
-            });
-            oneColumnTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabOneColumn = item[key];
-                    }
-                }
-            });
-            let contentTab = generateForm(
-                properties,
-                sorting,
-                tabLeft,
-                tabRight,
-                tabOneColumn
-            );
-            let active = i == 0 ? "show active" : "";
-            out += `<div class="tab-pane fade ${active}" id="arr${i}" role="tabpanel" aria-labelledby="arr${i}"><p></p>${contentTab}</div>`;
-        });
-        out += `</div>`;
-        out += `<p></p>`;
-    }
-    out += generateForm(properties, sorting, left, right, oneColumn);
-    return out;
+generatorApp.CREATE_ROUTER_API = (MYMODEL, zfields) => {
+  if (!isPlainObject(MYMODEL) || !MYMODEL.table) {
+    return { filename: "", content: "" };
+  }
+  return {
+    filename: `${MYMODEL.table}.js`,
+    content: applyTokens(defaultRouterContent(zfields), routerTokens(MYMODEL, zfields)),
+  };
 };
-generatorApp.GENERATE_VIEW = (MYMODEL, zFields) => {
-    let others = zFields.others || {};
-    let length = Object.keys(others).length;
-    if (length) {
-        return generatorApp.GENERATE_VIEW_WITH_CONTAINER(MYMODEL, zFields);
-    } else {
-        return generatorApp.GENERATE_VIEW_CLASSIC(MYMODEL, zFields);
-    }
+generatorApp.CREATE_VIEWS = async (MYMODEL, zFields) => {
+  if (!isPlainObject(MYMODEL) || !MYMODEL.table) throw new Error("MYMODEL.table is required");
+  const tokens = viewTokens(MYMODEL, zFields || {}, " ");
+  const dirView = path.join(generatorApp.DIRECTORY_VIEWS, MYMODEL.table);
+  fs.ensureDirSync(dirView);
+  VIEW_FILES.concat(["preview.ejs"]).forEach((item) => {
+    const name = viewSourceKey(item);
+    const source = zFields && zFields[name]
+      ? zFields[name]
+      : readFileSafe(path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item));
+    fs.writeFileSync(path.join(dirView, item), applyTokens(source, tokens), "utf-8");
+  });
 };
-generatorApp.GENERATE_VIEW_WITH_CONTAINER = (MYMODEL, zFields) => {
-    let out = "";
-    //check if it has a tab
-    let properties = zFields.properties || {};
-    let tabs = zFields.tabs ? zFields.tabs : [];
-    const others = zFields.others || {};
-    let leftData = others.LEFT || [];
-    let rightData = others.RIGHT || [];
-    let oneColumnData = others.ONE_COLUMN || [];
-    const isTab = tabs.length ? true : false;
-    let tabLeft = [],
-        tabRight = [],
-        tabOneColum = [];
-    let sorting = zFields.sorting;
-    let ALL_FIELDS = containerObject(leftData, rightData, oneColumnData, tabs);
-    let arrName = "";
+generatorApp.CREATE_VIEWS_API = (MYMODEL, zFields) => {
+  if (!isPlainObject(MYMODEL) || !isPlainObject(zFields)) return {};
+  const tabs = asArray(zFields.tabs);
+  const tokens = viewTokens(MYMODEL, zFields, tabs.length ? " novalidate " : "");
+  const datas = {};
+  VIEW_FILES.forEach((item) => {
+    const name = viewSourceKey(item);
+    const source = hasOwn(zFields, name) && zFields[name]
+      ? zFields[name]
+      : readFileSafe(path.join(generatorApp.DIRECTORY_GENERATOR_VIEWS, item));
+    datas[item] = applyTokens(source, tokens);
+  });
+  return datas;
+};
-    if (isTab) {
-        out += `<ul class="nav nav-tabs" id="myTab" role="tablist">${Util.newLine}`;
-        tabs.forEach(function (tab, i) {
-            arrName = `arr${i}`;
-            let active = i == 0 ? "active" : "";
-            out += `${Util.tab}<li class="nav-item ${arrName}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#tabgo${i}" type="button" role="tab" aria-controls="tabgo${i}" aria-selected="true">${tab}</button></li>${Util.newLine}`;
-        });
-        out += `</ul>${Util.newLine}`;
+generatorApp.MODIFIY = (SOURCE, TARGET, REPLACE, REPLACE_NEW) => {
+  const data = readFileSafe(SOURCE);
+  fs.writeFileSync(TARGET, Util.replaceAll(data, REPLACE, REPLACE_NEW == null ? "" : String(REPLACE_NEW)), "utf-8");
+};
-        out += `${Util.tabs(2)}<div class="tab-content" id="myTabContent">${
-            Util.newLine
-        }`;
-        tabs.forEach(function (tab, i) {
-            arrName = `arr${i}`;
-            tabLeft = ALL_FIELDS.tabLeft[arrName];
-            tabRight = ALL_FIELDS.tabRight[arrName];
-            tabOneColum = ALL_FIELDS.tabOneColumn[arrName];
-            //let contentTab = generateViewContainer(properties, sorting, tabLeft, tabRight, tabOneColum);
-            let contentTab = "";
-            sorting.forEach(function (item) {
-                contentTab += formBuildDiv(item, {
-                    left: tabLeft,
-                    right: tabRight,
-                    oneColumn: tabOneColum,
-                    properties: properties,
-                    tables: [],
-                });
-            });
-            let active = i == 0 ? "show active" : "";
-            out += `<div class="tab-pane fade ${active}" id="tabgo${i}" role="tabpanel" aria-labelledby="tabgo${i}"><p></p>${contentTab}</div>`;
-        });
-        out += `</div>`;
-        out += `<p></p>`;
+generatorApp.ADDITIONAL_FIELDS = (MYMODEL) => {
+  const bytime = configGenerator.createdUpdatedAt || [];
+  const byman = configGenerator.createdUpdatedBy || [];
+  const fields = (MYMODEL && MYMODEL.fields) || {};
+  const widgets = (MYMODEL && MYMODEL.widgets) || {};
+  const create = [];
+  Object.keys(fields).forEach((key) => {
+    if (Util.in_array(key, bytime)) create.push({ field: key, value: "Util.now()" });
+    if (Util.in_array(key, byman)) create.push({ field: key, value: "res.locals.userId" });
+  });
+  const update = create.filter((item) => String(item.field).indexOf("create") < 0);
+  let str = "";
+  Object.keys(widgets).forEach((key) => {
+    if (widgets[key] && widgets[key].name === "number") {
+      str += `${Util.tabs(2)}data.${key} = Util.replaceAll(data.${key},'.','')${Util.newLine}`;
     }
-    //out += generateViewContainer(properties, sorting, ALL_FIELDS.left, ALL_FIELDS.right, ALL_FIELDS.oneColumn);
-    sorting.forEach(function (item) {
-        out += formBuildDiv(item, {
-            left: ALL_FIELDS.left,
-            right: ALL_FIELDS.right,
-            oneColumn: ALL_FIELDS.oneColumn,
-            properties: properties,
-            tables: [],
-        });
-    });
-    out += viewCreatedBy();
-    out += viewApproval();
-    return out;
+  });
+  const lines = (rows) => rows.reduce((result, item) => (
+    result + `${Util.tabs(2)}data.${item.field} = ${item.value};${Util.newLine}`
+  ), "");
+  return { CREATE: str + lines(create), UPDATE: str + lines(update) };
 };
-generatorApp.GENERATE_VIEW_CLASSIC = (MYMODEL, zFields) => {
-    let out = "";
-    //check if it has a tab
-    let properties = zFields.properties || {};
-    let labels = zFields.labels;
-    let tabs = zFields.tabs ? zFields.tabs : [];
-    let leftData = zFields.left || [];
-    let rightData = zFields.right || [];
-    let oneColumnData = zFields.one_column || [];
-    let sorting = zFields.sorting;
-    let left = [],
-        right = [],
-        oneColumn = [],
-        leftTab = [],
-        rightTab = [],
-        oneColumnTab = [],
-        lefts = [],
-        rights = [];
-    const isTab = tabs.length ? true : false;
-    let arrName = "";
-    let tables = [];
-    let tabLeft = [],
-        tabRight = [],
-        tabOneColumn = [];
-    leftData.forEach(function (item) {
-        if (typeof item == "string") {
-            left.push(item);
-        } else {
-            leftTab.push(item);
-        }
-    });
-    rightData.forEach(function (item) {
-        if (typeof item == "string") {
-            right.push(item);
-        } else {
-            rightTab.push(item);
-        }
-    });
-    oneColumnData.forEach(function (item) {
-        if (typeof item == "string") {
-            oneColumn.push(item);
-        } else {
-            oneColumnTab.push(item);
-        }
-    });
+generatorApp.GENERATE_INDEXJS = (MYMODEL) => {
+  const fields = (MYMODEL && MYMODEL.fields) || {};
+  const widgets = (MYMODEL && MYMODEL.widgets) || {};
+  let out = Util.newLine;
+  Object.keys(fields).forEach((key) => {
+    if (key === "company_id") return;
+    const widgetName = widgets[key] && widgets[key].name;
+    const render = (widgetName && INDEXJS_WIDGET[widgetName]) || INDEXJS_WIDGET.text;
+    out += render(key);
+  });
+  return out;
+};
-    if (isTab) {
-        out += `<ul class="nav nav-tabs" id="myTab" role="tablist">`;
-        tabs.forEach(function (tab, i) {
-            arrName = `arr${i}`;
-            let active = i == 0 ? "active" : "";
-            out += ` <li class="nav-item ${arrName}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#tabgo${i}" type="button" role="tab" aria-controls="tabgo${i}" aria-selected="true">${tab}</button></li>`;
-        });
-        out += `</ul>`;
-    }
+generatorApp.GENERATE_FORM = (MYMODEL, zFields) => {
+  const others = (zFields && zFields.others) || {};
+  return Object.keys(others).length
+    ? generatorApp.GENERATE_FORM_WITH_CONTAINER(MYMODEL, zFields)
+    : generatorApp.GENERATE_FORM_CLASSIC(MYMODEL, zFields);
+};
-    if (isTab) {
-        out += `<div class="tab-content" id="myTabContent">`;
-        tabs.forEach(function (tab, i) {
-            arrName = `arr${i}`;
-            leftTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabLeft = item[key];
-                    }
-                }
-            });
-            rightTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabRight = item[key];
-                    }
-                }
-            });
-            oneColumnTab.forEach(function (item) {
-                for (let key in item) {
-                    if (key == arrName) {
-                        tabOneColumn = item[key];
-                    }
-                }
-            });
-            //let contentTab = generateViewClassic(properties, sorting, tabLeft, tabRight, tabOneColumn);
-            let contentTab = "";
-            sorting.forEach(function (item) {
-                contentTab += formBuildDiv(item, {
-                    left: tabLeft,
-                    right: tabRight,
-                    oneColumn: tabOneColumn,
-                    properties: properties,
-                    tables: tables,
-                });
-            });
-            let active = i == 0 ? "show active" : "";
-            out += `<div class="tab-pane fade ${active}" id="tabgo${i}" role="tabpanel" aria-labelledby="tabgo${i}"><p></p>${contentTab}</div>`;
-        });
-        out += `</div>`;
-        out += `<p></p>`;
-    }
-    //out += generateViewClassic(properties, sorting , left, right, oneColumn);
-    sorting.forEach(function (item) {
-        out += formBuildDiv(item, {
-            left: left,
-            right: right,
-            oneColumn: oneColumn,
-            properties: properties,
-            tables: tables,
-        });
+generatorApp.GENERATE_FORM_WITH_CONTAINER = (MYMODEL, zFields) => {
+  const z = zFields || {};
+  const others = z.others || {};
+  const properties = z.properties || {};
+  const tabs = asArray(z.tabs);
+  const sorting = asArray(z.sorting);
+  const ALL_FIELDS = containerObject(others.LEFT, others.RIGHT, others.ONE_COLUMN, tabs);
+  const tables = [];
+  let out = "";
+  if (tabs.length) {
+    out += renderTabNav(tabs);
+    out += `<div class="tab-content" id="myTabContent">${Util.newLine}`;
+    tabs.forEach((_, i) => {
+      const arrName = `arr${i}`;
+      const obj = {
+        left: ALL_FIELDS.tabLeft[arrName] || [],
+        right: ALL_FIELDS.tabRight[arrName] || [],
+        oneColumn: ALL_FIELDS.tabOneColumn[arrName] || [],
+        properties,
+        tables,
+      };
+      const contentTab = sorting.map((item) => formBuildDiv(item, obj)).join("");
+      const active = i === 0 ? "show active" : "";
+      out += `${Util.tab}<div class="tab-pane fade ${active}" id="arr${i}" role="tabpanel" aria-labelledby="arr${i}"><p></p>${contentTab}</div>${Util.newLine}`;
     });
-    out += viewCreatedBy();
-    out += viewApproval();
+    out += `</div>${Util.newLine}<p></p>${Util.newLine}`;
+  }
-    return out;
+  const outside = { left: ALL_FIELDS.left, right: ALL_FIELDS.right, oneColumn: ALL_FIELDS.oneColumn, properties, tables };
+  out += sorting.map((item) => formBuildDiv(item, outside)).join("");
+  return out;
 };
-function generateForm(
-    properties,
-    sorting,
-    left = [],
-    right = [],
-    oneColumn = []
-) {
-    var out = "",
-        lefts = [],
-        rights = [],
-        oneColumns = [],
-        tables = [];
-    left.forEach((item) => {
-        lefts.push(item);
-        /*if (properties[item].type == "table") {
-          tables.push(item);
-        } else {
-          lefts.push(item);
-        }*/
-    });
-    right.forEach((item) => {
-        rights.push(item);
-        /*if (properties[item].type == "table") {
-          tables.push(item);
-        } else {
-          rights.push(item);
-        }*/
-    });
-    oneColumn.forEach((item) => {
-        if (properties[item].type == "table") {
-            tables.push(item);
-        } else {
-            oneColumns.push(item);
-        }
+generatorApp.GENERATE_FORM_CLASSIC = (MYMODEL, zFields) => {
+  const z = zFields || {};
+  const properties = z.properties || {};
+  const tabs = asArray(z.tabs);
+  const sorting = asArray(z.sorting);
+  const leftCols = splitFlatAndTabbed(z.left);
+  const rightCols = splitFlatAndTabbed(z.right);
+  const oneCols = splitFlatAndTabbed(z.one_column);
+  let out = "";
+  if (tabs.length) {
+    out += `<ul class="nav nav-tabs" id="myTab" role="tablist">`;
+    tabs.forEach((tab, i) => {
+      const active = i === 0 ? "active" : "";
+      out += ` <li class="nav-item arr${i}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#arr${i}" type="button" role="tab" aria-controls="arr${i}" aria-selected="true">${tab}</button></li>`;
     });
-    var obj = {
-        left: lefts,
-        right: rights,
-        oneColumn: oneColumn,
-        properties: properties,
-        tables: tables,
-    };
-    sorting.forEach(function (item) {
-        out += formBuildDiv(item, obj);
+    out += `</ul>`;
+    out += `<div class="tab-content" id="myTabContent">`;
+    tabs.forEach((_, i) => {
+      const arrName = `arr${i}`;
+      const contentTab = generateForm(
+        properties,
+        sorting,
+        fieldsForTab(leftCols.tabbed, arrName),
+        fieldsForTab(rightCols.tabbed, arrName),
+        fieldsForTab(oneCols.tabbed, arrName)
+      );
+      const active = i === 0 ? "show active" : "";
+      out += `<div class="tab-pane fade ${active}" id="arr${i}" role="tabpanel" aria-labelledby="arr${i}"><p></p>${contentTab}</div>`;
     });
-    return out;
-}
-const viewField = (item, properties) => {
-    let html = "";
-    if (typeof item == "string") {
-        html += `${Util.newLine}${Util.tabs(
-            2
-        )}<div class="row"><label for="${item}" class="col col-form-label label-view"><%- attributeData.labels.${item} %></label><div class="col label-data"><%- data.${item} %></div></div>`;
-    } else {
-        if (Array.isArray(item)) {
-            let count = item.length;
-            html += `<div class="row">`;
-            item.forEach(function (childs) {
-                html += `<div class="col">`;
-                childs.forEach(function (child) {
-                    html += `${Util.newLine}${Util.tabs(
-                        2
-                    )}<label for="${child}" class="col col-form-label label-view"><%- attributeData.labels.${child} %></label><div class="col label-data"><%- data.${child} %></div>`;
-                    //html += `${Util.newLine}${Util.tabs(2)}<div class="row"><label for="${child}" class="col col-form-label label-view"><%- attributeData.labels.${child} %></label><div class="col label-data"><%- data.${child} %></div></div>`;
-                });
-                html += `</div>`;
-            });
-            html += `</div>`;
-        }
-    }
-    return html;
-};
+    out += `</div><p></p>`;
+  }
-function generateViewContainer(
-    properties,
-    sorting,
-    left = [],
-    right = [],
-    oneColumn = []
-) {
-    let out = "";
-    let col_md = 6;
-    if (left.length == 0 || right.length == 0) {
-        col_md = 12;
-    }
-    let count = left.length + right.length;
-    if (count) {
-        out += `<div class="container grid-striped ">${Util.newLine}`;
-        out += `${Util.tabs(2)}<div class="row">${Util.newLine}`;
-        out += `${Util.tabs(3)}<div class="col-md-${col_md} ">${Util.newLine}`;
-        left.forEach(function (item) {
-            out += viewField(item, properties);
-        });
-        out += `${Util.tabs(3)}</div>${Util.newLine}`;
-        out += `${Util.tabs(3)}<div class="col-md-${col_md}">${Util.newLine}`;
-        out += `${Util.tabs(3)}<div class="container-fluid">${Util.newLine}`;
-        right.forEach(function (item) {
-            out += viewField(item, properties);
-        });
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-    }
-    if (oneColumn.length) {
-        out += `<div class="container grid-striped mt-5">${Util.newLine}`;
-        out += `<div class="row ">${Util.newLine}`;
-        out += `<div class="col-md-12">${Util.newLine}`;
-        oneColumn.forEach(function (item) {
-            out += viewField(item, properties);
-        });
-        out += `</div>${Util.newLine}`;
-        out += `</div>${Util.newLine}`;
-        out += `</div>${Util.newLine}`;
-    }
-    return out;
-}
-const viewApproval = () => {
-    return `<div class="ps-lg-4 my-5 text-lg-start col-lg-3 mb-3 float-end">
-        <%- zForms.approval_history_table %>
-    </div>`;
+  out += generateForm(properties, sorting, leftCols.flat, rightCols.flat, oneCols.flat);
+  return out;
 };
-const viewCreatedBy = () => {
-    return `<div class="ps-lg-4 my-5 text-lg-start col-lg-3 mb-3 float-end">
-        <div class="dropdown">
-            <button class="btn boxy dropdown-toggle" type="button" id="viewCreatedBy" data-bs-toggle="dropdown" aria-expanded="false">
-                Last update : <%- zForms.users.updated_by %>
-            </button>
-            <ul class="dropdown-menu" aria-labelledby="viewCreatedBy">
-                <li><a class="dropdown-item" href="#">Updated at <%- zForms.users.updated_at %></a></li>
-                <li><a class="dropdown-item" href="#">Created at <%- zForms.users.created_at %></a></li>
-                <li><a class="dropdown-item" href="#">Created by <%- zForms.users.created_by %></a></li>
-            </ul>
-        </div>
-    </div>`;
+generatorApp.GENERATE_VIEW = (MYMODEL, zFields) => {
+  const others = (zFields && zFields.others) || {};
+  return Object.keys(others).length
+    ? generatorApp.GENERATE_VIEW_WITH_CONTAINER(MYMODEL, zFields)
+    : generatorApp.GENERATE_VIEW_CLASSIC(MYMODEL, zFields);
 };
-function generateViewClassic(
-    properties,
-    sorting,
-    left = [],
-    right = [],
-    oneColumn = []
-) {
-    let out = "",
-        lefts = [],
-        rights = [],
-        tables = [];
-    (lefts = left), (rights = right);
-    const maxNumber = lefts.length > rights.length ? lefts.length : rights.length;
-    let one = "",
-        two = "";
-    two += `<table class="table table-striped"><tbody>${Util.newLine}`;
-    for (var i = 0; i < maxNumber; i++) {
-        two += `${Util.tabs(3)}<tr>${Util.newLine}`;
-        let colspanRight = !rights[i] ? ` colspan="3" ` : "";
-        let colspanLeft = !lefts[i] ? ` colspan="3" ` : "";
-        if (lefts[i]) {
-            two += `${Util.tabs(4)}<th class="can-copy"   data-name="{${
-                lefts[i]
-            }}"><%- attributeData.labels.${lefts[i]} %></th>
-            <td  class="can-copy" ${colspanRight}><%- data.${lefts[i]} %></td>${
-                Util.newLine
-            }`;
-        }
-        if (rights[i]) {
-            two += `${Util.tabs(4)}<th class="can-copy"  data-name="{${
-                rights[i]
-            }}"><%- attributeData.labels.${rights[i]} %></th>
-            <td class="can-copy"   ${colspanLeft}><%- data.${
-                rights[i]
-            } %></td>${Util.newLine}`;
-        }
-        two += `${Util.tabs(3)}</tr>${Util.newLine}`;
-    }
-    two += `</tbody></table>`;
-    if (oneColumn.length) {
-        one += `<table class="table table-striped">`;
-        oneColumn.forEach(function (item) {
-            one += `<tr><th><%- attributeData.labels.${item} %></th><td><%- data.${item} %></td></tr>`;
-        });
-        one += `</table>`;
+const renderViewLayout = (ALL_FIELDS, tabs, sorting, properties, tabPrefix) => {
+  let out = "";
+  if (tabs.length) {
+    if (tabPrefix === "tabgo") {
+      out += `<ul class="nav nav-tabs" id="myTab" role="tablist">${Util.newLine}`;
+      tabs.forEach((tab, i) => {
+        const active = i === 0 ? "active" : "";
+        out += `${Util.tab}<li class="nav-item arr${i}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#tabgo${i}" type="button" role="tab" aria-controls="tabgo${i}" aria-selected="true">${tab}</button></li>${Util.newLine}`;
+      });
+      out += `</ul>${Util.newLine}${Util.tabs(2)}<div class="tab-content" id="myTabContent">${Util.newLine}`;
+    } else {
+      out += `<ul class="nav nav-tabs" id="myTab" role="tablist">`;
+      tabs.forEach((tab, i) => {
+        const active = i === 0 ? "active" : "";
+        out += ` <li class="nav-item arr${i}" role="presentation"><button class="nav-link ${active}" data-bs-toggle="tab" data-bs-target="#tabgo${i}" type="button" role="tab" aria-controls="tabgo${i}" aria-selected="true">${tab}</button></li>`;
+      });
+      out += `</ul><div class="tab-content" id="myTabContent">`;
     }
-    sorting.forEach(function (item) {
-        if (item == 1) {
-            out += one;
-        } else {
-            out += two;
-        }
+    tabs.forEach((_, i) => {
+      const arrName = `arr${i}`;
+      const obj = {
+        left: ALL_FIELDS.tabLeft[arrName] || [],
+        right: ALL_FIELDS.tabRight[arrName] || [],
+        oneColumn: ALL_FIELDS.tabOneColumn[arrName] || [],
+        properties,
+        tables: ALL_FIELDS.tables || [],
+      };
+      const contentTab = asArray(sorting).map((item) => formBuildDiv(item, obj)).join("");
+      const active = i === 0 ? "show active" : "";
+      out += `<div class="tab-pane fade ${active}" id="tabgo${i}" role="tabpanel" aria-labelledby="tabgo${i}"><p></p>${contentTab}</div>`;
     });
-    return out;
-}
+    out += `</div><p></p>`;
+  }
+  out += asArray(sorting).map((item) => formBuildDiv(item, {
+    left: ALL_FIELDS.left,
+    right: ALL_FIELDS.right,
+    oneColumn: ALL_FIELDS.oneColumn,
+    properties,
+    tables: ALL_FIELDS.tables || [],
+  })).join("");
+  out += viewCreatedBy();
+  out += viewApproval();
+  return out;
+};
-const formBuild = (arr, properties, tables) => {
-    let out = "";
-    arr.forEach(function (item, index) {
-        if (typeof item == "string") {
-            //console.log(`item string ${item}`)
-            let isHidden = !properties[item].values.hidden
-                ? false
-                : properties[item].values.hidden;
-            if (!isHidden) {
-                if (properties[item].type == "custom") {
-                    out += `${Util.tabs(3)}<%- ${properties[item].values.code} %>${
-                        Util.newLine
-                    }`;
-                } else {
-                    out += `${Util.tabs(3)}<%- zForms.build["${item}"] %>${Util.newLine}`;
-                }
-            }
-        } else {
-            out += `${Util.newLine}${Util.tabs(3)}<div class="row">${Util.newLine}`;
-            const col_md = `col-md-${12 / item.length}`;
-            item.forEach(function (myitems) {
-                //console.log(properties[myitems]);
-                out += `${Util.tabs(4)}<div class="${col_md}">${Util.newLine}`;
-                myitems.forEach(function (itemX) {
-                    if (properties[itemX].type == "custom") {
-                        out += `${Util.tabs(3)}<%- ${properties[itemX].values.code} %>${
-                            Util.newLine
-                        }`;
-                    } else {
-                        out += `${Util.tabs(5)}<%- zForms.build["${itemX}"] %>${
-                            Util.newLine
-                        }`;
-                    }
-                });
-                out += `${Util.tabs(4)}</div>${Util.newLine}`;
-            });
-            out += `${Util.tabs(3)}</div>${Util.newLine}`;
-        }
-    });
-    return out;
+generatorApp.GENERATE_VIEW_WITH_CONTAINER = (MYMODEL, zFields) => {
+  const z = zFields || {};
+  const others = z.others || {};
+  const ALL_FIELDS = containerObject(others.LEFT, others.RIGHT, others.ONE_COLUMN, asArray(z.tabs));
+  ALL_FIELDS.tables = [];
+  return renderViewLayout(ALL_FIELDS, asArray(z.tabs), z.sorting, z.properties || {}, "tabgo");
 };
-const formBuildDiv = (type = 1, obj = {}) => {
-    let out = "";
-    if (type == 1) {
-        out += `${Util.tab}<div class="row">${Util.newLine}${Util.tabs(
-            2
-        )}<div class="col-md-12">${Util.newLine}`;
-        out += formBuild(obj.oneColumn, obj.properties, obj.tables);
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tab}</div>${Util.newLine}`;
-    } else {
-        out += `${Util.tab}<div class="row">${Util.newLine}`;
-        out += `${Util.tabs(2)}<div class="col-md-6">${Util.newLine}`;
-        out += formBuild(obj.left, obj.properties, obj.tables);
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tabs(2)}<div class="col-md-6">${Util.newLine}`;
-        out += formBuild(obj.right, obj.properties, obj.tables);
-        out += `${Util.tabs(2)}</div>${Util.newLine}`;
-        out += `${Util.tab}</div>${Util.newLine}`;
-    }
-    return out;
+generatorApp.GENERATE_VIEW_CLASSIC = (MYMODEL, zFields) => {
+  const z = zFields || {};
+  const leftCols = splitFlatAndTabbed(z.left);
+  const rightCols = splitFlatAndTabbed(z.right);
+  const oneCols = splitFlatAndTabbed(z.one_column);
+  const tabs = asArray(z.tabs);
+  const ALL_FIELDS = {
+    left: leftCols.flat,
+    right: rightCols.flat,
+    oneColumn: oneCols.flat,
+    tabLeft: {},
+    tabRight: {},
+    tabOneColumn: {},
+    tables: [],
+  };
+  tabs.forEach((_, i) => {
+    const arrName = `arr${i}`;
+    ALL_FIELDS.tabLeft[arrName] = fieldsForTab(leftCols.tabbed, arrName);
+    ALL_FIELDS.tabRight[arrName] = fieldsForTab(rightCols.tabbed, arrName);
+    ALL_FIELDS.tabOneColumn[arrName] = fieldsForTab(oneCols.tabbed, arrName);
+  });
+  return renderViewLayout(ALL_FIELDS, tabs, z.sorting, z.properties || {}, "classic");
 };
 module.exports = generatorApp;