forked from DGNum/gestioCOF
add transfer information
This commit is contained in:
parent
ac0356386a
commit
36edc334d4
1 changed files with 23 additions and 11 deletions
|
@ -22,6 +22,7 @@ function KHistory(options={}) {
|
||||||
$opegroup.after($ope);
|
$opegroup.after($ope);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
$opegroup.addClass("transfergroup");
|
||||||
for (var i=0; i<opegroup['opes'].length; i++) {
|
for (var i=0; i<opegroup['opes'].length; i++) {
|
||||||
var $transfer = this._transferHtml(opegroup['opes'][i]);
|
var $transfer = this._transferHtml(opegroup['opes'][i]);
|
||||||
$transfer.data('transfergroup', opegroup['id']);
|
$transfer.data('transfergroup', opegroup['id']);
|
||||||
|
@ -74,8 +75,8 @@ function KHistory(options={}) {
|
||||||
$transfer_html
|
$transfer_html
|
||||||
.data('transfer', transfer['id'])
|
.data('transfer', transfer['id'])
|
||||||
.find('.amount').text(amount).end()
|
.find('.amount').text(amount).end()
|
||||||
.find('.from_acc').text(transfer['from_acc']).end()
|
.find('.infos1').text(transfer['from_acc']).end()
|
||||||
.find('.to_acc').text(transfer['to_acc']).end();
|
.find('.infos2').text(transfer['to_acc']).end();
|
||||||
|
|
||||||
return $transfer_html ;
|
return $transfer_html ;
|
||||||
|
|
||||||
|
@ -95,21 +96,31 @@ function KHistory(options={}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this._opeGroupHtml = function(opegroup) {
|
this._opeGroupHtml = function(opegroup) {
|
||||||
var $opegroup_html = $(this.template_opegroup);
|
|
||||||
|
var type = opegroup['type'];
|
||||||
|
|
||||||
|
|
||||||
|
if (type == 'opegroup') {
|
||||||
|
var $opegroup_html = $(this.template_opegroup);
|
||||||
|
var trigramme = opegroup['on_acc__trigramme'];
|
||||||
|
var amount = amountDisplay(
|
||||||
|
parseFloat(opegroup['amount']), opegroup['is_cof'], trigramme);
|
||||||
|
} else {
|
||||||
|
var $opegroup_html = $(this.template_transfergroup);
|
||||||
|
var trigramme = '';
|
||||||
|
var amount = '' ;
|
||||||
|
}
|
||||||
|
|
||||||
var at = dateUTCToParis(opegroup['at']).format('HH:mm:ss');
|
var at = dateUTCToParis(opegroup['at']).format('HH:mm:ss');
|
||||||
var trigramme = opegroup['on_acc__trigramme'];
|
|
||||||
var amount = amountDisplay(
|
|
||||||
parseFloat(opegroup['amount']), opegroup['is_cof'], trigramme);
|
|
||||||
amount = opegroup['type'] == 'opegroup' ? amount : '' ;
|
|
||||||
var comment = opegroup['comment'] || '';
|
var comment = opegroup['comment'] || '';
|
||||||
|
|
||||||
$opegroup_html
|
$opegroup_html
|
||||||
.data('opegroup', opegroup['id'])
|
.data(type, opegroup['id'])
|
||||||
.find('.time').text(at).end()
|
.find('.time').text(at).end()
|
||||||
|
.find('.trigramme').text(trigramme).end()
|
||||||
|
.find('.info').text("Transferts").end()
|
||||||
.find('.amount').text(amount).end()
|
.find('.amount').text(amount).end()
|
||||||
.find('.comment').text(comment).end()
|
.find('.comment').text(comment).end();
|
||||||
.find('.trigramme').text(trigramme).end();
|
|
||||||
|
|
||||||
if (!this.display_trigramme)
|
if (!this.display_trigramme)
|
||||||
$opegroup_html.find('.trigramme').remove();
|
$opegroup_html.find('.trigramme').remove();
|
||||||
|
@ -158,7 +169,8 @@ KHistory.default_options = {
|
||||||
container: '#history',
|
container: '#history',
|
||||||
template_day: '<div class="day"></div>',
|
template_day: '<div class="day"></div>',
|
||||||
template_opegroup: '<div class="opegroup"><span class="time"></span><span class="trigramme"></span><span class="amount"></span><span class="valid_by"></span><span class="comment"></span></div>',
|
template_opegroup: '<div class="opegroup"><span class="time"></span><span class="trigramme"></span><span class="amount"></span><span class="valid_by"></span><span class="comment"></span></div>',
|
||||||
|
template_transfergroup: '<div class="opegroup"><span class="time"></span><span class="info"></span><span class="valid_by"></span><span class="comment"></span></div>',
|
||||||
template_ope: '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="infos2"></span><span class="addcost"></span><span class="canceled"></span></div>',
|
template_ope: '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="infos2"></span><span class="addcost"></span><span class="canceled"></span></div>',
|
||||||
template_transfer: '<div class="ope transfer"><span class="amount"></span><span class="from_acc"></span><span class="glyphicon glyphicon-arrow-right"></span><span class="to_acc"></span></div>',
|
template_transfer: '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="glyphicon glyphicon-arrow-right"></span><span class="infos2"></span></div>',
|
||||||
display_trigramme: true,
|
display_trigramme: true,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue