backend-plus 1.12.2 → 1.13.3

package/for-client/my-menu.js

@@ -13,6 +13,7 @@ myOwn.i18n.messages.en=changing(myOwn.i18n.messages.en, {
     onLine:'on line',
     proceed:'proceed',
     processing:'processing',
+    readyToDownload:'ready to download',
     signIn:'sign in',
     speed1:'speed $1',
     user:'user',
@@ -28,6 +29,7 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
     onLine:'en línea',
     proceed:'proceder',
     processing:'procesando',
+    readyToDownload:'listo para descargar',
     signIn:'login',
     speed1:'velocidad $1',
     user:'usuario',
@@ -88,6 +90,10 @@ myOwn.wScreens.procAux = {
                     )
                 )
             )
+            if(parameterDef.references || parameterDef.options){
+                setTimeout(()=>control.ponerLupa(true), 500)
+                
+            }
             if(value!==undefined){
                 params[parameterDef.name] = value;
                 control.setTypedValue(value);
@@ -177,6 +183,13 @@ myOwn.wScreens.proc.result={
     showError:function(err, divResult){
         divResult.textContent = err.message;
         divResult.style.backgroundColor = 'orange';
+    },
+    showDownloadUrl:function(result, divResult){
+        divResult.innerHTML='';
+        divResult.appendChild(html.div([
+            html.div([my.messages.readyToDownload]),
+            ...result.map(r=>html.div([html.a({href:r.url}, r.label || r.url)]))
+        ]).create())
     }
 }
 

package/for-client/my-tables.js

@@ -567,7 +567,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     //chequeo que exista depot por las dudas
                     if(depot && !sameValue(JSON.stringify(row),JSON.stringify(depot.row))){
                         //grid.retrieveRowAndRefresh(depot); 
-                        grid.depotRefresh(depot,{updatedRow:row, sendedForUpdate:{}});
+                        grid.depotRefresh(depot,{updatedRow:row, sendedForUpdate:{}},{noDispatchEvents:true});
                     }
                 })
             })
@@ -1057,7 +1057,7 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
     var menuRef={w:'table', table:detailTableDef.table};
     var calculateFixedFields = function(){
         return detailTableDef.fields.map(function(pair){
-            var fieldCondition={fieldName: pair.target, value:depot.row[pair.source]}
+            var fieldCondition={fieldName: pair.target, value:'value' in pair ? pair.value : depot.row[pair.source]}
             if(pair.range){
                 fieldCondition.range=pair.range;
             }

package/lib/backend-plus.d.ts

@@ -194,6 +194,7 @@ export type FieldDefinition = EditableDbDefinition & {
     inView?:boolean
     sortMethod?:string
     generatedAs?:string
+    inJoin?:string /* alias from sql.join; implies inTable:false */
 } & ({} | {
     sequence:SequenceDefinition
     nullable:true
@@ -213,6 +214,8 @@ export type EditableDbDefinition = {
     }
 }
 export type FieldsForConnect = (string | {source:string, target:string})[]
+export type FieldsForConnectDetailTable = (string | {source:string, target:string} | {value:any, target:string})[]
+
 export type FkActions = 'no action'|'restrict'|'cascade'|'set null'|'set default';
 export type ForeignKey = {
     references:string, 
@@ -266,6 +269,7 @@ export type TableDefinition = EditableDbDefinition & {
             update?:{using?:string, check?:string}
             delete?:{using?:string}
         }
+        join?:string
     }
     foreignKeys?:ForeignKey[]
     softForeignKeys?:ForeignKey[]
@@ -288,7 +292,7 @@ export type TableDefinition = EditableDbDefinition & {
     description?:MarkdownDoc
     exportJsonFieldAsColumns?:string
 }
-export interface DetailTable { table?: string, fields: FieldsForConnect, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }
+export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }
 export type TableDefinitionFunction = (context: ContextForDump, opts?:any) => TableDefinition;
 export type TableItemDef=string|{name:string, path?:string, tableGenerator?:(context:TableContext)=>TableDefinition}
 // {{name: string; path?:string; fileName?: string; source?: string; tableGenerator?:()=>void; title?:string; mixin?:any[]}} TableItem
@@ -336,7 +340,7 @@ export class AppBackend{
         procedures:{[k:string]:{timestamp:number, result:any}}
     }
     fieldDomain:{[k:string]:Partial<FieldDefinition>}
-    exts:{img?:string[]}
+    exts:{img:string[], normal:string[]}
     optsGenericForAll:{allowedExts?:string[]}
     sqls:{[k:string]:string}
     messages:{[k:string]:string}

package/lib/backend-plus.js

@@ -2515,7 +2515,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 lines.push('create table '+cualQuoteTableName+' (');
                 var fields=[];
                 tableDef.fields.forEach(function(fieldDef){
-                    if(!fieldDef.clientSide && fieldDef.inTable!==false && !(tableDef.sql.fields[fieldDef.name]||{}).expr || fieldDef.inTable){
+                    if(!fieldDef.clientSide && fieldDef.inTable!==false && !fieldDef.inJoin && !(tableDef.sql.fields[fieldDef.name]||{}).expr || fieldDef.inTable){
                         var fieldType=typeDb[fieldDef.typeName]||'"'+fieldDef.typeName+'"';
                         if(fieldDef.sizeByte==4){
                             fieldType = 'integer';
@@ -2726,7 +2726,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 if(!defField && !fieldName.startsWith('!')){
                     throw new Error('field '+fieldName+' does no exists in .tab for '+tableName+' in '+path);
                 }
-                return !fieldName.startsWith('!') && defField.inTable!==false && (!defField.clientSide || defField.serverSide) && !defField.generatedAs;
+                return !fieldName.startsWith('!') && defField.inTable!==false && !defField.inJoin && (!defField.clientSide || defField.serverSide) && !defField.generatedAs;
             }
             if(/[-[]/.test(content[0])){
                 var filterField2=function(_value,fieldName){

package/lib/table-def-adapt.js

@@ -195,7 +195,7 @@ function tableDefAdapt(tableDef, context){
                 }
                 exprAs=resultTableDef.sql.fields[fieldDef.name].expr+' as ';
             }else{
-                resultName=be.db.quoteIdent(resultTableDef.alias)+'.'+resultName;
+                resultName=be.db.quoteIdent(fieldDef.inJoin ?? resultTableDef.alias)+'.'+resultName;
             }
             return exprAs+resultName;
         }
@@ -241,6 +241,9 @@ function tableDefAdapt(tableDef, context){
         }
         resultTableDef.sql.from = `( select *, ${otherColumns} from ${resultTableDef.sql.from}) as ${be.db.quoteIdent(resultTableDef.alias)}`
     }
+    if(resultTableDef.sql.join){
+        resultTableDef.sql.from += '\n'+resultTableDef.sql.join;
+    }
     if(resultTableDef.sql.logicalDeletes){
         resultTableDef.sql.where=(resultTableDef.sql.where?'('+resultTableDef.sql.where+') and ':'')+
             be.db.quoteIdent(resultTableDef.sql.logicalDeletes.fieldName)+
@@ -259,7 +262,7 @@ function tableDefAdapt(tableDef, context){
             var lastSourceField=null;
             fkDef.alias = fkDef.alias || fkDef.label || fkTableDef.alias;
             fkDef.displayFields = fkDef.displayAllFields?
-                (fkTableDef.fields.filter(fd=>fd.visible && !fd.clientSide && !resultTableDef.field[fd.name] /*&& fd.inTable!==false*/ && !fkTableDef.sql.fields[fd.name]).map(fd=>fd.name)): //EVALUAR SI ESTÁ BIEN COMENTARLO
+                (fkTableDef.fields.filter(fd=>fd.visible && !fd.clientSide && !resultTableDef.field[fd.name] && !fd.inJoin && !fkTableDef.sql.fields[fd.name]).map(fd=>fd.name)): //EVALUAR SI ESTÁ BIEN COMENTARLO
                 fkDef.displayFields || fkTableDef.nameFields;
             resultTableDef.sql.from += '\n    left join ' + fkTableDef.sql.fromWoAs + ' as ' + fkDef.alias + ' on ' +
                 fkDef.fields.map(function(pair){
@@ -342,7 +345,7 @@ tableDefAdapt.forInsertOnly = function forInsertOnly(tableDef){
         tableDef.fields.sort(bestGlobals.compareForOrder([{column:'orderForInsertOnly'}]))
         tableDef.sql.select = tableDef.fields.map(function(fieldDef){
             var typer=TypeStore.typerFrom(fieldDef);
-            return fieldDef.inTable===false && tableDef.sql.fields[fieldDef.name] ?"null::"+typer.typeDbPg+" as "+JSON.stringify(fieldDef.name):(
+            return (fieldDef.inTable===false || fieldDef.inJoin) && tableDef.sql.fields[fieldDef.name] ?"null::"+typer.typeDbPg+" as "+JSON.stringify(fieldDef.name):(
                 fieldDef.referencedName?(
                     JSON.stringify(fieldDef.referencedAlias)+"."+JSON.stringify(fieldDef.referencedName)+" as "+JSON.stringify(fieldDef.name)
                 ):(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.12.2",
+  "version": "1.13.3",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -33,10 +33,10 @@
     "best-globals": "~1.0.0",
     "big.js": "^6.1.1",
     "body-parser": "^1.19.0",
-    "cast-error": "^0.0.7",
+    "cast-error": "^0.1.0",
     "castellano": "~0.1.3",
     "connect-pg-simple": "^7.0.0",
-    "cookie-parser": "^1.4.5",
+    "cookie-parser": "^1.4.6",
     "dialog-promise": "~0.9.14",
     "discrepances": "~0.2.6",
     "express": "^4.17.1",
@@ -52,7 +52,7 @@
     "login-plus": "^1.6.2",
     "memorystore": "^1.6.6",
     "mini-tools": "^1.11.1",
-    "nodemailer": "^6.7.0",
+    "nodemailer": "^6.7.1",
     "moment": "^2.29.1",
     "multiparty": "^4.2.2",
     "numeral": "^2.0.6",
@@ -69,8 +69,8 @@
     "stack-trace": "~0.0.10",
     "stylus": "~0.55.0",
     "type-store": "~0.2.41",
-    "typed-controls": "~0.9.0",
-    "xlsx": "^0.17.3",
+    "typed-controls": "~0.9.1",
+    "xlsx": "^0.17.4",
     "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
@@ -79,18 +79,18 @@
     "@types/express": "^4.17.13",
     "@types/express-useragent": "^1.0.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/js-yaml": "^4.0.4",
+    "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^9.0.0",
     "@types/nodemailer": "^6.4.4",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^16.11.7",
+    "@types/node": "^16.11.9",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.29",
     "@types/websql": "~0.0.27",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.3.8",
+    "karma": "6.3.9",
     "karma-chrome-launcher": "^3.1.0",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.2",
@@ -103,7 +103,7 @@
     "sinon": "^12.0.1",
     "supertest": "^6.1.6",
     "types.d.ts": "~0.6.4",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.2",
     "why-is-node-running": "^2.2.0"
   },
   "engines": {

package/unlogged/my-ajax.js

@@ -493,7 +493,7 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
     if(o == null){
         return ;
     }
-    if(typeof o == "object" && !(o instanceof Date) &&  !o.isRealDateTime){
+    if(typeof o == "object" && !(o instanceof Date) && !o.isRealDateTime){
         if(o instanceof Array && o[0] && o[0] instanceof Object && !(o[0] instanceof Array) && !(o[0].isRealDateTime)){
             var table = document.createElement('table');
             div.appendChild(table);
@@ -550,6 +550,8 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
         div.className='plain-content';
         if(typeof o == "boolean"){
             div.textContent = o?'Sí':'No'
+        }else if(o && o instanceof Date && o.isRealDate){
+            div.textContent = o.toDmy();
         }else{
             div.textContent = o.toLocaleString();
         }