zet-lib 3.0.7 → 3.0.9

package/lib/Form.js

@@ -214,6 +214,10 @@ Form.field = (obj) => {
       displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}    ${tabindex}  ${style}  type="text" class="form-control number ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`;
       break;
 
+    case "money":
+      displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}    ${tabindex}  ${style}  type="text" class="form-control ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`;
+      break;
+
     case "integer":
       displayForm = `${prepend}${inputGroupLeft}<input autocomplete="off" autofocus="" ${disabled}  ${readonly} ${additional_attributes}   ${tabindex}  ${style}  type="number" class="form-control  ${obj.class}" ${id} ${name} ${placeholder}   ${required} value="${value}"  ${htmlOptions}>${inputGroupRight}${information}${append}`;
       break;
@@ -545,6 +549,10 @@ Form.field = (obj) => {
       displayForm = obj.html;
       break;
 
+    case "html":
+      displayForm = obj.code;
+      break;
+
     case "location":
       displayForm = `${prepend}<input type="text" class="form-control ${
           obj.class
@@ -1028,6 +1036,10 @@ Form.build = (obj) => {
       }
     }
   }
+
+  if(obj.type == "html") {
+    html = obj.code;
+  }
   return html;
 };
 

package/lib/Model.js

@@ -84,6 +84,7 @@ Model.keys = {
     text: "Text",
     textarea: "Textarea",
     checkbox: "Checkbox",
+    money: "Money",
     number: "Amount",
     integer: "Integer",
     select: "Select (static) ",
@@ -119,6 +120,7 @@ Model.keys = {
     ltree: "LTree",
     virtual: "Virtual Field (readonly)",
     custom: "Custom",
+    html: "HTML Tags (code)",
 };
 
 Model.dropzone = {
@@ -888,6 +890,147 @@ Model.password = {
     category: "text",
 };
 
+Model.money = {
+    properties: [
+        "required",
+        "unique",
+        "tabindex",
+        "min",
+        "max",
+        "hidden",
+        "defaultValue",
+        "inputGroupLeft",
+        "inputGroupRight",
+        "digitDecimal",
+        "decimalPlaces",
+        "thousandSeparator",
+        "symbol",
+        "information",
+    ],
+    attributes: ["min", "max"],
+    labels: {
+        required: "Required",
+        unique: "Unique",
+        tabindex: "Tab Index",
+        min: "Min",
+        max: "Max",
+        hidden: "Hidden",
+        defaultValue: "Default Value",
+        inputGroupLeft: "Input Group Left",
+        inputGroupRight: "Input Group Right",
+        digitDecimal:"Digit Decimal",
+        decimalPlaces:"Decimal Places",
+        thousandSeparator:"Use 1000 Separator",
+        symbol:"Currency Symbol",
+        information: "Additional Information",
+    },
+    defaultValues: {
+        required: false,
+        unique: false,
+        tabindex: 1,
+        min: 0,
+        max: 0,
+        hidden: false,
+        defaultValue: null,
+        inputGroupLeft: "",
+        inputGroupRight: "",
+        digitDecimal: 0,
+        decimalPlaces:",",
+        thousandSeparator:".",
+        symbol:"",
+        information: "",
+    },
+    typies: {
+        required: {
+            tag: "input",
+            type: "checkbox",
+        },
+        tabindex: {
+            tag: "input",
+            type: "number",
+        },
+        unique: {
+            tag: "input",
+            type: "checkbox",
+        },
+        min: {
+            tag: "input",
+            type: "number",
+        },
+        max: {
+            tag: "input",
+            type: "number",
+        },
+        hidden: {
+            tag: "input",
+            type: "checkbox",
+        },
+        defaultValue: {
+            tag: "input",
+            type: "number",
+        },
+        inputGroupLeft: {
+            tag: "input",
+            type: "text",
+        },
+        inputGroupRight: {
+            tag: "input",
+            type: "text",
+        },
+        digitDecimal: {
+            tag: "input",
+            type: "number",
+        },
+        decimalPlaces: {
+            tag: "input",
+            type: "text",
+        },
+        thousandSeparator: {
+            tag: "input",
+            type: "text",
+        },
+        symbol: {
+            tag: "input",
+            type: "text",
+        },
+        information: {
+            tag: "textarea",
+            type: "",
+            class: "",
+        },
+    },
+    comment: (obj = {}) => {
+        return `money`;
+    },
+    sql: (key, MYMODEL, obj = {}) => {
+        const required = !obj.required ? false : true;
+        const digitDecimal = obj.digitDecimal || 0;
+        let defaultValue = "";
+        if (!obj.defaultValue) {
+            defaultValue = ``;
+        } else if (obj.defaultValue == "null") {
+            defaultValue = `ALTER TABLE "${MYMODEL.table}" ALTER COLUMN "${key}" SET DEFAULT NULL;`;
+        } else {
+            defaultValue = `ALTER TABLE "${MYMODEL.table}" ALTER COLUMN "${key}" SET  DEFAULT ${obj.defaultValue};`;
+        }
+        const indexing = !obj.unique
+            ? ""
+            : `	ALTER TABLE "${MYMODEL.table}" ADD CONSTRAINT unique_${MYMODEL.table}_${key}  UNIQUE (${key});`;
+
+        const addTable = `ALTER TABLE "${MYMODEL.table}"  ADD COLUMN  "${key}" NUMERIC(15, ${digitDecimal});`;
+        return {
+            defaultValue: defaultValue,
+            column: addTable,
+            index: indexing,
+            foreignKey: "",
+        };
+    },
+    columnType: (obj = {}) => {
+        return `money`;
+    },
+    category: "money",
+};
+
 Model.number = {
     properties: [
         "required",
@@ -3155,6 +3298,36 @@ Model.custom = {
     category: "custom",
 };
 
+Model.html = {
+    properties: ["code"],
+    labels: {
+        code: "Code",
+    },
+    defaultValues: {
+        code: "<h1>Hello World</h1>",
+    },
+    typies: {
+        code: {
+            tag: "textarea",
+            type: "",
+        },
+    },
+    comment: (obj = {}) => {
+        return ``;
+    },
+    sql: (key, MYMODEL, obj = {}) => {
+        return {
+            index: "",
+            foreignKey: "",
+        };
+    },
+    columnType: (obj = {}) => {
+        return ``;
+    },
+    category: "custom",
+};
+
+
 Model.hardcodeGrid = `const data = await zRoute.listData(req, res, MYMODEL, zRole);
 ${Util.tab}res.json(data);`;
 

package/lib/Util.js

@@ -660,16 +660,18 @@ Util.toNumber = function (num) {
 Util.formatNumber = function (num, thousandSeparator = ".") {
   try {
     const strValue = String(num);
-    // Split into integer and decimal parts
-    const parts = strValue.split(",");
+    // Split into integer and decimal parts (input usually has "." as decimal separator)
+    const parts = strValue.split(".");
     // Format integer part with thousand separators
     const integerPart = parts[0].replace(
         /\B(?=(\d{3})+(?!\d))/g,
         thousandSeparator
     );
+    // Determine decimal separator: if thousandSeparator is ".", use ","; otherwise use "."
+    let decimalSeparator = thousandSeparator === "." ? "," : ".";
     // If there's a decimal part, add it back
     if (parts.length > 1) {
-      return `${integerPart},${parts[1]}`;
+      return `${integerPart}${decimalSeparator}${parts[1]}`;
     }
     return integerPart;
   } catch (e) {

package/lib/generatorApi.js

@@ -370,8 +370,8 @@ function containerObject(left,right,oneColumn,tabs = []) {
 Api.modalWithContainer = async (body) => {
     try {
         //let body = req.body;
-/*        console.log(body)
-        console.log("Container....")*/
+        /*        console.log(body)
+                console.log("Container....")*/
         let table = body.table || "";
         let html = '';
         let fields = [];
@@ -613,16 +613,16 @@ Api.modalClassic = async (body) => {
                             });
                         }
 
-                /*        console.log(arrName);
-                        console.log("tableft");
-                        console.log(JSON.stringify(tabLeft));
-                        console.log("tableft end");
-                        console.log("tabright");
-                        console.log(JSON.stringify(tabRight));
-                        console.log("tabright");
-                        console.log("tabonecolumn");
-                        console.log(JSON.stringify(tabOneColum));
-                        console.log("tabonecolumn end");*/
+                        /*        console.log(arrName);
+                                console.log("tableft");
+                                console.log(JSON.stringify(tabLeft));
+                                console.log("tableft end");
+                                console.log("tabright");
+                                console.log(JSON.stringify(tabRight));
+                                console.log("tabright");
+                                console.log("tabonecolumn");
+                                console.log(JSON.stringify(tabOneColum));
+                                console.log("tabonecolumn end");*/
 
 
                         if (tabLeft.length) {
@@ -673,16 +673,16 @@ Api.modalClassic = async (body) => {
             }
         }
 
-      /*  var rows = [];
-        if (Util.isEmptyObject(datas.details)) {
-            rows = await fieldsTable(table, rowsFields);
-        } else {
-            var d = datas.details;
-            var notabs = d.hasOwnProperty('notabs') ? d.notabs : [];
-            for (var i = 0; i < notabs.length; i++) {
-                rows.push({name: notabs[i], label: datas.labels[notabs[i]]})
-            }
-        }*/
+        /*  var rows = [];
+          if (Util.isEmptyObject(datas.details)) {
+              rows = await fieldsTable(table, rowsFields);
+          } else {
+              var d = datas.details;
+              var notabs = d.hasOwnProperty('notabs') ? d.notabs : [];
+              for (var i = 0; i < notabs.length; i++) {
+                  rows.push({name: notabs[i], label: datas.labels[notabs[i]]})
+              }
+          }*/
 
         //caption left or right
         if (datas.left.length) {
@@ -971,10 +971,10 @@ Api.create_field = (body) => {
             }
         }
 
-     /*   console.log(JSON.stringify(left))
-        console.log(JSON.stringify(right))
-        console.log(JSON.stringify(oneColumn))
-        console.log(position);*/
+        /*   console.log(JSON.stringify(left))
+           console.log(JSON.stringify(right))
+           console.log(JSON.stringify(oneColumn))
+           console.log(position);*/
 
         let othersLength = Object.keys(others).length;
         if(othersLength) {
@@ -1128,7 +1128,7 @@ const createTable = (postData, isIgnore) => {
     let name = postData.name;
     name = name.trim();
     let forbidden = ['group','copy','command','from','select','distinct','where','year','month','day','ignore','previous','next',
-    'start','end','set','setof','show','size','row','rows','return','order'];
+        'start','end','set','setof','show','size','row','rows','return','order'];
     if(forbidden.includes(name)) {
         json = Util.flashError("Module Name is Forbidden, try using other module name..", "route");
         return json;

package/lib/generatorModel.js

@@ -449,6 +449,13 @@ me.prepare = (MYMODEL) => {
                     ? 400
                     : property.values.height;
                 break;
+            case "html":
+                widgets[key].code = property.values.code || "";
+                break;
+
+            case "money":
+                widgets[key].symbol = property.values.symbol || "";
+                break;
 
             default:
                 break;
@@ -560,16 +567,12 @@ me.build_sql_api = (columns, constraintList, MYMODEL) => {
             }
         }
     }
-
-    //var constraintList = await connection.query(connection.constraintList(MYMODEL.table));
-    //make a object instead of array
     const constraintObject = Util.arrayToObject(constraintList, "conname");
-
     const alter = [];
     const index = [];
     const defaultValue = [];
     const fk = [];
-    const notAlters = ["virtual", "custom"];
+    const notAlters = ["virtual", "custom","html"];
     for (const key in properties) {
         const property = properties[key];
         if (!notAlters.includes(property.type)) {
@@ -599,6 +602,14 @@ me.build_sql_api = (columns, constraintList, MYMODEL) => {
                     index.push(`DROP INDEX ${idx}; `);
                 }
             }
+            if(property.type == "money"){
+                //ALTER TABLE nama_tabel
+                // ALTER COLUMN nama_kolom TYPE NUMERIC(15,2);
+                let digitDecimal = properties[key].values.digitDecimal || 0;
+                alter.push(
+                    `ALTER TABLE "${MYMODEL.table}" ALTER COLUMN "${key}" TYPE NUMERIC(15,${digitDecimal});; `
+                );
+            }
             //relations foreign key
             const fkx = `fk_${MYMODEL.table}_${key}`;
             if (sqlObject.foreignKey) {

package/lib/moduleLib.js

@@ -53,9 +53,9 @@ m.datepicker = function (req, res, elem) {
   /*  head += '<link href="/css/bootstrap-datepicker.css" rel="stylesheet">';
       end += '<script src="/js/bootstrap-datepicker.min.js"></script>';*/
   head +=
-    '<link href="/modules/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">';
+      '<link href="/modules/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">';
   end +=
-    '<script src="/modules/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>';
+      '<script src="/modules/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>';
   script = `$.fn.datepicker.defaults.format = "yyyy-mm-dd";$.fn.datepicker.defaults.todayHighlight = true;$("body").on("click", "${elem}", function(){$(this).datepicker();$(this).datepicker("show");});`;
 
   return {
@@ -74,7 +74,7 @@ m.selectize = function (req, res, elem) {
   let end = ``;
   elem = elem || ".selectize";
   head +=
-    '<link href="/modules/selectizejs/css/selectize.bootstrap5.css" rel="stylesheet">';
+      '<link href="/modules/selectizejs/css/selectize.bootstrap5.css" rel="stylesheet">';
   end += '<script src="/modules/selectizejs/js/selectize.min.js"></script>';
 
   script += `$(() => {
@@ -339,11 +339,11 @@ m.datetimepicker = function (req, res, elem) {
   let end = ``;
   elem = elem || ".datetimepicker";
   head +=
-    '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
+      '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
   end +=
-    '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
+      '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
   end +=
-    '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
+      '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
   script += `$(function () { $("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'}); });`;
   script += `setTimeout(function () { $("body").click();},1000);`;
   script += `$("body").on("click", function(){$("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'});});`;
@@ -362,14 +362,14 @@ m.ckeditor = function (req, res, elem) {
   let end = ``;
   elem = elem || ".editor";
   end +=
-    '<script src="/modules/ckeditor5-build-classic/ckeditor.js"></script>' +
-    newLine;
+      '<script src="/modules/ckeditor5-build-classic/ckeditor.js"></script>' +
+      newLine;
   end += "<script>";
   end +=
-    'ClassicEditor.create( document.querySelector( "' +
-    elem +
-    '" ) ).catch( error => {console.error( error );} );' +
-    newLine;
+      'ClassicEditor.create( document.querySelector( "' +
+      elem +
+      '" ) ).catch( error => {console.error( error );} );' +
+      newLine;
   end += "</script>";
   return {
     head: head,
@@ -385,8 +385,8 @@ m.tinymce = function (req, res, elem) {
   let end = ``;
   elem = elem || ".tinymce";
   end +=
-    '<script src="https://cdn.tiny.cloud/1/b7054u42l8lw67ch5oh9qutnvbyu8exzryg4edy0gg2snhtr/tinymce/6/tinymce.min.js" referrerpolicy="origin"></script>' +
-    newLine;
+      '<script src="https://cdn.tiny.cloud/1/b7054u42l8lw67ch5oh9qutnvbyu8exzryg4edy0gg2snhtr/tinymce/6/tinymce.min.js" referrerpolicy="origin"></script>' +
+      newLine;
   script += ` tinymce.init({
       selector: '${elem}',
       plugins: 'anchor autolink charmap codesample emoticons image link lists media searchreplace table visualblocks wordcount',
@@ -407,11 +407,11 @@ m.froala = function (req, res, elem) {
   elem = elem || ".editor";
 
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
   end +=
-    '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
+      '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
   script += `$(function() {$("${elem}").froalaEditor({height: 200})});`;
 
   return {
@@ -449,13 +449,13 @@ m.editor = (req, res, elem = "") => {
   let end = ``;
 
   head +=
-    '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.4.2/css/all.min.css" integrity="sha512-NicFTMUg/LwBeG8C7VG+gC4YiiRtQACl98QdkmfsLy37RzXdkaUAuPyVMND0olPP4Jn8M/ctesGSB2pgUBDRIw==" crossorigin="anonymous" referrerpolicy="no-referrer" />';
+      '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.4.2/css/all.min.css" integrity="sha512-NicFTMUg/LwBeG8C7VG+gC4YiiRtQACl98QdkmfsLy37RzXdkaUAuPyVMND0olPP4Jn8M/ctesGSB2pgUBDRIw==" crossorigin="anonymous" referrerpolicy="no-referrer" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
   end +=
-    '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
+      '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
   script += `$(function() {$("${elem}").froalaEditor({height: 200})});`;
 
   return {
@@ -472,11 +472,11 @@ m.switch = function (req, res, elem, array) {
   let end = ``;
 
   head +=
-    '<link href="/modules/bootstrap-switch/bootstrap-switch.css" rel="stylesheet" type="text/css" />' +
-    newLine;
+      '<link href="/modules/bootstrap-switch/bootstrap-switch.css" rel="stylesheet" type="text/css" />' +
+      newLine;
   end +=
-    '<script type="text/javascript" src="/modules/bootstrap-switch/bootstrap-switch.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/bootstrap-switch/bootstrap-switch.js"></script>' +
+      newLine;
 
   let labels = "";
   if (Array.isArray(array)) {
@@ -496,11 +496,11 @@ m.switchOld = function (req, res, elem, array) {
   let end = ``;
   elem = elem || ".switch";
   head +=
-    '<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">' +
-    newLine;
+      '<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">' +
+      newLine;
   end +=
-    '<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>' +
-    newLine;
+      '<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>' +
+      newLine;
 
   let labels = "";
   if (Array.isArray(array)) {
@@ -521,11 +521,11 @@ m.clockpicker = function (req, res, elem) {
   let end = ``;
   elem = elem || ".clockpicker";
   head +=
-    '<link href="/modules/jquery-clockpicker.min.css" rel="stylesheet" type="text/css" />' +
-    newLine;
+      '<link href="/modules/jquery-clockpicker.min.css" rel="stylesheet" type="text/css" />' +
+      newLine;
   end +=
-    '<script type="text/javascript" src="/modules/bootstrap-clockpicker.min.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/bootstrap-clockpicker.min.js"></script>' +
+      newLine;
   script += `$("body").on("click", "${elem}", function(){$(this).clockpicker({donetext: "Done"});});`;
   //end += '$("' + elem + '").clockpicker({donetext: "Done"});' + newLine;
   return {
@@ -542,7 +542,7 @@ m.number = (req, res, elem) => {
   elem = elem || ".number";
 
   end +=
-    '<script type="text/javascript" src="/js/jquery-currency.js"></script>';
+      '<script type="text/javascript" src="/js/jquery-currency.js"></script>';
   script += `$(function () { $(".number").formatCurrencyLive({symbol:"",roundToDecimalPlace :0,digitGroupSymbol :"."}); });`;
   script += `setTimeout(function () { $("body").click();},1000);`;
   script += `$("body").on("click", function(){$(".number").formatCurrencyLive({symbol:"",roundToDecimalPlace :0,digitGroupSymbol :"."});});`;
@@ -560,8 +560,8 @@ m.typeahead = (req, res, table, elem) => {
   let end = ``;
   elem = elem || ".typeahead";
   end +=
-    '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
+      newLine;
 
   let elemData = elem.replace(".", "").replace("#", "");
   let element = elem.replace("Typeahead", "");
@@ -607,8 +607,8 @@ m.typeaheadFile = (req, res, elem, data) => {
   data = data || [];
   elem = elem || ".typeahead";
   end +=
-    '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
+      newLine;
 
   let elemData = elem.replace(".", "");
   elemData = elemData.replace("#", "");
@@ -661,7 +661,7 @@ m.dropboxview = (req, res) => {
   let head = ``;
   let end = ``;
   script +=
-    `let dropbox_image = {}
+      `let dropbox_image = {}
     $(()=>{
    $(".zdropbox-view").each(function (index, item) {
        let dropboxLength = $(".zdropbox-view").length || 0;
@@ -729,9 +729,9 @@ m.addScript = (req, res, contentScript, at = "end", type = "script") => {
   if (contentScript) {
     let generateId = "app_" + Util.generate(6);
     let tagOpen =
-      type == "script"
-        ? `<script  id="${generateId}">`
-        : '<style type="text/css">';
+        type == "script"
+            ? `<script  id="${generateId}">`
+            : '<style type="text/css">';
     let tagClose = type == "script" ? "</script>" : "</style>";
     let content = at == "end" ? res.locals.moduleEnd : res.locals.moduleHead;
     content += tagOpen + newLine;
@@ -746,8 +746,8 @@ m.addScript = (req, res, contentScript, at = "end", type = "script") => {
 
 m.addModule = (req, res, content, isModuleHead = false) => {
   let moduleContent = isModuleHead
-    ? res.locals.moduleHead
-    : res.locals.moduleEnd;
+      ? res.locals.moduleHead
+      : res.locals.moduleEnd;
   moduleContent += content;
   if (isModuleHead) {
     res.locals.moduleHead = moduleContent;
@@ -762,8 +762,8 @@ m.highchart = async (req, res, obj) => {
   let end = res.locals.moduleEnd;
   if (end.indexOf("highcharts") < 0) {
     end +=
-      '<script src="https://code.highcharts.com/highcharts.js"></script>' +
-      newLine;
+        '<script src="https://code.highcharts.com/highcharts.js"></script>' +
+        newLine;
   }
 
   if (!Util.isEmptyObject(obj)) {
@@ -821,16 +821,16 @@ m.highlight = (req, res, elem) => {
   let end = res.locals.moduleEnd;
   if (head.indexOf("highlight") < 0) {
     head +=
-      '<link rel="stylesheet" href="/modules/highlight/default.min.css"> ' +
-      newLine;
+        '<link rel="stylesheet" href="/modules/highlight/default.min.css"> ' +
+        newLine;
     end +=
-      '<script src="/modules/highlight/highlight.min.js"></script>' + newLine;
+        '<script src="/modules/highlight/highlight.min.js"></script>' + newLine;
   }
   end +=
-    '<script>$(function(){ document.querySelectorAll("' +
-    elem +
-    '").forEach((block) => {hljs.highlightBlock(block);}); })</script>' +
-    newLine;
+      '<script>$(function(){ document.querySelectorAll("' +
+      elem +
+      '").forEach((block) => {hljs.highlightBlock(block);}); })</script>' +
+      newLine;
   res.locals.moduleHead = head;
   res.locals.moduleEnd = end;
 };
@@ -842,11 +842,11 @@ m.selectpicker = function (req, res, elem) {
   let end = res.locals.moduleEnd;
   if (head.indexOf("bootstrap-select") < 0) {
     head +=
-      '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">' +
-      newLine;
+        '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">' +
+        newLine;
     end +=
-      '<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>' +
-      newLine;
+        '<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>' +
+        newLine;
     end += `<script>$(function () {$('${elem}').selectpicker();});</script>${newLine}`;
   }
   res.locals.moduleHead = head;

package/lib/views/generatorjs.ejs

@@ -139,8 +139,8 @@
                     dropdownRelations('dropdown_multi_table', 'dropdown_multi_name', '', $('#dropdown_multi_table').data('value'), $('#dropdown_multi_name').data('value'))
                 }
 
-                $("#number_decimalPlaces").css("font-size","2rem");
-                $("#number_thousandSeparator").css("font-size","2rem");
+                $("#money_decimalPlaces").css("font-size","2rem");
+                $("#money_thousandSeparator").css("font-size","2rem");
             }
         )
         $('#modal_setting').modal('show')

package/lib/zRoute.js

@@ -329,6 +329,42 @@ zRoute.post = (req, res, MYMODEL, routeName, body) => {
         post[routeName][key] = val ? val : val === 0 ? 0 : null;
         break;
 
+      case "money":
+        if (typeof val == "string" && val.trim() !== "") {
+          // Get widget configuration
+          const widgetConfig = widgets[key] || {};
+          const symbol = widgetConfig.symbol || "";
+          const thousandSeparator = widgetConfig.thousandSeparator || ",";
+          const decimalPlaces = widgetConfig.decimalPlaces || ".";
+
+          // Remove symbol if present
+          let cleanedVal = val.trim();
+          if (symbol && cleanedVal.startsWith(symbol)) {
+            cleanedVal = cleanedVal.substring(symbol.length).trim();
+          }
+
+          // Remove thousand separators
+          if (thousandSeparator) {
+            // Escape special regex characters
+            const escapedThousandSep = thousandSeparator.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            cleanedVal = cleanedVal.replace(new RegExp(escapedThousandSep, 'g'), '');
+          }
+
+          // Replace decimal separator with standard dot
+          if (decimalPlaces && decimalPlaces !== ".") {
+            // Escape special regex characters
+            const escapedDecimalSep = decimalPlaces.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            cleanedVal = cleanedVal.replace(escapedDecimalSep, '.');
+          }
+
+          // Convert to number
+          const numVal = parseFloat(cleanedVal);
+          post[routeName][key] = isNaN(numVal) ? null : numVal;
+        } else {
+          post[routeName][key] = val ? val : val === 0 ? 0 : null;
+        }
+        break;
+
       case "json_array":
         myval = null;
         if (val) {
@@ -400,6 +436,9 @@ zRoute.attributeData = async (res, MYMODEL, obj) => {
     if (MYMODEL.widgets[key].name == "custom") {
       customs.push(key);
     }
+    if (MYMODEL.widgets[key].name == "html") {
+      customs.push(key);
+    }
   }
   if (customs.length) {
     visibles = visibles.filter((item) => !customs.includes(item));
@@ -1269,6 +1308,10 @@ zRoute.dataTableData = (
             myvalue = Util.formatNumber(value);
             break;
 
+          case "money":
+            myvalue = `${MYMODEL.widgets[key].symbol} ${Util.formatNumber(value, MYMODEL.widgets[key].thousandSeparator)}`;
+            break;
+
           case "integer":
             myvalue = value + "";
             break;
@@ -3103,6 +3146,10 @@ zRoute.forms = (
         case "tags":
           obj.type = "tags";
           break;
+        case "html":
+          obj.type = "html";
+          obj.code = widgets[key].code || ""
+          break;
         case "checkbox":
           obj.type = "checkbox";
           break;
@@ -3716,7 +3763,10 @@ zRoute.viewForm = (
           obj[key].value = data[key] || "";
           break;
         case "number":
-          obj[key].value = data[key] ? Util.formatNumber(data[key], ",") : "";
+          obj[key].value = data[key] ? Util.formatNumber(data[key], ".") : "";
+          break;
+        case "money":
+          obj[key].value = data[key] ? `${widgets[key].symbol} ${Util.formatNumber(data[key], ".")}` : "";
           break;
         case "typeahead":
           obj[key].type = "text";
@@ -4120,6 +4170,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
   let hasAttributes = [];
   let joinsFields = [];
   let selectize = [];
+  let moneys = [];
   if (MYMODEL.joins) {
     joinsFields = MYMODEL.joins.list;
   }
@@ -4129,6 +4180,9 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         hasDatePicker = true;
       } else if (widgets[key].name == "number") {
         hasNumber = true;
+      } else if (widgets[key].name == "money") {
+        hasNumber = true;
+        moneys.push(key);
       } else if (widgets[key].name == "clockpicker") {
         hasClockPicker = true;
       } else if (widgets[key].name == "editor") {
@@ -4220,6 +4274,24 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     scriptForm += numberObj.script;
     headObj.number = numberObj.head;
     endObj.number = numberObj.end;
+    if(moneys.length > 0) {
+      let moneyScript = ``
+      moneys.map((money) => {
+        moneyScript += `$('#${money}').formatCurrency({
+            symbol: '${widgets[money].symbol || "" }',
+            decimalSymbol: '${widgets[money].decimalPlaces || "," }',
+            digitGroupSymbol: '${widgets[money].thousandSeparator || "." }',
+            roundToDecimalPlace: ${widgets[money].digitDecimal || 0}
+        });`
+        moneyScript += `$('#${money}').formatCurrencyLive({
+            symbol: '${widgets[money].symbol || "" }',
+            decimalSymbol: '${widgets[money].decimalPlaces || "," }',
+            digitGroupSymbol: '${widgets[money].thousandSeparator || "." }',
+            roundToDecimalPlace: ${widgets[money].digitDecimal || 0}
+        });`
+      })
+      scriptForm += ` $(function() {${moneyScript}});`;
+    }
   }
   if (hasClockPicker) {
     let clockpickerObj = moduleLib.clockpicker(req, res);

package/package.json

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