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

KFNS#38873 technisch adres kan nu ook aan (evt. alleen) district worden gekoppelt

Browse Source 
svn path=/Website/trunk/; revision=32737
This commit is contained in:
Koen Reefman
2017-02-08 09:31:10 +00:00
parent 01da0288a1
commit 6a1db2fa9a
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/PRS/prs_bedrijfadres_list.asp
View File

@@ -65,15 +65,17 @@ var authparams = user.checkAutorisation(autfunction);
+ " prs_bedrijfadres_type,"
+ " ba.mld_typeopdr_key,"
+ lcl.xsqla("t.mld_typeopdr_omschrijving", "t.mld_typeopdr_key") +","
+ " d.alg_district_omschrijving,"
+ " l.alg_locatie_omschrijving,"
+ " prs_bedrijfadres_url,"
+ " prs_bedrijfadres_ordermode,"
+ " prs_bedrijfadres_certificate,"
+ " prs_bedrijfadres_xsl,"
+ " prs_bedrijfadres_ext"
+ " FROM prs_bedrijfadres ba, mld_typeopdr t, alg_locatie l"
+ " FROM prs_bedrijfadres ba, mld_typeopdr t, alg_locatie l, alg_district d"
+ " WHERE ba.mld_typeopdr_key = t.mld_typeopdr_key(+)"
+ " AND ba.alg_locatie_key = l.alg_locatie_key(+)"
+ " AND ba.alg_district_key = d.alg_district_key(+)"
+ (bedrijf_key != -1 ? " AND prs_bedrijf_key = " + bedrijf_key : "")
+ " ORDER BY prs_bedrijfadres_type, mld_typeopdr_key "; // uitwerken
@@ -99,6 +101,7 @@ var authparams = user.checkAutorisation(autfunction);
if (bedrijf_key == -1) // voor intern gebruik, niet via de gui
rst.addColumn(new Column({caption: L(""), content: "prs_bedrijf_key"}));
rst.addColumn(new Column({caption: L("lcl_prs_bedrijfadres_type"), content: fnAdrestype}));
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_location"), content: "alg_locatie_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_prs_bedrijfadres_url"), content: "prs_bedrijfadres_url"}));
rst.addColumn(new Column({caption: L("lcl_prs_companies_xsl"), content: "prs_bedrijfadres_xsl"}));

7
APPL/PRS/prs_edit_bedrijfadres.asp
View File

@@ -39,6 +39,7 @@ else
{
sql = "SELECT a.prs_bedrijfadres_key"
+ " , a.prs_bedrijf_key"
+ " , a.alg_district_key"
+ " , a.alg_locatie_key"
+ " , b.prs_bedrijf_naam"
+ " , a.prs_bedrijfadres_type"
@@ -65,6 +66,7 @@ else
shared.record_not_found();
var prs_bdrkey = oRs("prs_bedrijf_key").value;
var prs_distr_key = oRs("alg_district_key").value;
var prs_loc_key = oRs("alg_locatie_key").value;
var prs_bdrnaam = oRs("prs_bedrijf_naam").value;
var prs_type = oRs("prs_bedrijfadres_type").value;
@@ -202,8 +204,9 @@ else
// ALG_LOCATIE
FCLTplaatsselector(-1,
{ locatiekey: prs_loc_key,
startlevel: 2, //Locatie
{ districtkey: prs_distr_key,
locatiekey: prs_loc_key,
startlevel: 1, // District
eindlevel: 2 // Locatie
});

4
APPL/PRS/prs_edit_bedrijfadres_save.asp
View File

@@ -51,12 +51,12 @@ else
abort_with_warning(xsl + " not found");
var protocol = getFParam("protocol");
var prs_loc_key = getFParam("locatiekey");
var url = getFParam("prs_url");
var fields = [ { dbs: "prs_bedrijfadres_type", typ: "varchar", frm: "prs_type" }
, { dbs: "mld_typeopdr_key", typ: "key", val: typeopdr }
, { dbs: "alg_locatie_key", typ: "key", val: prs_loc_key }
, { dbs: "alg_district_key", typ: "key", frm: "districtkey" }
, { dbs: "alg_locatie_key", typ: "key", frm: "locatiekey" }
, { dbs: "prs_bedrijfadres_url", typ: "varchar", val: protocol + url}
, { dbs: "prs_bedrijfadres_username", typ: "varchar", frm: "prs_username" }
, { dbs: "prs_bedrijfadres_password", typ: "varchar", frm: "prs_password" }

5
APPL/PRS/prs_show_bedrijfadres.asp
View File

@@ -40,6 +40,7 @@ FCLTHeader.Requires({plugins:["jQuery"]})
+ " , a.prs_bedrijfadres_type"
+ " , a.mld_typeopdr_key"
+ " , " + lcl.xsqla("t.mld_typeopdr_omschrijving", "t.mld_typeopdr_key")
+ " , d.alg_district_omschrijving"
+ " , l.alg_locatie_omschrijving"
+ " , a.prs_bedrijfadres_url"
+ " , a.prs_bedrijfadres_username"
@@ -57,9 +58,11 @@ FCLTHeader.Requires({plugins:["jQuery"]})
+ " , prs_bedrijf b"
+ " , mld_typeopdr t"
+ " , alg_locatie l"
+ " , alg_district d"
+ " WHERE b.prs_bedrijf_key = a.prs_bedrijf_key"
+ " AND a.mld_typeopdr_key = t.mld_typeopdr_key(+)"
+ " AND a.alg_locatie_key = l.alg_locatie_key(+)"
+ " AND a.alg_district_key = d.alg_district_key(+)"
+ " AND prs_bedrijfadres_key = " + badr_key;
oRs = Oracle.Execute(sql);
if (oRs.Eof)
@@ -70,6 +73,7 @@ FCLTHeader.Requires({plugins:["jQuery"]})
var prs_type = Adrestype(oRs);
var prs_typeopdr = oRs("mld_typeopdr_key").value;
var prs_typeopdr_oms = oRs("mld_typeopdr_omschrijving").value;
var prs_district = oRs("alg_district_omschrijving").value;
var prs_locatie = oRs("alg_locatie_omschrijving").value;
var prs_url = oRs("prs_bedrijfadres_url").value;
var username = oRs('prs_bedrijfadres_username').value;
@@ -132,6 +136,7 @@ FCLTHeader.Requires({plugins:["jQuery"]})
ROFIELDTR("fld", L("lcl_prs_companies_name"), prs_bdrnaam);
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_type"), prs_type, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_mld_typeopdr"), prs_typeopdr_oms, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_district"), prs_district, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_location"), prs_locatie, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_url"), prs_url, {suppressEmpty:true});
ROFIELDTR("fld", L("lcl_prs_bedrijfadres_username"), username, {suppressEmpty:true});

12
UTILS/PutOrders/puo_allorders.js
View File

@@ -118,7 +118,11 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
+ " ba.prs_bedrijfadres_soapaction"
+ " FROM prs_bedrijfadres ba "
+ " WHERE ba.prs_bedrijf_key = " + Bedrijf_key
+ " AND ((ba.alg_locatie_key = " + prs_loc_key + ") OR (ba.alg_locatie_key IS NULL))";
+ " AND ((ba.alg_locatie_key = " + prs_loc_key + ") OR (ba.alg_locatie_key IS NULL))"
+ " AND (ba.alg_district_key = (SELECT d.alg_district_key"
+ " FROM alg_locatie d"
+ " WHERE d.alg_locatie_key = " + prs_loc_key + ")"
+ " OR (ba.alg_district_key IS NULL))";
switch (XMLnode)
{
@@ -134,7 +138,7 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
if (!oRsOT.Eof)
{
sqlB += " AND (ba.mld_typeopdr_key = " + oRsOT("mld_typeopdr_key").value + " OR ba.mld_typeopdr_key IS NULL)"
+ " ORDER BY mld_typeopdr_key NULLS LAST, ba.alg_locatie_key NULLS LAST"; // bedoeling: de gevulde specifieke boven de lege fallback
+ " ORDER BY mld_typeopdr_key NULLS LAST, ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST"; // bedoeling: de gevulde specifieke boven de lege fallback
}
else
{
@@ -146,13 +150,13 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
case "bestelopdr":
{
sqlB += " AND prs_bedrijfadres_type = 'B'";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST";
break;
}
case "contract":
{
sqlB += " AND prs_bedrijfadres_type = 'C'";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST";
break;
}
default: