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

DENB#39784 aantal objecten weggehaald in overzicht en button res voorziening toegevoegd aan 'lopende zaken'

Browse Source 
svn path=/Website/trunk/; revision=35431
This commit is contained in:
Koen Reefman
2017-09-26 07:35:38 +00:00
parent 4b94555567
commit 8bd38ef3d6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/PDA/fac_list.asp
View File

@@ -286,7 +286,13 @@ function fncolHeader(oRs)
|| (xfunc.canWrite("WEB_RESUSE") && modules[module].xmlnode == "reservering")
))
{
BUTTON (L("lcl_add"), {linkid:fncolLinkKey(modules[module].xmlnode, -1), dataicon: "plus", dataajax: 'false'});
if (modules[module].xmlnode == "reservering")
{
BUTTON (L("lcl_res_add_ruimte"), {linkid:fncolLinkKey(modules[module].xmlnode, -1) + "&restype=R", dataicon: "plus", dataajax: 'false'});
BUTTON (L("lcl_res_add_cv"), {linkid:fncolLinkKey(modules[module].xmlnode, -1) + "&restype=CV", dataicon: "plus", dataajax: 'false'});
}
else
BUTTON (L("lcl_add"), {linkid:fncolLinkKey(modules[module].xmlnode, -1), dataicon: "plus", dataajax: 'false'});
}
var rst = new ResultsetTable({sql: modules[module].sql,
keyColumn: "item_key",

14
APPL/PDA/reservering_new.asp
View File

@@ -457,7 +457,7 @@ if (rsv_ruimte_key == -1)
{ label : L("lcl_from"),
datum: res_van,
maxPast: 0,
maxFuture: (S("res_fe_reservering_limiet") > 0? S("res_fe_reservering_limiet") : S("res_reservering_limiet")),
maxFuture: (S("res_fe_reservering_limiet") > 0 ? S("res_fe_reservering_limiet") : S("res_reservering_limiet")),
timeField: true,
timeStep: S("res_h") * 60,
startTime: S("res_t1"),
@@ -473,7 +473,7 @@ if (rsv_ruimte_key == -1)
FCLTcalendar("date_to",
{ label : L("lcl_to"),
datum: res_tot,
maxFuture: (S("res_fe_reservering_limiet") > 0? S("res_fe_reservering_limiet") : S("res_reservering_limiet")),
maxFuture: (S("res_fe_reservering_limiet") > 0 ? S("res_fe_reservering_limiet") : S("res_reservering_limiet")),
timeField: true,
timeStep: S("res_h") * 60,
startTime: S("res_t1"),
@@ -722,16 +722,11 @@ if (rsv_ruimte_key == -1)
return oRs("aantal").Value > 0;
}
function fnDiscHeader(oRs)
{
return oRs("ins_discipline_omschrijving").Value + " (" + oRs("aantal").Value + ")";
}
var rst = new ResultsetTable({ sql: sql_d
, keyColumn: "ins_discipline_key"
, fnDataFilter: fnDiscFilter
, linkColumn: fnDiscLink
, headerColumn: fnDiscHeader
, headerColumn: "ins_discipline_omschrijving"
, ID: "disctable"
, showAll: true
, emptySetString: L("lcl_empty")
@@ -796,11 +791,10 @@ if (rsv_ruimte_key == -1)
, linkColumn: fnResCV
, iconColumn: fnResDeelIcon
, headerColumn: "res_deel_omschrijving"
// ? , extraFilterColumn: "mld_stdmelding_hint"
, subheaderColumn: fncolSubHeader
, ID: "restable"
, showAll: true
, emptySetString: L("lcl_empty")
, emptySetString: L("lcl_ins_no_obj_available").format(subject.toLowerCase()) // indien alle objecten al gereserveerd zijn (TODO: eruit filteren)
});
var cnt = rst.processResultset();