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

AAIT#70980: Extra prioritering meegeven in MJOB-planning/begroting.

Browse Source 
svn path=/Website/trunk/; revision=65661
This commit is contained in:
Maykel Geerdink
2024-07-22 12:43:35 +00:00
parent 197408fd3a
commit 5ab5816b64
7 changed files with 522 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
APPL/MJB/mjb_search_list.asp
View File

@@ -15,6 +15,7 @@
*/ %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/resultset_table_v2.inc" -->
<!-- #include file="../alg/alg.inc" -->
<!-- #include file="../ins/ins.inc" -->
<%
FCLTHeader.Requires({plugins: ["jQuery"],
@@ -374,6 +375,8 @@ var transitParam = buildTransitParam(["urole", "mode", "deel", "groep", "categor
<%
// Start building the query to fetch all objects satisfying
var algFlexParams = alg.alg_onroerendgoed_flex_params("G", 2); // In overzicht tonen: 2=MJOB Planningsconsole.
var insFlexParams = ins.ins_deel_flex_params(2, false); // In overzicht tonen: 2=MJOB Planningsconsole.
var mjbparams = { execute: mode == 3,
scenario: scenario,
fulldetails: fulldetails,
@@ -415,7 +418,9 @@ var transitParam = buildTransitParam(["urole", "mode", "deel", "groep", "categor
mjbStatus2: mjbStatus2,
mjbStatus3: mjbStatus3,
jaren: jaren,
show_scenario_oms: ((print || excel) && scenario > 1)
show_scenario_oms: ((print || excel) && scenario > 1),
algflex_sql: algFlexParams.sql,
insflex_sql: insFlexParams.sql
};
var sql = ins.getmjblist_sql(mjbparams);
// ========== now 'sql' holds the main SQL-statement voor de mjbsearchlist.
@@ -914,6 +919,36 @@ var transitParam = buildTransitParam(["urole", "mode", "deel", "groep", "categor
}
}
function fncolFlexAlgBijlagen(oRs)
{
var flexval = oRs("algflex").Value;
var alg_key = oRs("alg_gebouw_key").Value;
var result = ( flexval
? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
: ""
);
if (algFlexParams.bijlageflex)
{
result += alg.alg_onroerendgoed_flex_bijlagen("G", alg_key, 2);
}
return result;
}
function fncolFlexInsBijlagen(oRs)
{
var flexval = oRs("insflex").Value;
var ins_key = oRs("ins_deel_key").Value;
var result = ( flexval
? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
: ""
);
if (insFlexParams.bijlageflex)
{
result += ins.ins_deel_flex_bijlagen(ins_key, 2, false); // In overzicht tonen: 2=MJOB Planningsconsole.
}
return result;
}
var buttons = [];
buttons.push({ icon: "fa-columns", title: L("lcl_scf_columns"), action: "openColumns()"});
buttons.push({ icon: "fa-fclt-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
@@ -1023,10 +1058,20 @@ var transitParam = buildTransitParam(["urole", "mode", "deel", "groep", "categor
}
rst.addColumn(new Column({caption: L("lcl_prs_kosten"), content: "kostenplaats"}));
}
if (groupby == 9 && excel)
if (fulldetails)
{
rst.addColumn(new Column({caption: L("lcl_mjb_scen_opm"), content: "ins_srtcontrole_opmerking"}));
if (excel)
rst.addColumn(new Column({caption: L("lcl_mjb_scen_opm"), content: "ins_srtcontrole_opmerking"}));
rst.addColumn(new Column({caption: L("lcl_mjb_datum_org"), content: "ins_deelsrtcontrole_datum_org"}));
rst.addColumn(new Column({caption: L("lcl_mjb_plan_opmerking"), content: "ins_deelsrtcontrole_plan_opm"}));
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_srtgebouw"), content: "alg_srtgebouw_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "gebouwverantwoordelijke"}));
rst.addColumn(new Column({caption: L("ctr_discipline"), content: "taakcategorie"}));
rst.addColumn(new Column({caption: L("lcl_mjb_call_history"), content: "meldingshistorie", datatype: "number"}));
if (algFlexParams.anyflex)
rst.addColumn(new Column({caption: algFlexParams.flexlabel, content: fncolFlexAlgBijlagen, colName: "fncolFlexAlgBijlagen"}));
if (insFlexParams.anyflex)
rst.addColumn(new Column({caption: insFlexParams.flexlabel, content: fncolFlexInsBijlagen, colName: "fncolFlexInsBijlagen"}));
}
for (var j = 0; j < jaren.length; j++)
{