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

FSN#39567: Van MJOB naar MJOP/R.

Browse Source 
svn path=/Website/trunk/; revision=34891
This commit is contained in:
Peter Feij
2017-08-10 08:56:44 +00:00
parent a87dfbd195
commit b9d52813e1
1 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
APPL/MJB/mjb_search.asp
View File

@@ -25,7 +25,7 @@ FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"],
/***** Get webform parameters *****/
var urole = getQParamSafe("urole", "bo");
var autosearch = getQParamInt("autosearch", 0) == 1;
var mode = getQParamInt("mode", 1); // Schermmode begroting 1=aankomende jaren (=default), 2=lopende jaar, 3=geschiedenis.
var mode = getQParamInt("mode", 1); // Schermmode begroting 1=aankomende jaren (=default), 2=lopende jaar/jaren, 3=geschiedenis.
var actionpage;
switch (mode)
{
@@ -111,7 +111,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
var selectedScen = true;
function onChangeScenario()
{
if ($("#scenario").val() > 0)
if ($("#scenario").val() != 1)
{
if (!selectedScen)
{
@@ -130,7 +130,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
$(document).ready(function()
{
if (scen_key== 1) $(".tractsit").hide();
if (scen_key == 1) $(".tractsit").hide();
$("#actsit").prop("checked", true);
selectedScen = false;
<% if (autosearch)
@@ -201,7 +201,6 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
});
// Objectsoort
FCLTsrtdeelselector("srtdeel",
"sgSrtdeel",
{ label: L("lcl_obj_sort"),
@@ -215,6 +214,40 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
whenEmpty: L("lcl_search_generic") // want dit is een filter
});
// Scenarios
if (mode == 1) { // scenario's zijn er alleen voor de toekomst
sql = "SELECT ins_scenario_key"
+ " , ins_scenario_omschrijving"
+ " FROM ins_scenario"
+ " WHERE ins_scenario_verwerkt IS NULL"
+ " AND ins_scenario_key <> 1" // niet de actuele
+ " ORDER BY ins_scenario_omschrijving";
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
FCLTselector("scenario",
sql,
{ label: L("lcl_mjb_scenario"),
initKey: scen_key,
//multi: true, // Voor nu niet multi
trclass:"primsearch noxd",
emptyKey: 1,
emptyOption: "",
onChange: "onChangeScenario()"
});
RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch noxd tractsit'});
}
oRs.Close();
}
%>
</table>
</td><!-- end column 1 -->
<!-- Second column -->
<td valign=top>
<table><!-- x rijen, 2 kolommen: label + veld -->
<%
// <!-- Taakcategorie -->
var sql = "SELECT i.ins_discipline_key,"
+ " i.ins_discipline_omschrijving"
@@ -249,14 +282,8 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
emptyOption: L("lcl_all"),
trclass: "primsearch noxd"
});
%>
</table>
</td><!-- end column 1 -->
<!-- Second column -->
<td valign=top>
<table><!-- x rijen, 2 kolommen: label + veld -->
<% sql = "SELECT ins_srtcontrole_key"
sql = "SELECT ins_srtcontrole_key"
+ " , ins_srtcontrole_omschrijving"
+ " FROM ins_srtcontrole isc"
+ " , ctr_disc_params cdp"
@@ -294,7 +321,6 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
emptyOption: ""
});
ROFIELDTR("fld", L("lcl_mjb_inflation"), S("mjb_inflation"))
RWCHECKBOXTR("incbtw", "fldincbtw", L("lcl_mjb_inclbtw"), incbtw, { html: " value='1' ", trclass: 'noxd'});
sql = "SELECT 1, " + safe.qL("lcl_district") + ", 1 FROM DUAL"
+ " UNION SELECT 2, " + safe.qL("lcl_building") + ", 2 FROM DUAL"
@@ -304,44 +330,26 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
+ " UNION SELECT 6, " + safe.qL("lcl_ins_object") + ", 6 FROM DUAL"
+ " UNION SELECT 7, " + safe.qL("lcl_ins_controle_srt") + ", 7 FROM DUAL";
var jaar = new Date().getFullYear();
var sqljaren = [];
for (var i = 0; i < 30; i++) // TODO: Een setting voor de 30 jaar? Zie ook mjb_dragdropyear.asp.
sqljaren.push("SELECT {0}, '{0}' FROM DUAL".format(jaar + i));
FCLTselector("toyear",
sqljaren.join(" UNION "),
{ initKey: toyear,
label: L("lcl_mjb_uptoyear")
});
if (mode != 2) { // periode alleen van belang bij plannen (en/of verleden?)
var jaar = new Date().getFullYear();
var sqljaren = [];
for (var i = 0; i < 30; i++) // TODO: Een setting voor de 30 jaar? Zie ook mjb_dragdropyear.asp.
sqljaren.push("SELECT {0}, '{0}' FROM DUAL".format(jaar + i));
FCLTselector("toyear",
sqljaren.join(" UNION "),
{ initKey: toyear,
label: L("lcl_mjb_uptoyear")
});
}
FCLTselector("groupby",
sql,
{ initKey: groupby,
label: L("lcl_mjb_group")
});
sql = "SELECT ins_scenario_key"
+ " , ins_scenario_omschrijving"
+ " FROM ins_scenario"
+ " WHERE ins_scenario_verwerkt IS NULL"
+ " AND ins_scenario_key <> 1" // niet de actuele
+ " ORDER BY ins_scenario_omschrijving";
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
FCLTselector("scenario",
sql,
{ label: L("lcl_mjb_scenario"),
initKey: scen_key,
//multi: true, // Voor nu niet multi
trclass:"primsearch noxd",
emptyKey: 1,
emptyOption: "",
onChange: "onChangeScenario()"
});
RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch noxd tractsit'});
}
oRs.Close();
if (mode == 1) { // ook de verschillende bewerkingstatussen alleen tijdens plannen
%>
<!-- Status checkboxen -->
<tr>
@@ -350,17 +358,15 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
</td>
<td>
<div id="statusboxes">
<%
// Statusfilters:
// FO: zelf mee bezig (0), bij BO (2,3,4,7), afgewezen (1), afgemeld (5), archief (6)
// Merk op: de ids kunnen afhankelijk van de urole andere betekenis hebben, dus.
%>
<input type="checkbox" class="fldcheck" name="mjbMoved" id="mjbMoved" value="1" <%=mjbMoved? "checked" : ""%>><label for="mjbMoved"><%=L("lcl_mjb_moved")%></label>
<input type="checkbox" class="fldcheck" name="mjbFreezed" id="mjbFreezed" value="1" <%=mjbFreezed? "checked" : ""%>><label for="mjbFreezed"><%=L("lcl_mjb_started")%></label>
<input type="checkbox" class="fldcheck" name="mjbXcped" id="mjbXcped" value="1" <%=mjbXcped ? "checked" : " "%>><label for="mjbXcped"><%=L("lcl_mjb_overruled_xcp")%></label>
</div>
</td>
</tr>
<%
}
%>
</table>
</td><!-- end column 2-->
</tr>