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

AAIT#30722: Opmerkingen naar aanleiding van AAIT#29901 (Maint. proces).

Browse Source 
svn path=/Website/trunk/; revision=23546
This commit is contained in:
Maykel Geerdink
2014-12-03 13:16:42 +00:00
parent 8fbd1d5890
commit e73318f904
3 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
APPL/FAC/fac_fiattering_list.asp
View File

@@ -363,11 +363,11 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
{
switch (oRs("module").Value)
{
case "BES": return L("lcl_bes_bestelling");
case "CNT": return L("lcl_cnt_contract");
case "MLD": return L("lcl_shared_order") + "<br>" + safe.html(oRs("mld_typeopdr_omschrijving").Value);
case "GOED": return L("lcl_shared_order") + "<br>" + safe.html(oRs("mld_typeopdr_omschrijving").Value);
case "OFFERTE": return safe.html(oRs("mld_typeopdr_omschrijving").Value) + "<br>" + safe.html(oRs("uitvoerende").Value);
case "BES": return L("lcl_bes_bestelling"); break;
case "CNT": return L("lcl_cnt_contract"); break;
case "MLD": return L("lcl_shared_order") + "<br>" + safe.html(oRs("mld_typeopdr_omschrijving").Value); break;
case "GOED": return L("lcl_shared_order") + "<br>" + safe.html(oRs("mld_typeopdr_omschrijving").Value); break;
case "OFFERTE": return safe.html(oRs("mld_typeopdr_omschrijving").Value) + "<br>" + safe.html(oRs("uitvoerende").Value); break;
default: INTERNAL_ERROR;
}
}
@@ -425,6 +425,19 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
else return oRs.fields("gebouw").Value;
}
function fnactApprove(oRs)
{
switch (oRs("module").Value)
{
case "BES":
case "CNT":
case "MLD": return L("lcl_approve"); break; // Fiatteren bestelling, contract, melding opdracht
case "GOED": return L("lcl_goedkeur"); break; // Goedkeuren melding opdracht
case "OFFERTE": return L("lcl_accept"); break; // Accepteren melding offerte
default: INTERNAL_ERROR;
}
}
var sql = fiattering_sql(params);
var rst = new ResultsetTable({keyColumn: "request_key",
ID: "rfoTable",
@@ -452,7 +465,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
rst.addColumn(new Column({caption: L("lcl_bld_terra"), content: fncolGebouwTerrein, combine: true}));
rst.addAction({action: "fac_edit", caption: L("lcl_details"), isDefault: true});
rst.addAction({action: "fac_approve", caption: L("lcl_approve"), enabler: "eApprove", multi: true, multiOnce: true});
rst.addAction({action: "fac_approve", caption: L("lcl_approve"), captionoverrule: fnactApprove, enabler: "eApprove", multi: true, multiOnce: true});
rst.addAction({action: "fac_reject", caption: L("lcl_reject"), enabler: "eReject", multi: true, multiOnce: true});

18
APPL/Localscripts/resultset_table_v2.js
View File

@@ -151,6 +151,24 @@ function showActions(event) // event op de mouseover van resultsettable
$actiondiv.stop().hide();
$actiondiv.delay(100).fadeIn('fast');
event.stopPropagation();
// Kijken of er action captions zijn die verschillende waarden kunnen hebben (captionoverrule)
var captions = eval("(" + this.getAttribute("CAPTIONS") + ")");
if (captions)
{
for (var j = 0; j < captions.aantal; j++)
{
if (captions["caption" + j])
{
var thisTABLE = this.parentNode;
if (thisTABLE.nodeName == "TBODY")
thisTABLE = thisTABLE.parentNode; // Indien de tabel een <tbody> heeft dan de parent <table> pakken.
// Nu deze button overschrijven/overrulen door een ander tekst.
$("#allactions_" + thisTABLE.id + " > span")[j].innerHTML = captions["caption" + j];
}
}
}
var bits = String(this.getAttribute('ACTIONBITS'));
// Zet alle actions aan die enabled zijn
window.ww = 0;

24
APPL/Shared/resultset_table_v2.inc
View File

@@ -1198,6 +1198,30 @@ function __rsMakeTableRow(oRs, oRsFlex, cnt, anyMultiActions, noFlexResult)
}
if (!isPrinting && !isExcel && rowData != null)
appender += " ROWDATA='" + safe.htmlattr(rowData(oRs, this.processParams)) + "'";
// Kijken of er action captions zijn die verschillende waarden kunnen hebben (captionoverrule)
var captionoverrule = false;
for (var j = 0; j < this.actions.length; j++)
{
if (this.actions[j].captionoverrule) captionoverrule = true;
if (captionoverrule) break;
}
if (!isPrinting && !isExcel && this.actions.length > 0 && captionoverrule)
{
appenderpart = {};
var found = false;
for (var j = 0; j < this.actions.length; j++)
{
appenderpart.aantal = this.actions.length;
if (this.actions[j].captionoverrule)
{
appenderpart["caption" + j] = safe.htmlattr(this.actions[j].captionoverrule(oRs));
found = true;
}
}
appender += " CAPTIONS='" + JSON.stringify(appenderpart) + "'";
}
if (!isPrinting && dblClick != null)
appender += " onDblClick='" + safe.htmlattr(dblClick) + "'";