FSN#40717 Sortering op reserveringsnummer -->Toch nog niet

svn path=/Website/branches/v2017.1/; revision=34071
This commit is contained in:
Jos Groot Lipman
2017-05-30 15:12:01 +00:00
parent fda389eb25
commit 77c14fce37

View File

@@ -963,7 +963,7 @@ function res_list (pautfunction, params)
{ // verwijderd
rowclass = "deleted";
}
if (oRs("verval").Value == 0 || oRs("dirtlevel").Value != 0)
{ // dirty!
if (frontend)
@@ -974,7 +974,7 @@ function res_list (pautfunction, params)
{
rowclass += " res_fatal";
}
}
}
var res_recent = new Date(oRs("recentdatum").Value);
if (res_recent > recent)
@@ -999,10 +999,10 @@ function res_list (pautfunction, params)
function fncolStatus(oRs) {
var foStatKey = oRs("res_status_fo_key").value;
if (oRs("dirtlevel").Value != 0 && frontend)
foStatKey = -1;
return res.getfostatustext(foStatKey);
}
@@ -1057,7 +1057,7 @@ function res_list (pautfunction, params)
// Kolommen
if (!frontend && S("res_reservering_flags") > 0)
rst.addColumn(new Column({caption: "o", content: fncolFlags, align: "center"}));
rst.addColumn(new Column({caption: L("lcl_resnr"), content: fncolResNr, customSort: "rsv_ruimte_key" }));
rst.addColumn(new Column({caption: L("lcl_resnr"), content: fncolResNr }));
rst.addColumn(new Column({caption: L("lcl_room_n"), content: "waar", hasActions: true}));
// Compacter op scherm als datefrom==dateto
if (res_key || outputmode != 0 || outputmode == 0 && datefrom && dateto && datefrom.midnight().getTime() != dateto.midnight().getTime())
@@ -2363,7 +2363,7 @@ function res_list (pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_res_starttime"), content: fncolVan, datatype: "time", keepKeyRepeat: true}));
rst.addColumn(new Column({caption: L("lcl_res_endtime"), content: fncolTot, datatype: "time"}));
rst.addColumn(new Column({caption: L("lcl_resnr"), content: fnrowResNr, customSort: "rsv_ruimte_key"}));
rst.addColumn(new Column({caption: L("lcl_resnr"), content: fnrowResNr}));
rst.addColumn(new Column({caption: L("lcl_res_pers_n"), content: fnrowVisitors}));
if (excel)
{ // Aparte kolommen voor aantal/config en aantal/voorzieningen