zet-lib 3.0.8 → 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;

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) ",
@@ -889,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",
@@ -3175,7 +3317,6 @@ Model.html = {
     },
     sql: (key, MYMODEL, obj = {}) => {
         return {
-            column: "",
             index: "",
             foreignKey: "",
         };

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) {