AADS#52278 2017.3 feedback: beheerscherm meldingen

svn path=/Website/branches/v2017.3/; revision=37147
This commit is contained in:
Erik Groener
2018-02-22 13:12:09 +00:00
parent 683dac579f
commit 19d94b3954
3 changed files with 6 additions and 6 deletions

View File

@@ -553,8 +553,8 @@ function model_mld_stdmelding()
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
var proturl_bijlage = "<%=proturl%>";
var srtdisc_key = <%=srtdisc_key%>;
var disc_key = <%=disc_key%>;
var disciplinetype_key = <%=srtdisc_key%>;
var discipline_key = <%=disc_key%>;
</script>
<%
}

View File

@@ -19,10 +19,10 @@ function init_stdmelding()
onChangeHighprioritytime();
onChangeLowprioritytime()
if (typeof srtdisc_key == "undefined") var srtdisc_key = -1;
if (typeof disc_key == "undefined") var disc_key = -1;
var srtdisc_key = (typeof $("#disciplinetype").val() == "undefined" ? (typeof disciplinetype_key == "undefined" ? -1 : disciplinetype_key) : $("#disciplinetype").val() );
var disc_key = (typeof $("#discipline").val() == "undefined" ? (typeof discipline_key == "undefined" ? -1 : discipline_key) : $("#discipline").val() );
var init_srtdisc_key = (srtdisc_key > -1 ? srtdisc_key : 0);
var init_srtdisc_key = (srtdisc_key > -1 ? srtdisc_key : 0); // defaultwaarde 0 zorgt ervoor dat eerst de vakgroeptype moet worden gekozen voordat er een vakgroep kan worden geselecteerd.
var init_disc_key = (disc_key ? disc_key : -1);
fill_disciplineselector(init_srtdisc_key, init_disc_key);

View File

@@ -195,7 +195,7 @@ switch (req_info)
+ " , d.ins_srtdiscipline_key s_key"
+ " , null d_key"
+ " FROM mld_v_aanwezigdiscipline d"
+ (parent_key != -1 ? " WHERE d.ins_srtdiscipline_key IN (" + parent_key.join(",") + ")" : "")
+ (parent_key.length ? " WHERE d.ins_srtdiscipline_key IN (" + parent_key.join(",") + ")" : "")
+ " ORDER BY d.ins_discipline_omschrijving ASC";
break;
}