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

ASDL#36074 -- Implementatie NS in Digitaal logboek

Browse Source 
svn path=/Website/branches/v2016.1/; revision=29668
This commit is contained in:
Arthur Egberink
2016-06-08 12:36:03 +00:00
parent 60b8351336
commit 3598db3bfb
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CUST/ASDL/afmelden_locatie.asp
View File

@@ -41,21 +41,36 @@ if (locatie_key != -1)
HEADER({title: "Locatie ingevuld", back:0, home:1});
CONTENT_START();
var sql =
" SELECT DISTINCT ins_deel_key, ins_srtcontrole_key, p.prs_perslid_key from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
" SELECT DISTINCT ins_deel_key, ins_srtcontrole_key, p.prs_perslid_key, ins_deelsrtcontrole_key "
+ " FROM asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND p.prs_perslid_key = " + user_key
+ " AND kl.prs_link_key = " + user_key
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys ";
+ " AND s.maand = DECODE(INSTR(" + safe.quoted_sql(locatie) + ", 'PERIODIEK'), 0, 0, 1)"
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys "
+ " AND alg_locatie_key = " + locatie_key;
oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
sqll = "INSERT INTO ins_deelsrtcontrole (ins_deelsrtcontrole_datum, ins_deel_key, ins_srtcontrole_key, ins_controlemode_key, prs_perslid_key, ins_deelsrtcontrole_datum_org) "
if (oRs("ins_deelsrtcontrole_key").Value == null)
{
sql = "INSERT INTO ins_deelsrtcontrole (ins_deelsrtcontrole_datum, ins_deel_key, ins_srtcontrole_key, ins_controlemode_key, prs_perslid_key, ins_deelsrtcontrole_datum_org) "
+ " VALUES (SYSDATE, " + oRs("ins_deel_key").Value
+ ", " + oRs("ins_srtcontrole_key").Value
+ ", 10, " + oRs("prs_perslid_key").Value
+ ", SYSDATE )";
Oracle.Execute(sqll);
}
else {
sql = "UPDATE ins_deelsrtcontrole"
+ " SET ins_deelsrtcontrole_datum = SYSDATE,"
+ " ins_controlemode_key = 10,"
+ " prs_perslid_key = " + user_key + ","
+ " ins_deelsrtcontrole_plandatum = NULL, "
+ " ins_deelsrtcontrole_status = 6" // afgerond
+ " WHERE ins_deelsrtcontrole_key = " + oRs("ins_deelsrtcontrole_key").Value;
}
Oracle.Execute(sql);
oRs.MoveNext();
}
oRs.Close();
@@ -75,12 +90,13 @@ else
};
var sql = "SELECT DISTINCT alg_locatie_key, alg_locatie_omschrijving, alg_locatie_x from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(SUM(maand),0,'', ' *PERIODIEK*') alg_locatie_omschrijving, alg_locatie_x from asdl_v_rap_schoonmaak_today s, prs_kenmerklink kl, prs_perslid p"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND p.prs_perslid_key = " + user_key
+ " AND kl.prs_link_key = " + user_key
+ " AND alg_locatie_key = p.alg_onroerendgoed_keys "
+ " GROUP BY alg_locatie_key, alg_locatie_omschrijving, maand, alg_locatie_x "
+ " ORDER BY alg_locatie_x"
var rst = new ResultsetTable({sql: sql,

15
CUST/ASDL/kies_locatie.asp
View File

@@ -42,7 +42,12 @@ if (locatie_key != -1)
CONTENT_START();
var sql = "UPDATE prs_perslid SET alg_onroerendgoed_keys =" + locatie_key + ", alg_onroerendgoed_type = 'L' WHERE prs_perslid_key = " + user_key;
Oracle.Execute(sql);
ROFIELD("sel_srtcontrole_oms", "Locatie", locatie, {});
Oracle.Execute(sql);
%>
<script>
window.history.go(-2);
</script>
<%
}
else
{
@@ -58,11 +63,9 @@ else
return "../../cust/asdl/kies_locatie.asp?locatie_key=" + oRs("alg_locatie_key").Value+"&locatie=" + oRs("alg_locatie_omschrijving").Value;
};
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(COUNT(maand),0,'', ' PERIODIEK') alg_locatie_omschrijving "
+ " FROM asdl_v_rap_schoonmaak_today1 s, prs_kenmerklink kl"
+ " WHERE s.ins_srtcontroledl_xcp_groep = kl.prs_kenmerklink_waarde "
+ " AND kl.prs_kenmerk_key = 1000 "
+ " AND kl.prs_link_key = " + user_key
var sql = "SELECT alg_locatie_key, alg_locatie_omschrijving || DECODE(SUM(maand),0,'', ' *PERIODIEK*') alg_locatie_omschrijving "
+ " FROM asdl_v_rap_schoonmaak_today1 s"
+ " WHERE s.fclt_3d_user_key = " + user_key
+ discx3d ("",
"s.ins_discipline_key",
"s.alg_regio_key",

6
CUST/ASDL/kies_route.asp
View File

@@ -41,7 +41,11 @@ if (route != "none")
CONTENT_START();
var sql = "BEGIN PRS.upsertkenmerk (1000, " + user_key + ", " + safe.quoted_sql(route) + "); END;"
Oracle.Execute(sql);
ROFIELD("sel_srtcontrole_oms", "Route", route, {});
%>
<script>
window.history.go(-2);
</script>
<%
}
else
{