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

FSN#40545 Relatie discipline, objectgroep en objectsoort werkt niet bij toevoegen taak

Browse Source 
svn path=/Website/trunk/; revision=33899
This commit is contained in:
Erik Groener
2017-05-17 11:56:35 +00:00
parent e0ae82b14a
commit 948b25d142
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/API2/model_ins_kenmerk.inc
View File

@@ -210,6 +210,15 @@ function model_ins_kenmerk(niveau, params)
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
}
this.hook_pre_search = function(fld)
{
%>
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
}
}

9
APPL/API2/model_ins_srtcontrole.inc
View File

@@ -273,6 +273,15 @@ function model_ins_srtcontrole()
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
}
this.hook_pre_search = function(fld)
{
%>
<script>
var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
</script>
<%
}
}

26
APPL/MGT/srtinstallatieselector.js
View File

@@ -4,22 +4,22 @@ $(document).ready(function () {
function init_srtinstallatie()
{
$("#object_discipline").change(function() {change_object_discipline(); });
$("#object_group").change(function() {change_object_group(); });
$("#objectdiscipline").change(function() {change_object_discipline(); });
$("#objectgroup").change(function() {change_object_group(); });
var srtinstallatie_key = $("#object_key").val();
if (!srtinstallatie_key)
change_object_discipline(); // Initialisatie listboxen bij search.
else
{
var discipline_key = $("#object_discipline").val();
var srtgroep_key = $("#object_group").val();
var srtdeel_key = $("#object_type").val();
var discipline_key = $("#objectdiscipline").val();
var srtgroep_key = $("#objectgroup").val();
var srtdeel_key = $("#objecttype").val();
var niveau = $("#level").val();
if (niveau == "D")
{
fill_srtgroep(discipline_key);
$("#object_type").prop("disabled", true);
$("#objecttype").prop("disabled", true);
}
if (niveau == "G")
{
@@ -39,7 +39,7 @@ function change_object_discipline(srtgroep_key)
process_info({niveau:"G",lov:[]});
process_info({niveau:"S",lov:[]});
var discipline_key = $("#object_discipline").val();
var discipline_key = $("#objectdiscipline").val();
fill_srtgroep(discipline_key);
}
@@ -47,8 +47,8 @@ function change_object_group(srtdeel_key)
{
process_info({niveau:"S",lov:[]});
var discipline_key = $("#object_discipline").val();
var srtgroep_key = $("#object_group").val();
var discipline_key = $("#objectdiscipline").val();
var srtgroep_key = $("#objectgroup").val();
fill_srtdeel(discipline_key, srtgroep_key);
}
@@ -84,7 +84,7 @@ function fill_srtdeel(discipline_key, srtgroep_key, srtdeel_key)
function process_info(data)
{
var select = (data.niveau=="G" ? $("#object_group") : $("#object_type"));
var select = (data.niveau=="G" ? $("#objectgroup") : $("#objecttype"));
var sel_key = -1;
var new_lov = '<option value="-1" ></option>';
@@ -109,9 +109,9 @@ function process_info(data)
function pre_submit()
{
var discipline_key = $("#object_discipline").val();
var srtgroep_key = $("#object_group").val();
var srtdeel_key = $("#object_type").val();
var discipline_key = $("#objectdiscipline").val();
var srtgroep_key = $("#objectgroup").val();
var srtdeel_key = $("#objecttype").val();
if (discipline_key) // discipline_key, srtgroep_key en srtdeel_key zijn readonly, dan srtinstallatiekey laten staan.
{