backend-plus 1.13.3 → 1.13.8

package/for-client/my-menu.js

@@ -287,12 +287,16 @@ myOwn.showPage = function showPage(pageDef){
         }else if(typeof my.wScreens[w] === 'object'){
             wScreen = my.wScreens[w];
             if(wScreen.parameters){
-                wScreen.mainFunction=wScreen.mainFunction||function(addrParams){
-                    my.wScreens.procAux.showParams({
-                        parameters:wScreen.parameters,
-                        resultClass:wScreen.resultClass,
-                        proceedLabel:wScreen.proceedLabel,
-                    }, main_layout, addrParams, wScreen.mainAction);
+                if(wScreen.autoproced && addrParams[wScreen.parameters[0].name]!=null){
+                    wScreen.mainAction(addrParams,main_layout,null)
+                }else {
+                    wScreen.mainFunction=wScreen.mainFunction||function(addrParams){
+                        my.wScreens.procAux.showParams({
+                            parameters:wScreen.parameters,
+                            resultClass:wScreen.resultClass,
+                            proceedLabel:wScreen.proceedLabel,
+                        }, main_layout, addrParams, wScreen.mainAction);
+                    }
                 }
             }
         }else{

package/for-client/my-tables.js

@@ -89,8 +89,10 @@ myOwn.i18n.messages.en=changing(myOwn.i18n.messages.en, {
     preparingForExport: "preparing for export",
     recordsReimaining: "{$r} records remains in the table",
     refresh: "refresh - retrive data from database",
+    replaceNewLineWithSpace: 'replace new lines with spaces',
     showInheritedKeys: "show inherited keys",
     similarTo:'similar to',
+    simplificateSpaces:'simplificate spaces',
     skippedColumn:'skipped column',
     skippedColumns:'skipped columns',
     skipUnknownFieldsAtImport:'skip unknown fields at import',
@@ -151,8 +153,10 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
     preparingForExport: "preparando para exportar",
     recordsReimaining: "quedan {$r} registros en la tabla",
     refresh: "refrescar la grilla desde la base de datos",
+    replaceNewLineWithSpace: 'replazar saltos de línea por espacios',
     showInheritedKeys: "mostrar las columnas relacionadas",
     similarTo:'parecido a',
+    simplificateSpaces:'simplificar espacios',
     skippedColumn:'Columna salteada',
     skippedColumns:'Columnas salteadas',
     skipUnknownFieldsAtImport:'saltear columnas que no existan',
@@ -1659,15 +1663,20 @@ myOwn.dialogUpload = function dialogUpload(ajaxPath, ajaxParams, ajaxPrepareResu
                 }),{uploading:uploadingProgress, informProgress:informProgress}).then(eButton,eButton);
             }).then(ajaxPrepareResultFun).then(this.dialogPromiseDone,this.dialogPromiseDone);
         });
-        var skipUnknownFieldsAtImportButton=html.input({type:'checkbox'}).create();
-        skipUnknownFieldsAtImportButton.onchange=function(){
-            ajaxParams.skipUnknownFieldsAtImport = skipUnknownFieldsAtImportButton.checked;
-        }
+        var optsNames = ['skipUnknownFieldsAtImport','simplificateSpaces','replaceNewLineWithSpace'];
+        var buttons = {}
+        optsNames.map((name, i)=>{
+            var defValue = !!i;
+            ajaxParams[name]=defValue;
+            buttons[name] = html.input({type:'checkbox', checked:defValue}).create()
+            buttons[name].onchange = function(){
+                ajaxParams[name] = buttons[name].checked;
+            }
+        });
         simpleFormPromise({elementsList:[
             messages.importDataFromFile,
             buttonFile, 
-            html.br().create(),
-            html.label([skipUnknownFieldsAtImportButton, messages.skipUnknownFieldsAtImport]).create(),
+            ...(optsNames.map(name => html.label([html.br(), buttons[name], messages[name]]).create())),
             html.br().create(),
             buttonConfirmImport,
             html.br().create(),

package/lib/procedures-table.js

@@ -647,6 +647,8 @@ ProcedureTables = [
             {name: 'table'},
             {name: 'prefilledFields'},
             {name: 'skipUnknownFieldsAtImport'},
+            {name: 'simplificateSpaces'},
+            {name: 'replaceNewLineWithSpace'},
         ],
         files:{count:1},
         coreFunction:async function(context, parameters, files){
@@ -684,6 +686,10 @@ ProcedureTables = [
                             fieldName=fieldName.toLowerCase();
                             defField=tableDef.field[fieldName];
                         }
+                        if(!defField){
+                            fieldName=fieldName.toLowerCase().trim();
+                            defField=tableDef.fields.find(f =>(f.title??f.label??f.name).toLowerCase().trim() == fieldName);
+                        }
                         if(!defField && !tableDef.JSONFieldForOtherFields){
                             if(skipUnknownFieldsAtImport){
                                 skippedColumns.push(fieldName);
@@ -759,6 +765,12 @@ ProcedureTables = [
                                 if(field.defaultForOtherFields){
                                     addFieldToOthers(othersArray, field, value);
                                 }else{
+                                    if(value != null && parameters.replaceNewLineWithSpace){
+                                        value = value.replace(/\s*\r?\n\s*/g,' ').trim()
+                                    }
+                                    if(value != null && parameters.skipUnknownFieldsAtImport){
+                                        value = value.replace(/(\s|\u00A0)+/g,' ').trim()
+                                    }
                                     newRow[field.name]=value;
                                 }
                             });
@@ -822,6 +834,14 @@ ProcedureTables = [
                                         }
                                     }else{
                                         value=typeStore.typerFrom(field).fromExcelCell(cell);
+                                        if(field.typeName == 'text'){
+                                            if(value != null && parameters.replaceNewLineWithSpace){
+                                                value = value.replace(/\s*\r?\n\s*/g,' ').trim()
+                                            }
+                                            if(value != null && parameters.skipUnknownFieldsAtImport){
+                                                value = value.replace(/(\s|\u00A0)+/g,' ').trim()
+                                            }
+                                        }
                                     }
                                     if(Number.isNaN(value)){
                                         value=null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.13.3",
+  "version": "1.13.8",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -28,17 +28,17 @@
     }
   ],
   "dependencies": {
-    "ajax-best-promise": "~0.3.7",
-    "backend-skins": "~0.1.15",
-    "best-globals": "~1.0.0",
+    "ajax-best-promise": "^0.3.7",
+    "backend-skins": "^0.1.15",
+    "best-globals": "^1.0.0",
     "big.js": "^6.1.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.19.1",
     "cast-error": "^0.1.0",
-    "castellano": "~0.1.3",
+    "castellano": "^0.1.3",
     "connect-pg-simple": "^7.0.0",
     "cookie-parser": "^1.4.6",
-    "dialog-promise": "~0.9.14",
-    "discrepances": "~0.2.6",
+    "dialog-promise": "^0.9.14",
+    "discrepances": "^0.2.6",
     "express": "^4.17.1",
     "express-session": "^1.17.2",
     "express-useragent": "^1.0.15",
@@ -46,13 +46,13 @@
     "js-to-html": "^1.2.1",
     "js-yaml": "^4.1.0",
     "json4all": "^1.1.0",
-    "lazy-some": "~0.1.0",
-    "like-ar": "~0.3.6",
+    "lazy-some": "^0.1.0",
+    "like-ar": "^0.3.6",
     "@upgraded/locate-path": "^6.0.0-alfa.1",
     "login-plus": "^1.6.2",
     "memorystore": "^1.6.6",
     "mini-tools": "^1.11.1",
-    "nodemailer": "^6.7.1",
+    "nodemailer": "^6.7.2",
     "moment": "^2.29.1",
     "multiparty": "^4.2.2",
     "numeral": "^2.0.6",
@@ -60,16 +60,16 @@
     "pikaday": "^1.8.2",
     "pug": "^3.0.2",
     "read-yaml-promise": "^1.0.2",
-    "regexplicit": "~0.1.3",
-    "require-bro": "~0.2.2",
-    "self-explain": "~0.10.22",
-    "serve-content": "~0.3.16",
+    "regexplicit": "^0.1.3",
+    "require-bro": "^0.2.2",
+    "self-explain": "^0.10.22",
+    "serve-content": "^0.3.16",
     "session-file-store": "^1.5.0",
-    "sql-tools": "~0.1.0",
-    "stack-trace": "~0.0.10",
-    "stylus": "~0.55.0",
-    "type-store": "~0.2.41",
-    "typed-controls": "~0.9.1",
+    "sql-tools": "^0.1.0",
+    "stack-trace": "^0.0.10",
+    "stylus": "^0.55.0",
+    "type-store": "^0.2.41",
+    "typed-controls": "^0.10.0",
     "xlsx": "^0.17.4",
     "xlsx-style": "^0.8.13"
   },
@@ -83,7 +83,7 @@
     "@types/mocha": "^9.0.0",
     "@types/nodemailer": "^6.4.4",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^16.11.9",
+    "@types/node": "^16.11.13",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.29",
@@ -99,11 +99,11 @@
     "kill-9": "~0.4.3",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "puppeteer": "^11.0.0",
+    "puppeteer": "^13.0.0",
     "sinon": "^12.0.1",
     "supertest": "^6.1.6",
     "types.d.ts": "~0.6.4",
-    "typescript": "^4.5.2",
+    "typescript": "^4.5.4",
     "why-is-node-running": "^2.2.0"
   },
   "engines": {