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

FCLT#55779 Nieuwe meldingen registreren t/m min verplicht niveau op Mobile

Browse Source 
svn path=/Website/trunk/; revision=41193
This commit is contained in:
Alex Tiehuis
2019-02-27 11:51:34 +00:00
parent ccd36fe97a
commit 55b40ec9bb
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/PDA/melding.asp
View File

@@ -680,8 +680,6 @@ if (action != "forward")
{
PAGE_START({id: "page-1-"+mld_key});
HEADER({title: safe.html(subject), back:!qrc, home: !qrc, datatheme: (1||mld_info.melder_key==user_key ? jQFrontEndTheme : null) });
if (addSubheader)
HEADER({title: safe.html(subjectSubheader), datatheme: jQHeaderTheme});
CONTENT_START();
// Altijd forcesave omdat we geen doublecheck aankunnen
@@ -693,6 +691,8 @@ if (action != "forward")
<input type="hidden" name="urole" value="<%=mld_key > 0? "bo" : "fe"%>">
<input type="hidden" name="stdm" value="<%=mld_info.stdm%>">
<%
if (addSubheader)
BLOCK_START({title: safe.html(subjectSubheader), datatheme: jQHeaderTheme});
if (mld_key == -1)
{ // Nieuw, maar deze velden kunnen we zelf verzinnen
if (!fronto)
@@ -1059,6 +1059,8 @@ if (action != "forward")
}
}
}
if (addSubheader)
BLOCK_END();
CONTROLGROUP_START()
if (this_mld.canChange || mld_key == -1) {

12
APPL/PDA/melding_new.asp
View File

@@ -30,6 +30,8 @@
<%
var mld_key = getQParamInt("mld_key", -1); // -1 betekent nieuwe
var ruimte_key = getQParamInt("ruimte_key", -1); // -1 means unknown
var ins_key = getQParamInt("ins_key", -1); // -1 means unknown
var qrc = getQParamInt("qrc", 0) != 0;
var action = getQParam("action", "");
var urole = getQParamSafe("urole", "");
@@ -67,7 +69,7 @@ else
var authparams = user.checkAutorisation(autfunction, true);
var autlevel = authparams.ALGwritelevel;
var transitParam = buildTransitParam(["mld_key", "action", "disc", "srtdisc", "ins_key", "loc_key", "bld_key", "flr_key", "roo_key", "meldbronkey", "deelsrtcont_key"] );
var transitParam = buildTransitParam(["mld_key", "ruimte_key", "ins_key", "action", "disc", "srtdisc", "ins_key", "loc_key", "bld_key", "flr_key", "roo_key", "meldbronkey", "deelsrtcont_key"] );
// Verplicht:
var disc_key = getQParamInt("disc", -1);
@@ -94,7 +96,7 @@ if (stdm_info == "")
}
else
{
if (!stdm_info.ins_srtdiscipline_alg)
if (!stdm_info.ins_srtdiscipline_alg || ruimte_key > 0 || ins_key > 0) // ins_key/ruimte_key > 0 means the issue is issued from a object/room
{
var next_asp = "melding.asp"; // no place selection required, back without place selected
}
@@ -132,8 +134,8 @@ else
case 3: if (alg_level >= 3) { objPlaats.bld_key = thisUser.werklocatie.alg_gebouw_key; }
case 2: if (alg_level >= 2) { objPlaats.loc_key = thisUser.werklocatie.alg_locatie_key; }
}
if (alg_level >= requiredlevel) { var next_asp = "melding.asp"; }
}
if (alg_level >= requiredlevel) { var next_asp = "melding.asp"; }
}
}
%>
@@ -150,6 +152,8 @@ else
+ "?mld_key=-1"
+ "&disc_key="+disc_key
+ "&stdm_key=" + stdm_key
+ "<%=ruimte_key > 0 ? "&ruimte_key=" + ruimte_key : ""%>"
+ "<%=ins_key > 0 ? "&ins_key=" + ins_key : ""%>"
+ "<%=safe.jsstring(objPlaats.parms())%>"
+ "&urole=" + urole;
<%
@@ -167,6 +171,8 @@ else
+ "&stdm=" + stdm_key
+ "&filtCode=FAC"
+ "<%=safe.jsstring(objPlaats.parms())%>"
+ "<%=ruimte_key > 0 ? "&ruimte_key=" + ruimte_key : ""%>"
+ "<%=ins_key > 0 ? "&ins_key=" + ins_key : ""%>"
+ "&autlevel=<%=autlevel%>"
+ "&startlevel=<%=startlevel%>"
+ "&eindlevel=<%=requiredlevel%>"