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

Compare commits

base: admin:v2020.2
Branches Tags
admin:main admin:CUST admin:v2025.4 admin:v2025.3 admin:v2025.2 admin:v2025.1 admin:v2024.3 admin:v2024.2 admin:v2024.1 admin:v2023.3 admin:v2023.2 admin:v2023.1 admin:v2022.3 admin:v2022.2 admin:v2022.1 admin:v2021.1 admin:v2020.2 admin:v2020.1 admin:v2019.2 admin:v2019.1 admin:v2018.2 admin:v2018.1 admin:v2017.3 admin:v2017.2 admin:v2016.3 admin:v2017.1 admin:v2016.2 admin:v2016.1 admin:v2015.2 admin:v2015.3 admin:v2015.1 admin:v5.4.4 admin:v5.4.3 admin:v5.4.2 admin:v5.3.3 admin:v5.4.1 admin:v5.3.1 admin:v5.2.3 admin:v5.3.4 admin:v5.3.2 admin:v5.2.2
..
compare: admin:v2020.1
Branches Tags
admin:CUST admin:main admin:v2025.4 admin:v2025.3 admin:v2025.2 admin:v2025.1 admin:v2024.3 admin:v2024.2 admin:v2024.1 admin:v2023.3 admin:v2023.2 admin:v2023.1 admin:v2022.3 admin:v2022.2 admin:v2022.1 admin:v2021.1 admin:v2020.2 admin:v2020.1 admin:v2019.2 admin:v2019.1 admin:v2018.2 admin:v2018.1 admin:v2017.3 admin:v2017.2 admin:v2016.3 admin:v2017.1 admin:v2016.2 admin:v2016.1 admin:v2015.2 admin:v2015.3 admin:v2015.1 admin:v5.4.4 admin:v5.4.3 admin:v5.4.2 admin:v5.3.3 admin:v5.4.1 admin:v5.3.1 admin:v5.2.3 admin:v5.3.4 admin:v5.3.2 admin:v5.2.2

12 Commits
v2020.2 ... v2020.1

Author SHA1 Message Date
Jos Groot Lipman
1f87bee709 RWSN#63637 ftp code weer gewoon via SLNKDWF in plaats van Chilkat. Zelf gebruiken we het ondertussen niet meer 
svn path=/Website/branches/v2020.1/; revision=47938
 2020-08-26 15:33:43 +00:00
Gijs Wassink
0bd267e90f FCLT#63600: Titel in werkplek popup bevat & ipv & 
svn path=/Website/branches/v2020.1/; revision=47903
 2020-08-24 13:06:34 +00:00
Gijs Wassink
6103adebcf FCLT#63600: Titel in werkplek popup bevat & ipv & 
svn path=/Website/branches/v2020.1/; revision=47900
 2020-08-24 11:29:38 +00:00
Gijs Wassink
2c7b375a8d FCLT#63600: Titel in werkplek popup bevat & ipv & 
svn path=/Website/branches/v2020.1/; revision=47899
 2020-08-24 11:22:46 +00:00
Gijs Wassink
b9d225e8d2 FCLT#63600: Titel in werkplek popup bevat & ipv & 
svn path=/Website/branches/v2020.1/; revision=47898
 2020-08-24 11:22:20 +00:00
Jos Groot Lipman
c60edbaa31 Release 2020.1 Gold H 
svn path=/Website/branches/v2020.1/; revision=47768
 2020-08-13 15:32:20 +00:00
Jos Groot Lipman
28d6c45254 RWSN#62790 Grafiekparameters na upgrade 2020.1 
svn path=/Website/branches/v2020.1/; revision=47766
 2020-08-13 14:31:45 +00:00
Jos Groot Lipman
ae0b64153a RWSN#62790 Grafiekparameters na upgrade 2020.1 
svn path=/Website/branches/v2020.1/; revision=47765
 2020-08-13 14:23:07 +00:00
Erik Groener
1d6541b8f9 RWSN#62790 Grafiekparameters na upgrade 2020.1 
svn path=/Website/branches/v2020.1/; revision=47758
 2020-08-13 12:20:36 +00:00
Jos Groot Lipman
5999bc12fc YKPN#63222 Ellipse-symbool gaf bij draggen overflow 
svn path=/Website/branches/v2020.1/; revision=47706
 2020-08-11 08:41:41 +00:00
Erik Groener
2d6beb64cc RWSN#62790 Grafiekparameters na upgrade 2020.1 
svn path=/Website/branches/v2020.1/; revision=47703
 2020-08-11 07:36:07 +00:00
Alex Tiehuis
c81b5a35da PNBR#63365 Bijlagen worden niet opgenomen in doorgezette Opdrachten 
svn path=/Website/branches/v2020.1/; revision=47610
 2020-07-31 10:52:01 +00:00
1366 changed files with 5893 additions and 19345 deletions
Expand all files Collapse all files

2
APPL/ALG/alg_cnd_aggregate.asp
View File

@@ -61,4 +61,4 @@ for (var i = 0; i < ingesloten.length; i++)
}
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

2
APPL/ALG/alg_delete.asp
View File

@@ -139,4 +139,4 @@ for (var i = 0; i < ingesloten.length; i++)
}
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_district.asp
View File

@@ -80,4 +80,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_district_search.asp
View File

@@ -82,4 +82,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_district_search_list.asp
View File

@@ -33,4 +33,4 @@ district_list ( "*",
distr_descr: distr_descr
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_edit_district.asp
View File

@@ -110,4 +110,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

24
APPL/ALG/alg_edit_district_save.asp
View File

@@ -21,20 +21,21 @@ var onrgoedlvl = "D";
var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
var fields = [ { dbs: "alg_district_omschrijving", typ: "varchar", frm: "dis_oms", track: L("lcl_district") },
{ dbs: "alg_regio_key", typ: "number", frm: "regiokey", track: L("lcl_region"), foreign: "alg_regio" }
];
var fields = [ { dbs: "alg_district_omschrijving", typ: "varchar", frm: "dis_oms" },
{ dbs: "alg_regio_key", typ: "number", frm: "regiokey" }];
var warning = "";
if (dis_key > 0)
{
var algUpd = buildTrackingUpdate("alg_district", " alg_district_key = " + dis_key, fields);
var err = Oracle.Execute(algUpd.sql, true);
{
sql = buildUpdate("alg_district", fields)
+ " alg_district_key = " + dis_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
}
else
{
{
fields.push({ dbs: "alg_district_key", typ: "key", seq: "alg_s_alg_district_key" });
var regIns = buildInsert("alg_district", fields);
var dis_key = regIns.sequences["alg_district_key"];
@@ -43,14 +44,10 @@ else
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
}
if (!warning)
{
if (algUpd && algUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGDUP", dis_key, algUpd.trackarray.join("\n"));
}
currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+ " , ok.alg_onrgoedkenmerk_waarde"
+ " , k.alg_kenmerk_toonbaar"
@@ -92,4 +89,3 @@ else
<body>
</body>
</html>
<% ASPPAGE_END(); %>

81
APPL/ALG/alg_edit_gebouw.asp
View File

@@ -39,43 +39,42 @@ if (bld_key > 0)
if (oRs.Eof)
shared.record_not_found("<!--"+bld_key+"-->");
var bld_srtkey = oRs("alg_srtgebouw_key").Value;
var bld_naam = oRs("alg_gebouw_naam").Value;
var bld_code = oRs("alg_gebouw_code").Value;
var bld_descr = oRs("alg_gebouw_omschrijving").Value;
var bld_maak = oRs("alg_gebouw_aanmaak").Value;
var bld_email = oRs("alg_gebouw_email").Value;
var bld_image = oRs("alg_gebouw_image").Value;
var bld_teken = oRs("alg_gebouw_getekend").Value;
var bld_opp = oRs("alg_gebouw_bruto_vloeropp").Value;
var bld_omtrek = oRs("alg_gebouw_omtrek").Value;
var bld_inhoud = oRs("alg_gebouw_inhoud").Value;
var bld_opmerk = oRs("alg_gebouw_opmerking").Value;
var mld_adres = oRs("mld_adres_key").Value;
var prs_kstpl = oRs("prs_kostenplaats_key").Value;
var bld_ordrnr = oRs("alg_gebouw_ordernr").Value;
var bld_dwgx = oRs("alg_gebouw_dwgx").Value;
var bld_dwgy = oRs("alg_gebouw_dwgy").Value;
var bld_x = oRs("alg_gebouw_x").Value;
var bld_y = oRs("alg_gebouw_y").Value;
var bld_bez = oRs("alg_gebouw_bez").Value;
var bld_groep = oRs("alg_gebouw_groep").Value;
var bld_srtkey = oRs("alg_srtgebouw_key").Value;
var bld_naam = oRs("alg_gebouw_naam").Value;
var bld_code = oRs("alg_gebouw_code").Value;
var bld_descr = oRs("alg_gebouw_omschrijving").Value;
var bld_maak = oRs("alg_gebouw_aanmaak").Value;
var bld_email = oRs("alg_gebouw_email").Value;
var bld_teken = oRs("alg_gebouw_getekend").Value;
var bld_opp = oRs("alg_gebouw_bruto_vloeropp").Value;
var bld_omtrek = oRs("alg_gebouw_omtrek").Value;
var bld_inhoud = oRs("alg_gebouw_inhoud").Value;
var bld_opmerk = oRs("alg_gebouw_opmerking").Value;
var mld_adres = oRs("mld_adres_key").Value;
var prs_kstpl = oRs("prs_kostenplaats_key").Value;
var bld_ordrnr = oRs("alg_gebouw_ordernr").Value;
var bld_dwgx = oRs("alg_gebouw_dwgx").Value;
var bld_dwgy = oRs("alg_gebouw_dwgy").Value;
var bld_x = oRs("alg_gebouw_x").Value;
var bld_y = oRs("alg_gebouw_y").Value;
var bld_bez = oRs("alg_gebouw_bez").Value;
var bld_groep = oRs("alg_gebouw_groep").Value;
var dienstniveau = oRs("mld_dienstniveau_key").Value;
var beginuur = oRs("alg_gebouw_beginuur").Value;
var einduur = oRs("alg_gebouw_einduur").Value;
var werkdagen = oRs("alg_gebouw_werkdagen").Value;
var toon_telefoon = oRs("alg_gebouw_toon_telefoon").Value;
var toon_email = oRs("alg_gebouw_toon_email").Value;
var toon_kenteken = oRs("alg_gebouw_toon_kenteken").Value;
var verantw_key = oRs("prs_perslid_key_verantw").Value;
var verantw_key2 = oRs("prs_perslid_key_verantw2").Value;
var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
var beginuur = oRs("alg_gebouw_beginuur").Value;
var einduur = oRs("alg_gebouw_einduur").Value;
var werkdagen = oRs("alg_gebouw_werkdagen").Value;
var toon_telefoon = oRs("alg_gebouw_toon_telefoon").Value;
var toon_email = oRs("alg_gebouw_toon_email").Value;
var toon_kenteken = oRs("alg_gebouw_toon_kenteken").Value;
var verantw_key = oRs("prs_perslid_key_verantw").Value;
var verantw_key2 = oRs("prs_perslid_key_verantw2").Value;
var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
oRs.Close();
}
else
{
var werkdagen = 1;
var werkdagen = 1;
var toon_telefoon = 0;
var toon_email = 0;
var toon_kenteken = 0;
@@ -95,22 +94,10 @@ else
return false;
document.forms.u2.submit();
}
function alg_cancel()
{
FcltMgr.closeDetail(window, { cancel: true } );
}
function UploadImage()
{
url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHG")%>";
FcltMgr.openModalDetail(url, L("lcl_change"),
{ callback: function (data)
{
if (data.filenaam)
$("#bld_image").val(data.filenaam); }
} );
}
</script>
</head>
@@ -209,11 +196,6 @@ else
});
manRWFIELD("bld_email", "fld", L("lcl_alg_gebouw_email"), bld_email, {maxlength: 200});
manRWFIELD("bld_image", "fld", L("lcl_alg_gebouw_image"), bld_image, {maxlength: 255});
var params = { type: "button",
html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_alg_gebouw_image_upload"), L("lcl_fg_upload"), params);
BLOCK_END();
BLOCK_START("algLoc4", L("lcl_alg_gebouw_facilitair"));
@@ -306,4 +288,3 @@ else
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_gebouw_multi.asp
View File

@@ -313,4 +313,3 @@ user.auth_required_or_abort(ingesloten.length); // We klagen niet over enkele we
</form>
</body>
</html>
<% ASPPAGE_END(); %>

71
APPL/ALG/alg_edit_gebouw_save.asp
View File

@@ -30,46 +30,46 @@ var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse));
var fields = [ { dbs: "alg_locatie_key", typ: "key", frm: "locatiekey" },
{ dbs: "alg_srtgebouw_key", typ: "key", frm: "bld_srtkey", track: L("alg_srtgebouw"), foreign: {tbl: "alg_srtgebouw", key: "alg_srtgebouw_key", desc: "alg_srtgebouw_omschrijving"} },
{ dbs: "alg_gebouw_naam", typ: "varchar", frm: "bld_naam", track: L("lcl_estate_gebouw_man_name") },
{ dbs: "alg_gebouw_code", typ: "varchar", frm: "bld_code", track: L("lcl_estate_gebouw_man_code") },
{ dbs: "alg_gebouw_omschrijving", typ: "varchar", frm: "bld_descr" }, // wordt samengesteld uit code en naam
{ dbs: "alg_gebouw_email", typ: "varchar", frm: "bld_email", track: L("lcl_alg_gebouw_email") },
{ dbs: "alg_gebouw_image", typ: "varchar", frm: "bld_image", track: L("lcl_alg_gebouw_image") },
{ dbs: "alg_gebouw_getekend", typ: "date", frm: "bld_teken" }, //
{ dbs: "alg_gebouw_bruto_vloeropp", typ: "float", frm: "bld_opp", track: L("lcl_estate_gebouw_man_bruto_vloeropp") },
{ dbs: "alg_gebouw_omtrek", typ: "float", frm: "bld_omtrek", track: L("lcl_estate_gebouw_man_omtrek") },
{ dbs: "alg_gebouw_inhoud", typ: "float", frm: "bld_inhoud", track: L("lcl_estate_gebouw_man_inhoud") },
{ dbs: "alg_gebouw_opmerking", typ: "varchar", frm: "bld_opmerk", track: L("lcl_estate_gebouw_man_opmerk") },
{ dbs: "alg_gebouw_groep", typ: "varchar", frm: "bld_groep", track: L("lcl_estate_gebouw_groepkenmerk") },
{ dbs: "mld_adres_key", typ: "key", frm: "mld_adres", track: L("lcl_delivery_address"), foreign: "mld_v_factuuradres" },
{ dbs: "prs_kostenplaats_key", typ: "key", frm: "prs_kstpl", track: L("lcl_prs_dept_kosten"), foreign: "prs_kostenplaats" },
{ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" },
{ dbs: "alg_gebouw_ordernr", typ: "varchar", frm: "bld_ordrnr", track: L("lcl_estate_gebouw_ordernr") },
{ dbs: "alg_gebouw_dwgx", typ: "float", frm: "bld_dwgx" }, //
{ dbs: "alg_gebouw_dwgy", typ: "float", frm: "bld_dwgy" }, //
{ dbs: "alg_gebouw_x", typ: "float", frm: "bld_x", track: L("lcl_geoxcoord") },
{ dbs: "alg_gebouw_y", typ: "float", frm: "bld_y", track: L("lcl_geoycoord") },
{ dbs: "alg_gebouw_bez", typ: "check", frm: "bld_bez", track: L("lcl_estate_gebouw_bez") },
{ dbs: "alg_gebouw_werkdagen", typ: "check0", frm: "bld_werkdagen", track: L("lcl_estate_gebouw_werkdagen") },
{ dbs: "alg_gebouw_toon_telefoon", typ: "number", frm: "toon_telefoon", track: L("lcl_estate_gebouw_toon_telefoon") },
{ dbs: "alg_gebouw_toon_email", typ: "number", frm: "toon_email", track: L("lcl_estate_gebouw_toon_email") },
{ dbs: "alg_gebouw_toon_kenteken", typ: "number", frm: "toon_kenteken", track: L("lcl_estate_gebouw_toon_kenteken") },
{ dbs: "alg_gebouw_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "prs_perslid_key_verantw", typ: "key", frm: "verantw", track: L("lcl_alg_verantw"), foreign: "prs_perslid" },
{ dbs: "prs_perslid_key_verantw2", typ: "key", frm: "verantw2", track: L("lcl_alg_verantw2"), foreign: "prs_perslid" }
];
{ dbs: "alg_srtgebouw_key", typ: "key", frm: "bld_srtkey" },
{ dbs: "alg_gebouw_naam", typ: "varchar", frm: "bld_naam" },
{ dbs: "alg_gebouw_code", typ: "varchar", frm: "bld_code" },
{ dbs: "alg_gebouw_omschrijving", typ: "varchar", frm: "bld_descr" },
{ dbs: "alg_gebouw_email", typ: "varchar", frm: "bld_email" },
{ dbs: "alg_gebouw_getekend", typ: "date", frm: "bld_teken" },
{ dbs: "alg_gebouw_bruto_vloeropp", typ: "float", frm: "bld_opp" },
{ dbs: "alg_gebouw_omtrek", typ: "float", frm: "bld_omtrek" },
{ dbs: "alg_gebouw_inhoud", typ: "float", frm: "bld_inhoud" },
{ dbs: "alg_gebouw_opmerking", typ: "varchar", frm: "bld_opmerk" },
{ dbs: "alg_gebouw_groep", typ: "varchar", frm: "bld_groep" },
{ dbs: "mld_adres_key", typ: "key", frm: "mld_adres" },
{ dbs: "prs_kostenplaats_key", typ: "key", frm: "prs_kstpl" },
{ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau" },
{ dbs: "alg_gebouw_ordernr", typ: "varchar", frm: "bld_ordrnr" },
{ dbs: "alg_gebouw_dwgx", typ: "float", frm: "bld_dwgx" },
{ dbs: "alg_gebouw_dwgy", typ: "float", frm: "bld_dwgy" },
{ dbs: "alg_gebouw_x", typ: "float", frm: "bld_x" },
{ dbs: "alg_gebouw_y", typ: "float", frm: "bld_y" },
{ dbs: "alg_gebouw_bez", typ: "check", frm: "bld_bez" },
{ dbs: "alg_gebouw_werkdagen", typ: "check0", frm: "bld_werkdagen" },
{ dbs: "alg_gebouw_toon_telefoon", typ: "number", frm: "toon_telefoon" },
{ dbs: "alg_gebouw_toon_email", typ: "number", frm: "toon_email" },
{ dbs: "alg_gebouw_toon_kenteken", typ: "number", frm: "toon_kenteken" },
{ dbs: "alg_gebouw_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "prs_perslid_key_verantw", typ: "key", frm: "verantw" },
{ dbs: "prs_perslid_key_verantw2", typ: "key", frm: "verantw2" }];
if (beginuur != -2)
fields.push({ dbs: "alg_gebouw_beginuur", typ: "float", val: beginuur, track: L("lcl_estate_gebouw_beginuur") });
fields.push({ dbs: "alg_gebouw_beginuur", typ: "float", val: beginuur });
if (einduur != -2)
fields.push({ dbs: "alg_gebouw_einduur", typ: "float", val: einduur, track: L("lcl_estate_gebouw_einduur") });
fields.push({ dbs: "alg_gebouw_einduur", typ: "float", val: einduur });
var warning = "";
if (bld_key > 0)
{
var algUpd = buildTrackingUpdate("alg_gebouw", " alg_gebouw_key = " + bld_key, fields);
var err = Oracle.Execute(algUpd.sql, true);
sql = buildUpdate("alg_gebouw", fields)
+ " alg_gebouw_key = " + bld_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
@@ -87,10 +87,6 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
if (!warning)
{
if (algUpd && algUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGGUP", bld_key, algUpd.trackarray.join("\n"));
}
currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+ " , ok.alg_onrgoedkenmerk_waarde"
+ " , k.alg_kenmerk_toonbaar"
@@ -133,4 +129,3 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
<body>
</body>
</html>
<% ASPPAGE_END(); %>

93
APPL/ALG/alg_edit_locatie.asp
View File

@@ -21,7 +21,7 @@
<!-- #include file="alg.inc" -->
<%
FCLTHeader.Requires({plugins:["suggest", "jQuery", "kenmerk"], js: []})
FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: []})
var ins_score_enabled = S("ins_score_enabled") == 1;
var loc_key = getQParamInt("loc_key", -1);
@@ -33,31 +33,30 @@ user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse))
if (loc_key > 0)
{
sql = " SELECT * "
sql = " select * "
+ " FROM ALG_LOCATIE "
+ " WHERE alg_locatie_key = " + loc_key;
oRs = Oracle.Execute(sql);
var loc_omsch = oRs("alg_locatie_omschrijving").Value;
var loc_code = oRs("alg_locatie_code").Value;
var bez_adres = oRs("alg_locatie_adres").Value;
var bez_postc = oRs("alg_locatie_postcode").Value;
var bez_plaats = oRs("alg_locatie_plaats").Value
var bez_land = oRs("alg_locatie_land").Value;
var loc_vw = oRs("alg_locatie_verantw").Value;
var loc_vwtel = oRs("alg_locatie_verantw_tel").Value;
var loc_x = oRs("alg_locatie_x").Value;
var loc_y = oRs("alg_locatie_y").Value;
var loc_mail = oRs("alg_locatie_email").Value;
var loc_image = oRs("alg_locatie_image").Value;
var pst_adres = oRs("alg_locatie_post_adres").Value;
var pst_postc = oRs("alg_locatie_post_postcode").Value;
var pst_adres = oRs("alg_locatie_post_adres").Value;
var pst_plaats = oRs("alg_locatie_post_plaats").Value;
var pst_land = oRs("alg_locatie_post_land").Value;
var dienstniveau = oRs("mld_dienstniveau_key").Value;
var loc_score1 = oRs("alg_locatie_mjb_score1").Value;
var loc_omsch = oRs("alg_locatie_omschrijving").value;
var loc_code = oRs("alg_locatie_code").value;
var bez_adres = oRs("alg_locatie_adres").value;
var bez_postc = oRs("alg_locatie_postcode").value;
var bez_plaats = oRs("alg_locatie_plaats").value
var bez_land = oRs("alg_locatie_land").value;
var loc_vw = oRs("alg_locatie_verantw").value;
var loc_vwtel = oRs("alg_locatie_verantw_tel").value;
var loc_x = oRs("alg_locatie_x").value;
var loc_y = oRs("alg_locatie_y").value;
var loc_mail = oRs("alg_locatie_email").value;
var pst_adres = oRs("alg_locatie_post_adres").value;
var pst_postc = oRs("alg_locatie_post_postcode").value;
var pst_adres = oRs("alg_locatie_post_adres").value;
var pst_plaats = oRs("alg_locatie_post_plaats").value;
var pst_land = oRs("alg_locatie_post_land").value;
var dienstniveau = oRs("mld_dienstniveau_key").value;
var loc_score1 = oRs("alg_locatie_mjb_score1").value;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value != null ? new Date(oRs("alg_locatie_vervaldatum").Value) : null;
oRs.Close();
@@ -77,22 +76,10 @@ if (loc_key > 0)
return false;
document.forms.u2.submit();
}
function alg_cancel()
{
FcltMgr.closeDetail(window, { cancel: true } );
}
function UploadImage()
{
url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHL")%>";
FcltMgr.openModalDetail(url, L("lcl_change"),
{ callback: function (data)
{
if (data.filenaam)
$("#loc_image").val(data.filenaam); }
} );
}
</script>
</head>
@@ -123,12 +110,12 @@ BLOCK_START("algLoc1", "&nbsp;");
readonly: !this_alg.writeman,
required: true });
manRWFIELD("loc_omsch", "fld", L("lcl_estate_locatie_man_descr"), loc_omsch, {required: true, maxlength: 60});
manRWFIELD("loc_code", "fld", L("lcl_estate_locatie_man_code"), loc_code, {required: true, maxlength: 10});
manRWFIELD("bez_adres", "fld", L("lcl_prs_address_bezoek_adres"), bez_adres, {maxlength: 50});
manRWFIELD("bez_postc", "fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {maxlength: 12});
manRWFIELD("bez_plaats", "fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {maxlength: 30});
manRWFIELD("bez_land", "fld", L("lcl_prs_address_bezoek_land"), bez_land, {maxlength: 30});
manRWFIELD("loc_omsch", "fld", L("lcl_estate_locatie_man_descr"), loc_omsch, {required: true, maxlength: 60});
manRWFIELD("loc_code", "fld", L("lcl_estate_locatie_man_code"), loc_code, {required: true, maxlength: 10});
manRWFIELD("bez_adres", "fld", L("lcl_prs_address_bezoek_adres"), bez_adres, {maxlength: 50});
manRWFIELD("bez_postc", "fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {maxlength: 12});
manRWFIELD("bez_plaats", "fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {maxlength: 30});
manRWFIELD("bez_land", "fld", L("lcl_prs_address_bezoek_land"), bez_land, {maxlength: 30});
sql = "SELECT mld_dienstniveau_key, "
+ lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
@@ -142,8 +129,8 @@ manRWFIELD("bez_land", "fld", L("lcl_prs_address_bezoek_land"), bez_land,
readonly: !this_alg.writeuse
});
manRWFIELD("loc_x", "fld", L("lcl_geoxcoord"), loc_x, {maxlength: 25});
manRWFIELD("loc_y", "fld", L("lcl_geoycoord"), loc_y, {maxlength: 25});
manRWFIELD("loc_x", "fld", L("lcl_geoxcoord"), loc_x, {maxlength: 25});
manRWFIELD("loc_y", "fld", L("lcl_geoycoord"), loc_y, {maxlength: 25});
BLOCK_END();
BLOCK_START("algLoc2", "&nbsp;");
@@ -155,22 +142,15 @@ FCLTcalendar("vervaldatum",
readonly: !this_alg.writeman
});
manRWFIELD("pst_adres", "fld", L("lcl_prs_address_post_adres"), pst_adres, {maxlength: 50});
manRWFIELD("pst_postc", "fld", L("lcl_prs_address_post_postcode"), pst_postc, {maxlength: 12});
manRWFIELD("pst_plaats", "fld", L("lcl_prs_address_post_plaats"), pst_plaats, {maxlength: 30});
manRWFIELD("pst_land", "fld", L("lcl_prs_address_post_land"), pst_land, {maxlength: 30});
manRWFIELD("loc_vw", "fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {maxlength: 30});
manRWFIELD("loc_vwtel", "fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {maxlength: 15});
manRWFIELD("loc_mail", "fld", L("lcl_noti_email"), loc_mail, {maxlength: 200});
manRWFIELD("loc_image", "fld", L("lcl_alg_locatie_image"), loc_image, {maxlength: 255});
var params = { type: "button",
html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_alg_locatie_image_upload"), L("lcl_fg_upload"), params);
manRWFIELD("pst_adres", "fld", L("lcl_prs_address_post_adres"), pst_adres, {maxlength: 50});
manRWFIELD("pst_postc", "fld", L("lcl_prs_address_post_postcode"), pst_postc, {maxlength: 12});
manRWFIELD("pst_plaats", "fld", L("lcl_prs_address_post_plaats"), pst_plaats, {maxlength: 30});
manRWFIELD("pst_land", "fld", L("lcl_prs_address_post_land"), pst_land, {maxlength: 30});
manRWFIELD("loc_vw", "fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {maxlength: 30});
manRWFIELD("loc_vwtel", "fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {maxlength: 15});
manRWFIELD("loc_mail", "fld", L("lcl_noti_email"), loc_mail, {maxlength: 200});
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
BLOCK_END();
@@ -188,4 +168,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

49
APPL/ALG/alg_edit_locatie_save.asp
View File

@@ -21,32 +21,32 @@ var onrgoedlvl = "L";
var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse));
var fields = [ { dbs: "alg_district_key", typ: "number", frm: "districtkey" },
{ dbs: "alg_locatie_code", typ: "varchar", frm: "loc_code", track: L("lcl_estate_locatie_man_code") },
{ dbs: "alg_locatie_omschrijving", typ: "varchar", frm: "loc_omsch", track: L("lcl_estate_locatie_man_descr") },
{ dbs: "alg_locatie_adres", typ: "varchar", frm: "bez_adres", track: L("lcl_prs_address_bezoek_adres") },
{ dbs: "alg_locatie_postcode", typ: "varchar", frm: "bez_postc", track: L("lcl_prs_address_bezoek_postcode") },
{ dbs: "alg_locatie_plaats", typ: "varchar", frm: "bez_plaats", track: L("lcl_prs_address_bezoek_plaats") },
{ dbs: "alg_locatie_land", typ: "varchar", frm: "bez_land", track: L("lcl_prs_address_bezoek_land") },
{ dbs: "alg_locatie_post_adres", typ: "varchar", frm: "pst_adres", track: L("lcl_prs_address_post_adres") },
{ dbs: "alg_locatie_post_postcode", typ: "varchar", frm: "pst_postc", track: L("lcl_prs_address_post_postcode") },
{ dbs: "alg_locatie_post_plaats", typ: "varchar", frm: "pst_plaats", track: L("lcl_prs_address_post_plaats") },
{ dbs: "alg_locatie_post_land", typ: "varchar", frm: "pst_land", track: L("lcl_prs_address_post_land") },
{ dbs: "alg_locatie_verantw", typ: "varchar", frm: "loc_vw", track: L("lcl_estate_locatie_man_verantw") },
{ dbs: "alg_locatie_verantw_tel", typ: "varchar", frm: "loc_vwtel", track: L("lcl_estate_locatie_man_verantw_tel") },
{ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" },
{ dbs: "alg_locatie_x", typ: "float", frm: "loc_x", track: L("lcl_geoxcoord") },
{ dbs: "alg_locatie_y", typ: "float", frm: "loc_y", track: L("lcl_geoycoord") },
{ dbs: "alg_locatie_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "alg_locatie_email", typ: "varchar", frm: "loc_mail", track: L("lcl_noti_email") },
{ dbs: "alg_locatie_image", typ: "varchar", frm: "loc_image", track: L("lcl_alg_locatie_image") }
];
var fields = [ { dbs: "alg_district_key", typ: "number", frm: "districtkey" },
{ dbs: "alg_locatie_code", typ: "varchar", frm: "loc_code" },
{ dbs: "alg_locatie_omschrijving", typ: "varchar", frm: "loc_omsch" },
{ dbs: "alg_locatie_adres", typ: "varchar", frm: "bez_adres" },
{ dbs: "alg_locatie_postcode", typ: "varchar", frm: "bez_postc" },
{ dbs: "alg_locatie_plaats", typ: "varchar", frm: "bez_plaats" },
{ dbs: "alg_locatie_land", typ: "varchar", frm: "bez_land" },
{ dbs: "alg_locatie_post_adres", typ: "varchar", frm: "pst_adres" },
{ dbs: "alg_locatie_post_postcode", typ: "varchar", frm: "pst_postc" },
{ dbs: "alg_locatie_post_plaats", typ: "varchar", frm: "pst_plaats" },
{ dbs: "alg_locatie_post_land", typ: "varchar", frm: "pst_land" },
{ dbs: "alg_locatie_verantw", typ: "varchar", frm: "loc_vw" },
{ dbs: "alg_locatie_verantw_tel", typ: "varchar", frm: "loc_vwtel" },
{ dbs: "MLD_DIENSTNIVEAU_KEY", typ: "key", frm: "dienstniveau" },
{ dbs: "alg_locatie_x", typ: "float", frm: "loc_x" },
{ dbs: "alg_locatie_y", typ: "float", frm: "loc_y" },
{ dbs: "alg_locatie_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "alg_locatie_email", typ: "varchar", frm: "loc_mail" }];
var warning = "";
if (loc_key > 0)
{
var algUpd = buildTrackingUpdate("alg_locatie", " alg_locatie_key = " + loc_key, fields);
var err = Oracle.Execute(algUpd.sql, true);
sql = buildUpdate("alg_locatie", fields)
+ " alg_locatie_key = " + loc_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
@@ -64,10 +64,6 @@ else
if (!warning)
{
if (algUpd && algUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGLUP", loc_key, algUpd.trackarray.join("\n"));
}
currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+ " , ok.alg_onrgoedkenmerk_waarde"
+ " , k.alg_kenmerk_toonbaar"
@@ -110,4 +106,3 @@ else
<body>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_regio.asp
View File

@@ -87,4 +87,3 @@ var action = (regio_key == -1 ? "I" : "U");
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_edit_regio_save.asp
View File

@@ -46,4 +46,4 @@ var result = { regio_key: regio_key,
keepForm: !!warning,
success: true };
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_edit_ruimte.asp
View File

@@ -229,4 +229,3 @@ if (!room_exists)
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_ruimte_multi.asp
View File

@@ -210,4 +210,3 @@ IFACE.FORM_END();
</form>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_edit_ruimte_multi_save.asp
View File

@@ -90,4 +90,4 @@ result = { success : true, refresh: true };
Response.Write(JSON.stringify(result));
Response.End;
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_edit_ruimte_save.asp
View File

@@ -69,4 +69,3 @@ var result = { room_key: room_key,
success: true };
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_ruimtefunctie.asp
View File

@@ -135,4 +135,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_ruimtefunctie_save.asp
View File

@@ -101,4 +101,3 @@ __Log("srtruimte_lg_key = " + srtruimte_lg_key);
<body>
</body>
</html>
<% ASPPAGE_END(); %>

140
APPL/ALG/alg_edit_terreinsector.asp
View File

@@ -11,15 +11,14 @@
Note:
*/ %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!--#include file="../Shared/common.inc" -->
<!--#include file="../Shared/iface.inc" -->
<!--#include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!-- #include file="../Shared/plaatsselector.inc" -->
<!-- #include file="../Shared/kostenplaatsselector.inc" -->
<!-- #include file="../Shared/afdelingselector.inc" -->
<!-- #include file="../Shared/persoonselector.inc" -->
<!--#include file="../Shared/plaatsselector.inc" -->
<!--#include file="../Shared/kostenplaatsselector.inc" -->
<!--#include file="../Shared/afdelingselector.inc" -->
<!-- #include file="../API2/api2.inc" -->
<!-- #include file="alg_flexkenmerk.inc" -->
<!-- #include file="alg.inc" -->
@@ -45,38 +44,32 @@ if (ter_key > 0)
+ ", alg_terreinsector_omtrek"
+ ", alg_terreinsector_aanmaak"
+ ", alg_terreinsector_ordernr"
+ ", alg_terreinsector_image"
+ ", alg_terreinsector_toon_telef"
+ ", alg_terreinsector_toon_email"
+ ", alg_terreinsector_toon_kentk"
+ ", alg_terreinsector_vervaldatum"
+ ", prs_kostenplaats_key"
+ ", prs_afdeling_key"
+ ", prs_perslid_key_verantw"
+ ", prs_perslid_key_verantw2"
+ " FROM alg_terreinsector "
+ " WHERE alg_terreinsector_key = " + ter_key;
oRs = Oracle.Execute(sql);
var loc_key = oRs("alg_locatie_key").Value;
var ter_oms = oRs("alg_terreinsector_omschrijving").Value;
var ter_code = oRs("alg_terreinsector_code").Value;
var ter_naam = oRs("alg_terreinsector_naam").Value;
var ter_srkey = oRs("alg_srtterreinsector_key").Value;
var ter_opp = oRs("alg_terreinsector_oppervlak").Value;
var ter_omt = oRs("alg_terreinsector_omtrek").Value;
var ter_aanmk = oRs("alg_terreinsector_aanmaak").Value;
var ter_ordnr = oRs("alg_terreinsector_ordernr").Value;
var ter_image = oRs("alg_terreinsector_image").Value;
var prs_kstn = oRs("prs_kostenplaats_key").Value;
var prs_afd = oRs("prs_afdeling_key").Value;
var verantw_key = oRs("prs_perslid_key_verantw").Value
var verantw_key2 = oRs("prs_perslid_key_verantw2").Value;
var toon_telefoon = oRs("alg_terreinsector_toon_telef").Value;
var toon_email = oRs("alg_terreinsector_toon_email").Value;
var toon_kenteken = oRs("alg_terreinsector_toon_kentk").Value;
var vervaldatum = oRs("alg_terreinsector_vervaldatum").Value != null ? new Date(oRs("ALG_TERREINSECTOR_VERVALDATUM").Value) : null;
var loc_key = oRs("ALG_LOCATIE_KEY").value;
var ter_oms = oRs("ALG_TERREINSECTOR_OMSCHRIJVING").value;
var ter_code = oRs("ALG_TERREINSECTOR_CODE").value;
var ter_naam = oRs("ALG_TERREINSECTOR_NAAM").value;
var ter_srkey = oRs("ALG_SRTTERREINSECTOR_KEY").value;
var ter_opp = oRs("ALG_TERREINSECTOR_OPPERVLAK").value;
var ter_omt = oRs("ALG_TERREINSECTOR_OMTREK").value;
var ter_aanmk = oRs("ALG_TERREINSECTOR_AANMAAK").value;
var ter_ordnr = oRs("ALG_TERREINSECTOR_ORDERNR").value;
var prs_kstn = oRs("PRS_KOSTENPLAATS_KEY").value;
var prs_afd = oRs("PRS_AFDELING_KEY").value;
var toon_telefoon = oRs("ALG_TERREINSECTOR_TOON_TELEF").Value;
var toon_email = oRs("ALG_TERREINSECTOR_TOON_EMAIL").Value;
var toon_kenteken = oRs("ALG_TERREINSECTOR_TOON_KENTK").Value;
var vervaldatum = oRs("ALG_TERREINSECTOR_VERVALDATUM").Value != null ? new Date(oRs("ALG_TERREINSECTOR_VERVALDATUM").Value) : null;
oRs.Close();
}
@@ -106,17 +99,6 @@ else
{
FcltMgr.closeDetail(window, { cancel: true } );
}
function UploadImage()
{
url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHT")%>";
FcltMgr.openModalDetail(url, L("lcl_change"),
{ callback: function (data)
{
if (data.filenaam)
$("#ter_image").val(data.filenaam); }
} );
}
</script>
</head>
@@ -139,7 +121,7 @@ if (this_alg.writeman)
else
manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
BLOCK_START("algInfo", "");
FCLTplaatsselector(this_alg.authparams("WEB_TERMAN").ALGwritelevel, {
locatiekey: loc_key,
@@ -162,9 +144,32 @@ BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
RWFIELDTR("ter_code", "fld", L("lcl_estate_terreinsector_man_code"), ter_code, {maxlength: 12, required: true});
RWFIELDTR("ter_naam", "fld", L("lcl_estate_terreinsector_man_name"), ter_naam, {maxlength: 30, required: true});
BLOCK_END();
BLOCK_START("algLoc2", L("lcl_alg_gebouw_bezoek"));
FCLTkostenplaatsselector( "prs_kstn",
"prs_kstn",
user_key,
{ kostenplaatsKey: prs_kstn,
label: L("lcl_prs_dept_kosten") });
FCLTafdelingselector("prs_afd",
"sgDept",
{ label: L("lcl_dep_name_level2"),
departmentKey: prs_afd,
//autlevel: authparams.PRSreadlevel,
whenEmpty: L("lcl_search_generic")
});
RWFIELDTR("ter_ordnr", "fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {maxlength: 30});
RWFIELDTR("ter_opp", "fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {maxlength: 15});
RWFIELDTR("ter_omt", "fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {maxlength: 15});
FCLTcalendar("vervaldatum",
{ datum: vervaldatum,
initEmpty: vervaldatum==null,
label: L("lcl_alg_vervaldatum"),
readonly: !this_alg.writeman
});
var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
FCLTselector("toon_telefoon",
sql,
@@ -186,57 +191,9 @@ BLOCK_START("algLoc2", L("lcl_alg_gebouw_bezoek"));
initKey: toon_kenteken,
extraclass: "notmulti"
});
BLOCK_END();
BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
FCLTkostenplaatsselector( "prs_kstn",
"prs_kstn",
user_key,
{ kostenplaatsKey: prs_kstn,
label: L("lcl_prs_dept_kosten") });
FCLTafdelingselector("prs_afd",
"sgDept",
{ label: L("lcl_dep_name_level2"),
departmentKey: prs_afd,
//autlevel: authparams.PRSreadlevel,
whenEmpty: L("lcl_search_generic")
});
FCLTpersoonselector("verantw",
"sgVerantw",
{ perslidKey: verantw_key,
label: L("lcl_alg_verantw"),
autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
});
FCLTpersoonselector("verantw2",
"sgVerantw2",
{ perslidKey: verantw_key2,
label: L("lcl_alg_verantw2"),
autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
});
RWFIELDTR("ter_ordnr", "fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {maxlength: 30});
manRWFIELD("ter_image", "fld", L("lcl_alg_terreinsector_image"), ter_image, {maxlength: 255});
var params = { type: "button",
html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_alg_terreinsector_image_upload"), L("lcl_fg_upload"), params);
BLOCK_END();
BLOCK_START("algLoc4", L("lcl_alg_gebouw_fysiek"));
RWFIELDTR("ter_opp", "fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {maxlength: 15});
RWFIELDTR("ter_omt", "fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {maxlength: 15});
FCLTcalendar("vervaldatum",
{ datum: vervaldatum,
initEmpty: vervaldatum==null,
label: L("lcl_alg_vervaldatum"),
readonly: !this_alg.writeman
});
BLOCK_END();
generateFlexKenmerkBlock ({
onrgoed_key : ter_key,
onrgoed_niveau : onrgoedlvl,
@@ -252,4 +209,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

51
APPL/ALG/alg_edit_terreinsector_save.asp
View File

@@ -21,28 +21,24 @@ var onrgoedlvl = "T";
var this_alg = alg.func_enabled(ter_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.writeman || (ter_key>0&&this_alg.writeuse));
var fields = [ { dbs: "alg_locatie_key", typ: "key", frm: "locatiekey", track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "alg_terreinsector_omschrijving", typ: "varchar", frm: "ter_oms"},
{ dbs: "alg_terreinsector_code", typ: "varchar", frm: "ter_code", track: L("lcl_estate_terreinsector_man_code") },
{ dbs: "alg_terreinsector_naam", typ: "varchar", frm: "ter_naam", track: L("lcl_estate_terreinsector_man_name") },
{ dbs: "alg_srtterreinsector_key", typ: "key", frm: "ter_srkey", track: L("lcl_estate_terreinsector_man_sort"), foreign: "ALG_SRTTERREINSECTOR" },
{ dbs: "alg_terreinsector_oppervlak", typ: "float", frm: "ter_opp", track: L("lcl_estate_terreinsector_man_oppervlak") },
{ dbs: "alg_terreinsector_omtrek", typ: "float", frm: "ter_omt", track: L("lcl_estate_terreinsector_man_omtrek") },
{ dbs: "alg_terreinsector_ordernr", typ: "varchar", frm: "ter_ordnr", track: L("lcl_estate_terreinsector_ordernr") },
{ dbs: "alg_terreinsector_image", typ: "varchar", frm: "ter_image", track: L("lcl_alg_terreinsector_image") },
{ dbs: "alg_terreinsector_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "alg_terreinsector_toon_telef", typ: "number", frm: "toon_telefoon", track: L("lcl_estate_gebouw_toon_telefoon") },
{ dbs: "alg_terreinsector_toon_email", typ: "number", frm: "toon_email", track: L("lcl_estate_gebouw_toon_email") },
{ dbs: "alg_terreinsector_toon_kentk", typ: "number", frm: "toon_kenteken", track: L("lcl_estate_gebouw_toon_kenteken") },
{ dbs: "prs_kostenplaats_key", typ: "key", frm: "prs_kstn", track: L("lcl_prs_dept_kosten"), foreign: "PRS_KOSTENPLAATS" },
{ dbs: "prs_afdeling_key", typ: "key", frm: "prs_afd", track: L("lcl_dep_name_level2"), foreign: "PRS_AFDELING" },
{ dbs: "prs_perslid_key_verantw", typ: "key", frm: "verantw", track: L("lcl_alg_verantw"), foreign: "PRS_PERSLID" },
{ dbs: "prs_perslid_key_verantw2", typ: "key", frm: "verantw2", track: L("lcl_alg_verantw2"), foreign: "PRS_PERSLID" }
];
var fields = [ { dbs: "alg_locatie_key", typ: "key", frm: "locatiekey", track: true /* afzonderlijke tracking, wel oldjsval */ },
{ dbs: "ALG_TERREINSECTOR_OMSCHRIJVING", typ: "varchar", frm: "ter_oms" },
{ dbs: "ALG_TERREINSECTOR_CODE", typ: "varchar", frm: "ter_code" },
{ dbs: "ALG_TERREINSECTOR_NAAM", typ: "varchar", frm: "ter_naam" },
{ dbs: "ALG_SRTTERREINSECTOR_KEY", typ: "key", frm: "ter_srkey" },
{ dbs: "ALG_TERREINSECTOR_OPPERVLAK", typ: "float", frm: "ter_opp" },
{ dbs: "ALG_TERREINSECTOR_OMTREK", typ: "float", frm: "ter_omt" },
{ dbs: "ALG_TERREINSECTOR_ORDERNR", typ: "varchar", frm: "ter_ordnr" },
{ dbs: "ALG_TERREINSECTOR_VERVALDATUM", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") },
{ dbs: "ALG_TERREINSECTOR_TOON_TELEF", typ: "number", frm: "toon_telefoon" },
{ dbs: "ALG_TERREINSECTOR_TOON_EMAIL", typ: "number", frm: "toon_email" },
{ dbs: "ALG_TERREINSECTOR_TOON_KENTK", typ: "number", frm: "toon_kenteken" },
{ dbs: "PRS_KOSTENPLAATS_KEY", typ: "key", frm: "prs_kstn" },
{ dbs: "PRS_AFDELING_KEY", typ: "key", frm: "prs_afd" }];
var warning = "";
if (ter_key > 0)
{
{
var terUpd = buildTrackingUpdate("alg_terreinsector", "alg_terreinsector_key = " + ter_key, fields);
var err = Oracle.Execute(terUpd.sql, true);
@@ -74,25 +70,21 @@ if (ter_key > 0)
}
}
}
}
}
else
{
{
fields.push({ dbs: "alg_terreinsector_key", typ: "key", seq: "alg_s_alg_onroerendgoed_keys" });
var regIns = buildInsert("alg_terreinsector", fields);
var ter_key = regIns.sequences["alg_terreinsector_key"];
var regIns = buildInsert("alg_terreinsector", fields);
var ter_key = regIns.sequences["alg_terreinsector_key"];
sql = regIns.sql;
sql = regIns.sql;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
}
}
if (!warning)
{
if (terUpd && terUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGTUP", ter_key, terUpd.trackarray.join("\n"));
}
currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+ " , ok.alg_onrgoedkenmerk_waarde"
+ " , k.alg_kenmerk_toonbaar"
@@ -135,4 +127,3 @@ else
<body>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_verdieping.asp
View File

@@ -138,4 +138,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

17
APPL/ALG/alg_edit_verdieping_save.asp
View File

@@ -21,17 +21,19 @@ var onrgoedlvl = "V";
var this_alg = alg.func_enabled(flr_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.writeman || (flr_key>0&&this_alg.writeuse));
var fields = [ { dbs: "alg_verdieping_omschrijving", typ: "varchar", frm: "flr_omschr", track: L("lcl_estate_verdieping_man_descr") },
{ dbs: "alg_verdieping_volgnr", typ: "number", frm: "flr_volgnr", track: L("lcl_estate_verdieping_man_volgnr") },
{ dbs: "alg_verdieping_code", typ: "varchar", frm: "flr_code", track: L("lcl_estate_verdieping_man_code") },
var fields = [ { dbs: "alg_verdieping_omschrijving", typ: "varchar", frm: "flr_omschr" },
{ dbs: "alg_verdieping_volgnr", typ: "number", frm: "flr_volgnr" },
{ dbs: "alg_verdieping_code", typ: "varchar", frm: "flr_code" },
{ dbs: "alg_gebouw_key", typ: "key", frm: "gebouwkey" },
{ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" }
{ dbs: "MLD_DIENSTNIVEAU_KEY", typ: "key", frm: "dienstniveau" }
];
var warning = "";
if (flr_key > 0)
{
var algUpd = buildTrackingUpdate("alg_verdieping", " alg_verdieping_key = " + flr_key, fields);
sql = buildUpdate("alg_verdieping", fields)
+ " alg_verdieping_key = " + flr_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
@@ -50,10 +52,6 @@ else
if (!warning)
{
if (algUpd && algUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGVUP", flr_key, algUpd.trackarray.join("\n"));
}
currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+ " , ok.alg_onrgoedkenmerk_waarde"
+ " , k.alg_kenmerk_toonbaar"
@@ -96,4 +94,3 @@ else
<body>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_edit_wp.asp
View File

@@ -163,4 +163,3 @@ IFACE.FORM_END();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

29
APPL/ALG/alg_edit_wp_save.asp
View File

@@ -23,28 +23,26 @@ var wp_type = (S("prs_werkplek_implicit") == 1)?1:getFParamInt("wp_type");
var authparams = alg.checkAutorisation();
var fields = [ { dbs: "prs_werkplek_volgnr", typ: "number", frm: "wp_volgnr", track: L("lcl_estate_wp_seq") },
{ dbs: "prs_werkplek_omschrijving", typ: "varchar", frm: "wp_oms", track: L("lcl_workplace") },
{ dbs: "prs_werkplek_vastopp", typ: "number", frm: "wp_vstopp_v", track: L("lcl_estate_wp_fixed_v") },
{ dbs: "prs_werkplek_opp", typ: "number", frm: "wp_opp", track: L("lcl_estate_wp_area")},
{ dbs: "prs_werkplek_virtueel", typ: "number", val: (virtueel? 1 : 0), track: L("lcl_estate_wp_virt") },
{ dbs: "prs_werkplek_type", typ: "number", val: wp_type, track: L("lcl_wptype") },
{ dbs: "prs_alg_ruimte_key", typ: "key", frm: "ruimtekey"}
/*
{ dbs: "PRS_WERKPLEK_MODULE", typ: "varchar", frm: "" },
var fields = [// { dbs: "PRS_WERKPLEK_MODULE", typ: "varchar", frm: "" },
{ dbs: "PRS_WERKPLEK_VOLGNR", typ: "number", frm: "wp_volgnr" },
{ dbs: "PRS_WERKPLEK_OMSCHRIJVING", typ: "varchar", frm: "wp_oms" },
{ dbs: "PRS_WERKPLEK_VASTOPP", typ: "number", frm: "wp_vstopp_v" },
{ dbs: "PRS_WERKPLEK_OPP", typ: "number", frm: "wp_opp" },
{ dbs: "PRS_WERKPLEK_VIRTUEEL", typ: "number", val: (virtueel? 1 : 0) },
{ dbs: "PRS_WERKPLEK_TYPE", typ: "number", val: wp_type },
{ dbs: "PRS_ALG_RUIMTE_KEY", typ: "key", frm: "ruimtekey" } /*,
{ dbs: "PRS_WERKPLEK_GETEKEND", typ: "date", frm: "" },
{ dbs: "PRS_WERKPLEK_DWGX", typ: "number", frm: "" },
{ dbs: "PRS_WERKPLEK_DWGY", typ: "number", frm: "" },
{ dbs: "PRS_WERKPLEK_DWGZ", typ: "number", frm: "" },
{ dbs: "PRS_WERKPLEK_DWGROTATIE", typ: "number", frm: "" },
{ dbs: "PRS_WERKPLEK_DWGSCHAAL", typ: "number", frm: "" }
*/
];
{ dbs: "PRS_WERKPLEK_DWGSCHAAL", typ: "number", frm: "" }*/ ];
var warning = "";
if (wp_key > 0)
{
var algUpd = buildTrackingUpdate("prs_werkplek", " prs_werkplek_key = " + wp_key, fields);
sql = buildUpdate("prs_werkplek", fields)
+ " prs_werkplek_key = " + wp_key;
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
@@ -64,10 +62,6 @@ if (wp_key > 0)
wp_key = WPMove_PRS_WERKPLEK(wp_key, room_key_new);
}
if (algUpd && algUpd.trackarray.length)
{ // Tracking alleen op wijzigingen
shared.trackaction("ALGWUP", wp_key, algUpd.trackarray.join("\n"));
}
}
else
{
@@ -98,4 +92,3 @@ else
<body>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_gebouw.asp
View File

@@ -100,4 +100,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

13
APPL/ALG/alg_gebouw_search.asp
View File

@@ -143,22 +143,22 @@ var this_alg = alg.func_enabled(gebouw_key);
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="3">
maxlength="1">
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="3">
maxlength="1">
</td>
</tr>
<% } %>
@@ -184,4 +184,3 @@ var this_alg = alg.func_enabled(gebouw_key);
</div>
</body>
</html>
<% ASPPAGE_END(); %>

6
APPL/ALG/alg_gebouw_search_list.asp
View File

@@ -33,8 +33,8 @@ var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var fitness_score1_from = getQParamFloat("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
var bld_email = getQParam("bld_email", ""); // Gebouw email.
var bld_groep = getQParam("bld_groep", ""); // Gebouw groeperingskenmerk
@@ -59,4 +59,4 @@ gebouw_list ( "*",
expalgincl: expalgincl
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_locatie.asp
View File

@@ -97,4 +97,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

13
APPL/ALG/alg_locatie_search.asp
View File

@@ -101,22 +101,22 @@ var authparams = alg.checkAutorisation();
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="3">
maxlength="1">
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="3">
maxlength="1">
</td>
</tr>
<% } %>
@@ -142,4 +142,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

6
APPL/ALG/alg_locatie_search_list.asp
View File

@@ -29,8 +29,8 @@ var loc_code = getQParam("loc_code", ""); // Locatiecode
var loc_descr = getQParam("loc_descr", ""); // Locatienaam
var cnt_full = getQParamInt("cnt_full", 0) == 1;
var expalgincl = getQParamInt("expalgincl", 0) == 1;
var fitness_score1_from = getQParamFloat("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
locatie_list ( "*",
{ outputmode: outputmode,
@@ -47,4 +47,4 @@ locatie_list ( "*",
noref: (noref != -1? noref : null)
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_regio.asp
View File

@@ -59,4 +59,3 @@ var reg_key = getQParamInt("key", -1);
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_regio_search.asp
View File

@@ -67,4 +67,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_regio_search_list.asp
View File

@@ -29,4 +29,4 @@ regio_list ( "*",
reg_key: (reg_key != -1? reg_key : null)
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_ruimte.asp
View File

@@ -131,4 +131,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_ruimte_search.asp
View File

@@ -136,4 +136,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_ruimte_search_list.asp
View File

@@ -51,4 +51,4 @@ ruimte_list ( "*",
chkgeb: chkgeb
}
);
%><% ASPPAGE_END(); %>
%>

2
APPL/ALG/alg_ruimteafdeling.asp
View File

@@ -294,4 +294,4 @@ IFACE.FORM_END();
</html>
<%
}
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_ruimtefunctie.asp
View File

@@ -65,4 +65,3 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
%>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_ruimtefunctie_delete.asp
View File

@@ -39,4 +39,4 @@ var sql = "DELETE FROM alg_srtruimte_locatiegebouw"
}
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_ruimtefunctie_search.asp
View File

@@ -92,4 +92,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_ruimtefunctie_search_list.asp
View File

@@ -33,4 +33,4 @@ ruimtefunctie_list ( "*",
bld_key: (bld_key != -1? bld_key : null)
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_ruimteresscope.asp
View File

@@ -70,4 +70,3 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
</form>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_ruimteresscope_save.asp
View File

@@ -55,4 +55,4 @@ else if (scopemode == 'D')
var result = { toaster: toaster,
success: true };
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_search.asp
View File

@@ -95,4 +95,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

26
APPL/ALG/alg_show_district.asp
View File

@@ -22,21 +22,16 @@
FCLTHeader.Requires({plugins:["jQuery"], js: []})
var dis_key = getQParamInt("dis_key")
var reg_key
var onrgoedlvl = "D";
var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
var sql = "SELECT r.alg_regio_omschrijving"
+ " , d.alg_district_omschrijving"
+ " , d.alg_district_verwijder"
+ " FROM alg_regio r"
+ " , alg_district d"
+ " WHERE r.alg_regio_key = d.alg_regio_key"
+ " AND d.alg_district_key = " + dis_key;
var sql = "SELECT * "
+ " FROM alg_district"
+ " WHERE alg_district_key = " + dis_key;
var oRs = Oracle.Execute(sql);
var reg_naam = oRs("alg_regio_omschrijving").Value;
var dis_naam = oRs("alg_district_omschrijving").Value;
var dis_deleted = oRs("alg_district_verwijder").value != null;
oRs.Close();
%>
@@ -87,12 +82,12 @@ oRs.Close();
%>
<form name=u2 onSubmit="return false;">
<% BLOCK_START("algInfo", "&nbsp;");
params = { infoPointer: { Url: "appl/shared/status_info.asp?dis_key=" + dis_key,
Title: L("lcl_status_details") + " " + dis_naam
}
};
ROFIELDTR("fld", L("lcl_region"), reg_naam);
ROFIELDTR("fld", L("lcl_district"), dis_naam, params);
FCLTplaatsselector(-1,
{ regiokey: reg_key,
districtkey: dis_key,
startlevel: 0, // Regio
eindlevel: 1, // District
readonly: true });
BLOCK_END();
generateFlexKenmerkBlock ({ onrgoed_key : dis_key,
@@ -105,4 +100,3 @@ oRs.Close();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

5
APPL/ALG/alg_show_gebouw.asp
View File

@@ -41,7 +41,6 @@ var bld_code = oRs("alg_gebouw_code").Value;
var bld_descr = oRs("alg_gebouw_omschrijving").Value;
var bld_maak = oRs("alg_gebouw_aanmaak").Value;
var bld_email = oRs("alg_gebouw_email").Value;
var bld_image = oRs("alg_gebouw_image").Value;
var bld_teken = oRs("alg_gebouw_getekend").Value;
var bld_opp = oRs("alg_gebouw_bruto_vloeropp").Value;
var bld_omtrek = oRs("alg_gebouw_omtrek").Value;
@@ -187,7 +186,7 @@ oRs.Close();
BLOCK_END();
// suppressempty explicits
if (!(prs_kstpl==null && bld_ordrnr == null && verantw==null && verantw2 == null && bld_email == null && bld_image == null))
if (!(prs_kstpl==null && bld_ordrnr == null && verantw==null && verantw2 == null && bld_email ==null))
{
BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
FCLTselector("prs_kstpl",
@@ -217,7 +216,6 @@ oRs.Close();
});
ROFIELDTR("fld", L("lcl_alg_gebouw_email"), bld_email, { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_alg_gebouw_image"), bld_image, { suppressEmpty: true });
BLOCK_END();
}
if (!(dienstniveau_key == null && mld_adres == null && beginuur == null && einduur == null && werkdagen == 0))
@@ -297,4 +295,3 @@ oRs.Close();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

50
APPL/ALG/alg_show_locatie.asp
View File

@@ -31,27 +31,25 @@ var sql = "SELECT *"
+ " FROM alg_locatie"
+ " WHERE alg_locatie_key = " + loc_key;
var oRs = Oracle.Execute(sql);
var loc_code = oRs("alg_locatie_code").Value;
var loc_naam = oRs("alg_locatie_omschrijving").Value;
var bez_adres = oRs("alg_locatie_adres").Value;
var bez_postc = oRs("alg_locatie_postcode").Value;
var bez_plaats = oRs("alg_locatie_plaats").Value
var bez_land = oRs("alg_locatie_land").Value;
var loc_vw = oRs("alg_locatie_verantw").Value;
var loc_vwtel = oRs("alg_locatie_verantw_tel").Value;
var loc_x = oRs("alg_locatie_x").Value;
var loc_y = oRs("alg_locatie_y").Value;
var loc_mail = oRs("alg_locatie_email").Value;
var loc_image = oRs("alg_locatie_image").Value;
var loc_score1 = oRs("alg_locatie_mjb_score1").Value;
var pst_adres = oRs("alg_locatie_post_adres").Value;
var pst_postc = oRs("alg_locatie_post_postcode").Value;
var pst_adres = oRs("alg_locatie_post_adres").Value;
var pst_plaats = oRs("alg_locatie_post_plaats").Value;
var pst_land = oRs("alg_locatie_post_land").Value;
var loc_deleted = oRs("alg_locatie_verwijder").Value != null;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value;
var dienstniveau_key = oRs("mld_dienstniveau_key").Value;
var loc_code = oRs("alg_locatie_code").value;
var bez_adres = oRs("alg_locatie_adres").value;
var bez_postc = oRs("alg_locatie_postcode").value;
var bez_plaats = oRs("alg_locatie_plaats").value
var bez_land = oRs("alg_locatie_land").value;
var loc_vw = oRs("alg_locatie_verantw").value;
var loc_vwtel = oRs("alg_locatie_verantw_tel").value;
var loc_x = oRs("alg_locatie_x").value;
var loc_y = oRs("alg_locatie_y").value;
var loc_mail = oRs("alg_locatie_email").value;
var loc_score1 = oRs("alg_locatie_mjb_score1").value;
var pst_adres = oRs("alg_locatie_post_adres").value;
var pst_postc = oRs("alg_locatie_post_postcode").value;
var pst_adres = oRs("alg_locatie_post_adres").value;
var pst_plaats = oRs("alg_locatie_post_plaats").value;
var pst_land = oRs("alg_locatie_post_land").value;
var loc_deleted = oRs("alg_locatie_verwijder").value != null;
var vervaldatum = oRs("alg_locatie_vervaldatum").Value;
var dienstniveau_key = oRs("mld_dienstniveau_key").value;
oRs.Close();
%>
<html>
@@ -133,11 +131,7 @@ oRs.Close();
eindlevel: 2, // Locatie
readonly: true });
params = { infoPointer: { Url: "appl/shared/status_info.asp?loc_key=" + loc_key,
Title: L("lcl_status_details") + " " + loc_naam
}
};
ROFIELDTR("fld", L("lcl_estate_locatie_man_code"), loc_code, params);
ROFIELDTR("fld", L("lcl_estate_locatie_man_code"), loc_code, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_bezoek_adres"), bez_adres, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {suppressEmpty: true});
@@ -149,7 +143,7 @@ oRs.Close();
+ " FROM mld_dienstniveau "
+ " WHERE mld_dienstniveau_key = " + dienstniveau_key;
oRs = Oracle.Execute(sql);
ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").Value);
ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
oRs.Close();
}
ROFIELDTR("fld", L("lcl_geoxcoord"), loc_x, {suppressEmpty: true});
@@ -169,7 +163,6 @@ oRs.Close();
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_noti_email"), loc_mail, { suppressEmpty: true, type: "email" });
ROFIELDTR("fld", L("lcl_alg_locatie_image"), loc_image, { suppressEmpty: true });
if (ins_score_enabled)
ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
@@ -186,4 +179,3 @@ oRs.Close();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

11
APPL/ALG/alg_show_regio.asp
View File

@@ -85,15 +85,14 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>"
onSubmit="return false">
<% BLOCK_START("algInfo", "&nbsp;");
params = { infoPointer: { Url: "appl/shared/status_info.asp?reg_key=" + regio_data.id,
Title: L("lcl_status_details") + " " + regio_data.name
}
};
ROFIELDTR("fld", L("lcl_region"), regio_data.name, params);
FCLTplaatsselector(-1,
{ regiokey: regio_data.id,
startlevel: 0, // Regio
eindlevel: 0, // Regio
readonly: true });
BLOCK_END();
%>
</form>
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_show_ruimte.asp
View File

@@ -159,4 +159,3 @@ if (!room_data.cadcontours.length)
</div>
</body>
</html>
<% ASPPAGE_END(); %>

93
APPL/ALG/alg_show_terreinsector.asp
View File

@@ -16,7 +16,6 @@
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/plaatsselector.inc" -->
<!-- #include file="../Shared/persoonselector.inc" -->
<!-- #include file="../API2/api2.inc" -->
<!-- #include file="alg_flexkenmerk.inc" -->
<!-- #include file="alg.inc" -->
@@ -43,7 +42,6 @@ var sql = "SELECT ts.alg_locatie_key"
+ " , ts.alg_terreinsector_aanmaak"
+ " , ts.alg_terreinsector_omschrijving"
+ " , ts.alg_terreinsector_ordernr"
+ " , ts.alg_terreinsector_image"
+ " , ts.alg_terreinsector_toon_telef"
+ " , ts.alg_terreinsector_toon_email"
+ " , ts.alg_terreinsector_toon_kentk"
@@ -55,34 +53,29 @@ var sql = "SELECT ts.alg_locatie_key"
+ " , (SELECT prs_afdeling_omschrijving"
+ " FROM prs_afdeling a"
+ " WHERE a.prs_afdeling_key = ts.prs_afdeling_key) afdeling_oms"
+ " , prs_perslid_key_verantw"
+ " , prs_perslid_key_verantw2"
+ " , ts.alg_terreinsector_vervaldatum"
+ " , ts.alg_terreinsector_verwijder"
+ " FROM alg_terreinsector ts"
+ " WHERE ts.alg_terreinsector_key = " + ter_key;
var oRs = Oracle.Execute(sql);
var loc_key = oRs("alg_locatie_key").Value;
var ter_oms = oRs("alg_terreinsector_omschrijving").Value;
var ter_code = oRs("alg_terreinsector_code").Value;
var ter_naam = oRs("alg_terreinsector_naam").Value;
var ter_srkey = oRs("alg_srtterreinsector_key").Value;
var ter_sroms = oRs("srtterreinsector_oms").Value;
var ter_opp = oRs("alg_terreinsector_oppervlak").Value;
var ter_omt = oRs("alg_terreinsector_omtrek").Value;
var ter_aanmk = oRs("alg_terreinsector_aanmaak").Value;
var ter_oms = oRs("alg_terreinsector_omschrijving").Value;
var ter_ordnr = oRs("alg_terreinsector_ordernr").Value;
var ter_image = oRs("alg_terreinsector_image").Value;
var loc_key = oRs("alg_locatie_key").value;
var ter_oms = oRs("alg_terreinsector_omschrijving").value;
var ter_code = oRs("alg_terreinsector_code").value;
var ter_naam = oRs("alg_terreinsector_naam").value;
var ter_srkey = oRs("alg_srtterreinsector_key").value;
var ter_sroms = oRs("srtterreinsector_oms").value;
var ter_opp = oRs("alg_terreinsector_oppervlak").value;
var ter_omt = oRs("alg_terreinsector_omtrek").value;
var ter_aanmk = oRs("alg_terreinsector_aanmaak").value;
var ter_oms = oRs("alg_terreinsector_omschrijving").value;
var ter_ordnr = oRs("alg_terreinsector_ordernr").value;
var toon_telefoon = oRs("alg_terreinsector_toon_telef").Value;
var toon_email = oRs("alg_terreinsector_toon_email").Value;
var toon_kenteken = oRs("alg_terreinsector_toon_kentk").Value;
var prs_kstn = oRs("prs_kostenplaats_key").Value;
var prs_kstpl = oRs("kostenplaats_oms").Value;
var prs_afd = oRs("afdeling_oms").Value;
var verantw_key = oRs("prs_perslid_key_verantw").Value;
var verantw2_key = oRs("prs_perslid_key_verantw2").Value;
var ter_deleted = oRs("alg_terreinsector_verwijder").Value != null;
var prs_kstn = oRs("prs_kostenplaats_key").value;
var prs_kstpl = oRs("kostenplaats_oms").value;
var prs_afd = oRs("afdeling_oms").value;
var ter_deleted = oRs("alg_terreinsector_verwijder").value != null;
var vervaldatum = oRs("alg_terreinsector_vervaldatum").Value;
oRs.Close();
%>
@@ -143,7 +136,7 @@ oRs.Close();
%>
<form name=u2 onSubmit="return false;">
<%
BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
BLOCK_START("algInfo", "");
FCLTplaatsselector(-1,
{ locatiekey: loc_key,
startlevel: 2, // Locatie
@@ -151,22 +144,25 @@ oRs.Close();
readonly: true
});
params = { infoPointer: { Url: "appl/shared/status_info.asp?ter_key=" + ter_key,
Title: L("lcl_status_details") + " " + ter_naam
}
};
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code, params);
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
BLOCK_END();
BLOCK_START("algLoc2", L("lcl_alg_gebouw_bezoek"));
ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true, datatype: "float"});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true, datatype: "float"});
var fldcls = "fld";
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
FCLTselector("toon_telefoon",
sql,
{ label: L("lcl_estate_gebouw_toon_telefoon"),
initKey: toon_telefoon,
readonly: true,
suppressEmpty: true,
extraclass: "notmulti"
});
sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
@@ -175,6 +171,7 @@ oRs.Close();
{ label: L("lcl_estate_gebouw_toon_email"),
initKey: toon_email,
readonly: true,
suppressEmpty: true,
extraclass: "notmulti"
});
sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
@@ -183,42 +180,11 @@ oRs.Close();
{ label: L("lcl_estate_gebouw_toon_kenteken"),
initKey: toon_kenteken,
readonly: true,
suppressEmpty: true,
extraclass: "notmulti"
});
BLOCK_END();
BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
FCLTpersoonselector("verantw",
"sgVerantw",
{ perslidKey: verantw_key,
label: L("lcl_alg_verantw"),
readonly: true,
suppressEmpty: true
});
FCLTpersoonselector("verantw2",
"sgVerantw2",
{ perslidKey: verantw2_key,
label: L("lcl_alg_verantw2"),
readonly: true,
suppressEmpty: true
});
ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_alg_terreinsector_image"), ter_image, { suppressEmpty: true });
BLOCK_END();
if (!(ter_opp == null && ter_omt == null && vervaldatum == null))
{
BLOCK_START("algLoc4", L("lcl_alg_gebouw_fysiek"));
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true, datatype: "float"});
ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true, datatype: "float"});
var fldcls = "fld";
if (vervaldatum <= new Date())
fldcls += " expired2";
ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
BLOCK_END();
}
generateFlexKenmerkBlock({onrgoed_key : ter_key,
onrgoed_niveau : onrgoedlvl,
@@ -232,4 +198,3 @@ oRs.Close();
</div> <!-- edit -->
</body>
</html>
<% ASPPAGE_END(); %>

7
APPL/ALG/alg_show_verdieping.asp
View File

@@ -94,11 +94,7 @@ oRs.Close();
moreinfo: true,
readonly: true });
params = { infoPointer: { Url: "appl/shared/status_info.asp?flr_key=" + flr_key,
Title: L("lcl_status_details") + " " + flr_code
}
};
ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code, params);
ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code);
ROFIELDTR("fld", L("lcl_estate_verdieping_man_volgnr"), flr_volgnr);
if (dienstniveau_key)
{
@@ -131,4 +127,3 @@ oRs.Close();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

8
APPL/ALG/alg_show_wp.asp
View File

@@ -109,12 +109,7 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
<% ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true, datatype: "float"});
if (wp_virt==1)
CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt, { suppressEmpty:true, html: " disabled" });
params = { infoPointer: { Url: "appl/shared/status_info.asp?wp_key=" + wp_key,
Title: L("lcl_status_details") + " " + wp_oms
}
};
ROFIELDTR("wp_type", L("lcl_wptype"), wp_typ_str, params);
ROFIELDTR("wp_type", L("lcl_wptype"), wp_typ_str);
%>
</table>
<% BLOCK_END();
@@ -123,4 +118,3 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_srtruimte.asp
View File

@@ -336,4 +336,3 @@ else if (srtruimte_key > 0 && mode == "delete")
style="display:none"></iframe>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_srtruimte_search.asp
View File

@@ -82,4 +82,3 @@ FCLTHeader.Generate();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_srtruimte_search_list.asp
View File

@@ -112,4 +112,3 @@ FCLTHeader.Generate({outputmode: outputmode});
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_terreinsector.asp
View File

@@ -84,4 +84,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

131
APPL/ALG/alg_terreinsector_list.inc
View File

@@ -17,32 +17,6 @@
<%
FCLTHeader.Requires({ plugins:["jQuery"] });
// Fast check to see if any terrain responsibles have been set
// If not, we can suppress the column
sql = "SELECT 1"
+ " FROM alg_terreinsector"
+ " WHERE prs_perslid_key_verantw IS NOT NULL"
+ " AND alg_terreinsector_verwijder IS NULL"
+ " AND ROWNUM = 1";
oRs = Oracle.Execute(sql);
var anyterrainresp = !oRs.eof;
oRs.close();
// We gaan er vanuit dat verantw2 niet is gezet als nergens verantw1 wordt getoond.
// Als dat wel zo is, jammer maar dan tonen we die niet in de lijst.
var anyterrainresp2 = false;
if (anyterrainresp)
{
sql = "SELECT 1"
+ " FROM alg_terreinsector"
+ " WHERE prs_perslid_key_verantw2 IS NOT NULL"
+ " AND alg_terreinsector_verwijder IS NULL"
+ " AND ROWNUM = 1";
oRs = Oracle.Execute(sql);
anyterrainresp2 = !oRs.eof;
oRs.close();
}
function fnrowData(oRs)
{
var parent_key = oRs("alg_locatie_key").Value;
@@ -104,7 +78,6 @@ function terrein_list(pautfunction, params)
var dis_key = params.dis_key;
var loc_key = params.loc_key;
var ter_code = params.ter_code;
var verantw_key = params.verantw_key;
var ter_func_key = params.ter_func_key;
var expalgincl = params.expalgincl;
@@ -132,72 +105,64 @@ function terrein_list(pautfunction, params)
</head>
<body id="listbody">
<%
var sqln = "SELECT g.alg_terreinsector_key"
+ " , g.alg_locatie_key"
+ " , l.alg_locatie_omschrijving"
+ " , g.alg_terreinsector_naam"
+ " , g.alg_terreinsector_omschrijving"
+ " , g.alg_terreinsector_code"
+ " , g.alg_terreinsector_oppervlak"
+ " , g.alg_terreinsector_omtrek"
+ " , g.alg_terreinsector_vervaldatum"
+ " , (SELECT prs_perslid_naam_full FROM prs_v_perslid_fullnames_all WHERE prs_perslid_key = prs_perslid_key_verantw) perslid_resp"
+ " , (SELECT prs_perslid_naam_full FROM prs_v_perslid_fullnames_all WHERE prs_perslid_key = prs_perslid_key_verantw2) perslid_resp2"
+ " , g.alg_srtterreinsector_key"
+ " , " + lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
+ " FROM alg_v_aanwezigterreinsector g"
+ " , alg_locatie l"
+ " , alg_srtterreinsector s"
+ " WHERE l.alg_locatie_key(+) = g.alg_locatie_key"
+ " AND s.alg_srtterreinsector_key(+) = g.alg_srtterreinsector_key"
+ " AND g.alg_terreinsector_verwijder IS NULL"
var sqln = "SELECT g.alg_terreinsector_key, "
+ " g.alg_locatie_key, "
+ " l.alg_locatie_omschrijving, "
+ " g.alg_terreinsector_naam, "
+ " g.alg_terreinsector_omschrijving, "
+ " g.alg_terreinsector_code, "
+ " g.alg_terreinsector_oppervlak, "
+ " g.alg_terreinsector_omtrek, "
+ " g.alg_terreinsector_vervaldatum, "
+ " g.alg_srtterreinsector_key, "
+ lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
+ " FROM alg_v_aanwezigterreinsector g, "
+ " alg_locatie l, "
+ " alg_srtterreinsector s "
+ " WHERE l.alg_locatie_key(+) = g.alg_locatie_key "
+ " AND s.alg_srtterreinsector_key(+) = g.alg_srtterreinsector_key "
+ " AND g.alg_terreinsector_verwijder IS NULL "
if ( authparams.ALGreadlevel > -1 )
{ // Er is een scope-beperking van kracht
sqln += " AND g.alg_locatie_key IN"
+ " (SELECT alg_locatie_key"
+ " FROM fac_v_my_locations"
+ " WHERE prs_perslid_key="+user_key
+ " AND niveau=" + authparams.ALGreadlevel
+ " )";
}
if ( authparams.ALGreadlevel > -1 )
{ // Er is een scope-beperking van kracht
sqln += " AND g.alg_locatie_key IN "
+ "(SELECT alg_locatie_key FROM fac_v_my_locations "
+ "WHERE prs_perslid_key="+user_key
+ " AND niveau=" + authparams.ALGreadlevel + ")";
}
sqln += getKenmerkSql("ALG", "g.alg_terreinsector_key");
sqln += getKenmerkSql("ALG", "g.alg_terreinsector_key");
if (loc_key)
{
sqln += " AND g.alg_locatie_key = " + loc_key;
}
else if (dis_key)
if (loc_key)
{
sqln += " AND g.alg_locatie_key = " + loc_key;
}
else if (dis_key)
sqln += " AND l.alg_district_key = " + dis_key;
else if (reg_key)
else if (reg_key)
sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
if (ter_func_key)
{
sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
}
if (ter_func_key)
{
sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
}
if (ter_code)
{
sqln += " AND UPPER(g.alg_terreinsector_code) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
}
if (ter_code)
{
sqln += " AND UPPER(g.alg_terreinsector_code) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
}
if (verantw_key)
sqln += " AND (g.prs_perslid_key_verantw = " + verantw_key + " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")";
if (!expalgincl)
sqln += " AND (g.alg_terreinsector_vervaldatum IS NULL OR g.alg_terreinsector_vervaldatum > TRUNC(SYSDATE)) ";
if (!expalgincl)
sqln += " AND (g.alg_terreinsector_vervaldatum IS NULL OR g.alg_terreinsector_vervaldatum > TRUNC(SYSDATE)) ";
sqln += " ORDER BY g.alg_terreinsector_upper ASC "
sqln += " ORDER BY g.alg_terreinsector_upper ASC "
var addurl = "appl/alg/alg_terreinsector.asp";
if (canAdd)
{
if (canAdd)
{
addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
}
}
var rst = new ResultsetTable({sql:sqln,
keyColumn: "alg_terreinsector_key",
@@ -218,12 +183,6 @@ function terrein_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_code"), content: "alg_terreinsector_code"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_name"), content: "alg_terreinsector_naam"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_sort"), content: "alg_srtterreinsec_omschrijving"}));
if (anyterrainresp)
{
rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "perslid_resp"}));
if (anyterrainresp2)
rst.addColumn(new Column({caption: L("lcl_alg_verantw2"), content: "perslid_resp2", combine: true}));
}
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_oppervlak"), content: "alg_terreinsector_oppervlak"}));
rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_omtrek"), content: "alg_terreinsector_omtrek"}));
rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_terreinsector_vervaldatum", datatype: "date"}));

16
APPL/ALG/alg_terreinsector_search.asp
View File

@@ -8,7 +8,6 @@
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/plaatsselector.inc" -->
<!-- #include file="../Shared/persoonselector.inc" -->
<!-- #include file="alg.inc" -->
<%
@@ -17,7 +16,6 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
var locatie_key = getQParamInt("locatie_key", -1); // locatie
var vak_code = getQParam("vak_code", "");
var ter_func_key = getQParamInt("ter_func_key", -1);
var verantw_key = getQParamInt("verantw", -1); // Terrein verantwoordelijke
var autosearch = getQParamInt("autosearch", 0) == 1;
var authparams = alg.checkAutorisation();
@@ -95,19 +93,6 @@ var authparams = alg.checkAutorisation();
<td class="label"><label for="descr"><%=L("lcl_estate_terreinsector_man_code")%>:</label></td>
<td><input type="text" class="fldsrch" name="descr" value="<%=safe.htmlattr(vak_code)%>"></td>
</tr>
<!-- Terrein beheerder -->
<% // Dit veld is alleen zichtbaar indien er minimaal <20><>n terreinbeheerder geconfigureerd is (suppressNoValues).
FCLTpersoonselector("verantw",
"sgVerantw",
{ perslidKey: verantw_key,
label: L("lcl_alg_ter_verantw"),
filtercode: "TV", // Terrein Verantwoordelijke
trclass: "primsearch",
suppressNoValues: true,
whenEmpty: L("lcl_search_generic") // want filter
});
%>
</table>
</td><!-- end column 1 -->
</tr>
@@ -130,4 +115,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

4
APPL/ALG/alg_terreinsector_search_list.asp
View File

@@ -26,7 +26,6 @@ var reg_key = getQParamInt("regiokey", -1); // Regio
var dis_key = getQParamInt("districtkey", -1); // District
var loc_key = getQParamInt("locatiekey", -1); // Locatie
var ter_code = getQParam("descr", null);
var verantw_key = getQParamInt("verantw", -1); // Terrein verantwoordelijke
var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen terreinen
var ter_func_key = getQParamInt("srt", -1);
@@ -37,10 +36,9 @@ terrein_list ( "*",
dis_key: (dis_key != -1? dis_key : null),
loc_key: (loc_key != -1? loc_key : null),
ter_code: (ter_code != ""? ter_code : null),
verantw_key: (verantw_key != -1? verantw_key: null),
ter_func_key: (ter_func_key != -1? ter_func_key : null),
noref: (noref != -1? noref : null),
expalgincl: expalgincl
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_verdieping.asp
View File

@@ -99,4 +99,3 @@ else
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/alg_verdieping_search.asp
View File

@@ -87,4 +87,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_verdieping_search_list.asp
View File

@@ -42,4 +42,4 @@ verdiepingen_list ( "*",
chkgeb: chkgeb
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_werkplek_search.asp
View File

@@ -87,4 +87,3 @@ var authparams = alg.checkAutorisation();
</div>
</body>
</html>
<% ASPPAGE_END(); %>

2
APPL/ALG/alg_werkplek_search_list.asp
View File

@@ -40,4 +40,4 @@ werkplek_list ( "*",
wp_descr: (wp_descr != ""? wp_descr : null)
}
);
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/alg_wp.asp
View File

@@ -85,4 +85,3 @@ if (wp_key > 0)
%>
</body>
</html>
<% ASPPAGE_END(); %>

1
APPL/ALG/get_alg_info_ajax.asp
View File

@@ -42,4 +42,3 @@ switch (req_info)
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>

2
APPL/ALG/get_volgnr_ajax.asp
View File

@@ -26,4 +26,4 @@ var JSON_Result = true;
oRs.Close()
Response.Write(JSON.stringify(result));
%><% ASPPAGE_END(); %>
%>

1
APPL/ALG/load_kenmerk.asp
View File

@@ -35,4 +35,3 @@ generateFlexKenmerkBlock ({ urole: getQParamSafe("urole"),
advanced: getQParam("advanced", 0) == 1 // Geavanceerd
});
%>
<% ASPPAGE_END(); %>

2
APPL/API/api.asp
View File

@@ -24,4 +24,4 @@ var EXPIRED_PASSWORD_OK = true; // performance
__Log("Transferring to: " + API.apidata.file);
Server.Transfer(API.apidata.file);
%><% ASPPAGE_END(); %>
%>

2
APPL/API/api_XMLNode.asp
View File

@@ -141,4 +141,4 @@
STR2Stream(xml_nodes_dom.xml, stylesheet, Response, mode, srtnotificatie);
Session.Abandon(); // Voor de zekerheid
%><% ASPPAGE_END(); %>
%>

2
APPL/API/api_algsoap.asp
View File

@@ -24,4 +24,4 @@
Response.Charset = 'utf-8';
var API = new API_func();
%><% ASPPAGE_END(); %>
%>

1
APPL/API/api_besordsoap.asp
View File

@@ -402,4 +402,3 @@
Response.Write(xmlResp.xml)
}
%>
<% ASPPAGE_END(); %>

1
APPL/API/api_bessoap.asp
View File

@@ -270,4 +270,3 @@
Response.Write(xmlResp.xml)
}
%>
<% ASPPAGE_END(); %>

2
APPL/API/api_bezsoap.asp
View File

@@ -289,4 +289,4 @@ xmlResp.appendChild(FCLTElement);
Response.ContentType = "text/xml";
Response.Write(xmlResp.xml)
%><% ASPPAGE_END(); %>
%>

1
APPL/API/api_cntsoap.asp
View File

@@ -178,4 +178,3 @@ catch (e)
Response.ContentType = "text/xml";
Response.Write(xmlResp.xml)
%>
<% ASPPAGE_END(); %>

2
APPL/API/api_fetchXML.asp
View File

@@ -33,4 +33,4 @@
stylesheet: stylesheet});
Session.Abandon(); // Voor de zekerheid
%><% ASPPAGE_END(); %>
%>

2
APPL/API/api_finsoap.asp
View File

@@ -24,4 +24,4 @@
Response.Charset = 'utf-8';
var API = new API_func();
%><% ASPPAGE_END(); %>
%>

1
APPL/API/api_flex.asp
View File

@@ -41,4 +41,3 @@ __Log(props);
Response.Write(JSON.stringify(props));
Response.End;
%>
<% ASPPAGE_END(); %>

22
APPL/API/api_gen_import.asp
View File

@@ -119,28 +119,6 @@
}
oRs.Close();
// De import database procedure mag in fac_result onder sessionid IMPORT_<importkey)
// een aantal naam/waarde records aanmaken die als <naam>waarde</naam> in de xml terecht komen
var sql = "SELECT fac_result_naam,"
+ " fac_result_waarde"
+ " FROM fac_result"
+ " WHERE fac_result_sessionid = 'IMPORT_{0}'".format(import_key);
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
var elementResults = xmlResp.createElement("result");
while (!oRs.Eof)
{
var elementResult = xmlResp.createElement(oRs("fac_result_naam").Value);
var elementResultText = xmlResp.createTextNode(oRs("fac_result_waarde").Value);
elementResult.appendChild(elementResultText);
elementResults.appendChild(elementResult);
oRs.moveNext();
}
oRs.Close();
elementDetails.appendChild(elementResults);
}
FCLTElement.appendChild(elementDetails);
}

4
APPL/API/api_hmail.asp
View File

@@ -21,7 +21,6 @@
<!-- #include file="../api/api.inc" -->
<%
var authparams = user.checkAutorisation("WEB_FACHML");
var API = new API_func();
function abortRejectMail(tekst, maillog)
@@ -66,7 +65,7 @@ function get_XMLval(psessionid, pxml, ptag, pindex)
+ " VALUES"
+ " (" + safe.quoted_sql(psessionid)
+ " ," + safe.quoted_sql(ptag + (pindex ? "_"+pindex : ""), 30) // Een mail kan meerdere bijlagen bevatten. Voor elke bijlage is er dan een filename en size.
+ " ," + safe.quoted_sql(tag_value, 4000)
+ " ," + safe.quoted_sql(tag_value, 1000)
+ " )";
Oracle.Execute(sql_ins);
return tag_value;
@@ -355,4 +354,3 @@ __Log(result);
Response.Write(JSON.stringify(result));
Response.End;
%>
<% ASPPAGE_END(); %>

1
APPL/API/api_inssoap.asp
View File

@@ -259,4 +259,3 @@
Response.Write(antwoord);
}
%>
<% ASPPAGE_END(); %>

112
APPL/API/api_marknotisent.asp
View File

@@ -1,112 +0,0 @@
<%@ language = "JavaScript" %>
<% /*
$Revision$
$Id$
File: api_marknotisent.asp
Description: API om custom notificatie queue te manipuleren
Parameters: noti_key een fac_notificatie_key
resultcode als die >= 0 is wordt het bitje 64 van de notificatie gereset
track_text wordt getrackt bij de xmlnode van de notificatie
Context: Wordt door de MARX adapter gebruikt
Notes: Voor notificaties waar bitje 64 van fac_notificatie_status is gezet
Er is een database procedure fac.marknotiassent die min of meer hetzelfde doet
maar (nog) ongebruikt is.
*/
JSON_Result = true;
THIS_FILE = "appl/api/api_marknotisent.asp";
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../api/api.inc" -->
<%
// TODO: Welke autorisatie is logisch?
// APIKEY is van een leverancier waarvan de opdracht bijgewerkt gaat worden in AX
/// Die leverancier moet wijzigrechten op de opdracht (/factuur/melding/contract/xxx) hebben?
// var authparams = user.checkAutorisation("WEB_FACHML");
var API = new API_func();
var result = { success: true };
var noti_key = getQParamInt("noti_key");
var resultcode = getQParamInt("resultcode");
var track_text = getQParam("track_text", "");
var sql = "SELECT fac_notificatie_refkey"
+ " , fac_notificatie_status"
+ " , fac_notificatie_datum"
+ " , fac_notificatie_notbefore"
+ " , fac_notificatie_failcount"
+ " , fac_srtnotificatie_xmlnode"
+ " FROM fac_notificatie fs"
+ " , fac_srtnotificatie fsn"
+ " WHERE fs.fac_srtnotificatie_key = fsn.fac_srtnotificatie_key"
+ " AND fs.fac_notificatie_key = " + noti_key;
var oRs = Oracle.Execute(sql);
if (oRs.EOF)
API.error("Notification key {0} not found".format(noti_key));
var ref_key = oRs("fac_notificatie_refkey").Value;
var noti_status = oRs("fac_notificatie_status").Value;
var xmlnode = oRs("fac_srtnotificatie_xmlnode").Value;
var noti_datum = new Date(oRs("fac_notificatie_datum").Value);
var notbefore = new Date(oRs("fac_notificatie_notbefore").Value);
var failcount = oRs("fac_notificatie_failcount").Value;
oRs.Close();
if ((noti_status & 64) == 0)
API.error("Notification key {0} status {1} does not have bit 64 set".format(noti_key, noti_status));
if (track_text)
{
var trackcode = { "opdracht": "ORDTRK",
"melding": "MLDTRK",
"bestelopdr": "BESTRK",
"contract": "CNTTRK",
"factuur": "FINTRK"
}[xmlnode];
if (!trackcode)
API.error("Tracking for xmlnode {0} unknown".format(xmlnode));
shared.trackaction (trackcode, ref_key, track_text);
}
if (resultcode >= 0)
{
var sql = "UPDATE fac_notificatie"
+ " SET fac_notificatie_status = BITAND (fac_notificatie_status, 255 - 64)"
+ " WHERE fac_notificatie_key = " + noti_key;
Oracle.Execute(sql);
}
else
{
failcount ++;
// Interval tussen pogingen steeds 10 minuten langer, max 120 minuten
var backofminutes = Math.min(S("puo_faildelaymax"), failcount * S("puo_faildelayincrement"));
var nextdate = new Date();
nextdate.setMinutes(nextdate.getMinutes() + backofminutes);
var sql = "UPDATE fac_notificatie"
+ " SET fac_notificatie_failcount = " + failcount
+ " , fac_notificatie_notbefore = " + nextdate.toSQL(true)
+ " WHERE fac_notificatie_key = " + noti_key;
Oracle.Execute(sql);
// Let op dat er latere notificaties over dezelfde xmlnode kunnen zijn of kunnen komen
// Als je wilt dat ze nooit out-of-order worden verwerkt moet de custom-queue
// processor zelf zo slim zijn om ook te stoppen met deze opdracht zodra hij
// *een* notbefore in de toekomst tegenkomt.
// Als de aanroeper nog een cursor op fac_v_notifyqueue open heeft staan ziet
// die cursor bovenstaande wijziging nog niet!
result.failcount = failcount;
result.nextdate = nextdate;
__DoLog("Notification key {0} xmlnode {1} refkey {2} failed {3} time(s) since {4} , delaying until {5}".format(noti_key, xmlnode, ref_key,
failcount, toDateTimeString(noti_datum), toDateTimeString(nextdate)));
}
__Log(result);
Response.Write(JSON.stringify(result));
Response.End;
%>
<% ASPPAGE_END(); %>

1
APPL/API/api_mldsoap.asp
View File

@@ -727,4 +727,3 @@ else
Response.Write(xmlResp.xml)
}
%>
<% ASPPAGE_END(); %>

18
APPL/API/api_opdrsoap.asp
View File

@@ -714,9 +714,9 @@ for (var i = 0; i < opdrachten.length; i++)
}
break;
case 'ORDAFM' :
if (oldstatus == 6 || oldstatus == 7)
if (oldstatus == 6)
{
// al afgemeld of verwerkt, dan gewoon negeren
// dan gewoon negeren
}
else // aanpassen
{
@@ -911,11 +911,7 @@ for (var i = 0; i < opdrachten.length; i++)
}
else if (resultcode > 0)
{
var logtxt = "api_opdrsoap fail.\nResultcode: {0}\nReturntekst: {1}\nOpdracht: {2}\nOldstatus: {3}".format(resultcode, resulttekst, opdrid, oldstatus);
if (resulttekst.match(/^Not authorized/)) // Dit komt heel vaak voor door updates op gesloten opdrachten.
__Log(logtxt); // Het vervuilt de logfile veel te veel
else
__DoLog(logtxt, "#00FF00");
__DoLog("api_opdrsoap fail.\nResultcode: {0}\nReturntekst: {1}\nOpdracht: {2}\nOldstatus: {3}".format(resultcode, resulttekst, opdrid, oldstatus), "#00FF00");
}
var binfo = {
@@ -966,14 +962,14 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
//Response.Write(kenmerk_waarde);
// Kenmerk_key opzoeken
ksql = "SELECT k.mld_kenmerk_key"
+ " , COALESCE (" + lcl.xsql("k.mld_kenmerk_omschrijving", "k.mld_kenmerk_key")
+ " , " + lcl.xsql("sk.mld_srtkenmerk_omschrijving", "sk.mld_srtkenmerk_key") + ") kenmerk_omschrijving"
+ " , COALESCE (lcl.x('mld_kenmerk_omschrijving', k.mld_kenmerk_key, k.mld_kenmerk_omschrijving)"
+ " , lcl.x('mld_srtkenmerk_omschrijving', sk.mld_srtkenmerk_key, sk.mld_srtkenmerk_omschrijving)) kenmerk_omschrijving"
+ " , sk.mld_srtkenmerk_kenmerktype"
+ " , sk.mld_srtkenmerk_lengte"
+ " , sk.fac_kenmerkdomein_key"
+ " FROM mld_kenmerk k"
+ " , mld_srtkenmerk sk"
+ " WHERE (k.mld_typeopdr_key = " + topdr_key + " OR k.mld_kenmerk_niveau = 'P')"
+ " WHERE k.mld_typeopdr_key = " + topdr_key
+ " AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key"
+ " AND k.mld_kenmerk_verwijder IS NULL"
+ srtkenmerk_key_code_omschr;
@@ -992,7 +988,6 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
+ " FROM mld_kenmerkopdr ko "
+ " WHERE ko.mld_opdr_key = " + opdr_key
+ " AND ko.mld_kenmerk_key = " + kenmerk_key;
oRs.Close();
var oRs = Oracle.Execute(ksql);
switch (kenmerk_type)
@@ -1115,7 +1110,6 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
}
}
}
oRs.Close();
}
// Via de GUI komt dit in hetzelfde tracking record als de vaste-velden-wijziging.
// Hier komt het in een eigen tracking record. Daar kan ik mee leven.

2
APPL/API/api_perslid.asp
View File

@@ -168,4 +168,4 @@ catch (e)
{
API.error(typeof e == "string"? e : "API_error: " + e.description);
}
%><% ASPPAGE_END(); %>
%>

2
APPL/API/api_prssoap.asp
View File

@@ -24,4 +24,4 @@
Response.Charset = 'utf-8';
var API = new API_func();
%><% ASPPAGE_END(); %>
%>

1
APPL/API/api_report.asp
View File

@@ -43,4 +43,3 @@
Response.Redirect(site+url + "?1=1" + transitParam);
%>
<% ASPPAGE_END(); %>

1
APPL/API/api_ressoap.asp
View File

@@ -437,4 +437,3 @@
Response.Write(xmlResp.xml)
}
%>
<% ASPPAGE_END(); %>

2
APPL/API/api_ressoap_info.asp
View File

@@ -171,4 +171,4 @@ function set_deep_info(params, plan_info)
plan_info[r].image_url = HTTP.urlzelfnoroot() + S("res_image_path") + plan_info[r].foto;
}
}
%><% ASPPAGE_END(); %>
%>

1
APPL/API/get_phonebook_info.asp
View File

@@ -62,4 +62,3 @@ var JSON_Result = true;
else
Response.Write(JSON.stringify(result));
%>
<% ASPPAGE_END(); %>

1
APPL/API/phonebook_js.asp
View File

@@ -198,4 +198,3 @@ function L(p_lcl)
});
};
})();
<% ASPPAGE_END(); %>

5
APPL/API/shorturl.asp
View File

@@ -39,7 +39,7 @@ __Log("== Entering shorturl.asp ==");
'faq': { gui: 'appl/fac/fac_faq.asp?faq_key=' },
'locatie': { gui: 'appl/alg/alg_locatie.asp?key=' },
'melding': { gui: 'appl/mld/mld_melding.asp?mld_key=', mob: 'appl/pda/melding.asp?mld_key=' },
'message': { gui: 'appl/msg/msg_message.asp?message_key=', mob: 'appl/pda/message.asp?msg_key=' },
'message': { gui: 'appl/msg/msg_message.asp?message_key=' },
'opdracht': { gui: 'appl/mld/mld_opdr.asp?opdr_key=',
mob: 'appl/pda/order.asp?opdr_key=',
lckgui: 'appl/mld/mld_opdr_actions.asp?opdr_key=',
@@ -111,7 +111,7 @@ __Log("== Entering shorturl.asp ==");
{
isKnownBookmark = true;
checkUserAgent(); // devicebits waren anders mogelijk nog niet gezet
if (Session("interface") == "desktop" || Session("interface") == "touch")
if (device.test(device.isDesktop) || device.test(device.isTouch))
{
url = locked_bdradr_key > 0? known_bookmarks[u].lckgui : known_bookmarks[u].gui;
}
@@ -253,4 +253,3 @@ __Log("== Entering shorturl.asp ==");
Response.Redirect(theURL);
%>
<% ASPPAGE_END(); %>

2
APPL/API2/TESTER/api2_tester.asp
View File

@@ -142,4 +142,4 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
</tr>
</table>
</body>
</html><% ASPPAGE_END(); %>
</html>

6
APPL/API2/api2.inc
View File

@@ -283,13 +283,11 @@ api2 = {
}
else if (String(filterval).substr(0,1) == '~'
&& field.foreign
&& typeof field.foreign == 'string'
) // Als je een foreign filter met ~ begint dan filtert hij op de tekst
{
operand = " IN ";
if (typeof field.foreign == 'string')
var foreign = foreignKeyTable(field.foreign);
else
var foreign = field.foreign;
var foreign = foreignKeyTable(field.foreign);
if (!foreign)
MISSING_FOREIGN;
var fieldname = (foreign.name||foreign.desc);

2
APPL/API2/api2_dispatch.inc
View File

@@ -97,7 +97,7 @@ var api2_mapper = {
"workflowsteps" : { "filename": "appl/mgt/mld_workflowstep.asp", "nodoc": true },
"workflowexpressions" : { "filename": "appl/mgt/mld_workflow_expression.asp" },
"issuedisciplines" : { "filename": "appl/api2/api_issuedisciplines.asp", "module": "MLD" },
"orders2" : { "filename": "appl/api2/api_orders.asp", "module": "MLD", "nodoc": true },
"orders2" : { "filename": "appl/api2/api_orders.asp", "module": "MLD" },
"orders" : { "filename": "appl/bgt/mld_opdr.asp", "module": "MLD" },
"issues" : { "filename": "appl/api2/api_issues.asp", "module": "MLD" },
"issuetypes" : { "filename": "appl/mgt/mld_stdmelding.asp", "module": "MLD" },

2
APPL/API2/api_about.asp
View File

@@ -21,4 +21,4 @@
<!-- #include file="./model_about.inc" -->
<%
api2_rest.process(model_about);
%><% ASPPAGE_END(); %>
%>

2
APPL/API2/api_apis.asp
View File

@@ -21,4 +21,4 @@
<!-- #include file="./model_apis.inc" -->
<%
api2_rest.process(model_apis);
%><% ASPPAGE_END(); %>
%>

2
APPL/API2/api_appointments.asp
View File

@@ -21,4 +21,4 @@
<!-- #include file="./model_appointments.inc" -->
<%
api2_rest.process(model_appointments);
%><% ASPPAGE_END(); %>
%>

Some files were not shown because too many files have changed in this diff Show More