zet-lib 3.1.1 → 3.1.3

package/lib/zMenuRouter.js

@@ -53,12 +53,13 @@ router.get('/', async function (req, res, next) {
       }
     })
     if(copyMenu){
-      copyMenu.json = JSON.stringify(copyMenu.json);
+      copyMenu.json = '[]';
       copyMenu.updated_by = res.locals.userId;
       copyMenu.created_by = res.locals.userId;
       copyMenu.created_at = Util.now();
       copyMenu.updated_at = Util.now();
       copyMenu.company_id = companyId;
+      company.name = 'Default';
       delete copyMenu.id;
       await connection.insert({
         table : "zmenu",

package/lib/zRoute.js

@@ -3766,7 +3766,9 @@ zRoute.viewForm = (
           obj[key].value = data[key] ? Util.formatNumber(data[key], ".") : "";
           break;
         case "money":
-          obj[key].value = data[key] ? `${widgets[key].symbol} ${Util.formatNumber(data[key], ".")}` : "";
+          // Set value in standard format (number with dot as decimal separator)
+          // Let formatCurrency handle the formatting
+          obj[key].value = data[key] ? `${widgets[key].symbol || ""} ${Util.formatNumber(data[key], widgets[key].thousandSeparator)}` : "";
           break;
         case "typeahead":
           obj[key].type = "text";
@@ -4277,6 +4279,50 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     if(moneys.length > 0) {
       let moneyScript = ``
       moneys.map((money) => {
+        // Clean and normalize the value to standard format (number with dot as decimal separator)
+        // This must be done BEFORE formatCurrency is called
+        moneyScript += `var ${money}Val = $('#${money}').val();`
+        moneyScript += `if(${money}Val) {`
+        // Remove all non-numeric characters (symbols, spaces, etc)
+        moneyScript += `  ${money}Val = ${money}Val.toString().replace(/[^0-9.,-]/g, '');`
+        // Normalize to standard format based on thousand separator configuration
+        moneyScript += `  if('${widgets[money].thousandSeparator || "."}' === '.') {`
+        // Thousand separator is ".", so "," is decimal separator
+        // If value has multiple dots or comma, it's already formatted - normalize it
+        moneyScript += `    var dotCount = (${money}Val.match(/\\./g) || []).length;`
+        moneyScript += `    var commaCount = (${money}Val.match(/,/g) || []).length;`
+        moneyScript += `    if(dotCount > 1 || commaCount > 0) {`
+        // Remove all dots (thousand separators) and replace comma with dot (decimal separator)
+        moneyScript += `      ${money}Val = ${money}Val.replace(/\\./g, '').replace(',', '.');`
+        moneyScript += `    }`
+        // If dotCount === 1 and commaCount === 0, value is already in standard format, keep it
+        moneyScript += `  } else {`
+        // Thousand separator is ",", so "." is decimal separator
+        moneyScript += `    var commaCount = (${money}Val.match(/,/g) || []).length;`
+        moneyScript += `    if(commaCount > 1) {`
+        // Multiple commas means formatted - remove all commas (thousand separators)
+        moneyScript += `      ${money}Val = ${money}Val.replace(/,/g, '');`
+        moneyScript += `    }`
+        // If commaCount <= 1, value is already in standard format, keep it
+        moneyScript += `  }`
+        // Convert to number first to ensure we have a valid number, then back to string
+        moneyScript += `  var ${money}Num = parseFloat(${money}Val);`
+        moneyScript += `  if(!isNaN(${money}Num)) {`
+        // Always use toFixed to ensure proper decimal format
+        moneyScript += `    var ${money}Decimals = ${widgets[money].digitDecimal || 0};`
+        moneyScript += `    ${money}Val = ${money}Num.toFixed(${money}Decimals);`
+        // If thousand separator is ".", formatCurrency expects comma as decimal separator
+        // So we need to replace dot with comma before formatCurrency processes it
+        moneyScript += `    if('${widgets[money].thousandSeparator || "."}' === '.') {`
+        moneyScript += `      ${money}Val = ${money}Val.replace('.', ',');`
+        moneyScript += `    }`
+        moneyScript += `  } else {`
+        moneyScript += `    ${money}Val = '';`
+        moneyScript += `  }`
+        // Set the normalized value back to input
+        moneyScript += `  $('#${money}').val(${money}Val);`
+        moneyScript += `}`
+        // Now formatCurrency will format the standard format value correctly
         moneyScript += `$('#${money}').formatCurrency({
             symbol: '${widgets[money].symbol || "" }',
             decimalSymbol: '${widgets[money].decimalPlaces || "," }',

package/lib/zdataTable.js

@@ -20,10 +20,23 @@ class dataTable {
     this.types = {}
     this.roles = myCache.get('ROLES')[datas.zuser.role_id] || {}
     this.level_approval = this.roles.approvals && this.roles.approvals[datas.routeName] ? this.roles.approvals[datas.routeName] : {}
-    this.hasLevels = Object.keys(this.level_approval).length == 0 ? false : true
+    this.hasLevels = Object.keys(this.level_approval).length > 0
     this.visiblesKey = this.visibles.map((item) => item.key)
     this.gridType = datas.gridType || 1
     this.additionalCss = ''
+    this.moneyAttributes = {}
+    this.hasMoney = false
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      const widgets = this.MYMODEL.widgets
+      for (let i = 0; i < this.visiblesKey.length; i++) {
+        const item = this.visiblesKey[i]
+        const widget = widgets[item]
+        if (widget && widget.name == 'money') {
+          this.moneyAttributes[item] = widget
+          this.hasMoney = true
+        }
+      }
+    }
     if (this.gridType == 1) {
       this.dataTableScript = '/modules/datatable/normal.js'
     } else if (this.gridType == 2) {
@@ -54,7 +67,26 @@ class dataTable {
     this.relations = obj.relations
     this.routeName = this.MYMODEL.routeName
     this.types = obj.TYPES
-    this.totalFields = this.visiblesKey.filter((item) => this.MYMODEL.widgets[item] && this.MYMODEL.widgets[item].name == 'number')
+    this.totalFields = []
+    this.moneyAttributes = {}
+    this.hasMoney = false
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      const widgets = this.MYMODEL.widgets
+      for (let i = 0; i < this.visiblesKey.length; i++) {
+        const item = this.visiblesKey[i]
+        const widget = widgets[item]
+        if (widget) {
+          const widgetName = widget.name
+          if (widgetName == 'number' || widgetName == 'money') {
+            this.totalFields.push(item)
+          }
+          if (widgetName == 'money') {
+            this.moneyAttributes[item] = widget
+            this.hasMoney = true
+          }
+        }
+      }
+    }
     delete obj.MYMODEL
     delete obj.relations
     delete obj.TYPES
@@ -72,9 +104,10 @@ class dataTable {
     if (this.setColumns) return this.setColumns
     let html = ''
     if (Array.isArray(this.visibles)) {
-      this.visibles.map((item) => {
+      for (let i = 0; i < this.visibles.length; i++) {
+        const item = this.visibles[i]
         html += `<th id="data_${item.key}_label">${item.name || ''}</th>`
-      })
+      }
     } else {
       for (const key in this.visibles) {
         html += `<th id="data_${key}_label">${this.visibles[key]}</th>`
@@ -87,9 +120,10 @@ class dataTable {
   get columnsFilter() {
     let html = '<tr class="filters">'
     if (Array.isArray(this.visibles)) {
-      this.visibles.map((item) => {
+      for (let i = 0; i < this.visibles.length; i++) {
+        const item = this.visibles[i]
         html += `<th id="data_${item.key}_label">${this.searchColumns[item.key]}</th>`
-      })
+      }
     } else {
       for (const key in this.visibles) {
         html += `<th id="data_${key}">${this.searchColumns[key]}</th>`
@@ -193,6 +227,9 @@ class dataTable {
     script += `var dataTableTypes = ${JSON.stringify(this.types, null, 2)};${Util.newLine}`
     script += `var dataTableRoute = "${this.routeName}";${Util.newLine}`
     script += `var dataTableHasTotalFields = ${JSON.stringify(this.totalFields)};${Util.newLine}`
+    if(this.hasMoney) {
+      script += `var dataTableMoneyAttributes = ${JSON.stringify(this.moneyAttributes, null, 2)};${Util.newLine}`
+    }
     script += `</script>${Util.newLine}`
     script += `<script type="text/javascript" src="${this.dataTableScript}"></script>${Util.newLine}`
     if (this.searchColumns.FILTERKEY) {
@@ -202,9 +239,10 @@ class dataTable {
 
     //additional script for typeahead in grid
     let typeaheadScript = ''
-    for (let key in this.MYMODEL.widgets) {
-      if (this.MYMODEL.widgets[key].name == 'typeahead') {
-        typeaheadScript += `if($("#${key}").val()){
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      for (let key in this.MYMODEL.widgets) {
+        if (this.MYMODEL.widgets[key].name == 'typeahead') {
+          typeaheadScript += `if($("#${key}").val()){
         setTimeout(()=>{
           ajaxPost('/ztypeaheadpost/${this.MYMODEL.table}/${key}', {
             id: $("#${key}").val()
@@ -217,11 +255,13 @@ class dataTable {
           },1500)
           };
           `
+        }
       }
     }
     if (typeaheadScript) {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }
+
     if (this.hasLevels) {
       //modal-body-approval
       let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')

package/package.json

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