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

FSN#37849 a. de verschillende taaktermen gebruiken

Browse Source 
svn path=/Website/trunk/; revision=30886
This commit is contained in:
Peter Feij
2016-09-27 17:22:00 +00:00
parent de37c7a3d5
commit 436c9fc27a
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
APPL/PDA/ins_inspect.asp
View File

@@ -43,8 +43,7 @@ if (alg_ruimte_key > 0)
+ " AND sc.ins_srtinstallatie_key = dg.ins_srtgroep_key"
+ " OR sc.ins_srtcontrole_niveau = 'D'"
+ " AND sc.ins_srtinstallatie_key = dg.ins_discipline_key)"
+ " AND dg.alg_ruimte_key = " + alg_ruimte_key
// + " AND dg.ins_alg_ruimte_type = 'R'";
+ " AND dg.alg_ruimte_key = " + alg_ruimte_key;
var oRs = Oracle.Execute(sql);
var ins_key = oRs("ins_deel_key").Value;
}
@@ -253,9 +252,12 @@ else
+ " , idsc.ins_deelsrtcontrole_status"
+ " , idsc.ins_controlemode_key"
+ " , idsc.ins_deelsrtcontrole_opmerking"
+ " , cdp.ctr_disc_params_controle_type"
+ " FROM ins_srtcontrole isc"
+ " , ins_deelsrtcontrole idsc"
+ " , ctr_disc_params cdp"
+ " WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key(+)" // Er kan nog voor de eerste keer geinspecteerd moeten worden.
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key"
+ " AND idsc.ins_deel_key(+) = " + ins_key
+ " AND isc.ins_srtcontrole_key = " + srtcontrole_key
+ (deelsrtcont_key > 0
@@ -266,6 +268,7 @@ else
// Waarden moeten aanwezig zijn. Mocht dat niet zo zijn dan is er iets fout.
var deelsrtcont_key = oRs("ins_deelsrtcontrole_key").Value != null? oRs("ins_deelsrtcontrole_key").Value : -1;
var ins_deelsrtcontrole_status = oRs("ins_deelsrtcontrole_status").Value != null? oRs("ins_deelsrtcontrole_status").Value : -1;
var sctype = oRs("ctr_disc_params_controle_type").Value;
var status_str = "";
switch (ins_deelsrtcontrole_status)
{
@@ -275,7 +278,7 @@ else
break;
case 0:
case 2:
case 5: status_str = ins.getinsstatustext(ins_deelsrtcontrole_status);
case 5: status_str = ins.getinspectstatustext(ins_deelsrtcontrole_status);
break;
}
var ins_controlemode_key = oRs("ins_controlemode_key").Value != null && ins_deelsrtcontrole_status != 6? oRs("ins_controlemode_key").Value : -1;
@@ -288,8 +291,16 @@ else
</head>
<body>
<%
var titletext;
switch(sctype)
{
case 1: titletext = L("lcl_ins_srtcontrole_insp"); break;
case 2: titletext = L("lcl_ins_srtcontrole_repl"); break;
case 3: titletext = L("lcl_ins_srtcontrole_cert"); break;
default: titletext = L("lcl_ins_controle_srt"); break;
}
PAGE_START();
HEADER({title: L("lcl_mobile_inspecties") + " " + subject, back: !qrc, home: !qrc});
HEADER({title: titletext + " " + subject, back: !qrc, home: !qrc});
CONTENT_START();
deelsrtcontrole_datum = new Date();
%>
@@ -472,13 +483,15 @@ else
}
sql = "SELECT " + lcl.xsqla('isc.ins_srtcontrole_omschrijving', 'isc.ins_srtcontrole_key')
+ " , ins_srtcontrole_type"
+ " , ctr_disc_params_controle_type"
+ " , ins_srtcontrole_info"
+ " FROM ins_srtcontrole isc"
+ " WHERE ins_srtcontrole_key = " + srtcontrole_key;
+ " , ctr_disc_params cdp"
+ " WHERE ins_srtcontrole_key = " + srtcontrole_key
+ " AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key";
oRs = Oracle.Execute(sql);
var srtcontrole_oms = oRs("ins_srtcontrole_omschrijving").Value;
var srtcontrole_type = oRs("ins_srtcontrole_type").Value;
var srtcontrole_type = oRs("ctr_disc_params_controle_type").Value;
var srtcontrole_info = oRs("ins_srtcontrole_info").Value;
oRs.Close();
@@ -489,7 +502,7 @@ else
sql = "SELECT cm.ins_controlemode_key"
+ " , " + lcl.xsqla('cm.ins_controlemode_oms', 'cm.ins_controlemode_key')
+ " FROM ins_controlemode cm"
+ " WHERE ins_srtcontrole_type = " + srtcontrole_type;
+ " WHERE ins_srtcontrole_type = " + srtcontrole_type; // modelfoutje? moet langs ctr_disc_params_controle_type?
FCLTselector("sel_controlemode",
sql,
{ initKey: ins_controlemode_key,

11
APPL/PDA/ins_inspect_list.asp
View File

@@ -81,8 +81,15 @@ else
{
var object = safe.html(oRs("ins_deel_omschrijving").Value);
var srtcontrole = safe.html(oRs("ins_srtcontrole_omschrijving").Value);
return object + "<br>" + srtcontrole;
var titletext;
switch(oRs("ctr_controle_type").value)
{
case 1: titletext = L("lcl_ins_srtcontrole_insp"); break;
case 2: titletext = L("lcl_ins_srtcontrole_repl"); break;
case 3: titletext = L("lcl_ins_srtcontrole_cert"); break;
default: titletext = L("lcl_menu_ins_controle"); break;
}
return titletext + " " + object + "<br>" + srtcontrole; // wat formatting zou fijn zijn, maar dan wel uniform overal
};