From 5c6bfab3fb7f4f1841f380de9134a871a5536879 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Wed, 7 Apr 2021 16:32:31 +0200
Subject: [PATCH 01/15] :lipstick: [#58] Updated templates

---
 .../destruction/management/__init__.py        |  0
 .../management/commands/__init__.py           |  0
 .../commands/convert_log_templates.py         | 18 ++++++++++++++++
 .../destruction/tasks.py                      | 10 ++++-----
 .../templates/destruction/logs/aborted.html   | 14 +++++++++++++
 .../templates/destruction/logs/aborted.txt    | 14 -------------
 .../templates/destruction/logs/created.html   | 14 +++++++++++++
 .../templates/destruction/logs/created.txt    | 14 -------------
 .../logs/item_destruction_failed.html         | 14 +++++++++++++
 .../logs/item_destruction_failed.txt          | 13 ------------
 .../logs/item_destruction_succeeded.html      |  8 +++++++
 .../logs/item_destruction_succeeded.txt       |  7 -------
 .../destruction/logs/item_update_failed.html  | 14 +++++++++++++
 .../destruction/logs/item_update_failed.txt   | 13 ------------
 .../logs/item_update_succeeded.html           |  8 +++++++
 .../logs/item_update_succeeded.txt            |  7 -------
 .../destruction/logs/review_created.html      | 20 ++++++++++++++++++
 .../destruction/logs/review_created.txt       | 14 -------------
 .../templates/destruction/logs/updated.html   | 21 +++++++++++++++++++
 .../templates/destruction/logs/updated.txt    | 14 -------------
 .../tests/test_destruction_list_create.py     |  2 +-
 .../tests/test_destruction_list_detail.py     |  6 +++---
 .../destruction/tests/test_review_create.py   |  8 +++----
 .../destruction/tests/test_tasks.py           |  4 ++--
 .../destruction/views.py                      |  8 +++----
 .../sass/components/_log-item.scss            | 12 +++--------
 26 files changed, 153 insertions(+), 124 deletions(-)
 create mode 100644 src/archiefvernietigingscomponent/destruction/management/__init__.py
 create mode 100644 src/archiefvernietigingscomponent/destruction/management/commands/__init__.py
 create mode 100644 src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.txt
 create mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
 delete mode 100644 src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.txt

diff --git a/src/archiefvernietigingscomponent/destruction/management/__init__.py b/src/archiefvernietigingscomponent/destruction/management/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/archiefvernietigingscomponent/destruction/management/commands/__init__.py b/src/archiefvernietigingscomponent/destruction/management/commands/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py b/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
new file mode 100644
index 00000000..d38490e8
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+
+from timeline_logger.models import TimelineLog
+
+
+class Command(BaseCommand):
+    help = "Change the extension of the log templates from .txt to .html"
+
+    def handle(self, *args, **options):
+        logs = TimelineLog.objects.all()
+
+        with transaction.atomic():
+            for log in logs:
+                template_name = log.template
+                if ".txt" in template_name:
+                    log.template = template_name.replace(".txt", ".html")
+                    log.save()
diff --git a/src/archiefvernietigingscomponent/destruction/tasks.py b/src/archiefvernietigingscomponent/destruction/tasks.py
index d60d5cd7..54f64f9c 100644
--- a/src/archiefvernietigingscomponent/destruction/tasks.py
+++ b/src/archiefvernietigingscomponent/destruction/tasks.py
@@ -69,7 +69,7 @@ def process_list_item(list_item_id):
         list_item.save()
         TimelineLog.objects.create(
             content_object=list_item,
-            template="destruction/logs/item_destruction_failed.txt",
+            template="destruction/logs/item_destruction_failed.html",
             extra_data={"zaak": None, "error": traceback.format_exc(),},
         )
         return
@@ -98,7 +98,7 @@ def process_list_item(list_item_id):
         list_item.fail()
         TimelineLog.objects.create(
             content_object=list_item,
-            template="destruction/logs/item_destruction_failed.txt",
+            template="destruction/logs/item_destruction_failed.html",
             extra_data={
                 "zaak": zaak["identificatie"],
                 "error": traceback.format_exc(),
@@ -108,7 +108,7 @@ def process_list_item(list_item_id):
         list_item.complete()
         TimelineLog.objects.create(
             content_object=list_item,
-            template="destruction/logs/item_destruction_succeeded.txt",
+            template="destruction/logs/item_destruction_succeeded.html",
             extra_data={"zaak": zaak["identificatie"]},
         )
 
@@ -229,12 +229,12 @@ def update_zaak_from_list_item(list_item_id: str, archive_data: dict):
 
         TimelineLog.objects.create(
             content_object=list_item,
-            template="destruction/logs/item_update_failed.txt",
+            template="destruction/logs/item_update_failed.html",
             extra_data={"zaak": None, "error": traceback.format_exc()},
         )
     else:
         TimelineLog.objects.create(
             content_object=list_item,
-            template="destruction/logs/item_update_succeeded.txt",
+            template="destruction/logs/item_update_succeeded.html",
             extra_data={"zaak": zaak["identificatie"]},
         )
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.html
new file mode 100644
index 00000000..4706ceca
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with list=log.content_object role=log.user.role count counter=log.extra_data.n_items trimmed %}
+        User with role <strong>{{ role }}</strong> has aborted the list <strong>{{ list }}</strong>
+        with {{ counter }} case.
+    {% plural %}
+        User with role <strong>{{ role }}</strong> has aborted the list <strong>{{ list }}</strong>
+        with {{ counter }} cases.
+    {% endblocktrans %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.txt
deleted file mode 100644
index 5615f9ae..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    {% blocktrans with list=log.content_object user=log.user count counter=log.extra_data.n_items trimmed %}
-        <span class="log-item__user">{{ user }}</span> has aborted the list <strong>{{ list }}</strong>
-        with {{ counter }} zaak.
-    {% plural %}
-        <span class="log-item__user">{{ user }}</span> has aborted the list <strong>{{ list }}</strong>
-        with {{ counter }} zaken.
-    {% endblocktrans %}
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
new file mode 100644
index 00000000..6002f30b
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with list=log.content_object role=log.user.role count counter=log.extra_data.n_items trimmed %}
+        User with role <strong>{{ role }}</strong> created the list <strong>{{ list }}</strong>
+        with {{ counter }} case.
+    {% plural %}
+        User with role <strong>{{ role }}</strong> created the list <strong>{{ list }}</strong>
+        with {{ counter }} cases.
+    {% endblocktrans %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.txt
deleted file mode 100644
index 13026e6c..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    {% blocktrans with list=log.content_object user=log.user count counter=log.extra_data.n_items trimmed %}
-        <span class="log-item__user">{{ user }}</span> heeft de lijst <strong>{{ list }}</strong>
-        met {{ counter }} zaak aangemaakt.
-    {% plural %}
-        <span class="log-item__user">{{ user }}</span> heeft de lijst <strong>{{ list }}</strong>
-        met {{ counter }} zaken aangemaakt.
-    {% endblocktrans %}
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html
new file mode 100644
index 00000000..a574952d
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with zaak=log.extra_data.zaak %}Case <strong>{{ zaak }}</strong> was not deleted.{% endblocktrans %}
+
+    <p class="log-item__details">
+        <code>
+            {{ log.extra_data.error|linebreaksbr|linenumbers }}
+        </code>
+    </p>
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.txt
deleted file mode 100644
index ac7b5dd8..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    Zaak <strong>{{ log.extra_data.zaak }}</strong> is niet vernietigd.
-
-    <p class="log-item__details">
-        <code>
-            {{ log.extra_data.error|linebreaksbr|linenumbers }}
-        </code>
-    </p>
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.html
new file mode 100644
index 00000000..4a8ae067
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with zaak=log.extra_data.zaak %}Case <strong>{{ zaak }}</strong> was deleted.{% endblocktrans %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.txt
deleted file mode 100644
index 2ddbb47e..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    Zaak <strong>{{ log.extra_data.zaak }}</strong> is vernietigd.
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.html
new file mode 100644
index 00000000..dc85412e
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with zaak=log.extra_data.zaak %}Case <strong>{{ zaak }}</strong> was not updated.{% endblocktrans %}
+
+    <p class="log-item__details">
+        <code>
+            {{ log.extra_data.error|linebreaksbr|linenumbers }}
+        </code>
+    </p>
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.txt
deleted file mode 100644
index e57d83f4..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    Zaak <strong>{{ log.extra_data.zaak }}</strong> is not updated.
-
-    <p class="log-item__details">
-        <code>
-            {{ log.extra_data.error|linebreaksbr|linenumbers }}
-        </code>
-    </p>
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html
new file mode 100644
index 00000000..58913262
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html
@@ -0,0 +1,8 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% blocktrans with zaak=log.extra_data.zaak %}Case <strong>{{ zaak }}</strong> was updated.{% endblocktrans %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.txt
deleted file mode 100644
index 1ad5916c..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    Zaak <strong>{{ log.extra_data.zaak }}</strong> is updated.
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
new file mode 100644
index 00000000..480efd0e
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
@@ -0,0 +1,20 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% if log.extra_data.n_items %}
+        {% blocktrans with list=log.content_object.destruction_list role=log.user.role count counter=log.extra_data.n_items trimmed %}
+            User with role <strong>{{ role }}</strong> has reviewed the list <strong>{{ list }}</strong>
+            and requested changes for {{ counter }} item.
+        {% plural %}
+            User with role <strong>{{ role }}</strong> has reviewed the list <strong>{{ list }}</strong>
+            and requested changes for {{ counter }} items.
+        {% endblocktrans %}
+    {% else %}
+        {% blocktrans with list=log.content_object.destruction_list role=log.user.role %}
+            User with role <strong>{{ role }}</strong> has approved the list <strong>{{ list }}</strong>.
+        {% endblocktrans %}
+    {% endif %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.txt
deleted file mode 100644
index 8f9180d2..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    {% blocktrans with review=log.content_object user=log.user count counter=log.extra_data.n_items trimmed %}
-        <span class="log-item__user">{{ user }}</span> has created the review <strong>{{ review }}</strong>
-        and requested changes for {{ counter }} item.
-    {% plural %}
-        <span class="log-item__user">{{ user }}</span> has created the review <strong>{{ review }}</strong>
-        and requested changes for {{ counter }} items.
-    {% endblocktrans %}
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
new file mode 100644
index 00000000..3f920673
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+<code class="log-item__title" title="{{ log.timestamp.isoformat }}">
+    <strong>[{{ log.timestamp|date:'Y-m-d H:i' }}]:</strong>
+</code>
+
+<div class="log-item__body">
+    {% if log.extra_data.n_items %}
+        {% blocktrans with list=log.content_object role=log.user.role count counter=log.extra_data.n_items trimmed %}
+            User with role <strong>{{ role }}</strong> has updated the list <strong>{{ list }}</strong>
+            and removed {{ counter }} case.
+        {% plural %}
+            User with role <strong>{{ role }}</strong> has updated the list <strong>{{ list }}</strong>
+            and removed {{ counter }} cases.
+        {% endblocktrans %}
+    {% else %}
+        {% blocktrans with list=log.content_object role=log.user.role trimmed %}
+            User with role <strong>{{ role }}</strong> has resubmitted the list <strong>{{ list }}</strong>
+            for review.
+        {% endblocktrans %}
+    {% endif %}
+</div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.txt b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.txt
deleted file mode 100644
index b32c1bb9..00000000
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load i18n %}
-<time class="log-item__title" title="{{ log.timestamp.isoformat }}">
-    {{ log.timestamp|timesince }} geleden
-</time>
-
-<div class="log-item__body">
-    {% blocktrans with list=log.content_object user=log.user count counter=log.extra_data.n_items trimmed %}
-        <span class="log-item__user">{{ user }}</span> has updated the list <strong>{{ list }}</strong>
-        with {{ counter }} zaak removed.
-    {% plural %}
-        <span class="log-item__user">{{ user }}</span> has updated the list <strong>{{ list }}</strong>
-        with {{ counter }} zaken removed.
-    {% endblocktrans %}
-</div>
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
index 55cd7d68..420e3bcc 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
@@ -59,7 +59,7 @@ def test_create_list(self):
         # check that a log entry was created
         timeline_log = destruction_list.logs.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/created.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/created.html")
 
         # check that notifications were sent
         notification = Notification.objects.get()
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
index 75063b22..5f12f808 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
@@ -90,7 +90,7 @@ def test_update_destruction_list(self, m):
         # check log
         timeline_log = TimelineLog.objects.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/updated.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/updated.html")
 
         # check notification
         notification = Notification.objects.get()
@@ -150,7 +150,7 @@ def test_abort_destruction_list(self, m):
         # check log
         timeline_log = TimelineLog.objects.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/aborted.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/aborted.html")
 
         # Check notification
         # Since the User is both the author and the assignee, no notification is sent
@@ -204,7 +204,7 @@ def test_abort_destruction_list_notify_assignee(self, m):
         # check log
         timeline_log = TimelineLog.objects.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/aborted.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/aborted.html")
 
         # Check notification
         notifications = Notification.objects.filter(destruction_list=destruction_list)
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py b/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
index f2a4f8f2..3115b741 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
@@ -100,7 +100,7 @@ def test_create_review_approve(self):
         #  check logs
         timeline_log = review.logs.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
 
         #  check notifications
         notifications = Notification.objects.all()
@@ -160,7 +160,7 @@ def test_create_review_change(self):
         #  check logs
         timeline_log = review.logs.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
 
         #  check notifications
         notifications = Notification.objects.order_by("created").all()
@@ -215,7 +215,7 @@ def test_create_review_reject(self):
         #  check logs
         timeline_log = review.logs.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
 
         #  check notifications
         notifications = Notification.objects.order_by("created").all()
@@ -258,7 +258,7 @@ def test_create_review_approve_last(self, m):
         #  check logs
         timeline_log = review.logs.get()
         self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.txt")
+        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
 
         #  check notification
         notification = Notification.objects.get()
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_tasks.py b/src/archiefvernietigingscomponent/destruction/tests/test_tasks.py
index 7aa218ad..61ca07e7 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_tasks.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_tasks.py
@@ -566,7 +566,7 @@ def test_update_zaak_from_list_item(self, mock_update_zaak):
         log = TimelineLog.objects.get()
         self.assertEqual(log.content_object, list_item)
         self.assertEqual(log.extra_data, {"zaak": "foobar"})
-        self.assertEqual(log.template, "destruction/logs/item_update_succeeded.txt")
+        self.assertEqual(log.template, "destruction/logs/item_update_succeeded.html")
 
         mock_update_zaak.assert_called_once_with(
             list_item.zaak, archive_data, "Change archive params"
@@ -590,6 +590,6 @@ def test_update_zaak_from_list_item_fail(self, mock_update_zaak):
         extra_data = log.extra_data
         self.assertEqual(extra_data["zaak"], None)
         self.assertTrue("something went wrong" in extra_data["error"])
-        self.assertEqual(log.template, "destruction/logs/item_update_failed.txt")
+        self.assertEqual(log.template, "destruction/logs/item_update_failed.html")
 
         mock_update_zaak.assert_called_once_with(list_item.zaak, archive_data, None)
diff --git a/src/archiefvernietigingscomponent/destruction/views.py b/src/archiefvernietigingscomponent/destruction/views.py
index 7365eea3..6b23aeed 100644
--- a/src/archiefvernietigingscomponent/destruction/views.py
+++ b/src/archiefvernietigingscomponent/destruction/views.py
@@ -152,7 +152,7 @@ def form_valid(self, form):
         TimelineLog.log_from_request(
             self.request,
             destruction_list,
-            template="destruction/logs/created.txt",
+            template="destruction/logs/created.html",
             n_items=destruction_list.items.count(),
             reviewers=list(
                 destruction_list.assignees.values("assignee__id", "assignee__username")
@@ -221,7 +221,7 @@ def abort_destruction_list(self, destruction_list):
         TimelineLog.log_from_request(
             self.request,
             destruction_list,
-            template="destruction/logs/aborted.txt",
+            template="destruction/logs/aborted.html",
             n_items=destruction_list.items.count(),
         )
 
@@ -256,7 +256,7 @@ def forms_valid(self, form, inlines):
         TimelineLog.log_from_request(
             self.request,
             destruction_list,
-            template="destruction/logs/updated.txt",
+            template="destruction/logs/updated.html",
             n_items=destruction_list.items.filter(
                 status=ListItemStatus.removed
             ).count(),
@@ -415,7 +415,7 @@ def forms_valid(self, form, inlines):
         TimelineLog.log_from_request(
             self.request,
             list_review,
-            template="destruction/logs/review_created.txt",
+            template="destruction/logs/review_created.html",
             n_items=list_review.item_reviews.count(),
         )
         # send notification
diff --git a/src/archiefvernietigingscomponent/sass/components/_log-item.scss b/src/archiefvernietigingscomponent/sass/components/_log-item.scss
index f03435d5..02a84468 100644
--- a/src/archiefvernietigingscomponent/sass/components/_log-item.scss
+++ b/src/archiefvernietigingscomponent/sass/components/_log-item.scss
@@ -3,8 +3,10 @@
 
 .log-item {
 
-  padding: 1em;
+  padding: 0 1em;
   border-radius: 3px;
+  display: flex;
+  margin: 0.25em 0;
 
   &:hover {
     background: #fedede;
@@ -12,8 +14,6 @@
 
   @include element("title") {
     display: block;
-    margin-bottom: 0.5em;
-    text-decoration: underline;
   }
 
   @include element("body") {
@@ -25,10 +25,4 @@
       padding: 0.5em;
     }
   }
-
-  @include element("user") {
-    font-weight: bold;
-    color: $color-primary;
-  }
-
 }

From 46716f0b43284e996d28d803d728727acb4c95a7 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Wed, 7 Apr 2021 18:27:36 +0200
Subject: [PATCH 02/15] :sparkles: [#58] Audit trail report

---
 .../report/audittrail/audittrail.html         | 32 +++++++++++++++++++
 .../report/utils.py                           | 19 ++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/archiefvernietigingscomponent/report/templates/report/audittrail/audittrail.html

diff --git a/src/archiefvernietigingscomponent/report/templates/report/audittrail/audittrail.html b/src/archiefvernietigingscomponent/report/templates/report/audittrail/audittrail.html
new file mode 100644
index 00000000..913d9266
--- /dev/null
+++ b/src/archiefvernietigingscomponent/report/templates/report/audittrail/audittrail.html
@@ -0,0 +1,32 @@
+{% load i18n %}
+<head>
+    <style>
+        @page{
+            margin: 1cm;
+            @bottom-center{
+                content: counter(page) "/" counter(pages);
+            }
+        }
+        .log-item {
+            padding: 0 1em;
+            border-radius: 3px;
+            display: flex;
+            margin: 0.25em 0;
+            font-size: 12px;
+        }
+        .log-item > .log-item__title {
+            display: block;
+        }
+
+        .log-item > .log-item__body {
+            padding-left: 1em;
+        }
+
+    </style>
+</head>
+
+<h2>Audit trail</h2>
+
+{% for log in logs %}
+    <div class="log-item">{{ log.get_message }}</div>
+{% endfor %}
diff --git a/src/archiefvernietigingscomponent/report/utils.py b/src/archiefvernietigingscomponent/report/utils.py
index 486d8e81..d7ac7de7 100644
--- a/src/archiefvernietigingscomponent/report/utils.py
+++ b/src/archiefvernietigingscomponent/report/utils.py
@@ -1,6 +1,7 @@
 import csv
 import io
 from datetime import date, datetime
+from itertools import chain
 from typing import ByteString, List, Optional
 
 from django.conf import settings
@@ -225,6 +226,7 @@ def create_destruction_report(destruction_list: DestructionList) -> DestructionR
     report_content_html = create_html_report_content(
         zaken_data_for_report, destruction_list.contains_sensitive_info
     )
+    audittrail_html = create_audittrail_report(destruction_list)
     report_content_csv = create_csv_report_content(
         zaken_data_for_report, destruction_list.contains_sensitive_info
     )
@@ -243,7 +245,8 @@ def create_destruction_report(destruction_list: DestructionList) -> DestructionR
         title=report_subject,
         process_owner=process_owner_review.author if process_owner_review else None,
         content_pdf=ContentFile(
-            content=convert_to_pdf(report_content_html), name=f"{report_filename}.pdf"
+            content=convert_to_pdf(report_content_html + audittrail_html),
+            name=f"{report_filename}.pdf",
         ),
         content_csv=ContentFile(
             content=report_content_csv.read(), name=f"{report_filename}.csv"
@@ -261,3 +264,17 @@ def get_absolute_url(path: str, request: Optional[HttpRequest] = None) -> str:
     site = Site.objects.get_current()
     protocol = "https" if settings.IS_HTTPS else "http"
     return f"{protocol}://{site.domain}{path}"
+
+
+def create_audittrail_report(destruction_list: DestructionList):
+    list_logs = destruction_list.logs.all()
+    reviews_logs = [review.logs.all() for review in destruction_list.reviews.all()]
+    all_logs = sorted(
+        chain(*reviews_logs, list_logs), key=lambda instance: instance.timestamp
+    )
+
+    return render(
+        request=None,
+        template_name="report/audittrail/audittrail.html",
+        context={"logs": all_logs},
+    ).content.decode("utf8")

From 31ad62cede1f2afeb14cd62f35250c3ee62124f3 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Wed, 7 Apr 2021 18:28:06 +0200
Subject: [PATCH 03/15] :white_check_mark: [#58] Audit trail tests

---
 .../report/tests/test_utils.py                | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/src/archiefvernietigingscomponent/report/tests/test_utils.py b/src/archiefvernietigingscomponent/report/tests/test_utils.py
index 42d03123..012f1e4c 100644
--- a/src/archiefvernietigingscomponent/report/tests/test_utils.py
+++ b/src/archiefvernietigingscomponent/report/tests/test_utils.py
@@ -3,6 +3,8 @@
 from django.test import TestCase, override_settings
 
 from freezegun import freeze_time
+from lxml.html import document_fromstring
+from timeline_logger.models import TimelineLog
 
 from archiefvernietigingscomponent.accounts.tests.factories import UserFactory
 from archiefvernietigingscomponent.constants import RoleTypeChoices
@@ -17,6 +19,7 @@
     DestructionListReviewFactory,
 )
 from archiefvernietigingscomponent.report.utils import (
+    create_audittrail_report,
     get_destruction_list_archivaris_comments,
     get_destruction_report_data,
     get_looptijd,
@@ -707,3 +710,95 @@ def test_failed_destruction_not_in_report_content(self, m_vcs, m_zaaktype):
         self.assertEqual(1, len(report_data))
 
         self.assertEqual("ZAAK-2", report_data[0]["identificatie"])
+
+    def test_logs_from_right_list_are_shown(self):
+        record_manager = UserFactory.create(role__type=RoleTypeChoices.record_manager)
+        archivaris = UserFactory.create(role__type=RoleTypeChoices.archivist)
+
+        destruction_list_1 = DestructionListFactory.create(author=record_manager)
+        review_1 = DestructionListReviewFactory.create(
+            destruction_list=destruction_list_1, author=archivaris
+        )
+        destruction_list_2 = DestructionListFactory.create(author=record_manager)
+        review_2 = DestructionListReviewFactory.create(
+            destruction_list=destruction_list_2, author=archivaris
+        )
+
+        TimelineLog.objects.create(
+            content_object=destruction_list_1,
+            template="destruction/logs/created.html",
+            extra_data={"n_items": 3},
+            user=record_manager,
+        )
+        TimelineLog.objects.create(
+            content_object=review_1,
+            template="destruction/logs/review_created.html",
+            user=archivaris,
+        )
+        # These should not appear in the audit trail report, because they are not related to the right list
+        TimelineLog.objects.create(
+            content_object=destruction_list_2,
+            template="destruction/logs/created.html",
+            extra_data={"n_items": 3},
+            user=record_manager,
+        )
+        TimelineLog.objects.create(
+            content_object=review_2,
+            template="destruction/logs/review_created.html",
+            user=archivaris,
+        )
+
+        report = create_audittrail_report(destruction_list_1)
+        html_report = document_fromstring(report)
+
+        self.assertEqual(2, len(html_report.find_class("log-item")))
+        self.assertIn(destruction_list_1.name, report)
+        self.assertNotIn(destruction_list_2.name, report)
+
+    def test_logs_are_in_correct_order(self):
+        record_manager = UserFactory.create(role__type=RoleTypeChoices.record_manager)
+        archivaris = UserFactory.create(role__type=RoleTypeChoices.archivist)
+
+        destruction_list = DestructionListFactory.create(author=record_manager)
+        review = DestructionListReviewFactory.create(
+            destruction_list=destruction_list, author=archivaris
+        )
+
+        with freeze_time("2012-01-14 12:00"):
+            TimelineLog.objects.create(
+                content_object=destruction_list,
+                template="destruction/logs/created.html",
+                extra_data={"n_items": 3},
+                user=record_manager,
+            )
+        with freeze_time("2012-01-14 12:05"):
+            TimelineLog.objects.create(
+                content_object=review,
+                template="destruction/logs/review_created.html",
+                user=archivaris,
+            )
+        with freeze_time("2012-01-14 12:10"):
+            TimelineLog.objects.create(
+                content_object=destruction_list,
+                template="destruction/logs/updated.html",
+                extra_data={"n_items": 1},
+                user=record_manager,
+            )
+        with freeze_time("2012-01-14 12:15"):
+            TimelineLog.objects.create(
+                content_object=destruction_list,
+                template="destruction/logs/aborted.html",
+                extra_data={"n_items": 3},
+                user=record_manager,
+            )
+
+        report = create_audittrail_report(destruction_list)
+        html_report = document_fromstring(report)
+
+        self.assertEqual(4, len(html_report.find_class("log-item")))
+
+        titles = html_report.find_class("log-item__title")
+        times = [title.text_content() for title in titles]
+        sorted_times = sorted(times)
+
+        self.assertEqual(times, sorted_times)

From 882fa8bc6f074ac52ffabd83d57c8728849c2db9 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Thu, 8 Apr 2021 09:39:32 +0200
Subject: [PATCH 04/15] :memo: [#58] Document audit trail

---
 doc/installation/configuration.rst | 22 ++++++++++++++++++++++
 doc/manual/destruction.rst         |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/doc/installation/configuration.rst b/doc/installation/configuration.rst
index c201addf..c860ecdc 100644
--- a/doc/installation/configuration.rst
+++ b/doc/installation/configuration.rst
@@ -419,3 +419,25 @@ This feature will load the following reasons (in this order):
 - Bescheiden die vervangen wat door een calamiteit verloren is gegaan.
 - Precedenten: individuele zaken die leiden tot algemene regels.
 - Bescheiden waarbij de vernietiging de logische samenhang zou verstoren.
+
+Audit trails
+============
+
+In version ``1.0``, the templates used for the audit trail have been renamed. Their extension was changed from
+``.txt`` to ``.html``. A management command was added to change the template name in all existing logs.
+This can be executed as follows:
+
+    .. tabs::
+
+        .. group-tab:: Docker
+
+           .. code:: shell
+
+              $ docker-compose exec web src/manage.py convert_log_templates
+
+        .. group-tab:: Python
+
+          .. code:: shell
+
+              $ source env/bin/activate
+              $ python src/manage.py convert_log_templates
diff --git a/doc/manual/destruction.rst b/doc/manual/destruction.rst
index 33e8df58..b309f220 100644
--- a/doc/manual/destruction.rst
+++ b/doc/manual/destruction.rst
@@ -145,6 +145,9 @@ filtering for lists that have already been reviewed. All lists with an associate
     :width: 100%
     :alt: Download destruction report
 
+In addition, the PDF of the destruction report contains the audit trail of the destruction process.
+It shows in chronological order which actions have been performed and the role of the user who performed
+the action.
 
 Audit trails, logs and notifications
 ====================================

From 6a7eef289d01f54b1756eefaa22e0965c6f4e2c8 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Thu, 8 Apr 2021 10:46:40 +0200
Subject: [PATCH 05/15] :dizzy: [#58] Translations

---
 .../conf/locale/nl/LC_MESSAGES/django.mo      | Bin 18477 -> 20369 bytes
 .../conf/locale/nl/LC_MESSAGES/django.po      | 140 ++++++++++++------
 2 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo
index ffabd9e4bcd6e2d3723aa8e507cfadaf7ece2659..f9b45a1658772978206a3928fa346ab75ad9194c 100644
GIT binary patch
delta 6912
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
Mz20gL<$L4*3xW8fl>h($

delta 5475
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
JCQi)``wu&O>S+J~

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
index 7633f172..4b3b3c08 100644
--- a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
+++ b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
@@ -544,59 +544,107 @@ msgstr "De vernietigingslijst is nog niet beoordeeld."
 msgid "Download destruction report: "
 msgstr "Download verklaring van vernietiging"
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.txt:7
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/aborted.html:7
 #, python-format
 msgid ""
-"<span class=\"log-item__user\">%(user)s</span> has aborted the list <strong>"
-"%(list)s</strong> with %(counter)s zaak."
+"User with role <strong>%(role)s</strong> has aborted the list <strong>"
+"%(list)s</strong> with %(counter)s case."
 msgid_plural ""
-"<span class=\"log-item__user\">%(user)s</span> has aborted the list <strong>"
-"%(list)s</strong> with %(counter)s zaken."
+"User with role <strong>%(role)s</strong> has aborted the list <strong>"
+"%(list)s</strong> with %(counter)s cases."
 msgstr[0] ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de vernietigingslijst "
-"<strong>%(list)s</strong> met %(counter)s zaak geannuleerd."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> met %(counter)s zaak geannuleerd."
 msgstr[1] ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de vernietigingslijst "
-"<strong>%(list)s</strong> met %(counter)s zakem geannuleerd."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> met %(counter)s zaken geannuleerd."
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/created.txt:7
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html:7
 #, python-format
 msgid ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de lijst <strong>"
-"%(list)s</strong> met %(counter)s zaak aangemaakt."
+"User with role <strong>%(role)s</strong> created the list <strong>%(list)s</"
+"strong> with %(counter)s case."
 msgid_plural ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de lijst <strong>"
-"%(list)s</strong> met %(counter)s zaken aangemaakt."
+"User with role <strong>%(role)s</strong> created the list <strong>%(list)s</"
+"strong> with %(counter)s cases."
 msgstr[0] ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> met %(counter)s zaak aangemaakt."
 msgstr[1] ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> met %(counter)s zaken aangemaakt."
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.txt:7
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html:7
+#, python-format
+msgid "Case <strong>%(zaak)s</strong> was not deleted."
+msgstr "Zaak <strong>%(zaak)s</strong> is niet verwijderd."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_succeeded.html:7
+#, python-format
+msgid "Case <strong>%(zaak)s</strong> was deleted."
+msgstr "Zaak <strong>%(zaak)s</strong> is verwijderd."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_failed.html:7
+#, python-format
+msgid "Case <strong>%(zaak)s</strong> was not updated."
+msgstr "Zaak <strong>%(zaak)s</strong> is niet aangepast."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html:7
+#, python-format
+#, python-format
+msgid "Case <strong>%(zaak)s</strong> was updated."
+msgstr "Zaak <strong>%(zaak)s</strong> is aangepast."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:8
 #, python-format
 msgid ""
-"<span class=\"log-item__user\">%(user)s</span> has created the review "
-"<strong>%(review)s</strong> and requested changes for %(counter)s item."
+"User with role <strong>%(role)s</strong> has reviewed the list <strong>"
+"%(list)s</strong> and requested changes for %(counter)s item."
 msgid_plural ""
-"<span class=\"log-item__user\">%(user)s</span> has created the review "
-"<strong>%(review)s</strong> and requested changes for %(counter)s items."
+"User with role <strong>%(role)s</strong> has reviewed the list <strong>"
+"%(list)s</strong> and requested changes for %(counter)s items."
 msgstr[0] ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de review <strong>"
-"%(review)s</strong> opgevoerd. Er zijn aanpassingen gevraagd voor "
-"%(counter)s record."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> beoordeeld en heeft wijzigingen voor %(counter)s zaak vereist."
 msgstr[1] ""
-"<span class=\"log-item__user\">%(user)s</span> heeft de review <strong>"
-"%(review)s</strong> opgevoerd. Er zijn aanpassingen gevraagd voor "
-"%(counter)s records."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> beoordeeld en heeft wijzigingen voor %(counter)s zaken vereist."
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.txt:7
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:16
 #, python-format
 msgid ""
-"<span class=\"log-item__user\">%(user)s</span> has updated the list <strong>"
-"%(list)s</strong> with %(counter)s zaak removed."
+"\n"
+"            User with role <strong>%(role)s</strong> has approved the list "
+"<strong>%(list)s</strong>.\n"
+"        "
+msgstr ""
+"\n"
+"            Gebruiker met rol <strong>%(role)s</strong> heeft de lijst "
+"<strong>%(list)s</strong> goedgekeurd.\n"
+"        "
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:8
+#, python-format
+msgid ""
+"User with role <strong>%(role)s</strong> has updated the list <strong>"
+"%(list)s</strong> and removed %(counter)s case."
 msgid_plural ""
-"<span class=\"log-item__user\">%(user)s</span> has updated the list <strong>"
-"%(list)s</strong> with %(counter)s zaken removed."
+"User with role <strong>%(role)s</strong> has updated the list <strong>"
+"%(list)s</strong> and removed %(counter)s cases."
 msgstr[0] ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> aangepast en heeft %(counter)s zaak weggehaald."
 msgstr[1] ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> aangepast en heeft %(counter)s zaken weggehaald."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:16
+#, python-format
+msgid ""
+"User with role <strong>%(role)s</strong> has resubmitted the list <strong>"
+"%(list)s</strong> for review."
+msgstr ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
+"%(list)s</strong> opnieuw ingediend."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/recordmanager_list.html:13
 #: archiefvernietigingscomponent/destruction/templates/destruction/reviewer_list.html:14
@@ -842,79 +890,79 @@ msgstr ""
 "vernietiging"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:32
-#: archiefvernietigingscomponent/report/utils.py:169
+#: archiefvernietigingscomponent/report/utils.py:170
 msgid "Unique ID"
 msgstr "Uniek kenmerk"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:34
-#: archiefvernietigingscomponent/report/utils.py:170
+#: archiefvernietigingscomponent/report/utils.py:171
 msgid "Description"
 msgstr "Beschrijving"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:36
-#: archiefvernietigingscomponent/report/utils.py:171
+#: archiefvernietigingscomponent/report/utils.py:172
 msgid "Duration"
 msgstr "Looptijd"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:37
-#: archiefvernietigingscomponent/report/utils.py:172
+#: archiefvernietigingscomponent/report/utils.py:173
 msgid "Destruction category Selectielijst"
 msgstr "Vernietigings-Categorie Selectielijst"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:38
-#: archiefvernietigingscomponent/report/utils.py:173
+#: archiefvernietigingscomponent/report/utils.py:174
 msgid "Explanation"
 msgstr "Toelichting"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:40
-#: archiefvernietigingscomponent/report/utils.py:174
+#: archiefvernietigingscomponent/report/utils.py:175
 msgid "Remarks SAD"
 msgstr "Opmerkingen SAD"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:42
-#: archiefvernietigingscomponent/report/utils.py:175
+#: archiefvernietigingscomponent/report/utils.py:176
 msgid "Reaction caretaker"
 msgstr "Reactie zorgdrager"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:43
-#: archiefvernietigingscomponent/report/utils.py:176
+#: archiefvernietigingscomponent/report/utils.py:177
 msgid "Case type"
 msgstr "Zaaktype"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:44
-#: archiefvernietigingscomponent/report/utils.py:177
+#: archiefvernietigingscomponent/report/utils.py:178
 msgid "Archive action period"
 msgstr "Archiefactietermijn"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:45
-#: archiefvernietigingscomponent/report/utils.py:178
+#: archiefvernietigingscomponent/report/utils.py:179
 msgid "Result type"
 msgstr "Resultaattype"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:46
-#: archiefvernietigingscomponent/report/utils.py:179
+#: archiefvernietigingscomponent/report/utils.py:180
 msgid "Organisation responsible"
 msgstr "Verantwoordelijke organisatie"
 
 #: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:47
-#: archiefvernietigingscomponent/report/utils.py:180
+#: archiefvernietigingscomponent/report/utils.py:181
 msgid "Relations"
 msgstr "Relaties"
 
-#: archiefvernietigingscomponent/report/utils.py:121
+#: archiefvernietigingscomponent/report/utils.py:122
 #, python-format
 msgid "%(looptijd)s days"
 msgstr "%(looptijd)s dagen"
 
-#: archiefvernietigingscomponent/report/utils.py:143
+#: archiefvernietigingscomponent/report/utils.py:144
 msgid "Yes"
 msgstr "Ja"
 
-#: archiefvernietigingscomponent/report/utils.py:145
+#: archiefvernietigingscomponent/report/utils.py:146
 msgid "No"
 msgstr "Nee"
 
-#: archiefvernietigingscomponent/report/utils.py:210
+#: archiefvernietigingscomponent/report/utils.py:211
 #, python-format
 msgid "Declaration of destruction - %(name)s (%(date)s)"
 msgstr "Verklaring van vernietiging - %(name)s (%(date)s)"

From f8c3eeab141f918b6cda88ceb80c54e8e91f1e6c Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Mon, 12 Apr 2021 11:38:03 +0200
Subject: [PATCH 06/15] :loud_sound: [#58] Added comments to audittrail

---
 .../destruction/logs/review_created.html      | 10 +++++++-
 .../templates/destruction/logs/updated.html   |  8 ++++++
 .../destruction/views.py                      | 25 +++++++++++--------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
index 480efd0e..a97c4b87 100644
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
@@ -13,8 +13,16 @@
             and requested changes for {{ counter }} items.
         {% endblocktrans %}
     {% else %}
-        {% blocktrans with list=log.content_object.destruction_list role=log.user.role %}
+        {% blocktrans with list=log.content_object.destruction_list role=log.user.role trimmed %}
             User with role <strong>{{ role }}</strong> has approved the list <strong>{{ list }}</strong>.
         {% endblocktrans %}
     {% endif %}
+
+    {% if log.extra_data.text %}
+        <div class="log-item__review-text">
+            {% blocktrans with text=log.extra_data.text trimmed %}
+                <strong>Reviewer's comment</strong>: {{ text }}
+            {% endblocktrans %}
+        </div>
+    {% endif %}
 </div>
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
index 3f920673..676f606e 100644
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
@@ -18,4 +18,12 @@
             for review.
         {% endblocktrans %}
     {% endif %}
+
+    {% if log.extra_data.text %}
+        <div class="log-item__author-comment">
+            {% blocktrans with text=log.extra_data.text trimmed %}
+                <strong>Author's comment</strong>: {{ text }}
+            {% endblocktrans %}
+        </div>
+    {% endif %}
 </div>
diff --git a/src/archiefvernietigingscomponent/destruction/views.py b/src/archiefvernietigingscomponent/destruction/views.py
index 6b23aeed..905342a9 100644
--- a/src/archiefvernietigingscomponent/destruction/views.py
+++ b/src/archiefvernietigingscomponent/destruction/views.py
@@ -252,17 +252,8 @@ def forms_valid(self, form, inlines):
             self.abort_destruction_list(destruction_list)
             return response
 
-        # log
-        TimelineLog.log_from_request(
-            self.request,
-            destruction_list,
-            template="destruction/logs/updated.html",
-            n_items=destruction_list.items.filter(
-                status=ListItemStatus.removed
-            ).count(),
-        )
-
         # Check if there are comments from the author
+        comment_text = None
         if self.request.POST.get("text"):
             comment = DestructionListReviewComment(
                 review=destruction_list.last_review()
@@ -273,6 +264,19 @@ def forms_valid(self, form, inlines):
             else:
                 super().forms_invalid(form, inlines)
 
+            comment_text = comment_form.cleaned_data["text"]
+
+        # log
+        TimelineLog.log_from_request(
+            self.request,
+            destruction_list,
+            template="destruction/logs/updated.html",
+            n_items=destruction_list.items.filter(
+                status=ListItemStatus.removed
+            ).count(),
+            text=comment_text if comment_text else "",
+        )
+
         # assign a reviewer
         destruction_list.assign(destruction_list.next_assignee())
         destruction_list.save()
@@ -417,6 +421,7 @@ def forms_valid(self, form, inlines):
             list_review,
             template="destruction/logs/review_created.html",
             n_items=list_review.item_reviews.count(),
+            text=list_review.text,
         )
         # send notification
         message = _("{author} has reviewed the destruction list.").format(

From aa079cd9352a020733e58cd2165e7b408eba4ebc Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Mon, 12 Apr 2021 11:38:48 +0200
Subject: [PATCH 07/15] :white_check_mark: [#58] Updated tests

---
 .../report/tests/test_utils.py                | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/archiefvernietigingscomponent/report/tests/test_utils.py b/src/archiefvernietigingscomponent/report/tests/test_utils.py
index 012f1e4c..6647ba0c 100644
--- a/src/archiefvernietigingscomponent/report/tests/test_utils.py
+++ b/src/archiefvernietigingscomponent/report/tests/test_utils.py
@@ -13,6 +13,9 @@
     ListStatus,
     ReviewStatus,
 )
+from archiefvernietigingscomponent.destruction.models import (
+    DestructionListReviewComment,
+)
 from archiefvernietigingscomponent.destruction.tests.factories import (
     DestructionListFactory,
     DestructionListItemFactory,
@@ -802,3 +805,57 @@ def test_logs_are_in_correct_order(self):
         sorted_times = sorted(times)
 
         self.assertEqual(times, sorted_times)
+
+    def test_logs_contain_comments(self):
+        record_manager = UserFactory.create(role__type=RoleTypeChoices.record_manager)
+        archivaris = UserFactory.create(role__type=RoleTypeChoices.archivist)
+
+        destruction_list = DestructionListFactory.create(author=record_manager)
+        review_1 = DestructionListReviewFactory.create(
+            destruction_list=destruction_list,
+            author=archivaris,
+            text="This is a comment for the author.",
+        )
+        author_comment = DestructionListReviewComment.objects.create(
+            text="This is a comment for the reviewer.", review=review_1
+        )
+
+        review_2 = DestructionListReviewFactory.create(
+            destruction_list=destruction_list, author=archivaris, text=""
+        )
+
+        TimelineLog.objects.create(
+            content_object=destruction_list,
+            template="destruction/logs/created.html",
+            extra_data={"n_items": 3},
+            user=record_manager,
+        )
+        TimelineLog.objects.create(
+            content_object=review_1,
+            template="destruction/logs/review_created.html",
+            user=archivaris,
+            extra_data={"n_items": 1, "text": review_1.text},
+        )
+        TimelineLog.objects.create(
+            content_object=destruction_list,
+            template="destruction/logs/updated.html",
+            user=record_manager,
+            extra_data={"n_items": 1, "text": author_comment.text},
+        )
+        TimelineLog.objects.create(
+            content_object=review_2,
+            template="destruction/logs/review_created.html",
+            user=archivaris,
+            extra_data={"n_items": 1, "text": review_2.text},
+        )
+
+        report = create_audittrail_report(destruction_list)
+        html_report = document_fromstring(report)
+
+        self.assertEqual(4, len(html_report.find_class("log-item")))
+
+        # The second review should not have this tag, because the review text was empty
+        self.assertEqual(1, len(html_report.find_class("log-item__review-text")))
+        self.assertIn("This is a comment for the author.", report)
+        self.assertEqual(1, len(html_report.find_class("log-item__author-comment")))
+        self.assertIn("This is a comment for the reviewer.", report)

From 0e337bb9df19d7ebe007c6c4b8a1cc8904d52923 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Mon, 12 Apr 2021 11:47:21 +0200
Subject: [PATCH 08/15] :dizzy: [#58] Updated translations

---
 .../conf/locale/nl/LC_MESSAGES/django.mo      | Bin 20369 -> 20551 bytes
 .../conf/locale/nl/LC_MESSAGES/django.po      |  53 ++++++++++--------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo
index f9b45a1658772978206a3928fa346ab75ad9194c..ca6aaae000ec565b9a6b9fc4e586d971331f9bcc 100644
GIT binary patch
delta 5166
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

delta 4974
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

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
index 4b3b3c08..c1e2524b 100644
--- a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
+++ b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
@@ -553,11 +553,11 @@ msgid_plural ""
 "User with role <strong>%(role)s</strong> has aborted the list <strong>"
 "%(list)s</strong> with %(counter)s cases."
 msgstr[0] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> met %(counter)s zaak geannuleerd."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> met %(counter)s zaak geannuleerd."
 msgstr[1] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> met %(counter)s zaken geannuleerd."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> met %(counter)s zaken geannuleerd."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html:7
 #, python-format
@@ -591,7 +591,6 @@ msgstr "Zaak <strong>%(zaak)s</strong> is niet aangepast."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_update_succeeded.html:7
 #, python-format
-#, python-format
 msgid "Case <strong>%(zaak)s</strong> was updated."
 msgstr "Zaak <strong>%(zaak)s</strong> is aangepast."
 
@@ -604,24 +603,25 @@ msgid_plural ""
 "User with role <strong>%(role)s</strong> has reviewed the list <strong>"
 "%(list)s</strong> and requested changes for %(counter)s items."
 msgstr[0] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> beoordeeld en heeft wijzigingen voor %(counter)s zaak vereist."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaak vereist."
 msgstr[1] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> beoordeeld en heeft wijzigingen voor %(counter)s zaken vereist."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaken vereist."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:16
-#, python-format
 msgid ""
-"\n"
-"            User with role <strong>%(role)s</strong> has approved the list "
-"<strong>%(list)s</strong>.\n"
-"        "
+"User with role <strong>%(role)s</strong> has approved the list <strong>"
+"%(list)s</strong>."
 msgstr ""
-"\n"
-"            Gebruiker met rol <strong>%(role)s</strong> heeft de lijst "
-"<strong>%(list)s</strong> goedgekeurd.\n"
-"        "
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst "
+"<strong>%(list)s</strong> goedgekeurd."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:23
+#, python-format
+msgid "<strong>Reviewer's comment</strong>: %(text)s"
+msgstr "<strong>Opmerking van de reviewer</strong>: %(text)s"
+
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:8
 #, python-format
 msgid ""
@@ -631,11 +631,11 @@ msgid_plural ""
 "User with role <strong>%(role)s</strong> has updated the list <strong>"
 "%(list)s</strong> and removed %(counter)s cases."
 msgstr[0] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> aangepast en heeft %(counter)s zaak weggehaald."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> aangepast en heeft %(counter)s zaak weggehaald."
 msgstr[1] ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> aangepast en heeft %(counter)s zaken weggehaald."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> aangepast en heeft %(counter)s zaken weggehaald."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:16
 #, python-format
@@ -643,8 +643,13 @@ msgid ""
 "User with role <strong>%(role)s</strong> has resubmitted the list <strong>"
 "%(list)s</strong> for review."
 msgstr ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>"
-"%(list)s</strong> opnieuw ingediend."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> opnieuw ingediend."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:24
+#, python-format
+msgid "<strong>Author's comment</strong>: %(text)s"
+msgstr "<strong>Opmerking van de auteur</strong>: %(text)s"
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/recordmanager_list.html:13
 #: archiefvernietigingscomponent/destruction/templates/destruction/reviewer_list.html:14

From 60db9660613f3dbeca5c8b6dd856d759dbaf3886 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 11:13:25 +0200
Subject: [PATCH 09/15] :recycle: [#58] Replaced management command with data
 migration

---
 .../destruction/management/__init__.py        |  0
 .../management/commands/__init__.py           |  0
 .../commands/convert_log_templates.py         | 18 -------------
 .../migrations/0016_auto_20210413_1049.py     | 25 +++++++++++++++++++
 4 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 src/archiefvernietigingscomponent/destruction/management/__init__.py
 delete mode 100644 src/archiefvernietigingscomponent/destruction/management/commands/__init__.py
 delete mode 100644 src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
 create mode 100644 src/archiefvernietigingscomponent/destruction/migrations/0016_auto_20210413_1049.py

diff --git a/src/archiefvernietigingscomponent/destruction/management/__init__.py b/src/archiefvernietigingscomponent/destruction/management/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/archiefvernietigingscomponent/destruction/management/commands/__init__.py b/src/archiefvernietigingscomponent/destruction/management/commands/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py b/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
deleted file mode 100644
index d38490e8..00000000
--- a/src/archiefvernietigingscomponent/destruction/management/commands/convert_log_templates.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.db import transaction
-
-from timeline_logger.models import TimelineLog
-
-
-class Command(BaseCommand):
-    help = "Change the extension of the log templates from .txt to .html"
-
-    def handle(self, *args, **options):
-        logs = TimelineLog.objects.all()
-
-        with transaction.atomic():
-            for log in logs:
-                template_name = log.template
-                if ".txt" in template_name:
-                    log.template = template_name.replace(".txt", ".html")
-                    log.save()
diff --git a/src/archiefvernietigingscomponent/destruction/migrations/0016_auto_20210413_1049.py b/src/archiefvernietigingscomponent/destruction/migrations/0016_auto_20210413_1049.py
new file mode 100644
index 00000000..731d94cb
--- /dev/null
+++ b/src/archiefvernietigingscomponent/destruction/migrations/0016_auto_20210413_1049.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.18 on 2021-04-13 08:49
+
+from django.db import migrations
+from django.db.models import Value
+from django.db.models.functions import Replace
+
+
+def convert_log_templates(apps, schema_editor):
+    TimelineLog = apps.get_model("timeline_logger", "TimelineLog")
+
+    TimelineLog.objects.filter(template__endswith=".txt").update(
+        template=Replace("template", Value(".txt"), Value(".html"))
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("destruction", "0015_auto_20210326_1603"),
+        ("timeline_logger", "0004_alter_fields"),
+    ]
+
+    operations = [
+        migrations.RunPython(convert_log_templates),
+    ]

From 38e4b098b17f2896eab880d533810f3110e6ddb6 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 13:33:00 +0200
Subject: [PATCH 10/15] :construction: [#58] Added identificaties to log when
 creating list

---
 src/archiefvernietigingscomponent/destruction/forms.py |  2 ++
 .../templates/destruction/logs/created.html            | 10 ++++++++--
 src/archiefvernietigingscomponent/destruction/views.py |  1 +
 .../components/destruction-list-create/create-modal.js |  9 ++++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/archiefvernietigingscomponent/destruction/forms.py b/src/archiefvernietigingscomponent/destruction/forms.py
index f7fb5506..eb64ee7e 100644
--- a/src/archiefvernietigingscomponent/destruction/forms.py
+++ b/src/archiefvernietigingscomponent/destruction/forms.py
@@ -54,6 +54,7 @@ class DestructionListForm(forms.ModelForm):
     reviewer_2 = forms.ModelChoiceField(
         queryset=User.objects.reviewers().all(), required=False
     )
+    zaken_identificaties = SimpleArrayField(forms.CharField(max_length=250))
 
     class Meta:
         model = DestructionList
@@ -62,6 +63,7 @@ class Meta:
             "zaken",
             "reviewer_1",
             "reviewer_2",
+            "zaken_identificaties",
             "contains_sensitive_info",
         )
 
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
index 6002f30b..346573f5 100644
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html
@@ -6,9 +6,15 @@
 <div class="log-item__body">
     {% blocktrans with list=log.content_object role=log.user.role count counter=log.extra_data.n_items trimmed %}
         User with role <strong>{{ role }}</strong> created the list <strong>{{ list }}</strong>
-        with {{ counter }} case.
+        with {{ counter }} case:
     {% plural %}
         User with role <strong>{{ role }}</strong> created the list <strong>{{ list }}</strong>
-        with {{ counter }} cases.
+        with {{ counter }} cases:
     {% endblocktrans %}
+
+    <div class="log-item__cases">
+        {% for item in log.extra_data.items %}
+            {{ item }}{% if forloop.last %}. {% else %}, {% endif %}
+        {% endfor %}
+    </div>
 </div>
diff --git a/src/archiefvernietigingscomponent/destruction/views.py b/src/archiefvernietigingscomponent/destruction/views.py
index 905342a9..c362fe00 100644
--- a/src/archiefvernietigingscomponent/destruction/views.py
+++ b/src/archiefvernietigingscomponent/destruction/views.py
@@ -157,6 +157,7 @@ def form_valid(self, form):
             reviewers=list(
                 destruction_list.assignees.values("assignee__id", "assignee__username")
             ),
+            items=form.cleaned_data["zaken_identificaties"],
         )
 
         return response
diff --git a/src/archiefvernietigingscomponent/js/components/destruction-list-create/create-modal.js b/src/archiefvernietigingscomponent/js/components/destruction-list-create/create-modal.js
index 38261f8c..c63a28c2 100644
--- a/src/archiefvernietigingscomponent/js/components/destruction-list-create/create-modal.js
+++ b/src/archiefvernietigingscomponent/js/components/destruction-list-create/create-modal.js
@@ -2,7 +2,7 @@ import React, {useContext, useState} from "react";
 import Modal from 'react-modal';
 
 import { CsrfInput } from "../../forms/csrf";
-import {CheckboxInput, Input, TextInput} from "../../forms/inputs";
+import {CheckboxInput, HiddenInput, Input, TextInput} from "../../forms/inputs";
 import { SelectInput } from "../../forms/select";
 import {Label} from "../../forms/label";
 import {ShortReviewZaaktypesContext} from "./context";
@@ -59,6 +59,13 @@ const CreateModal = ({ zaken, checkboxes, modalIsOpen, setIsOpen, reviewers, url
                     name={"zaken"}
                     initial={selectedUrls}
                 />
+                {/* Used to log the ID of the cases that are selected, so that the backend doesnt need to
+                fetch the zaken again. */}
+                <HiddenInput
+                    name="zaken_identificaties"
+                    id="id_zaken_identificaties"
+                    value={zaken.filter(zaak => checkboxes[zaak.url]).map(zaak => zaak.identificatie)}
+                />
 
                 <div className="form__field-group">
                     <TextInput

From 1cac77c96aa1135cc1e578d4885dc727c01ba973 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 14:27:59 +0200
Subject: [PATCH 11/15] :construction: [#58] Added identificaties to log of
 list updated

---
 .../destruction/forms.py                             |  3 ++-
 .../templates/destruction/logs/updated.html          | 10 ++++++++--
 .../destruction/views.py                             | 12 +++++++++---
 .../destruction-list-detail/list-item-form.js        |  5 +++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/archiefvernietigingscomponent/destruction/forms.py b/src/archiefvernietigingscomponent/destruction/forms.py
index eb64ee7e..2687b52e 100644
--- a/src/archiefvernietigingscomponent/destruction/forms.py
+++ b/src/archiefvernietigingscomponent/destruction/forms.py
@@ -132,9 +132,10 @@ class ListItemForm(forms.ModelForm):
     archiefnominatie = forms.CharField(required=False)
     # used charfield for easy conversion into json
     archiefactiedatum = forms.CharField(required=False)
+    identificatie = forms.CharField()
 
     class Meta:
-        fields = ("action", "archiefnominatie", "archiefactiedatum")
+        fields = ("action", "archiefnominatie", "archiefactiedatum", "identificatie")
 
     def save(self, commit=True):
         list_item = super().save(commit)
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
index 676f606e..392a62eb 100644
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html
@@ -7,11 +7,17 @@
     {% if log.extra_data.n_items %}
         {% blocktrans with list=log.content_object role=log.user.role count counter=log.extra_data.n_items trimmed %}
             User with role <strong>{{ role }}</strong> has updated the list <strong>{{ list }}</strong>
-            and removed {{ counter }} case.
+            and removed {{ counter }} case:
         {% plural %}
             User with role <strong>{{ role }}</strong> has updated the list <strong>{{ list }}</strong>
-            and removed {{ counter }} cases.
+            and removed {{ counter }} cases:
         {% endblocktrans %}
+
+        <div class="log-item__cases">
+            {% for item in log.extra_data.items %}
+                {{ item }}{% if forloop.last %}. {% else %}, {% endif %}
+            {% endfor %}
+        </div>
     {% else %}
         {% blocktrans with list=log.content_object role=log.user.role trimmed %}
             User with role <strong>{{ role }}</strong> has resubmitted the list <strong>{{ list }}</strong>
diff --git a/src/archiefvernietigingscomponent/destruction/views.py b/src/archiefvernietigingscomponent/destruction/views.py
index c362fe00..199d0509 100644
--- a/src/archiefvernietigingscomponent/destruction/views.py
+++ b/src/archiefvernietigingscomponent/destruction/views.py
@@ -267,15 +267,21 @@ def forms_valid(self, form, inlines):
 
             comment_text = comment_form.cleaned_data["text"]
 
+        # Get the identificaties of the removed zaken
+        removed_zaken = []
+        for list_item_form in inlines[0]:
+            action = list_item_form.cleaned_data.get("action")
+            if action:
+                removed_zaken.append(list_item_form.cleaned_data["identificatie"])
+
         # log
         TimelineLog.log_from_request(
             self.request,
             destruction_list,
             template="destruction/logs/updated.html",
-            n_items=destruction_list.items.filter(
-                status=ListItemStatus.removed
-            ).count(),
+            n_items=len(removed_zaken),
             text=comment_text if comment_text else "",
+            items=removed_zaken,
         )
 
         # assign a reviewer
diff --git a/src/archiefvernietigingscomponent/js/components/destruction-list-detail/list-item-form.js b/src/archiefvernietigingscomponent/js/components/destruction-list-detail/list-item-form.js
index e615478f..ec8cec5f 100644
--- a/src/archiefvernietigingscomponent/js/components/destruction-list-detail/list-item-form.js
+++ b/src/archiefvernietigingscomponent/js/components/destruction-list-detail/list-item-form.js
@@ -88,6 +88,11 @@ const ListItemForm = ({ index, data }) => {
                         name={name_prefix("archiefactiedatum")}
                         value={archiefactiedatum}
                     />
+                    <HiddenInput
+                        id={id_prefix("identificatie")}
+                        name={name_prefix("identificatie")}
+                        value={zaak.identificatie}
+                    />
                 </td>
             </tr>
             <ListItemModal

From cde8cc3a9ebc18384da4fa41d5f8f25c6d99edcd Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 17:01:19 +0200
Subject: [PATCH 12/15] :construction: [#58] Added identificaties to log of
 review

---
 .../destruction/forms.py                        | 15 +++++++++------
 .../destruction/logs/review_created.html        | 16 +++++++++++++---
 .../destruction/views.py                        | 17 +++++++++++++----
 .../components/review-list/review-item-form.js  |  5 +++++
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/archiefvernietigingscomponent/destruction/forms.py b/src/archiefvernietigingscomponent/destruction/forms.py
index 2687b52e..acd1bf71 100644
--- a/src/archiefvernietigingscomponent/destruction/forms.py
+++ b/src/archiefvernietigingscomponent/destruction/forms.py
@@ -3,7 +3,6 @@
 
 from django import forms
 from django.contrib.postgres.forms import SimpleArrayField
-from django.forms.models import BaseInlineFormSet
 
 from archiefvernietigingscomponent.accounts.models import User
 
@@ -117,14 +116,18 @@ class Meta:
         fields = ("text",)
 
 
-class ReviewItemBaseFormset(BaseInlineFormSet):
+class ReviewItemBaseForm(forms.ModelForm):
+    identificatie = forms.CharField()
+
+    class Meta:
+        fields = ["destruction_list_item", "text", "suggestion", "identificatie"]
+
     def save(self, commit=True):
         # save only items with suggestions
-        instances = super().save(commit=False)
+        instance = super().save(commit=False)
 
-        for instance in instances:
-            if instance.suggestion:
-                instance.save()
+        if instance.suggestion:
+            instance.save()
 
 
 class ListItemForm(forms.ModelForm):
diff --git a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
index a97c4b87..871760a4 100644
--- a/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
+++ b/src/archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html
@@ -4,14 +4,24 @@
 </code>
 
 <div class="log-item__body">
-    {% if log.extra_data.n_items %}
+    {% if log.content_object.status == "rejected" %}
+        {% blocktrans with list=log.content_object.destruction_list role=log.user.role trimmed %}
+            User with role <strong>{{ role }}</strong> has rejected the list <strong>{{ list }}</strong>.
+        {% endblocktrans %}
+    {% elif log.extra_data.n_items and log.content_object.status == "changes_requested" %}
         {% blocktrans with list=log.content_object.destruction_list role=log.user.role count counter=log.extra_data.n_items trimmed %}
             User with role <strong>{{ role }}</strong> has reviewed the list <strong>{{ list }}</strong>
-            and requested changes for {{ counter }} item.
+            and requested changes for {{ counter }} item:
         {% plural %}
             User with role <strong>{{ role }}</strong> has reviewed the list <strong>{{ list }}</strong>
-            and requested changes for {{ counter }} items.
+            and requested changes for {{ counter }} items:
         {% endblocktrans %}
+
+        <div class="log-item__cases">
+            {% for item in log.extra_data.items %}
+                {{ item }}{% if forloop.last %}. {% else %}, {% endif %}
+            {% endfor %}
+        </div>
     {% else %}
         {% blocktrans with list=log.content_object.destruction_list role=log.user.role trimmed %}
             User with role <strong>{{ role }}</strong> has approved the list <strong>{{ list }}</strong>.
diff --git a/src/archiefvernietigingscomponent/destruction/views.py b/src/archiefvernietigingscomponent/destruction/views.py
index 199d0509..788668cc 100644
--- a/src/archiefvernietigingscomponent/destruction/views.py
+++ b/src/archiefvernietigingscomponent/destruction/views.py
@@ -34,7 +34,7 @@
     ListItemForm,
     ReviewCommentForm,
     ReviewForm,
-    ReviewItemBaseFormset,
+    ReviewItemBaseForm,
     get_reviewer_choices,
     get_zaaktype_choices,
 )
@@ -337,8 +337,7 @@ def get_queryset(self):
 
 class ReviewItemInline(InlineFormSetFactory):
     model = DestructionListItemReview
-    fields = ["destruction_list_item", "text", "suggestion"]
-    formset_class = ReviewItemBaseFormset
+    form_class = ReviewItemBaseForm
 
 
 class ReviewCreateView(RoleRequiredMixin, UserPassesTestMixin, CreateWithInlinesView):
@@ -421,14 +420,24 @@ def form_valid(self, form):
     def forms_valid(self, form, inlines):
         response = super().forms_valid(form, inlines)
 
+        # Get the identificaties of the zaken with suggestions
+        zaken_with_suggestions = []
+        for list_item_form in inlines[0]:
+            suggestion = list_item_form.cleaned_data.get("suggestion")
+            if suggestion:
+                zaken_with_suggestions.append(
+                    list_item_form.cleaned_data["identificatie"]
+                )
+
         # log review
         list_review = form.instance
         TimelineLog.log_from_request(
             self.request,
             list_review,
             template="destruction/logs/review_created.html",
-            n_items=list_review.item_reviews.count(),
+            n_items=len(zaken_with_suggestions),
             text=list_review.text,
+            items=zaken_with_suggestions,
         )
         # send notification
         message = _("{author} has reviewed the destruction list.").format(
diff --git a/src/archiefvernietigingscomponent/js/components/review-list/review-item-form.js b/src/archiefvernietigingscomponent/js/components/review-list/review-item-form.js
index ec22d77c..3f7ce2ff 100644
--- a/src/archiefvernietigingscomponent/js/components/review-list/review-item-form.js
+++ b/src/archiefvernietigingscomponent/js/components/review-list/review-item-form.js
@@ -64,6 +64,11 @@ const ReviewItemForm = ({ index, data }) => {
                         name={name_prefix("text")}
                         value={comment}
                     />
+                    <HiddenInput
+                        id={id_prefix("identificatie")}
+                        name={name_prefix("identificatie")}
+                        value={zaak.identificatie}
+                    />
                 </td>
             </tr>
 

From 51ebc4987ea142c3b3f33e482c735d4ceb7fe769 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 17:01:44 +0200
Subject: [PATCH 13/15] :lipstick: [#58] Modified Report title

---
 .../report/templates/report/vernietigings_rapport.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html b/src/archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html
index be29b3ed..84ff7701 100644
--- a/src/archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html
+++ b/src/archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html
@@ -26,8 +26,8 @@
     </style>
 </head>
 
+<h2>{% trans "Destruction report" %}</h2>
 <table>
-    <caption>{% trans "Destruction report" %}</caption>
     <tr>
         <th>{% trans "Unique ID" %}</th>
         {% if not contains_sensitive_info %}

From f5f749b04acf6f71ff6aa1d581c21dbb0c1c73c7 Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 17:02:29 +0200
Subject: [PATCH 14/15] :white_check_mark: [#58] Updated tests

---
 .../tests/test_destruction_list_create.py     | 13 ++++
 .../tests/test_destruction_list_detail.py     | 46 ++++++++++++++-
 .../destruction/tests/test_review_create.py   | 59 ++++++++++++++++---
 3 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
index 420e3bcc..cb0e5151 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py
@@ -2,6 +2,8 @@
 from django.urls import reverse
 from django.utils.translation import gettext as _
 
+from timeline_logger.models import TimelineLog
+
 from archiefvernietigingscomponent.accounts.tests.factories import UserFactory
 from archiefvernietigingscomponent.notifications.models import Notification
 
@@ -21,6 +23,7 @@ def setUp(self):
     def test_create_list(self):
         reviewers = UserFactory.create_batch(2, role__can_review_destruction=True)
         zaken = [f"http://some.zaken.nl/api/v1/zaken/{i}" for i in range(1, 3)]
+        zaken_identificaties = ["ZAAK-1", "ZAAK-2", "ZAAK-3"]
 
         url = reverse("destruction:record-manager-create")
         data = {
@@ -28,6 +31,7 @@ def test_create_list(self):
             "zaken": ",".join(zaken),
             "reviewer_1": reviewers[0].id,
             "reviewer_2": reviewers[1].id,
+            "zaken_identificaties": ",".join(zaken_identificaties),
         }
 
         response = self.client.post(url, data)
@@ -66,6 +70,15 @@ def test_create_list(self):
         self.assertEqual(notification.user, destruction_list.assignee)
         self.assertEqual(notification.message, _("You are assigned for review."))
 
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertIn("items", log.extra_data)
+        self.assertEqual(zaken_identificaties, sorted(log.extra_data["items"]))
+
     def test_list_with_short_review_process(self):
         archive_config = ArchiveConfig.get_solo()
         archive_config.short_review_zaaktypes = ["http://example.com/zaak/uuid-1"]
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
index 5f12f808..089ff41e 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py
@@ -57,14 +57,17 @@ def test_update_destruction_list(self, m):
             "items-0-action": Suggestion.change_and_remove,
             "items-0-archiefnominatie": "blijvend_bewaren",
             "items-0-archiefactiedatum": "2020-06-17",
+            "items-0-identificatie": "ZAAK-01",
             "items-1-id": list_items[1].id,
             "items-1-action": Suggestion.remove,
             "items-1-archiefnominatie": "vernietigen",
             "items-1-archiefactiedatum": "2020-06-16",
+            "items-1-identificatie": "ZAAK-02",
             "items-2-id": list_items[2].id,
             "items-2-action": "",
             "items-2-archiefnominatie": "vernietigen",
             "items-2-archiefactiedatum": "2020-06-15",
+            "items-2-identificatie": "ZAAK-03",
         }
         data.update(MANAGEMENT_FORM_DATA)
 
@@ -88,9 +91,20 @@ def test_update_destruction_list(self, m):
         self.assertEqual(destruction_list.assignee, assignee.assignee)
 
         # check log
-        timeline_log = TimelineLog.objects.get()
-        self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/updated.html")
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertEqual(log.user, self.user)
+        self.assertEqual(log.template, "destruction/logs/updated.html")
+        self.assertIn("n_items", log.extra_data)
+        self.assertIn("items", log.extra_data)
+        self.assertIn("text", log.extra_data)
+        self.assertEqual(2, log.extra_data["n_items"])
+        self.assertEqual(["ZAAK-01", "ZAAK-02"], sorted(log.extra_data["items"]))
+        self.assertEqual("", log.extra_data["text"])
 
         # check notification
         notification = Notification.objects.get()
@@ -129,6 +143,7 @@ def test_abort_destruction_list(self, m):
                     f"items-{i}-action": "",
                     f"items-{i}-archiefnominatie": "blijvend_bewaren",
                     f"items-{i}-archiefactiedatum": "2020-06-17",
+                    f"items-{i}-identificatie": f"ZAAK-{i}",
                 }
             )
 
@@ -183,6 +198,7 @@ def test_abort_destruction_list_notify_assignee(self, m):
                     f"items-{i}-action": "",
                     f"items-{i}-archiefnominatie": "blijvend_bewaren",
                     f"items-{i}-archiefactiedatum": "2020-06-17",
+                    f"items-{i}-identificatie": f"ZAAK-{i}",
                 }
             )
 
@@ -242,6 +258,7 @@ def test_cant_abort_completed_destruction_list(self, m):
                     f"items-{i}-action": "",
                     f"items-{i}-archiefnominatie": "blijvend_bewaren",
                     f"items-{i}-archiefactiedatum": "2020-06-17",
+                    f"items-{i}-identificatie": f"ZAAK-{i}",
                 }
             )
 
@@ -288,6 +305,7 @@ def test_list_author_can_comment_on_review(self, m):
             "items-0-action": "",
             "items-0-archiefnominatie": "blijvend_bewaren",
             "items-0-archiefactiedatum": "2020-06-17",
+            "items-0-identificatie": "ZAAK-01",
         }
 
         self.client.force_login(record_manager)
@@ -308,6 +326,17 @@ def test_list_author_can_comment_on_review(self, m):
         self.assertEqual(record_manager, comment.review.destruction_list.author)
         self.assertEqual(destruction_list.last_review(), comment.review)
 
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertIn("items", log.extra_data)
+        self.assertIn("text", log.extra_data)
+        self.assertEqual([], log.extra_data["items"])
+        self.assertEqual("I disagree with these comments!", log.extra_data["text"])
+
     def test_list_author_can_leave_comment_empty(self, m):
         record_manager = UserFactory(
             role__can_start_destruction=True, role__type=RoleTypeChoices.archivist
@@ -340,6 +369,7 @@ def test_list_author_can_leave_comment_empty(self, m):
             "items-0-action": "",
             "items-0-archiefnominatie": "blijvend_bewaren",
             "items-0-archiefactiedatum": "2020-06-17",
+            "items-0-identificatie": "ZAAK-01",
         }
 
         self.client.force_login(record_manager)
@@ -354,6 +384,15 @@ def test_list_author_can_leave_comment_empty(self, m):
 
         self.assertEqual(0, comments.count())
 
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertIn("text", log.extra_data)
+        self.assertEqual("", log.extra_data["text"])
+
     def test_empty_comment_is_not_saved(self, m):
         record_manager = UserFactory(
             role__can_start_destruction=True, role__type=RoleTypeChoices.archivist
@@ -386,6 +425,7 @@ def test_empty_comment_is_not_saved(self, m):
             "items-0-action": "",
             "items-0-archiefnominatie": "blijvend_bewaren",
             "items-0-archiefactiedatum": "2020-06-17",
+            "items-0-identificatie": "ZAAK-01",
             "text": "",
         }
 
diff --git a/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py b/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
index 3115b741..0a47e6a4 100644
--- a/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
+++ b/src/archiefvernietigingscomponent/destruction/tests/test_review_create.py
@@ -5,6 +5,7 @@
 from django.utils.translation import gettext as _
 
 from django_capture_on_commit_callbacks import capture_on_commit_callbacks
+from timeline_logger.models import TimelineLog
 
 from archiefvernietigingscomponent.accounts.tests.factories import UserFactory
 from archiefvernietigingscomponent.notifications.models import Notification
@@ -78,6 +79,7 @@ def test_create_review_approve(self):
                     f"item_reviews-{i}-destruction_list_item": item.id,
                     f"item_reviews-{i}-suggestion": "",
                     f"item_reviews-{i}-text": "",
+                    f"item_reviews-{i}-identificatie": f"ZAAK-{i}",
                 }
             )
 
@@ -98,9 +100,20 @@ def test_create_review_approve(self):
         self.assertEqual(review.destruction_list.assignee, next_assignee.assignee)
 
         #  check logs
-        timeline_log = review.logs.get()
-        self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertEqual(log.user, self.user)
+        self.assertEqual(log.template, "destruction/logs/review_created.html")
+        self.assertIn("n_items", log.extra_data)
+        self.assertIn("items", log.extra_data)
+        self.assertIn("text", log.extra_data)
+        self.assertEqual(0, log.extra_data["n_items"])
+        self.assertEqual([], log.extra_data["items"])
+        self.assertEqual("some comment", log.extra_data["text"])
 
         #  check notifications
         notifications = Notification.objects.all()
@@ -129,12 +142,15 @@ def test_create_review_change(self):
             "item_reviews-0-destruction_list_item": items[0].id,
             "item_reviews-0-suggestion": Suggestion.change_and_remove,
             "item_reviews-0-text": "some comment",
+            "item_reviews-0-identificatie": "ZAAK-00",
             "item_reviews-1-destruction_list_item": items[1].id,
             "item_reviews-1-suggestion": Suggestion.remove,
             "item_reviews-1-text": "",
+            "item_reviews-1-identificatie": "ZAAK-01",
             "item_reviews-2-destruction_list_item": items[2].id,
             "item_reviews-2-suggestion": "",
             "item_reviews-2-text": "",
+            "item_reviews-2-identificatie": "ZAAK-02",
         }
         data.update(MANAGEMENT_FORM_DATA)
 
@@ -158,9 +174,20 @@ def test_create_review_change(self):
         self.assertEqual(review.destruction_list.assignee, destruction_list.author)
 
         #  check logs
-        timeline_log = review.logs.get()
-        self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertEqual(log.user, self.user)
+        self.assertEqual(log.template, "destruction/logs/review_created.html")
+        self.assertIn("n_items", log.extra_data)
+        self.assertIn("items", log.extra_data)
+        self.assertIn("text", log.extra_data)
+        self.assertEqual(2, log.extra_data["n_items"])
+        self.assertEqual(["ZAAK-00", "ZAAK-01"], sorted(log.extra_data["items"]))
+        self.assertEqual("", log.extra_data["text"])
 
         #  check notifications
         notifications = Notification.objects.order_by("created").all()
@@ -189,12 +216,15 @@ def test_create_review_reject(self):
             "item_reviews-0-destruction_list_item": items[0].id,
             "item_reviews-0-suggestion": "",
             "item_reviews-0-text": "",
+            "item_reviews-0-identificatie": "ZAAK-00",
             "item_reviews-1-destruction_list_item": items[1].id,
             "item_reviews-1-suggestion": "",
             "item_reviews-1-text": "",
+            "item_reviews-1-identificatie": "ZAAK-01",
             "item_reviews-2-destruction_list_item": items[2].id,
             "item_reviews-2-suggestion": "",
             "item_reviews-2-text": "",
+            "item_reviews-2-identificatie": "ZAAK-02",
         }
         data.update(MANAGEMENT_FORM_DATA)
 
@@ -213,9 +243,20 @@ def test_create_review_reject(self):
         self.assertEqual(review.destruction_list.assignee, destruction_list.author)
 
         #  check logs
-        timeline_log = review.logs.get()
-        self.assertEqual(timeline_log.user, self.user)
-        self.assertEqual(timeline_log.template, "destruction/logs/review_created.html")
+        logs = TimelineLog.objects.all()
+
+        self.assertEqual(1, logs.count())
+
+        log = logs.first()
+
+        self.assertEqual(log.user, self.user)
+        self.assertEqual(log.template, "destruction/logs/review_created.html")
+        self.assertIn("n_items", log.extra_data)
+        self.assertIn("items", log.extra_data)
+        self.assertIn("text", log.extra_data)
+        self.assertEqual(0, log.extra_data["n_items"])
+        self.assertEqual([], log.extra_data["items"])
+        self.assertEqual("", log.extra_data["text"])
 
         #  check notifications
         notifications = Notification.objects.order_by("created").all()

From b32eccbcf7ad7620a4b71c099b267c2515649abe Mon Sep 17 00:00:00 2001
From: silvia <silvia@maykinmedia.nl>
Date: Tue, 13 Apr 2021 17:05:58 +0200
Subject: [PATCH 15/15] :dizzy: [#58] Updated translations

---
 .../conf/locale/nl/LC_MESSAGES/django.mo      | Bin 20551 -> 20753 bytes
 .../conf/locale/nl/LC_MESSAGES/django.po      |  60 ++++++++++--------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.mo
index ca6aaae000ec565b9a6b9fc4e586d971331f9bcc..796ca2a2f51c65c8198b2fa133c20780da0af6ca 100644
GIT binary patch
delta 4744
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

delta 4703
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

diff --git a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
index c1e2524b..0897e6fb 100644
--- a/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
+++ b/src/archiefvernietigingscomponent/conf/locale/nl/LC_MESSAGES/django.po
@@ -339,15 +339,15 @@ msgid "destruction lists"
 msgstr "vernietigingslijsten"
 
 #: archiefvernietigingscomponent/destruction/models.py:115
-#: archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py:67
-#: archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py:99
-#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:114
+#: archiefvernietigingscomponent/destruction/tests/test_destruction_list_create.py:71
+#: archiefvernietigingscomponent/destruction/tests/test_destruction_list_detail.py:113
+#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:127
 msgid "You are assigned for review."
 msgstr "Je bent als reviewer aangewezen."
 
 #: archiefvernietigingscomponent/destruction/models.py:120
-#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:174
-#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:229
+#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:201
+#: archiefvernietigingscomponent/destruction/tests/test_review_create.py:270
 msgid "There is a review to process."
 msgstr "Er is een te verwerken beoordeling."
 
@@ -560,19 +560,18 @@ msgstr[1] ""
 "strong> met %(counter)s zaken geannuleerd."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/created.html:7
-#, python-format
 msgid ""
 "User with role <strong>%(role)s</strong> created the list <strong>%(list)s</"
-"strong> with %(counter)s case."
+"strong> with %(counter)s case:"
 msgid_plural ""
 "User with role <strong>%(role)s</strong> created the list <strong>%(list)s</"
-"strong> with %(counter)s cases."
+"strong> with %(counter)s cases:"
 msgstr[0] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> met %(counter)s zaak aangemaakt."
+"strong> met %(counter)s zaak aangemaakt:"
 msgstr[1] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> met %(counter)s zaken aangemaakt."
+"strong> met %(counter)s zaken aangemaakt:"
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/item_destruction_failed.html:7
 #, python-format
@@ -595,49 +594,56 @@ msgid "Case <strong>%(zaak)s</strong> was updated."
 msgstr "Zaak <strong>%(zaak)s</strong> is aangepast."
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:8
-#, python-format
+msgid ""
+"User with role <strong>%(role)s</strong> has rejected the list <strong>"
+"%(list)s</strong>."
+msgstr ""
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> afgewezen."
+
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:12
 msgid ""
 "User with role <strong>%(role)s</strong> has reviewed the list <strong>"
-"%(list)s</strong> and requested changes for %(counter)s item."
+"%(list)s</strong> and requested changes for %(counter)s item:"
 msgid_plural ""
 "User with role <strong>%(role)s</strong> has reviewed the list <strong>"
-"%(list)s</strong> and requested changes for %(counter)s items."
+"%(list)s</strong> and requested changes for %(counter)s items:"
 msgstr[0] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaak vereist."
+"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaak vereist:"
 msgstr[1] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaken vereist."
+"strong> beoordeeld en heeft wijzigingen voor %(counter)s zaken vereist:"
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:16
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:26
+#, python-format
 msgid ""
 "User with role <strong>%(role)s</strong> has approved the list <strong>"
 "%(list)s</strong>."
 msgstr ""
-"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst "
-"<strong>%(list)s</strong> goedgekeurd."
+"Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
+"strong> goedgekeurd."
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:23
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/review_created.html:33
 #, python-format
 msgid "<strong>Reviewer's comment</strong>: %(text)s"
 msgstr "<strong>Opmerking van de reviewer</strong>: %(text)s"
 
 #: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:8
-#, python-format
 msgid ""
 "User with role <strong>%(role)s</strong> has updated the list <strong>"
-"%(list)s</strong> and removed %(counter)s case."
+"%(list)s</strong> and removed %(counter)s case:"
 msgid_plural ""
 "User with role <strong>%(role)s</strong> has updated the list <strong>"
-"%(list)s</strong> and removed %(counter)s cases."
+"%(list)s</strong> and removed %(counter)s cases:"
 msgstr[0] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> aangepast en heeft %(counter)s zaak weggehaald."
+"strong> aangepast en heeft %(counter)s zaak weggehaald:"
 msgstr[1] ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
-"strong> aangepast en heeft %(counter)s zaken weggehaald."
+"strong> aangepast en heeft %(counter)s zaken weggehaald:"
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:16
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:22
 #, python-format
 msgid ""
 "User with role <strong>%(role)s</strong> has resubmitted the list <strong>"
@@ -646,7 +652,7 @@ msgstr ""
 "Gebruiker met rol <strong>%(role)s</strong> heeft de lijst <strong>%(list)s</"
 "strong> opnieuw ingediend."
 
-#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:24
+#: archiefvernietigingscomponent/destruction/templates/destruction/logs/updated.html:30
 #, python-format
 msgid "<strong>Author's comment</strong>: %(text)s"
 msgstr "<strong>Opmerking van de auteur</strong>: %(text)s"
@@ -880,7 +886,7 @@ msgid "Destruction list for which the report was created."
 msgstr "Vernietingslijst waarvoor de verklaring van vernietiging is gemaakt."
 
 #: archiefvernietigingscomponent/report/models.py:52
-#: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:30
+#: archiefvernietigingscomponent/report/templates/report/vernietigings_rapport.html:29
 msgid "Destruction report"
 msgstr "Verklaring van vernietiging"