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

HCAS#36932 INS/MGT: beheerscherm kenmerken toont verwijderde disciplines

Browse Source 
svn path=/Website/trunk/; revision=29848
This commit is contained in:
Erik Groener
2016-06-24 12:50:54 +00:00
parent 0d7b81891c
commit e7c8b85ac8
4 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
APPL/INS/get_ins_info_ajax.asp
View File

@@ -37,17 +37,42 @@ switch (req_info)
var niveau = getQParam("niveau","");
var install_key = getQParamInt("install_key");
var init_key = getQParamInt("init_key", -1);
var available = getQParamInt("available", 0) == 1;
var sql = "SELECT ins_srtinstallatie_key"
+ " , DECODE(niveau, 'D', discipline_oms"
+ " , 'G', srtgroep_oms"
+ " , 'S', srtdeel_oms) ins_srtinstallatie_oms"
+ " FROM ins_v_allsrtinstallatie"
+ " WHERE niveau = " + safe.quoted_sql(niveau);
var sql = "SELECT a.ins_srtinstallatie_key"
+ " , DECODE(niveau, 'D', a.discipline_oms"
+ " , 'G', a.srtgroep_oms"
+ " , 'S', a.srtdeel_oms) ins_srtinstallatie_oms"
+ " FROM ins_v_allsrtinstallatie a";
if (available)
{
switch(niveau)
{
case "G": sql += " AND ins_discipline_key = " + install_key; break;
case "S": sql += " AND ins_srtgroep_key = " + install_key; break;
case "D": sql += ", ins_discipline d"; break;
case "G": sql += ", ins_srtgroep g"; break;
case "S": sql += ", ins_srtdeel s"; break;
}
}
sql += " WHERE a.niveau = " + safe.quoted_sql(niveau);
if (available)
{
switch(niveau)
{
case "D": sql += " AND a.ins_discipline_key = d.ins_discipline_key"
+ " AND d.ins_discipline_verwijder IS NULL";
break;
case "G": sql += " AND a.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND g.ins_srtgroep_verwijder IS NULL";
break;
case "S": sql += " AND a.ins_srtdeel_key = s.ins_srtdeel_key"
+ " AND s.ins_srtdeel_verwijder IS NULL";
break;
}
}
switch(niveau)
{
case "G": sql += " AND a.ins_discipline_key = " + install_key; break;
case "S": sql += " AND a.ins_srtgroep_key = " + install_key; break;
}
sql += " ORDER BY 2"
var new_lov = [];

10
APPL/MGT/ins_kenmerk.asp
View File

@@ -7,6 +7,12 @@
var kenmerk_params = {};
kenmerk_params.niveau = getQParam("inspectie", "");
%>
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
var this_model = new model_ins_kenmerk(kenmerk_params);
@@ -23,6 +29,8 @@ scaffolding(this_model,
"js": ["../mgt/srtinstallatieselector.js"]
}
},
"transit": { "inspectie": kenmerk_params.niveau }
"transit": {
"inspectie": kenmerk_params.niveau
}
});
%>

6
APPL/MGT/ins_srtcontrole.asp
View File

@@ -6,6 +6,12 @@
<%
var this_model = new model_ins_srtcontrole();
%>
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
scaffolding(this_model,
{
"search": {

6
APPL/MGT/srtinstallatieselector.js
View File

@@ -60,7 +60,8 @@ function fill_srtgroep(discipline_key, srtgroep_key)
{ req_info: "ins_srtinstallatie",
niveau: "G",
install_key: discipline_key,
init_key: srtgroep_key
init_key: srtgroep_key,
available: srtinstallatieselector_available
},
process_info);
}
@@ -74,7 +75,8 @@ function fill_srtdeel(discipline_key, srtgroep_key, srtdeel_key)
{ req_info: "ins_srtinstallatie",
niveau: "S",
install_key: srtgroep_key,
init_key: srtdeel_key
init_key: srtdeel_key,
available: srtinstallatieselector_available
},
process_info);
}