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

FSN#35534 berekende oppervlakte efficienter berekenen

Browse Source 
svn path=/Website/trunk/; revision=28243
This commit is contained in:
Ruud Lipper
2016-02-22 11:35:20 +00:00
parent 8a5404f76d
commit b2e1e3faf3
5 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/ALG/alg.inc
View File

@@ -390,7 +390,7 @@ alg = {
return aresult;
},
calc_algm2: function _calc_algm2(alg_key, lvl, opp)
calc_algm2: function _calc_algm2(alg_key, lvl)
{
var sql = "SELECT SUM (alg_ruimte_bruto_vloeropp) opp1, "
+ " SUM (alg_ruimte_opp_alt1) opp2, "
@@ -411,15 +411,7 @@ alg = {
var oRs = Oracle.Execute(sql);
switch (opp)
{
case "opp1": var algm2 = oRs("opp1").Value;
break;
case "opp2": var algm2 = oRs("opp2").Value;
break;
case "opp3": var algm2 = oRs("opp3").Value;
break;
}
var algm2 = { oppbruto: oRs("opp1").Value, oppalt1: oRs("opp2").Value, oppalt2: oRs("opp3").Value }
oRs.Close();

10
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -165,12 +165,10 @@ else
BLOCK_START("algLoc2", "");
if (bld_key > 0)
{
var calcopp1 = alg.calc_algm2(bld_key, onrgoedlvl, "opp1");
var calcopp2 = alg.calc_algm2(bld_key, onrgoedlvl, "opp2");
var calcopp3 = alg.calc_algm2(bld_key, onrgoedlvl, "opp3");
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp3, {suppressEmpty: true});
var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
}
manRWFIELD("bld_opp", "fld float", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {datatype:"float", maxlength: 15});
manRWFIELD("bld_omtrek", "fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {maxlength: 15});

10
APPL/ALG/alg_edit_verdieping.asp
View File

@@ -114,12 +114,10 @@ BLOCK_START("algLoc1", "");
BLOCK_END();
BLOCK_START("algLoc2", "");
var calcopp1 = alg.calc_algm2(flr_key, onrgoedlvl, "opp1");
var calcopp2 = alg.calc_algm2(flr_key, onrgoedlvl, "opp2");
var calcopp3 = alg.calc_algm2(flr_key, onrgoedlvl, "opp3");
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp3, {suppressEmpty: true});
var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({

13
APPL/ALG/alg_show_gebouw.asp
View File

@@ -162,14 +162,11 @@ oRs.Close();
AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
BLOCK_END();
BLOCK_START("algLoc2", "");
var calcopp1 = alg.calc_algm2(bld_key, onrgoedlvl, "opp1");
var calcopp2 = alg.calc_algm2(bld_key, onrgoedlvl, "opp2");
var calcopp3 = alg.calc_algm2(bld_key, onrgoedlvl, "opp3");
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp3, {suppressEmpty: true});
BLOCK_START("algLoc2", "");
var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true});

10
APPL/ALG/alg_show_verdieping.asp
View File

@@ -108,12 +108,10 @@ oRs.Close();
BLOCK_END();
BLOCK_START("algLoc2", "");
var calcopp1 = alg.calc_algm2(flr_key, onrgoedlvl, "opp1");
var calcopp2 = alg.calc_algm2(flr_key, onrgoedlvl, "opp2");
var calcopp3 = alg.calc_algm2(flr_key, onrgoedlvl, "opp3");
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp3, {suppressEmpty: true});
var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({