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

FCLT#89456: Wijzigingen en verbeteringsvoorstellen MJOB module (Punt 31).

Browse Source 
svn path=/Website/trunk/; revision=70741
This commit is contained in:
Maykel Geerdink
2025-10-28 16:47:42 +00:00
parent 821a7873b3
commit db76d3be03
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/INS/ins.inc
View File

@@ -4268,7 +4268,6 @@ ins = {checkAutLevel:
var getsumtypes = params.getsumtypes;
var deelscore1 = params.deelscore1;
var deelscore2 = params.deelscore2;
var mjb_show_srt_with_tasks = S("mjb_show_srt_with_tasks") == 1;
var algFlexParams = params.algFlexParams;
var insFlexParams = params.insFlexParams;
@@ -6050,11 +6049,9 @@ ins = {checkAutLevel:
+ " , alg_locatie_code"
+ " , alg_gebouw_code"
+ " , alg_gebouw_naam"
+ (mjb_show_srt_with_tasks
? " , ins_discipline_omschrijving"
+ " , ins_srtgroep_omschrijving"
+ " , ins_srtdeel_omschrijving"
: "")
+ " , ins_discipline_omschrijving"
+ " , ins_srtgroep_omschrijving"
+ " , ins_srtdeel_omschrijving"
+ " , ins_deel_omschrijving"
+ " , alg_ruimte_nr";
break;

10
APPL/MJB/mjb_search_list.asp
View File

@@ -24,7 +24,6 @@ FCLTHeader.Requires({plugins: ["jQuery"],
var urole = getQParamSafe("urole", ""); // Indien niet meegegeven, veronderstel dan frontend gebruik
var mode = getQParamInt("mode", 1); // Schermmode 1=Begroting (aankomende jaren) (=default), 2=Realisatie (huidige en lopende jaren, 3=Uitvoering (koppelen (uitvoerend) van taken aan een melding).
var ins_score_enabled = S("ins_score_enabled") == 1;
var mjb_show_srt_with_tasks = S("mjb_show_srt_with_tasks") == 1;
var scenario = getQParamInt("scenario", 1); // Scenario
// FORM parameters: de waarde indien aanwezig, anders null
@@ -1012,12 +1011,9 @@ var transitParam = buildTransitParam(["urole", "mode", "deel", "groep", "categor
rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: fnGebouwTerreinCode, colName: "fnGebouwTerreinCode" }));
rst.addColumn(new Column({caption: L("lcl_bld_terra"), content: fnGebouwTerrein, colName: "fnGebouwTerrein" }));
}
if (!fulldetails || (fulldetails && mjb_show_srt_with_tasks) || moredetail == 1)
{
if (groupby >= 4 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_discipline"), content: "ins_discipline_omschrijving"}));
if (groupby >= 5 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_srtgroep_omschrijving"}));
if (groupby >= 6 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "ins_srtdeel_omschrijving"}));
}
if (groupby >= 4 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_discipline"), content: "ins_discipline_omschrijving"}));
if (groupby >= 5 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_srtgroep_omschrijving"}));
if (groupby >= 6 || moredetail == 1) rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "ins_srtdeel_omschrijving"}));
if (groupby == 2 && ins_score_enabled)
rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1", datatype: "number", align: "center"}));
if (groupby == 3 && ins_score_enabled)