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

FSN#39567: Van MJOB naar MJOP/R details

Browse Source 
svn path=/Website/trunk/; revision=34938
This commit is contained in:
Peter Feij
2017-08-15 09:59:56 +00:00
parent 8e57fd19fe
commit ffdf25d564
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MJB/mjb_search_list.asp
View File

@@ -1182,7 +1182,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
multiple: true,
filterParams: params,
outputmode: outputmode,
title: L("ins_srtcontrole_m") + (inflatiepct != 0 ? " ("+L("lcl_mjb_inflation")+": " + inflatiepct+"%)": ""),
title: L("lcl_mjb_begroting") + (inflatiepct != 0 ? " "+L("lcl_mjb_inflation").format(safe.curr(inflatiepct)): ""),
showAll: showall,
buttons: buttons
});

44
APPL/MJB/mjb_search_list_curr.asp
View File

@@ -71,8 +71,6 @@ var disc_key = getQParamInt("disc", -1);
var srtgroep_key = getQParamInt("srtgroep", -1);
var srtdeel_key = getQParamInt("srtdeel", -1);
var srtcontrole = getQParamIntArray("srtcontrole", []); // Taak
var inflatiepct = S("mjb_inflation");
var inflatiefactor = 1 + (inflatiepct / 100);
var frequentie = getQParamIntArray("frequentie", []); // Array met frequenties.
var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
@@ -99,11 +97,10 @@ var params = { deel: (deel != ""? deel : null),
objsrt_key_arr: srtdeel_key,
mjbgroup: groupby,
mjbsrtcontr: srtcontrole.join(","),
mjbinfl_pct: inflatiepct,
mjbfreq: frequentie.join(","),
mjbincbtw: incbtw
};
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie",
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole",
"frequentie", "incbtw", "alg_startlevel", "alg_endlevel",
"deel", "groep", "categorie_key", "scenario",
"mjbMoved", "mjbFreezed", "mjbXcped"]);
@@ -568,16 +565,15 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
var rst = new ResultsetTable({ keyColumn: fnkeyFunction,
sql: sql,
ID: "mjobtable",
ID: "mjobctable",
rowData: fnrowData,
rowClass: fnrowClass,
//suppressKeyRepeat: "alg_locatie_omschrijving",
totalShow: totalShow,
flexModule: "INS",
multiple: true,
filterParams: params,
outputmode: outputmode,
title: L("ins_srtcontrole_m"),
title: (S("mjb_operation_external") == 0) ? L("lcl_mjb_begroting_cur") : L("lcl_mjb_begroting_curx"),
showAll: showall,
buttons: buttons
});
@@ -646,7 +642,39 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
}
var count = rst.processResultset();
if (!excel && !print)
{
%>
<!-- LEGENDA -->
<script type="text/javascript">
function openLegenda()
{
params = { width: 500,
minWidth: 250,
minHeight: 10,
resizable: false,
position: {my: "right top", at: "right top + 30"},
title: "<%=L("lcl_ins_controle_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');
FcltMgr.resized();
}
</script>
<div id="legenda" style="display:none; line-height: 30px;">
<table id="inslegenda">
<tr class="mjbbusy">
<td title="<%= L("lcl_mjb_busy") %>"><%= L("lcl_mjb_busy") %></td>
</tr>
<tr class="mjbwaiting">
<td title="<%= L("lcl_mjb_waiting") %>"><%= L("lcl_mjb_waiting") %></td>
</tr>
<tr class="mjbexpired">
<td title="<%= L("lcl_mjb_expired") %>"><%= L("lcl_mjb_expired") %></td>
</tr>
</table>
</div>
<%
}
%>
</body>
</html>