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

HVDF#25094: Volledige inspectie-info ontbreekt voor de inspecteur.

Browse Source 
svn path=/Website/branches/v5.2.3/; revision=16516
This commit is contained in:
Maykel Geerdink
2013-01-14 15:05:54 +00:00
parent 2e0cc0bbd2
commit dc9ae739a9
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/INS/ins_inspect.asp
View File

@@ -110,7 +110,10 @@ user.anything_todo_or_abort(tobeinspected > 0); // We klagen niet over enkele we
+ " OR isc.ins_srtcontrole_niveau = 'G' AND isc.ins_srtinstallatie_key = s.ins_srtgroep_key"
+ " OR isc.ins_srtcontrole_niveau = 'D' AND isc.ins_srtinstallatie_key = d.ins_discipline_key"
+ " )"
+ " AND d.ins_deel_key in (" + ingesloten.join(",") + ")"
+ " AND d.ins_deel_key IN (" + ingesloten.join(",") + ")"
+ (srtcont_key > 0
? " AND isc.ins_srtcontrole_key = " + srtcont_key
: "")
+ " GROUP BY ins_srtcontrole_key,"
+ " ins_srtcontrole_omschrijving,"
+ " ins_srtcontrole_periode"
@@ -122,6 +125,12 @@ user.anything_todo_or_abort(tobeinspected > 0); // We klagen niet over enkele we
required: true
}
);
if (srtcont_key > 0)
{
sql = "SELECT ins_srtcontrole_info FROM ins_srtcontrole WHERE ins_srtcontrole_key = " + srtcont_key;
var oRs = Oracle.Execute(sql);
RWTEXTAREATR("srtcontrole_info", "fldtxt", L("lcl_ins_info"), oRs("ins_srtcontrole_info").value, {html: "rows='3'"});
}
FCLTcalendar( "deelsrtcontrole_datum",
{ label : L("lcl_ins_controle_datum"),
datum : inspect_data.deelsrtcontrole_datum,

19
APPL/INS/ins_list.inc
View File

@@ -451,7 +451,7 @@ function ins_list (pautfunction, params)
// Eerstvolgende inspectie
var sqlNext = ""
+ "SELECT ins_deel_key, inspectie_next, ins_srtcontrole_omschrijving"
+ "SELECT ins_deel_key, inspectie_next, ins_srtcontrole_omschrijving, ins_srtcontrole_key"
+ " FROM (WITH defined_inspect" // gedefinieerde inspecties
+ " AS (SELECT *"
+ " FROM ins_deel id, ins_srtdeel s, ins_srtcontrole isc"
@@ -469,7 +469,8 @@ function ins_list (pautfunction, params)
+ " SELECT 1 rn," // inspecties die nog nooit zijn uitgevoerd
+ " di.ins_deel_key,"
+ " ins_deel_aanmaak + ins_srtcontrole_periode inspectie_next,"
+ " ins_srtcontrole_omschrijving"
+ " ins_srtcontrole_omschrijving,"
+ " ins_srtcontrole_key"
+ " FROM defined_inspect di"
+ " WHERE (ins_deel_key, ins_srtcontrole_key) NOT IN"
+ " (SELECT ins_deel_key, ins_srtcontrole_key"
@@ -484,7 +485,8 @@ function ins_list (pautfunction, params)
+ " di.ins_deel_key,"
+ " ins_deelsrtcontrole_datum + ins_srtcontrole_periode"
+ " inspectie_next,"
+ " ins_srtcontrole_omschrijving"
+ " ins_srtcontrole_omschrijving,"
+ " di.ins_srtcontrole_key"
+ " FROM ins_deelsrtcontrole idsc, defined_inspect di"
+ " WHERE idsc.ins_srtcontrole_key = di.ins_srtcontrole_key"
+ " AND idsc.ins_deel_key = di.ins_deel_key"
@@ -524,7 +526,8 @@ function ins_list (pautfunction, params)
+ ", " + sqlLentOutFrom + " uitgegeven_vanuit"
+ ", " + sqlInspectie_select
+ ", rd.res_deel_key"
+ ", rd.res_deel_opmerking";
+ ", rd.res_deel_opmerking"
+ ", i.ins_deel_vervaldatum";
sqlOwner_from = " FROM ins_deel i"
+ ", ins_srtdeel s"
@@ -561,6 +564,7 @@ function ins_list (pautfunction, params)
+ ", (SELECT " + S("prs_dep_string") + " FROM prs_v_afdeling d WHERE prs_afdeling_key = i.ins_alg_ruimte_key) eigenaar"
+ ", NULL alg_ruimte_key " // person key
+ ", i.ins_alg_ruimte_key prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_v_afdeling_boom d"
@@ -577,6 +581,7 @@ function ins_list (pautfunction, params)
+ ", " + S("prs_pers_string") + " eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key " // person key
+ ", p.prs_afdeling_key prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_perslid p"
@@ -595,6 +600,7 @@ function ins_list (pautfunction, params)
+ ", c.prs_contactpersoon_naam eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key" // person key
+ ", NULL prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_contactpersoon c"
@@ -636,11 +642,13 @@ function ins_list (pautfunction, params)
+ ", " + sqlInspectie_select
+ ", rd.res_deel_key"
+ ", rd.res_deel_opmerking"
+ ", i.ins_deel_vervaldatum"
+ ", null prs_bedrijf_key"
+ ", null prs_afdeling_key1"
+ ", null eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key"
+ ", 0 dummy1" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ " FROM ins_deel i"
+ (terr_key
@@ -1045,8 +1053,9 @@ function ins_list (pautfunction, params)
var insKey = oRs("ins_deel_key").value;
var insTypeKey = oRs("ins_srtdeel_key").value;
var insAvailable = oRs("ins_alg_ruimte_key_org").value == null? 1 : 0;
var insSrtControleKey = oRs("ins_srtcontrole_key").value;
var data = {insKey:insKey, insTypeKey:insTypeKey, insAvailable:insAvailable};
var data = {insKey:insKey, insTypeKey:insTypeKey, insAvailable:insAvailable, insSrtControleKey:insSrtControleKey};
return JSON.stringify(data);
}

8
APPL/INS/ins_list.js
View File

@@ -184,8 +184,14 @@ function insMultiEdit(rowArray)
function insInspect(rowArray)
{
var insKeyString = getKeyString(rowArray);
var srtcontrole_key = -1;
if (rowArray.length == 1)
{
rowdata = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')');
srtcontrole_key = rowdata.insSrtControleKey;
}
var subject = L("lcl_ins_multi_controle");
var url = "../ins/ins_inspect.asp?ins_keys=" + insKeyString;
var url = "../ins/ins_inspect.asp?ins_keys=" + insKeyString + (srtcontrole_key > 0? "&srtcont_key=" + srtcontrole_key : "");
FcltMgr.openModalDetail(url, rowArray.length > 1? L("lcl_ins_multi_controle") : L("lcl_ins_docontrole"), {callback: FcltCallbackRefresh});
}