From a87dfbd195350dbc29e7ff66a279932e8413ecf8 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Wed, 9 Aug 2017 13:56:51 +0000 Subject: [PATCH] FSN#39567: Van MJOB naar MJOP/R. svn path=/Website/trunk/; revision=34878 --- APPL/MJB/mjb_search.asp | 43 +- APPL/MJB/mjb_search_list.asp | 208 ++++++--- APPL/MJB/mjb_search_list_curr.asp | 681 ++++++++++++++++++++++++++++++ APPL/PDA/ins_inspect.asp | 20 +- APPL/Shared/default.csx | 19 +- APPL/Shared/get_ctr_info.asp | 5 +- 6 files changed, 903 insertions(+), 73 deletions(-) create mode 100644 APPL/MJB/mjb_search_list_curr.asp diff --git a/APPL/MJB/mjb_search.asp b/APPL/MJB/mjb_search.asp index a4af84b97b..79e524a8f0 100644 --- a/APPL/MJB/mjb_search.asp +++ b/APPL/MJB/mjb_search.asp @@ -25,6 +25,18 @@ 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 actionpage; +switch (mode) +{ + case 1: actionpage = "mjb_search_list.asp"; // Aankomende jaren + break; + case 2: actionpage = "mjb_search_list_curr.asp"; // Huidig (current) jaar. + break; + // TODO: Overzicht voorgaande jaren + //case 3: actionpage = "mjb_search_list_hist.asp"; // Geschiedenis (History). + // break; +} var deel = getQParam("deel", ""); // Identificatie var groep = getQParam("groep", ""); // Categorie/Groep @@ -47,10 +59,13 @@ var groupby = getQParamInt("groupby", 2); var frequentie = getQParamInt("frequentie", -1); var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years")); var incbtw = getQParamInt("incbtw", 0) == 1; -var scen_key = getQParamInt("scenario", -1); // Scenario +var scen_key = getQParamInt("scenario", 1); // Scenario var actsit = getQParamInt("actsit", 0) == 1; var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline +var mjbMoved = (getQParamInt("mjbMoved", 0) == 1); +var mjbFreezed = (getQParamInt("mjbFreezed", 0) == 1); +var mjbXcped = (getQParamInt("mjbXcped", 0) == 1); if (ctrdisc_key <= 0) // Als er maar eentje is selecteer die automatisch { @@ -115,7 +130,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE"); $(document).ready(function() { - if (scen_key < 0) $(".tractsit").hide(); + if (scen_key== 1) $(".tractsit").hide(); $("#actsit").prop("checked", true); selectedScen = false; <% if (autosearch) @@ -128,7 +143,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");