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

ARAI#56438 Kolommen in opdrachtenlijst, veralgemeniseerd en met setting configureerbaar

Browse Source 
svn path=/Website/trunk/; revision=41035
This commit is contained in:
Peter Feij
2019-02-19 11:37:17 +00:00
parent 1812f89c1a
commit f898035e8d
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/opdr_list.asp
View File

@@ -31,7 +31,7 @@ var theparams = { urole: urole,
ks_key: getQParamInt("ks_key", null),
opdr_key: getQParamInt("opdr_key", null), // de leesbare
intopdr_key: getQParamInt("intopdr_key", null), // de echte
outputmode: getQParamInt("outputmode", null),
outputmode: getQParamInt("outputmode", 0),
showall: getQParamInt("showall", null),
tiny: getQParamInt("tiny", 0) == 1,
inline: getQParamInt("inline", 0) == 1,

23
APPL/MLD/opdr_list.inc
View File

@@ -752,6 +752,7 @@ if (S("mld_show_order_details"))
if (anyalg && !tiny)
{
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving", purpose: PRINTING_ONLY}));
// zou aardig zijn om hier nog kolommen voor locatie, gebouw, verdieping, ruimte voor PRINTING_ONLY op te nemen
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsmelding"}));
}
// betreffende objecten combined
@@ -780,20 +781,20 @@ if (S("mld_show_order_details"))
// de opdrachttekst
rst.addColumn(new Column({caption: L("lcl_mld_opdr_description"), content: "mld_opdr_omschrijving"}));
// timing
// timing and statusses
rst.addColumn(new Column({columncode: ORDLST_STARTDATE, caption: L("lcl_orderdate"), content: "mld_opdr_datumbegin", datatype: "date", nowrap: true}));
rst.addColumn(new Column({columncode: ORDLST_STARTDATE, caption: L("lcl_time"), content: "mld_opdr_datumbegin", datatype: "time", combine: true, nomidnight: true}));
// statussen
// statussen; tooltips op voorwaardelijke en gecombineerde kolommen is ingewikkeld, alleen de tooltip van de eerste waarde doet wat, daarom allemaal
if (hasMLDFOBO && (orderslistcolumns & ORDLST_MLDSTATUS)) // lelijk, dit zou ik niet moeten willen weten
{
rst.addColumn(new Column({columncode: ORDLST_MLDSTATUS, caption: L("lcl_mld_mldstatus"), content: fnMldStatus, tooltip: (outputmode == 0 && !frontend? fncolNoteTooltip : null)})); // TODO check
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus, combine: true}));
rst.addColumn(new Column({columncode: ORDLST_MLDSTATUS, caption: L("lcl_mld_mldstatus"), content: fnMldStatus, tooltip: (!frontend? fncolNoteTooltip : null)}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus, combine: true, tooltip: (!frontend? fncolNoteTooltip : null)}));
}
else
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_status"), content: fnOpdrStatus, tooltip: (!frontend? fncolNoteTooltip : null)}));
// Notities
if (!frontend && !print)
rst.addColumn(new Column({caption: L("lcl_mld_note"), content: fncolNote, combine: true}));
if (!frontend)
rst.addColumn(new Column({caption: I("fa-comment-o")+" "+L("lcl_mld_note"), content: fncolNote, combine: true}));
// Plandata
rst.addColumn(new Column({columncode: ORDLST_PLANDATE1, caption: L("lcl_opdr_plandate"), content: "mld_opdr_plandatum", datatype: "date", nowrap: true}));
@@ -802,7 +803,7 @@ if (S("mld_show_order_details"))
rst.addColumn(new Column({columncode: ORDLST_PLANDATE2, caption: L("lcl_time"), content: "mld_opdr_plandatum2", datatype: "time", combine: true, nomidnight: true}));
rst.addColumn(new Column({caption: L("lcl_opdr_enddate"), content: "mld_opdr_einddatum", datatype: "date", nowrap: true}));
rst.addColumn(new Column({caption: L("lcl_time"), content: "mld_opdr_einddatum", datatype: "time", combine: true, nomidnight: true}));
// En ik kan een kolom met tijdstip laatste wijziging hier ook nog wel voorstellen
// de uitvoerder enzo (onderdrukken indien meegegeven)
if (params.handler_key > 0)
@@ -814,11 +815,11 @@ if (S("mld_show_order_details"))
else
rst.addColumn(new Column({caption: L("lcl_mld_behandelaar"), content: "behandelaar", combine: (!params.handler_key > 0)}));
// Contractnummer. best zinloos?
// Contractnummer. Erg zinloos als frame onder het contract, als print dan maar
if (cnt_key)
{
rst.addColumn(new Column({caption: L("lcl_cnt_contractnr"), content: "cnt_contract_nummer"}));
rst.addColumn(new Column({caption: L("lcl_cnt_intern_nr"), content: fncolContractnr}));
rst.addColumn(new Column({caption: L("lcl_cnt_contractnr"), content: "cnt_contract_nummer", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_cnt_intern_nr"), content: fncolContractnr, purpose: PRINTING_ONLY}));
}
rst.addColumn(new Column({columncode: ORDLST_OPMERK, caption: L("lcl_mld_inf_Opmerking"), content: "mld_opdr_opmerking"}));