admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nu het nog kan: fac_usrrap_cols zo veel mogelijk 'number' gebruiken ipv. 'integer'

Browse Source 
svn path=/Website/trunk/; revision=24415
This commit is contained in:
Jos Groot Lipman
2015-03-11 14:09:28 +00:00
parent 8495949d63
commit 8d072b280b
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API2/api2.inc
View File

@@ -412,7 +412,6 @@ api2 = {
} }
break; break;
case "number": case "number":
case "integer":
var safe_val = parseInt(filterval, 10); var safe_val = parseInt(filterval, 10);
if (filter == "range") if (filter == "range")
{ {

5
APPL/API2/model_reportcolumns.inc
View File

@@ -28,7 +28,7 @@ model_reportcolumns =
"name" : { dbs: "fac_usrrap_cols_column_name", typ: "varchar", label: L("lcl_rap_column"), insertonly: true }, "name" : { dbs: "fac_usrrap_cols_column_name", typ: "varchar", label: L("lcl_rap_column"), insertonly: true },
"datatype" : { dbs: "fac_usrrap_cols_datatype", typ: "varchar", label: L("lcl_rap_datatype"), "datatype" : { dbs: "fac_usrrap_cols_datatype", typ: "varchar", label: L("lcl_rap_datatype"),
required: true, required: true,
LOV: L("lcl_rap_datatypeLOV")}, // "varchar;Tekst;date;Datum;datetime;Datumtijd;float;Float;currency;Bedrag;integer;Getal" LOV: L("lcl_rap_datatypeLOV")}, // "varchar;Tekst;date;Datum;datetime;Datumtijd;float;Float;currency;Bedrag;number;Getal"
"sequence" : { dbs: "fac_usrrap_cols_volgnr", typ: "number", label: L("lcl_rap_sequence") }, "sequence" : { dbs: "fac_usrrap_cols_volgnr", typ: "number", label: L("lcl_rap_sequence") },
"caption" : { dbs: "fac_usrrap_cols_caption", typ: "varchar", label: L("lcl_rap_caption")}, "caption" : { dbs: "fac_usrrap_cols_caption", typ: "varchar", label: L("lcl_rap_caption")},
"filter" : { dbs: "fac_usrrap_cols_filter", typ: "varchar", label: L("lcl_rap_filter"), "filter" : { dbs: "fac_usrrap_cols_filter", typ: "varchar", label: L("lcl_rap_filter"),
@@ -61,10 +61,9 @@ model_reportcolumns =
break; break;
case "float": case "float":
case "number": case "number":
case "integer":
case "currency": case "currency":
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A"); model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G,S,C,A");
model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,integer"); model_reportcolumns.fields.datatype.LOV = api2.filterLOV(L("lcl_rap_datatypeLOV"), "float,currency,number");
break; break;
default: default:
model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G"); model_reportcolumns.fields.group.LOV = api2.filterLOV(L("lcl_rap_groupbyLOV"), "G");

4
APPL/API2/model_reports.inc
View File

@@ -173,7 +173,7 @@ function model_reports(fac_usrrap_key)
group: usrrap.columns[i].group, // bij een beheerder maar rapportages wordt misschien wel fe group: usrrap.columns[i].group, // bij een beheerder maar rapportages wordt misschien wel fe
visible: usrrap.columns[i].visible.id visible: usrrap.columns[i].visible.id
}; };
if (field.typ == "integer" && field.dbs.match(/_key$/i)) // Vooral de FCLT_3D filters if (field.typ == "number" && field.dbs.match(/_key$/i)) // Vooral de FCLT_3D filters
field.typ = "key"; field.typ = "key";
if (usrrap.columns[i].filter) if (usrrap.columns[i].filter)
@@ -191,7 +191,7 @@ function model_reports(fac_usrrap_key)
field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id] field.filter = api2.splitLOV("E;exact;L;like;R;range")[usrrap.columns[i].filter.id]
} }
} }
var fld = field.dbs.toLowerCase(); // "C" + String(usrrap.columns[i].id) var fld = field.dbs.toLowerCase();
model.fields[fld] = field; model.fields[fld] = field;
if (usrrap.columns[i].visible.id == 'V') if (usrrap.columns[i].visible.id == 'V')
model.list.columns.push(fld); model.list.columns.push(fld);

2
APPL/FAC/fac_usrrap.inc
View File

@@ -292,7 +292,7 @@ usrrap = {
} }
else if (ora_type == 'NUMBER') else if (ora_type == 'NUMBER')
{ {
colpar.datatype = 'integer'; colpar.datatype = 'number';
if (ora_scale > 0) if (ora_scale > 0)
{ {
colpar.datatype = 'float'; colpar.datatype = 'float';

3
APPL/SCF/scaffolding_list.inc
View File

@@ -134,6 +134,9 @@ function scaffolding_list(model, scf_params)
continue; // Dat voegt dan weinig toe continue; // Dat voegt dan weinig toe
var coldata = { caption: field.label, content: fld, datatype: field.typ, total: field.total }; var coldata = { caption: field.label, content: fld, datatype: field.typ, total: field.total };
if (coldata.datatype == 'number' || coldata.datatype == 'key')
coldata.datatype = 'integer'; // Zo verwacht resultsettable dat (/nog)
if (field.typ == 'check' || field.typ == 'check0') if (field.typ == 'check' || field.typ == 'check0')
{ {
coldata.content = fnfncolCheck(fld); coldata.content = fnfncolCheck(fld);