diff --git a/kfet/static/kfet/css/history.css b/kfet/static/kfet/css/history.css index 64b82f96..fc6a46ad 100644 --- a/kfet/static/kfet/css/history.css +++ b/kfet/static/kfet/css/history.css @@ -40,7 +40,7 @@ width:90px; } -#history .opegroup .info { +#history .opegroup .infos { text-align:center; width:145px; } diff --git a/kfet/static/kfet/js/history.js b/kfet/static/kfet/js/history.js index f870b4cc..bde8b149 100644 --- a/kfet/static/kfet/js/history.js +++ b/kfet/static/kfet/js/history.js @@ -58,7 +58,7 @@ function KHistory(options={}) { var addcost_for = ope['addcost_for__trigramme']; if (addcost_for) { var addcost_amount = parseFloat(ope['addcost_amount']); - $ope_html.find('.addcost').text('('+amountDisplay(addcost_amount, is_cof)+'UKF pour '+addcost_for+')'); + $ope_html.find('.addcost').text('('+amountDisplay(addcost_amount, is_cof)+' UKF pour '+addcost_for+')'); } if (ope['canceled_at']) @@ -88,7 +88,7 @@ function KHistory(options={}) { this.cancelOpe = function(ope, $ope = null) { if (!$ope) - $ope = this.findOpe(ope['id']); + $ope = this.findOpe(ope['id'], ope['type']); var cancel = 'Annulé'; var canceled_at = dateUTCToParis(ope['canceled_at']); @@ -123,7 +123,7 @@ function KHistory(options={}) { .data('id', opegroup['id']) .find('.time').text(at).end() .find('.trigramme').text(trigramme).end() - .find('.info').text("Transferts").end() + .find('.infos').text("Transferts").end() .find('.amount').text(amount).end() .find('.comment').text(comment).end(); @@ -155,7 +155,7 @@ function KHistory(options={}) { }); } - this.findOpe = function(id, type) { + this.findOpe = function(id, type='ope') { return this.$container.find('.ope').filter(function() { return ($(this).data('id') == id && $(this).data('type') == type) }); @@ -175,7 +175,7 @@ KHistory.default_options = { container: '#history', template_day: '
', template_opegroup: '