diff --git a/kfet/static/kfet/css/history.css b/kfet/static/kfet/css/history.css
index dbd36a92..e7d6858c 100644
--- a/kfet/static/kfet/css/history.css
+++ b/kfet/static/kfet/css/history.css
@@ -23,6 +23,7 @@
color:#fff;
font-weight:bold;
padding-left:20px;
+ overflow:auto;
}
#history .opegroup .time {
@@ -43,6 +44,10 @@
padding-left:20px
}
+#history .opegroup .comment {
+ padding-left:20px;
+}
+
#history .ope {
position:relative;
height:25px;
diff --git a/kfet/templates/kfet/account_read.html b/kfet/templates/kfet/account_read.html
index 2c9537ba..977b7c22 100644
--- a/kfet/templates/kfet/account_read.html
+++ b/kfet/templates/kfet/account_read.html
@@ -51,6 +51,9 @@
{% if perms.kfet.is_team %}
Par {{ ope.group.valid_by.trigramme }}
{% endif %}
+ {% if ope.group.comment %}
+
+ {% endif %}
{% endifchanged %}
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index c27d7f27..19fca28f 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -980,7 +980,7 @@ $(document).ready(function() {
// -----
var history_container = $('#history');
- var history_operationgroup_html = '
';
+ var history_operationgroup_html = '
';
var history_operation_html = '
';
function getOpeHtml(ope, is_cof=false, trigramme='') {
@@ -1040,13 +1040,15 @@ $(document).ready(function() {
var valid_by = '';
if (opegroup['valid_by__trigramme'])
valid_by = 'Par '+opegroup['valid_by__trigramme'];
+ var comment = opegroup['comment'] || '';
opegroup_html
.attr('data-opegroup', opegroup['id'])
.find('.time').text(at_formated).end()
.find('.amount').text(amount).end()
.find('.trigramme').text(trigramme).end()
- .find('.valid_by').text(valid_by).end();
+ .find('.valid_by').text(valid_by).end()
+ .find('.comment').text(comment).end();
return opegroup_html;
}
diff --git a/kfet/views.py b/kfet/views.py
index f91bcf95..ff477a3c 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -794,6 +794,7 @@ def kpsul_perform_operations(request):
'checkout__name': operationgroup.checkout.name,
'at': operationgroup.at,
'is_cof': operationgroup.is_cof,
+ 'comment': operationgroup.comment,
'valid_by__trigramme': ( operationgroup.valid_by and
operationgroup.valid_by.trigramme or None),
'on_acc__trigramme': operationgroup.on_acc.trigramme,
@@ -987,7 +988,7 @@ def kpsul_cancel_operations(request):
def kpsul_history(request):
opegroups_list = (OperationGroup.objects
.values(
- 'id', 'amount', 'at', 'checkout_id', 'is_cof',
+ 'id', 'amount', 'at', 'checkout_id', 'is_cof', 'comment',
'valid_by__trigramme', 'on_acc__trigramme')
.select_related('valid_by', 'on_acc')
.filter(at__gt=timezone.now()-timedelta(hours=24)))