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

HCAS#37974 Meerdere disciplines en groepen kunnen selecteren in periodiek onderhoud

Browse Source 
svn path=/Website/trunk/; revision=39320
This commit is contained in:
Erik Groener
2018-10-09 11:59:49 +00:00
parent 3b3a2a82e0
commit 0601dbd81f
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/INS/ins_search.asp
View File

@@ -233,7 +233,8 @@ var authparams = user.checkAutorisation(autfunction);
readonly: dis_key > 0,
trclass: "primsearch noxd",
whenEmpty: L("lcl_search_generic"), // want dit is een filter
multitoggle: true
multitoggle: true,
sgRelType: "srtGroep" // wijzigen van discipline heeft effect op srtgroepselector
});
%>
@@ -247,7 +248,8 @@ var authparams = user.checkAutorisation(autfunction);
urlAdd: [{urlParam: "disc_key", field: "disc"}],
trclass: "primsearch noxd",
filtercode: urole == "fo" ? "LEND" : null,
whenEmpty: L("lcl_search_generic") // want dit is een filter
whenEmpty: L("lcl_search_generic"), // want dit is een filter
multitoggle: true
});
}
%>

4
APPL/INS/ins_search_list.asp
View File

@@ -45,8 +45,8 @@ var room_key = getQParamInt("ruimtekey", -1); // Ruimte
var wpl_key = getQParamInt("werkplekkey", -1); // Werkplek
var deel = getQParam("deel", ""); // Identificatie
var deel_opm = getQParam("deel_opm", ""); // Omschrijving
var disc_key = getQParamIntArray("disc", []); // Discipline
var insgroup_key = getQParamInt("srtgroep", -1); // Groep
var disc_key = getQParamIntArray("disc", [-1]); // Discipline
var insgroup_key = getQParamIntArray("srtgroep", [-1]); // Groep
var objsrt_key = getQParamIntArray("srtdeel", -1); // Objectsoort
var objsrtomschr = getQParam("srtdeelomschr", ""); // Soortdeel code en/of omschrijving
var groep = getQParam("groep", ""); // Groep

14
APPL/Shared/Suggest/suggest.js
View File

@@ -370,15 +370,15 @@ function Suggest(inParams)
{
if (window[key] instanceof Suggest)
{
if (thisSgObj != null && window[key].sgType && window[key].sgType === sgType)
if (thisSgObj != null && window[key].sgType && (window[key].sgType === sgType || (typeof params.sgRelType != "undefined" && window[key].sgType === params.sgRelType)))
sgRel.push(window[key]);
if (window[key].getKeyField() === params.keyField) // keyField used as unique identifier
thisSgObj = window[key];
}
}
// Toggle subsequent multiSuggest SELECT's of the same type, back to input's (not in advanced popup)
$suggestField.closest("tr").nextAll("tr").find("select.multiSuggest").prev("span.multi_suggest_toggle").click();
// Toggle subsequent multiSuggest SELECT's of the same sgType, back to input's (not in advanced popup)
$suggestField.closest("tr").nextAll("tr").find("select.multiSuggest[sgType=\"" + sgType + "\"]").prev("span.multi_suggest_toggle").click();
// hide|show subsequent suggests of the same type
for (var key in sgRel)
@@ -529,6 +529,14 @@ function Suggest(inParams)
if (!checkExist && doonChange && params.queryField.getAttribute("sgonChange"))
{
eval(params.queryField.getAttribute("sgonChange")).call(null, key, txt, {suggestid: params.queryField.id});
// Update related multiSuggests
if (typeof params.sgRelType != "undefined")
{
// We hebben niet de objectName dus we togglen gewoon handmatig 2x zodat de multisuggest update
$(params.queryField).closest("tr").nextAll("tr").find("select.multiSuggest[sgType=\"" + params.sgRelType + "\"]").prev("span.multi_suggest_toggle").click()
.click();
}
}
if (checkExist)
params.queryField.setAttribute("checkExist", true);

2
APPL/Shared/disciplineselector.inc
View File

@@ -13,6 +13,7 @@
perslidKey: Verplicht voor MLD: persoon waarvoor melding is
multitoggle: Sta multi-toggle toe
idadd: Identieficatie verschil bij gebruik van meerdere disciplineselectoren
sgRelType: Welke onderliggende multiSuggest-types zijn afhankelijk van deze FCLTdisciplineselector
autfunctionKey: verplicht fac_function_key
label: label dat voor het veld wordt weergegeven.
filtercode: extra filtercode voor de query die gebruikt wordt voor de suggest.
@@ -168,6 +169,7 @@ function FCLTdisciplineselector(fieldName, objectName, params)
keyField: $("#<%=fieldName%>")[0]
<%=params.noJustOne ? ", noJustOne: true" : ""%>
<%=params.multitoggle ? ", multitoggle: true" : ""%>
<%=params.sgRelType ? ", sgRelType: \"" + params.sgRelType + "\"": ""%>
<%=params.urlAdd? ", urlAdd: " + urlAddTxt : ""%>
<%=params.extraParamField? ", extraParamField: $(\"" + "#" + params.extraParamField + "\")[0]" : ""%>
<%=params.extraParamField? ", initExtraParam: \"" + safe.jsstring("" + lextraInit) + "\"": ""%>

6
APPL/Shared/srtgroepselector.inc
View File

@@ -11,6 +11,7 @@
srtgroep_key Initi<74>le key waarde van de srtgroep die ingevuld moet worden.
disc_key: Discipline key (parent)
module: Verplicht: module waarvan de srtgroepen zijn
multitoggle: Sta multi-toggle toe
autfunction Verplicht autfunction (fac_function_code)
label: label dat voor het veld wordt weergegeven.
filtercode: extra filtercode voor de query die gebruikt wordt voor de suggest.
@@ -29,6 +30,7 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"], js: [] });
function FCLTsrtgroepselector(fieldName, objectName, params)
{
var sgType = "srtGroep";
params = params || {};
var lwhenEmpty = (params.whenEmpty != null ? params.whenEmpty : (params.readonly ? L("lcl_select_readonly") : L("lcl_select_srtgroep")));
@@ -81,7 +83,7 @@ function FCLTsrtgroepselector(fieldName, objectName, params)
} %>
<nobr>
<input id="<%=fieldName%>_show" class="fldsrtgroup<%=(!params.readonly && params.required)? " required" : ""%>" value="<%=safe.htmlattr(lsrtgroepName)%>" placeholder="<%=lwhenEmpty%>"
<%=params.readonly? " readonly":""%>
<%=params.readonly? " readonly":""%> sgType="<%=sgType%>"
<%=params.onChange && !params.readonly? " sgonChange='" + params.onChange + "'":""%>
>
<input type="hidden" id="<%=fieldName%>" name="<%=fieldName%>" value="<%=params.srtgroep_key%>">
@@ -115,11 +117,13 @@ function FCLTsrtgroepselector(fieldName, objectName, params)
$(function()
{
<%=objectName%> = new Suggest({ objectName: "<%=objectName%>",
sgType: "<%=sgType%>",
queryField: $("#<%=fieldName%>_show")[0],
queryUrl: "<%=srtgroepQueryUrl%>",
initKey: <%=params.srtgroep_key? params.srtgroep_key : -1%>,
icon: "fa-tag",
keyField: $("#<%=fieldName%>")[0]
<%=params.multitoggle ? ", multitoggle: true" : ""%>
<%=params.urlAdd? ", urlAdd: " + urlAddTxt : ""%>
<%=params.extraParamField? ", extraParamField: $(\"" + "#" + params.extraParamField + "\")[0]" : ""%>
<%=params.extraParamField? ", initExtraParam: \"" + safe.jsstring("" + lextraInit) + "\"": ""%>