gina 0.1.6-alpha.9 → 0.1.6-alpha.90

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.90}/core/plugins/lib/validator/src/form-validator.js

@@ -385,11 +385,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                         // system error
                         systemError = result.error;
                     }
-                    // Fixed on 2023-01-10
+                    // Fixed added on 2023-01-10
                     // We want `local.errorLabels['query']` before the generic|user defined `rule` error
                     var optionError = ( typeof(options['error']) != 'undefined' ) ? options['error'] : null;
                     errors['query'] = replace(systemError || _this['error'] || optionError || local.errorLabels['query'],  _this);
-                    console.debug('[1] query error detected !! ', result);
+
+                    console.debug('[1] query error detected !! ', result, errorFields, errors['query']);
                 }
 
                 if ( !errors['query'] && _this.value == '' ) {
@@ -459,6 +460,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
             var id = _this.target.id || _this.target.getAttribute('id');
             console.debug('prematurely completed event `'+ 'asyncCompleted.' + id +'`');
+
             return triggerEvent(gina, _this.target, 'asyncCompleted.' + id, self[_this['name']]);
         } // EO onResult
 
@@ -681,7 +683,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             //instance: self.serverInstance,
             //template: (routeHasViews) ? conf.content.templates[templateName] : undefined,
             //isUsingTemplate: local.isUsingTemplate,
-            cacheless: conf.cacheless //,
+            isCacheless: conf.isCacheless //,
             //path: params.param.path || null, // user custom path : namespace should be ignored | left blank
             //assets: {}
         };
@@ -854,7 +856,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 isValid = condition;
             } else if (!isValid) {
                 var re = null, flags = null;
-                // Fixed on 2021-03-13: $variable now replaced with real value beafore validation
+                // Fixed added on 2021-03-13: $variable now replaced with real value beafore validation
                 if ( /[\!\=>\>\<a-z 0-9]+/i.test(condition) ) {
                     var variables = condition.match(/\${0}[-_,.\[\]a-z0-9]+/ig); // without space(s)
                     if (variables && variables.length > 0) {
@@ -1230,24 +1232,26 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
 
         self[el]['toFloat'] = function(decimals) {
-            if ( typeof(this.value) == 'string' ) {
-                this.value = this.value.replace(/\s+/g, '');
-                if ( /\,/.test(this.value) && !/\./.test(this.value) ) {
-                    this.value = this.value.replace(/\,/g,'.');
-                    //local.data[this.name] = this.value;
-                    // if (isGFFCtx) {
-                    //     //this.target.setAttribute('value', this.value);
-                    //     document.getElementById(this.target.id).value = this.value;
-                    //     //triggerEvent(gina, this.target, 'change', self[this['name']]);
-                    // }
-
-                } else {
-                    this.value = this.value.replace(/\,/g,'');
+            // Fixed on 2025-03-12
+            // In case we are dealing with a filtered value (swig::formatNumber())
+            var val                     = document.getElementById(this.target.getAttribute('id')).value || this.value
+                isFloatingWithCommas    = false
+            ;
+            if ( typeof(val) == 'string' ) {
+                val = val.replace(/\s+/g, '');
+                // Fixed on 2025-03-12
+                // thousand separator ?
+                if ( /\,/.test(val) && /\./.test(val) ) {
+                    val = val.replace(/\,/g,'');
+                }
+                else if ( /\,/.test(val) ) {
+                    val = val.replace(/\,/g,'.');
+                    isFloatingWithCommas = true;
                 }
             }
 
-            var val         = local.data[this.name] = this.value
-                , errors    = self[this['name']]['errors'] || {}
+            local.data[this.name] = val;
+            var errors    = self[this['name']]['errors'] || {}
                 , isValid   = true
             ;
 
@@ -1262,32 +1266,40 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             } else {
                 if ( this['isNumber']().valid ) {
                     try {
-
                         if ( !Number.isFinite(val) ) {
-                            val = this.value = local.data[this.name] = new Number(parseFloat(val.match(/[0-9.,]+/g).join('').replace(/,/, '.')));// Number <> number
+                            // Number <> number
+                            val = new Number(parseFloat(val.match(/[0-9.,]+/g).join('').replace(/,/, '.')));
                         }
-                        if (isGFFCtx)
-                            this.target.setAttribute('value', val);
                     } catch(err) {
                         isValid = false;
-                        errors['toFloat'] = replace(this.error || local.errorLabels['toFloat'], this);
+                        errors['toFloat'] = replace(this.error || local.errorLabels['toFloat'], this);
                         this.valid = false;
                         if ( errors.count() > 0 )
                             this['errors'] = errors;
                     }
                 } else {
                     isValid = false;
-                    errors['toFloat'] = replace(this.error || local.errorLabels['toFloatNAN'], this)
+                    errors['toFloat'] = replace(this.error || local.errorLabels['toFloatNAN'], this)
                 }
             }
 
             if (this['decimals'] && val && !errors['toFloat']) {
-                this.value = local.data[this.name] = parseFloat(this.value.toFixed(this['decimals']));
+                val = parseFloat(val.toFixed(this['decimals']));
+            }
+
+            this.value = local.data[this.name] = val;
+            if (isGFFCtx) {
+                // restore original input format for display
+                if (isFloatingWithCommas) {
+                    val = (''+val).replace(/\./g,',');
+                }
+                this.target.setAttribute('value', val);
             }
 
             this.valid = isValid;
-            if ( errors.count() > 0 )
+            if ( errors.count() > 0 ) {
                 this['errors'] = errors;
+            }
 
             return self[this.name]
         }