FSN#22875 Settings naar de database

svn path=/Website/trunk/; revision=6312
This commit is contained in:
Jos Groot Lipman
2012-05-03 14:02:31 +00:00
parent 49e23cf731
commit 1f380f3df6

View File

@@ -31,11 +31,11 @@ if (floorKey != -1)
+ " FROM prs_ruimteafdeling ra2"
+ " WHERE ra.alg_ruimte_key = ra2.alg_ruimte_key"
+ " GROUP BY ra.alg_ruimte_key) bezetting"
+ ", (SELECT " + prs_dep_string
+ ", (SELECT " + S("prs_dep_string")
+ " FROM prs_v_afdeling d, prs_v_afdeling_boom b"
+ " WHERE ra.prs_afdeling_key = b.prs_afdeling_key"
+ " AND d.prs_afdeling_key = b.prs_afdeling_key1) divisie"
+ ", (SELECT " + prs_dep_string
+ ", (SELECT " + S("prs_dep_string")
+ " FROM prs_v_afdeling d"
+ " WHERE d.prs_afdeling_key = ra.prs_afdeling_key"
+ " AND d.prs_afdeling_parentkey is not null) afdeling"
@@ -135,9 +135,9 @@ else
{
var status_row = "<label>" + L("lcl_estate_totaal_opp") + "</label> "
+ "<label>" + L("lcl_estate_ruimte_bruto_vloeropp") + "</label>: " + summaryParams.selectedopp.toFixed(2) + " " + L("lcl_estate_ruimte_opp_m2");
if (fg_contourlayers_alt1 != "" && fg_labellayers_alt1 != "")
if (S("fg_contourlayers_alt1") != "" && S("fg_labellayers_alt1") != "")
status_row += ", <label>" + L("lcl_estate_ruimte_opp_alt1") + "</label>: " + summaryParams.selectedoppAlt1.toFixed(2) + " " + L("lcl_estate_ruimte_opp_m2");
if (fg_contourlayers_alt2 != "" && fg_labellayers_alt2 != "")
if (S("fg_contourlayers_alt2") != "" && S("fg_labellayers_alt2") != "")
status_row += ", <label>" + L("lcl_estate_ruimte_opp_alt2") + "</label>: " + summaryParams.selectedoppAlt2.toFixed(2) + " " + L("lcl_estate_ruimte_opp_m2");
return status_row;
}
@@ -183,9 +183,9 @@ else
rst.addColumn(new Column({caption: "Ruimtesoort", content: "ruimtesoort"}));
rst.addColumn(new Column({caption: "Ruimtegebruik", content: "ruimtegebruik"}));
rst.addColumn(new Column({caption: L("lcl_estate_ruimte_bruto_vloeropp"), content: fnOpp, datatype: "float"}));
if (fg_contourlayers_alt1 != "" && fg_labellayers_alt1 != "")
if (S("fg_contourlayers_alt1") != "" && S("fg_labellayers_alt1") != "")
rst.addColumn(new Column({caption: "VVO (m2)", content: fnOppAlt1, datatype: "float"}));
if (fg_contourlayers_alt2 != "" && fg_labellayers_alt2 != "")
if (S("fg_contourlayers_alt2") != "" && S("fg_labellayers_alt2") != "")
rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt2"), content: fnOppAlt2, datatype: "float"}));
rst.addColumn(new Column({caption: L("lcl_dep_name_level1"), content: "divisie"}));
rst.addColumn(new Column({caption: L("lcl_obj_inf_room"), content: "afdeling"}));