Merge branch 'master' into manage_button

apps/note/tables.py

@@ -1,12 +1,15 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import html
+
 import django_tables2 as tables
 from django.db.models import F
 from django_tables2.utils import A
+from django.utils.translation import gettext_lazy as _
 
 from .models.notes import Alias
-from .models.transactions import Transaction, TransactionTemplate
+from .models.transactions import Transaction
 from .templatetags.pretty_money import pretty_money
 
 
@@ -17,17 +20,25 @@ class HistoryTable(tables.Table):
                 'table table-condensed table-striped table-hover'
         }
         model = Transaction
-        exclude = ("polymorphic_ctype", )
+        exclude = ("id", "polymorphic_ctype", )
         template_name = 'django_tables2/bootstrap4.html'
-        sequence = ('...', 'total', 'valid')
+        sequence = ('...', 'type', 'total', 'valid', )
+        orderable = False
+
+    type = tables.Column()
 
     total = tables.Column()  # will use Transaction.total() !!
 
+    valid = tables.Column(attrs={"td": {"id": lambda record: "validate_" + str(record.id),
+                                        "class": lambda record: str(record.valid).lower() + ' validate',
+                                        "onclick": lambda record: 'de_validate(' + str(record.id) + ', '
+                                                                  + str(record.valid).lower() + ')'}})
+
     def order_total(self, queryset, is_descending):
         # needed for rendering
         queryset = queryset.annotate(total=F('amount') * F('quantity')) \
             .order_by(('-' if is_descending else '') + 'total')
-        return (queryset, True)
+        return queryset, True
 
     def render_amount(self, value):
         return pretty_money(value)
@@ -35,6 +46,16 @@ class HistoryTable(tables.Table):
     def render_total(self, value):
         return pretty_money(value)
 
+    def render_type(self, value):
+        return _(value)
+
+    # Django-tables escape strings. That's a wrong thing.
+    def render_reason(self, value):
+        return html.unescape(value)
+
+    def render_valid(self, value):
+        return "✔" if value else "✖"
+
 
 class AliasTable(tables.Table):
     class Meta: