backend-plus 2.0.0-beta.14 → 2.0.0-beta.15

package/for-client/my-menu.js

@@ -56,6 +56,9 @@ myOwn.wScreens.table = function(addrParams){
         if(addrParams.detailing){
             opts.detailing=addrParams.detailing;
         }
+        if(addrParams.pick){
+            opts.pick=addrParams.pick;
+        }
         opts.detailingForUrl=opts.detailing||{};
         opts.detailingPath = [];
         var pageTitle = addrParams.label || addrParams.name || addrParams.table || my.config.config.title;

package/for-client/my-tables.js

@@ -294,6 +294,7 @@ myOwn.TableConnector = function(context, opts){
     connector.opts = opts||{};
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
+    connector.pick = connector.opts.pick;
     connector.hideBecauseRelated = {};
     connector.fixedFields.forEach(function(pair){
         if(!pair.range && pair.value != myOwn.skipInFixedFields){
@@ -360,7 +361,8 @@ myOwn.TableConnector.prototype.getData = function getData(){
     return connector.my.ajax.table_data({
         table:connector.tableName,
         fixedFields:connector.fixedFields,
-        paramfun:connector.parameterFunctions||{}
+        paramfun:connector.parameterFunctions||{},
+        pick:connector.pick
     }).then(function(rows){
         return connector.whenStructureReady.then(function(){
             if(connector.getElementToDisplayCount){
@@ -447,6 +449,7 @@ myOwn.TableConnectorLocal = function(context, opts){
     connector.opts = opts||{};
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
+    connector.pick = connector.opts.pick;    
     connector.hideBecauseRelated = {};
     connector.fixedFields.forEach(function(pair){
         if(!pair.range && pair.value != myOwn.skipInFixedFields){
@@ -615,7 +618,8 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
             await grid.connector.my.ajax.table_data({
                 table:grid.connector.tableName,
                 fixedFields:grid.connector.fixedFields,
-                paramfun:grid.connector.parameterFunctions||{}
+                paramfun:grid.connector.parameterFunctions||{},
+                pick:grid.connector.pick
             }).then(function(rows){
                 var primaryKey = grid.def.primaryKey;
                 var getPrimaryKeyValues=function getPrimaryKeyValues(primaryKey, row){
@@ -2379,7 +2383,8 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
             table:depot.def.name,
             fixedFields:grid.def.primaryKey.map(function(fieldName, i){ 
                 return {fieldName:fieldName, value:depot.primaryKeyValues[i]};
-            })
+            }),
+            pick:grid.def.pick
         }).then(function(result){
             grid.depotRefresh(depot,{updatedRow:result[0], sendedForUpdate:{}}, opts);
         })

package/lib/procedures-table.js

@@ -76,13 +76,14 @@ ProcedureTables = [
         parameters:[
             {name: 'table', encoding:'plain'},
             {name: 'fixedFields', defaultValue:[]},
-            {name: 'paramfun', defaultValue:[]}
+            {name: 'paramfun', defaultValue:[]},
+            {name: 'pick', defaultValue:'', encoding:'plain'}
         ],
         coreFunction:
         /**
         * 
         * @param {*} context 
-        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[]}} parameters 
+        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
         */
         async function tableDatum(context, parameters){
             var be=context.be;
@@ -155,6 +156,37 @@ ProcedureTables = [
             return context.client.query(sql,
                 queryValues
             ).fetchAll().then(function(result){
+                if (parameters.pick) {
+                    // /*
+                    return result.rows.filter(row=>{
+                        var line = likeAr(row).join(' ').trim().split(/\s+/);
+                        return parameters.pick.split(' ').map(p=>p.toLocaleLowerCase()).every(palabraBuscada=>
+                            line.map(p=>p.toLocaleLowerCase()).filter(palabra=>
+                                palabraBuscada.length <= 3 
+                                ? palabra == palabraBuscada.toLocaleLowerCase()
+                                : palabra.includes(palabraBuscada.toLocaleLowerCase()
+                            )).length
+                        )
+                    });
+                    // */
+                    /*
+                    var filter = parameters.pick.split('|').map(andPart=>andPart.trim().split(/\s+/));
+                    return result.rows.filter(row=>{
+                        var line = likeAr(row).join(' ').trim().split(/\s+/);
+                        for (var orPart of filter){
+                            var allFound = true;
+                            for (var andPart of orPart){
+                                if (!line.includes(andPart)) {
+                                    allFound = false;
+                                    break;
+                                }
+                            }
+                            if (allFound) return true;
+                        }
+                        return false;
+                    })
+                    */
+                }
                 return result.rows;
             }).catch(function(err){
                 throw err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.15",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -81,7 +81,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.0",
     "@types/nodemailer": "^6.4.14",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -98,7 +98,7 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^21.6.1",
+    "puppeteer": "^21.7.0",
     "sinon": "^17.0.1",
     "supertest": "^6.3.3",
     "types.d.ts": "~0.6.21",

package/unlogged/my-ajax.js

@@ -593,6 +593,7 @@ myAjax.UriSearchToObjectParams={
 	td               :{                   encode:function(x){ return json4all.toUrl(x); }, decode:function(x){ return json4all.parse(x)}  },
 	today            :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return bestGlobals.date.iso((x+'').substr(0,10))}  },
 	section          :{ showInMenu:true , encode:noChange                                , decode:noChange          },
+	pick             :{                   encode:noChange                                , decode:noChange          },
 	directUrl        :{ hide:true       },
 	selectedByDefault:{ hide:true       },
 	showParams       :{ hide:true       },