From cbafd53101c487e0928d9b3deefaaad19c17dd3f Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 10:45:57 +0200
Subject: [PATCH 01/28] add work_in_progress, approved_by_user, approved_at,
 migration

---
 .../migrations/0029_work_in_progress.py       | 31 +++++++++++++++++++
 indigo_api/models/works.py                    |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 indigo_api/migrations/0029_work_in_progress.py

diff --git a/indigo_api/migrations/0029_work_in_progress.py b/indigo_api/migrations/0029_work_in_progress.py
new file mode 100644
index 000000000..c27bded92
--- /dev/null
+++ b/indigo_api/migrations/0029_work_in_progress.py
@@ -0,0 +1,31 @@
+# Generated by Django 3.2.13 on 2023-12-06 08:43
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('indigo_api', '0028_alter_taxonomytopic_slug'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='work',
+            name='approved_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='work',
+            name='approved_by_user',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='work',
+            name='work_in_progress',
+            field=models.BooleanField(default=False, help_text='Work in progress, to be approved'),
+        ),
+    ]
diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 3db5e7ffe..6ccafd733 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -499,11 +499,15 @@ class Meta:
     consolidation_note_override = models.CharField(max_length=1024, null=True, blank=True, help_text='Consolidation note about this particular work, to override consolidation note for place')
     disclaimer = models.CharField(max_length=1024, null=True, blank=True, help_text='Disclaimer text about this work')
 
+    work_in_progress = models.BooleanField(default=False, help_text="Work in progress, to be approved")
+
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    approved_at = models.DateTimeField(auto_now=True)
 
     created_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
     updated_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
+    approved_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
 
     objects = WorkManager.from_queryset(WorkQuerySet)()
 

From 1018f2780a541f9e8351c357b69d0b877a56aed1 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:00:48 +0200
Subject: [PATCH 02/28] make approved_at nullable

---
 indigo_api/migrations/0029_work_in_progress.py | 4 ++--
 indigo_api/models/works.py                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indigo_api/migrations/0029_work_in_progress.py b/indigo_api/migrations/0029_work_in_progress.py
index c27bded92..e2056fb1a 100644
--- a/indigo_api/migrations/0029_work_in_progress.py
+++ b/indigo_api/migrations/0029_work_in_progress.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2023-12-06 08:43
+# Generated by Django 3.2.13 on 2023-12-06 11:21
 
 from django.conf import settings
 from django.db import migrations, models
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='work',
             name='approved_at',
-            field=models.DateTimeField(auto_now=True),
+            field=models.DateTimeField(null=True),
         ),
         migrations.AddField(
             model_name='work',
diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 6ccafd733..241ef6ca1 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -503,7 +503,7 @@ class Meta:
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    approved_at = models.DateTimeField(auto_now=True)
+    approved_at = models.DateTimeField(null=True)
 
     created_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
     updated_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')

From 410616984a96ec2d2975c3e3714163e0dab2048c Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 14:42:04 +0200
Subject: [PATCH 03/28] add 'Change status' to bulk operations

---
 indigo_app/forms.py                           | 22 ++++++++++++++++++-
 .../templates/indigo_app/place/_work.html     |  2 +-
 .../indigo_app/place/_works_actions.html      | 11 ++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/indigo_app/forms.py b/indigo_app/forms.py
index ff17e63b7..463e6f60b 100644
--- a/indigo_app/forms.py
+++ b/indigo_app/forms.py
@@ -1,7 +1,7 @@
 import json
 import re
 import urllib.parse
-from datetime import date
+from datetime import date, datetime
 from lxml import etree
 
 from django import forms
@@ -767,12 +767,14 @@ class WorkBulkActionsForm(forms.Form):
     save = forms.BooleanField()
     all_work_pks = forms.CharField(required=False)
     works = forms.ModelMultipleChoiceField(queryset=Work.objects, required=True)
+    user = forms.ModelChoiceField(queryset=User.objects)
     add_taxonomy_topics = forms.ModelMultipleChoiceField(
         queryset=TaxonomyTopic.objects.all(),
         required=False)
     del_taxonomy_topics = forms.ModelMultipleChoiceField(
         queryset=TaxonomyTopic.objects.all(),
         required=False)
+    change_status = forms.ChoiceField(choices=[('', ''), ('approve', 'Approve'), ('un_approve', 'Un-approve')], required=False)
 
     def clean_all_work_pks(self):
         return self.cleaned_data.get('all_work_pks').split() or []
@@ -785,3 +787,21 @@ def save_changes(self):
         if self.cleaned_data.get('del_taxonomy_topics'):
             for work in self.cleaned_data['works']:
                 work.taxonomy_topics.remove(*self.cleaned_data['del_taxonomy_topics'])
+
+        if self.cleaned_data.get('change_status'):
+            change = self.cleaned_data['change_status']
+            user = self.cleaned_data['user']
+
+            if change == 'approve':
+                for work in self.cleaned_data['works']:
+                    work.work_in_progress = False
+                    work.approved_by_user = user
+                    work.approved_at = datetime.now()
+                    work.save_with_revision(user)
+
+            else:
+                for work in self.cleaned_data['works']:
+                    work.work_in_progress = True
+                    work.approved_by_user = None
+                    work.approved_at = None
+                    work.save_with_revision(user)
diff --git a/indigo_app/templates/indigo_app/place/_work.html b/indigo_app/templates/indigo_app/place/_work.html
index 3255a1ef1..65c5e162a 100644
--- a/indigo_app/templates/indigo_app/place/_work.html
+++ b/indigo_app/templates/indigo_app/place/_work.html
@@ -7,7 +7,7 @@
     </div>
   {% endif %}
   <div class="flex-fill">
-    <div class="border bg-white mb-2">
+    <div class="border {% if work.work_in_progress %}bg-transparent{% else %}bg-white{% endif %} mb-2">
       <div class="d-flex p-2 pl-3" type="button" data-toggle="collapse" id="work-heading-{{ work.pk }}"
            data-target="#work-detail-{{ work.pk }}" aria-expanded="true" aria-controls="work-detail-{{ work.pk }}"
            hx-get="{% url 'place_works_work_detail' place=place.place_code pk=work.pk %}"
diff --git a/indigo_app/templates/indigo_app/place/_works_actions.html b/indigo_app/templates/indigo_app/place/_works_actions.html
index c02ea2ed0..aec3c44cb 100644
--- a/indigo_app/templates/indigo_app/place/_works_actions.html
+++ b/indigo_app/templates/indigo_app/place/_works_actions.html
@@ -11,6 +11,7 @@
     {% csrf_token %}
 
     <input type="hidden" name="save" value="1">
+    <input type="hidden" name="user" value="{{ request.user.pk }}">
     {% for work in works %}
       <input type="hidden" name="works" value="{{ work.pk }}">
     {% endfor %}
@@ -26,6 +27,16 @@ <h5 class="modal-title">
           </div>
 
           <div class="modal-body max-vh-60">
+
+            <div class="form-group col-md-4">
+              <label for="{{ form.change_status.id_for_label }}">{% trans "Change status" %}</label>
+              <select id="{{ form.change_status.id_for_label }}" name="{{ form.change_status.html_name }}" class="form-control">
+                {% for opt in form.change_status %}
+                  {{ opt }}
+                {% endfor %}
+              </select>
+            </div>
+
             <div class="form-group col-md-10">
               <label for="{{ form.add_taxonomy_topics.id_for_label }}">{% trans "Add taxonomy topics" %}</label>
               <select id="{{ form.add_taxonomy_topics.id_for_label }}" name="{{ form.add_taxonomy_topics.html_name }}"

From 69700d1d9794ebccbd30df41476250eed26ac4d4 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:43:31 +0200
Subject: [PATCH 04/28] add approved property

---
 indigo_api/models/works.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 241ef6ca1..5ec66765d 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -511,6 +511,10 @@ class Meta:
 
     objects = WorkManager.from_queryset(WorkQuerySet)()
 
+    @property
+    def approved(self):
+        return not self.work_in_progress
+
     @property
     def locality_code(self):
         # Helper to get/set locality using the locality_code, used by the WorkSerializer.

From 6ac0f7742749072b6a5c90055b8a18256716024d Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:43:45 +0200
Subject: [PATCH 05/28] add work in progress badge

---
 indigo_app/templates/indigo_api/_work_info_badges.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indigo_app/templates/indigo_api/_work_info_badges.html b/indigo_app/templates/indigo_api/_work_info_badges.html
index 5cf6b4f4c..513c63d1c 100644
--- a/indigo_app/templates/indigo_api/_work_info_badges.html
+++ b/indigo_app/templates/indigo_api/_work_info_badges.html
@@ -12,3 +12,6 @@
 {% elif not work.commencement_date %}
   <span class="badge badge-info">{% trans 'commencement date unknown' %}</span>
 {% endif %}
+{% if work.work_in_progress %}
+  <span class="badge badge-warning">{% trans 'work in progress' %}</span>
+{% endif %}

From a44519d39aabbcf7717c92f296e4803184570e57 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:44:43 +0200
Subject: [PATCH 06/28] add wip badge in document view, disable publishing
 document

---
 indigo_app/templates/indigo_api/document/show.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indigo_app/templates/indigo_api/document/show.html b/indigo_app/templates/indigo_api/document/show.html
index 32ecbdb39..ed5c457c3 100644
--- a/indigo_app/templates/indigo_api/document/show.html
+++ b/indigo_app/templates/indigo_api/document/show.html
@@ -25,6 +25,9 @@ <h5 class="main-header-title">
             <span class="badge badge-info if-published">{% trans 'published' %}</span>
             <span class="badge badge-warning if-draft">{% trans 'draft' %}</span>
             <span class="badge badge-info if-repealed">{% trans 'repealed' %}</span>
+            {% if document.work.work_in_progress %}
+              <span class="badge badge-warning">{% trans 'work in progress' %}</span>
+            {% endif %}
           </h5>
         </div>
 
@@ -42,7 +45,7 @@ <h5 class="main-header-title">
                     </button>
                     <button class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                     <div class="dropdown-menu dropdown-menu-right">
-                      <a class="dropdown-item save-and-publish if-draft {% if not perms.indigo_api.publish_document %}disabled{% endif %}" href="#">{% trans 'Save &amp; publish' %}</a>
+                      <a class="dropdown-item save-and-publish if-draft {% if not perms.indigo_api.publish_document %}disabled{% endif %} {% if document.work.work_in_progress %}disabled{% endif %}" href="#">{% trans 'Save &amp; publish' %}</a>
                       <a class="dropdown-item save-and-unpublish if-published {% if not perms.indigo_api.publish_document %}disabled{% endif %}" href="#">{% trans 'Unpublish &amp; save' %}</a>
                     </div>
                   </div>

From ef860f57ec72ec916386c3f8f60062cac454dfa5 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:45:47 +0200
Subject: [PATCH 07/28] make all new works WIPs

---
 indigo_app/views/works.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indigo_app/views/works.py b/indigo_app/views/works.py
index 92b433e2e..f2958ae5b 100644
--- a/indigo_app/views/works.py
+++ b/indigo_app/views/works.py
@@ -216,6 +216,7 @@ def get_context_data(self, **kwargs):
     def form_valid(self, form):
         form.instance.updated_by_user = self.request.user
         form.instance.created_by_user = self.request.user
+        form.instance.work_in_progress = True
 
         with reversion.create_revision():
             reversion.set_user(self.request.user)

From 7b9277d0a283287c54d6cf30dbba982cf2ea16ef Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:09:11 +0200
Subject: [PATCH 08/28] add work in progress facet

---
 indigo_app/forms.py        | 12 ++++++++++++
 indigo_app/views/places.py | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/indigo_app/forms.py b/indigo_app/forms.py
index 463e6f60b..060fdcd41 100644
--- a/indigo_app/forms.py
+++ b/indigo_app/forms.py
@@ -374,6 +374,7 @@ class WorkFilterForm(forms.Form):
     repealed_date_end = forms.DateField(input_formats=['%Y-%m-%d'])
 
     stub = forms.MultipleChoiceField(choices=[('stub', 'Stub'), ('not_stub', 'Not a stub'), ])
+    work_in_progress = forms.MultipleChoiceField(choices=[('work_in_progress', 'Work in progress'), ('approved', 'Approved')])
     status = forms.MultipleChoiceField(choices=[('published', 'published'), ('draft', 'draft')])
     sortby = forms.ChoiceField(choices=[('-created_at', '-created_at'), ('created_at', 'created_at'), ('-updated_at', '-updated_at'), ('updated_at', 'updated_at'), ('title', 'title'), ('-title', '-title')])
     principal = forms.MultipleChoiceField(required=False, choices=[('principal', 'Principal'), ('not_principal', 'Not Principal')])
@@ -413,6 +414,17 @@ def filter_queryset(self, queryset, exclude=None):
         if self.cleaned_data.get('q'):
             queryset = queryset.filter(Q(title__icontains=self.cleaned_data['q']) | Q(frbr_uri__icontains=self.cleaned_data['q']))
 
+        # filter by work in progress
+        if exclude != "work_in_progress":
+            work_in_progress_filter = self.cleaned_data.get('work_in_progress', [])
+            work_in_progress_qs = Q()
+            if "work_in_progress" in work_in_progress_filter:
+                work_in_progress_qs |= Q(work_in_progress=True)
+            if "approved" in work_in_progress_filter:
+                work_in_progress_qs |= Q(work_in_progress=False)
+
+            queryset = queryset.filter(work_in_progress_qs)
+
         # filter by stub
         if exclude != "stub":
             stub_filter = self.cleaned_data.get('stub', [])
diff --git a/indigo_app/views/places.py b/indigo_app/views/places.py
index 3f58d77fd..7a5191320 100644
--- a/indigo_app/views/places.py
+++ b/indigo_app/views/places.py
@@ -814,6 +814,7 @@ def get_context_data(self, **kwargs):
         # build facets
         context["work_facets"] = work_facets = []
         self.facet_subtype(work_facets, qs)
+        self.facet_work_in_progress(work_facets, qs)
         self.facet_principal(work_facets, qs)
         self.facet_stub(work_facets, qs)
         self.facet_tasks(work_facets, qs)
@@ -898,6 +899,28 @@ def facet_stub(self, facets, qs):
         ]
         facets.append(Facet("Stubs", "stub", "checkbox", items))
 
+    def facet_work_in_progress(self, facets, qs):
+        qs = self.form.filter_queryset(qs, exclude="work_in_progress")
+        counts = qs.aggregate(
+            work_in_progress_counts=Count("pk", filter=Q(work_in_progress=True), distinct=True),
+            approved_counts=Count("pk", filter=Q(work_in_progress=False), distinct=True),
+        )
+        items = [
+            FacetItem(
+                "Work in progress",
+                "work_in_progress",
+                counts.get("work_in_progress_counts", 0),
+                "work_in_progress" in self.form.cleaned_data.get("work_in_progress", [])
+            ),
+            FacetItem(
+                "Approved",
+                "approved",
+                counts.get("approved_counts", 0),
+                "approved" in self.form.cleaned_data.get("work_in_progress", [])
+            ),
+        ]
+        facets.append(Facet("Work in progress", "work_in_progress", "checkbox", items))
+
     def facet_tasks(self, facets, qs):
         qs = self.form.filter_queryset(qs, exclude="tasks")
         task_states = qs.annotate(

From 7b81b152ccfef21af8b95a507b160623b386bbfb Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 6 Dec 2023 17:14:30 +0200
Subject: [PATCH 09/28] don't use status for work in progress

---
 indigo_app/forms.py                                       | 8 ++++----
 indigo_app/templates/indigo_app/place/_works_actions.html | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indigo_app/forms.py b/indigo_app/forms.py
index 060fdcd41..60df6547c 100644
--- a/indigo_app/forms.py
+++ b/indigo_app/forms.py
@@ -786,7 +786,7 @@ class WorkBulkActionsForm(forms.Form):
     del_taxonomy_topics = forms.ModelMultipleChoiceField(
         queryset=TaxonomyTopic.objects.all(),
         required=False)
-    change_status = forms.ChoiceField(choices=[('', ''), ('approve', 'Approve'), ('un_approve', 'Un-approve')], required=False)
+    change_work_in_progress = forms.ChoiceField(choices=[('', ''), ('approved', 'Approved'), ('work_in_progress', 'Work in progress')], required=False)
 
     def clean_all_work_pks(self):
         return self.cleaned_data.get('all_work_pks').split() or []
@@ -800,11 +800,11 @@ def save_changes(self):
             for work in self.cleaned_data['works']:
                 work.taxonomy_topics.remove(*self.cleaned_data['del_taxonomy_topics'])
 
-        if self.cleaned_data.get('change_status'):
-            change = self.cleaned_data['change_status']
+        if self.cleaned_data.get('change_work_in_progress'):
+            change = self.cleaned_data['change_work_in_progress']
             user = self.cleaned_data['user']
 
-            if change == 'approve':
+            if change == 'approved':
                 for work in self.cleaned_data['works']:
                     work.work_in_progress = False
                     work.approved_by_user = user
diff --git a/indigo_app/templates/indigo_app/place/_works_actions.html b/indigo_app/templates/indigo_app/place/_works_actions.html
index aec3c44cb..869f338d2 100644
--- a/indigo_app/templates/indigo_app/place/_works_actions.html
+++ b/indigo_app/templates/indigo_app/place/_works_actions.html
@@ -29,9 +29,9 @@ <h5 class="modal-title">
           <div class="modal-body max-vh-60">
 
             <div class="form-group col-md-4">
-              <label for="{{ form.change_status.id_for_label }}">{% trans "Change status" %}</label>
-              <select id="{{ form.change_status.id_for_label }}" name="{{ form.change_status.html_name }}" class="form-control">
-                {% for opt in form.change_status %}
+              <label for="{{ form.change_work_in_progress.id_for_label }}">{% trans "Change work in progress" %}</label>
+              <select id="{{ form.change_work_in_progress.id_for_label }}" name="{{ form.change_work_in_progress.html_name }}" class="form-control">
+                {% for opt in form.change_work_in_progress %}
                   {{ opt }}
                 {% endfor %}
               </select>

From cd05a7b2aaf1b64bb7baa417e52ec6157d0f4b21 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:47:00 +0200
Subject: [PATCH 10/28] change permission to bulk_add_work

---
 indigo_app/templates/indigo_app/place/_work.html       | 2 +-
 indigo_app/templates/indigo_app/place/_works_list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indigo_app/templates/indigo_app/place/_work.html b/indigo_app/templates/indigo_app/place/_work.html
index 65c5e162a..0fc39011b 100644
--- a/indigo_app/templates/indigo_app/place/_work.html
+++ b/indigo_app/templates/indigo_app/place/_work.html
@@ -1,7 +1,7 @@
 {% load humanize i18n %}
 
 <div class="d-flex">
-  {% if perms.indigo_api.change_work %}
+  {% if perms.indigo_api.bulk_add_work %}
     <div class="mr-2 mt-2">
       <input type="checkbox" name="works" value="{{ work.pk }}" class="work-checkbox">
     </div>
diff --git a/indigo_app/templates/indigo_app/place/_works_list.html b/indigo_app/templates/indigo_app/place/_works_list.html
index 5997d9170..d3eb2398c 100644
--- a/indigo_app/templates/indigo_app/place/_works_list.html
+++ b/indigo_app/templates/indigo_app/place/_works_list.html
@@ -39,7 +39,7 @@
       hx-trigger="change from:.work-checkbox, change from:.all-works-checkbox"
     >
       {% csrf_token %}
-      {% if perms.indigo_api.change_work %}
+      {% if perms.indigo_api.bulk_add_work %}
         <div>
           <input id="all-work-pks" type="checkbox" name="all_work_pks" value="{{ work_pks }}" class="all-works-checkbox mr-2">
           <label for="all-work-pks" class="text-muted">

From 17fd3996f7a84b20f1ee07b602db3111d63ed085 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:11:48 +0200
Subject: [PATCH 11/28] don't include user in form, just pass it from the view

---
 indigo_app/forms.py                           | 28 +++++++++----------
 .../indigo_app/place/_works_actions.html      |  1 -
 indigo_app/views/places.py                    |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/indigo_app/forms.py b/indigo_app/forms.py
index 60df6547c..f41bd722f 100644
--- a/indigo_app/forms.py
+++ b/indigo_app/forms.py
@@ -779,7 +779,6 @@ class WorkBulkActionsForm(forms.Form):
     save = forms.BooleanField()
     all_work_pks = forms.CharField(required=False)
     works = forms.ModelMultipleChoiceField(queryset=Work.objects, required=True)
-    user = forms.ModelChoiceField(queryset=User.objects)
     add_taxonomy_topics = forms.ModelMultipleChoiceField(
         queryset=TaxonomyTopic.objects.all(),
         required=False)
@@ -791,7 +790,7 @@ class WorkBulkActionsForm(forms.Form):
     def clean_all_work_pks(self):
         return self.cleaned_data.get('all_work_pks').split() or []
 
-    def save_changes(self):
+    def save_changes(self, user):
         if self.cleaned_data.get('add_taxonomy_topics'):
             for work in self.cleaned_data['works']:
                 work.taxonomy_topics.add(*self.cleaned_data['add_taxonomy_topics'])
@@ -801,19 +800,20 @@ def save_changes(self):
                 work.taxonomy_topics.remove(*self.cleaned_data['del_taxonomy_topics'])
 
         if self.cleaned_data.get('change_work_in_progress'):
-            change = self.cleaned_data['change_work_in_progress']
-            user = self.cleaned_data['user']
-
-            if change == 'approved':
+            if self.cleaned_data['change_work_in_progress'] == 'approved':
                 for work in self.cleaned_data['works']:
-                    work.work_in_progress = False
-                    work.approved_by_user = user
-                    work.approved_at = datetime.now()
-                    work.save_with_revision(user)
+                    # only save if it's changed
+                    if work.work_in_progress:
+                        work.work_in_progress = False
+                        work.approved_by_user = user
+                        work.approved_at = datetime.now()
+                        work.save_with_revision(user)
 
             else:
                 for work in self.cleaned_data['works']:
-                    work.work_in_progress = True
-                    work.approved_by_user = None
-                    work.approved_at = None
-                    work.save_with_revision(user)
+                    # only save if it's changed
+                    if work.approved:
+                        work.work_in_progress = True
+                        work.approved_by_user = None
+                        work.approved_at = None
+                        work.save_with_revision(user)
diff --git a/indigo_app/templates/indigo_app/place/_works_actions.html b/indigo_app/templates/indigo_app/place/_works_actions.html
index 869f338d2..0caec1d5f 100644
--- a/indigo_app/templates/indigo_app/place/_works_actions.html
+++ b/indigo_app/templates/indigo_app/place/_works_actions.html
@@ -11,7 +11,6 @@
     {% csrf_token %}
 
     <input type="hidden" name="save" value="1">
-    <input type="hidden" name="user" value="{{ request.user.pk }}">
     {% for work in works %}
       <input type="hidden" name="works" value="{{ work.pk }}">
     {% endfor %}
diff --git a/indigo_app/views/places.py b/indigo_app/views/places.py
index 7a5191320..67afbf3f1 100644
--- a/indigo_app/views/places.py
+++ b/indigo_app/views/places.py
@@ -1202,7 +1202,7 @@ class WorkActionsView(PlaceViewBase, FormView):
 
     def form_valid(self, form):
         if form.cleaned_data['save'] and self.request.user.has_perm('indigo_api.change_work'):
-            form.save_changes()
+            form.save_changes(self.request.user)
             messages.success(self.request, f"Updated {form.cleaned_data['works'].count()} works.")
             return redirect(
                 self.request.META.get('HTTP_REFERER')

From 20aacf23d46df2bf3d635f76199c93eb8fbc6c92 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:20:10 +0200
Subject: [PATCH 12/28] make wip True by default; backfill existing to False

---
 .../migrations/0029_work_in_progress.py       |  4 ++--
 .../0030_backfill_work_in_progress.py         | 24 +++++++++++++++++++
 indigo_api/models/works.py                    |  2 +-
 indigo_app/views/works.py                     |  1 -
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 indigo_api/migrations/0030_backfill_work_in_progress.py

diff --git a/indigo_api/migrations/0029_work_in_progress.py b/indigo_api/migrations/0029_work_in_progress.py
index e2056fb1a..552cc8264 100644
--- a/indigo_api/migrations/0029_work_in_progress.py
+++ b/indigo_api/migrations/0029_work_in_progress.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2023-12-06 11:21
+# Generated by Django 3.2.13 on 2023-12-07 10:13
 
 from django.conf import settings
 from django.db import migrations, models
@@ -26,6 +26,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='work',
             name='work_in_progress',
-            field=models.BooleanField(default=False, help_text='Work in progress, to be approved'),
+            field=models.BooleanField(default=True, help_text='Work in progress, to be approved'),
         ),
     ]
diff --git a/indigo_api/migrations/0030_backfill_work_in_progress.py b/indigo_api/migrations/0030_backfill_work_in_progress.py
new file mode 100644
index 000000000..8045fa337
--- /dev/null
+++ b/indigo_api/migrations/0030_backfill_work_in_progress.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.13 on 2023-12-07 10:14
+from django.db import migrations
+
+
+def backfill_work_in_progress(apps, schema_editor):
+    """ Mark existing works as work_in_progress = False; only new ones should be True by default.
+    """
+    Work = apps.get_model('indigo_api', 'Work')
+    db_alias = schema_editor.connection.alias
+
+    for work in Work.objects.using(db_alias).iterator(100):
+        work.work_in_progress = False
+        work.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('indigo_api', '0029_work_in_progress'),
+    ]
+
+    operations = [
+        migrations.RunPython(backfill_work_in_progress, migrations.RunPython.noop)
+    ]
diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 5ec66765d..b7863143e 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -499,7 +499,7 @@ class Meta:
     consolidation_note_override = models.CharField(max_length=1024, null=True, blank=True, help_text='Consolidation note about this particular work, to override consolidation note for place')
     disclaimer = models.CharField(max_length=1024, null=True, blank=True, help_text='Disclaimer text about this work')
 
-    work_in_progress = models.BooleanField(default=False, help_text="Work in progress, to be approved")
+    work_in_progress = models.BooleanField(default=True, help_text="Work in progress, to be approved")
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
diff --git a/indigo_app/views/works.py b/indigo_app/views/works.py
index f2958ae5b..92b433e2e 100644
--- a/indigo_app/views/works.py
+++ b/indigo_app/views/works.py
@@ -216,7 +216,6 @@ def get_context_data(self, **kwargs):
     def form_valid(self, form):
         form.instance.updated_by_user = self.request.user
         form.instance.created_by_user = self.request.user
-        form.instance.work_in_progress = True
 
         with reversion.create_revision():
             reversion.set_user(self.request.user)

From 8b84eaa2bdd7a09533a5b1bd722a68898e165824 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Thu, 7 Dec 2023 13:22:19 +0200
Subject: [PATCH 13/28] make new fields blank=True too

---
 indigo_api/migrations/0029_work_in_progress.py | 6 +++---
 indigo_api/models/works.py                     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indigo_api/migrations/0029_work_in_progress.py b/indigo_api/migrations/0029_work_in_progress.py
index 552cc8264..c4e8f3e71 100644
--- a/indigo_api/migrations/0029_work_in_progress.py
+++ b/indigo_api/migrations/0029_work_in_progress.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2023-12-07 10:13
+# Generated by Django 3.2.13 on 2023-12-07 11:18
 
 from django.conf import settings
 from django.db import migrations, models
@@ -16,12 +16,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='work',
             name='approved_at',
-            field=models.DateTimeField(null=True),
+            field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AddField(
             model_name='work',
             name='approved_by_user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AddField(
             model_name='work',
diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index b7863143e..17d3844d9 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -503,11 +503,11 @@ class Meta:
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
-    approved_at = models.DateTimeField(null=True)
+    approved_at = models.DateTimeField(null=True, blank=True)
 
     created_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
     updated_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
-    approved_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='+')
+    approved_by_user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
 
     objects = WorkManager.from_queryset(WorkQuerySet)()
 

From ec60128b34f3dbc284fd52796cdcaf3b28554187 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:01:14 +0200
Subject: [PATCH 14/28] style work form

---
 .../indigo_api/_work_commencement_form.html   |  35 +-
 .../indigo_api/_work_parent_form.html         |  39 +-
 .../indigo_api/_work_repeal_form.html         |  33 +-
 .../templates/indigo_api/work_form.html       | 697 +++++++++---------
 4 files changed, 385 insertions(+), 419 deletions(-)

diff --git a/indigo_app/templates/indigo_api/_work_commencement_form.html b/indigo_app/templates/indigo_api/_work_commencement_form.html
index f5ba5be87..c7bce77fa 100644
--- a/indigo_app/templates/indigo_api/_work_commencement_form.html
+++ b/indigo_app/templates/indigo_api/_work_commencement_form.html
@@ -2,7 +2,7 @@
 
 <div class="form-group row">
   <label class="col-2 col-form-label">{% trans 'Commenced by' %}</label>
-  <div class="col">
+  <div class="col-4">
     <input type="hidden" id="{{ form.commencing_work.id_for_label }}" name="{{ form.commencing_work.html_name }}" value="{{ form.commencing_work.value|default:'' }}">
     {% if commencing_work %}
       <div class="mb-2">
@@ -15,33 +15,32 @@
     <div>
       {% url 'work_form_commencement' place.place_code as edit_url %}
       <button
-        class="btn btn-outline-primary"
-        type="button"
-        hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-commencing-work"|urlencode }}&field=work-commencing_work"
-        hx-target="#work-commencing-work-modal"
-        hx-trigger="click"
-        data-toggle="modal"
-        data-target="#work-commencing-work-modal"
-      >{% trans 'Choose work' %}</button>
+          class="btn btn-outline-primary"
+          type="button"
+          hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-commencing-work"|urlencode }}&field=work-commencing_work"
+          hx-target="#work-commencing-work-modal"
+          hx-trigger="click"
+          data-toggle="modal"
+          data-target="#work-commencing-work-modal"
+      >{% trans 'Choose commencing work' %}</button>
 
       {% if commencing_work %}
         <button
-          class="btn btn-outline-danger ml-2"
-          hx-get="{{ edit_url }}"
-          hx-target="#work-form-commencing-work"
+            class="btn btn-outline-danger ml-2"
+            hx-get="{{ edit_url }}"
+            hx-target="#work-form-commencing-work"
         >Clear</button>
       {% endif %}
     </div>
-
-    <div class="form-text text-muted">{% trans 'The work that gives the commencement date of this work.' %}</div>
   </div>
+  <div class="col-6 form-text text-muted">{% trans 'The work that brings this work into force.' %}</div>
 </div>
 
 <div
-  id="work-commencing-work-modal"
-  class="modal modal-blur fade"
-  style="display: none"
-  tabindex="-1"
+    id="work-commencing-work-modal"
+    class="modal modal-blur fade"
+    style="display: none"
+    tabindex="-1"
 >
   <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
     <div class="modal-content">Loading...</div>
diff --git a/indigo_app/templates/indigo_api/_work_parent_form.html b/indigo_app/templates/indigo_api/_work_parent_form.html
index 218af6f4e..24caf5026 100644
--- a/indigo_app/templates/indigo_api/_work_parent_form.html
+++ b/indigo_app/templates/indigo_api/_work_parent_form.html
@@ -2,7 +2,7 @@
 
 <div class="form-group row">
   <label class="col-2 col-form-label">{% trans 'Primary work' %}</label>
-  <div class="col">
+  <div class="col-4">
     <input type="hidden" id="{{ form.parent_work.id_for_label }}" name="{{ form.parent_work.html_name }}" value="{{ form.parent_work.value|default:'' }}">
     {% if work.parent_work %}
       <div class="mb-2">
@@ -15,35 +15,34 @@
     <div>
       {% url 'work_form_parent' place.place_code as edit_url %}
       <button
-        class="btn btn-outline-primary"
-        type="button"
-        hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-parent"|urlencode }}&field=work-parent_work"
-        hx-target="#work-parent-modal"
-        hx-trigger="click"
-        data-toggle="modal"
-        data-target="#work-parent-modal"
-      >{% trans 'Choose parent work' %}</button>
+          class="btn btn-outline-primary"
+          type="button"
+          hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-parent"|urlencode }}&field=work-parent_work"
+          hx-target="#work-parent-modal"
+          hx-trigger="click"
+          data-toggle="modal"
+          data-target="#work-parent-modal"
+      >{% trans 'Choose primary work' %}</button>
 
       {% if work.parent_work %}
         <button
-          class="btn btn-outline-danger ml-2"
-          hx-get="{{ edit_url }}"
-          hx-target="#work-form-parent"
+            class="btn btn-outline-danger ml-2"
+            hx-get="{{ edit_url }}"
+            hx-target="#work-form-parent"
         >Clear</button>
       {% endif %}
     </div>
   </div>
+  <div class="col-6 form-text text-muted">
+    {% trans 'The primary work for regulations is the Act in terms of which they were promulgated.' %}
+  </div>
 </div>
 
-<p class="form-text text-muted">
-  {% trans 'The primary work for regulations and notices is the primary Act.' %}
-</p>
-
 <div
-  id="work-parent-modal"
-  class="modal modal-blur fade"
-  style="display: none"
-  tabindex="-1"
+    id="work-parent-modal"
+    class="modal modal-blur fade"
+    style="display: none"
+    tabindex="-1"
 >
   <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
     <div class="modal-content">Loading...</div>
diff --git a/indigo_app/templates/indigo_api/_work_repeal_form.html b/indigo_app/templates/indigo_api/_work_repeal_form.html
index 5370b7cb6..3d8c11ad6 100644
--- a/indigo_app/templates/indigo_api/_work_repeal_form.html
+++ b/indigo_app/templates/indigo_api/_work_repeal_form.html
@@ -15,20 +15,20 @@
     <div>
       {% url 'work_form_repeal' place.place_code as edit_url %}
       <button
-        class="btn btn-outline-primary"
-        type="button"
-        hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-repeal"|urlencode }}&field=work-repealed_by"
-        hx-target="#work-repeal-modal"
-        hx-trigger="click"
-        data-toggle="modal"
-        data-target="#work-repeal-modal"
+          class="btn btn-outline-primary"
+          type="button"
+          hx-get="{% url 'place_work_chooser' place.place_code %}?submit={{ edit_url|urlencode }}&target={{ "#work-form-repeal"|urlencode }}&field=work-repealed_by"
+          hx-target="#work-repeal-modal"
+          hx-trigger="click"
+          data-toggle="modal"
+          data-target="#work-repeal-modal"
       >{% trans 'Choose repealing work' %}</button>
 
       {% if work.repealed_by %}
         <button
-          class="btn btn-outline-danger ml-2"
-          hx-get="{{ edit_url }}"
-          hx-target="#work-form-repeal"
+            class="btn btn-outline-danger ml-2"
+            hx-get="{{ edit_url }}"
+            hx-target="#work-form-repeal"
         >Clear</button>
       {% endif %}
     </div>
@@ -38,20 +38,23 @@
 {% if work.repealed_by %}
   <div class="form-group row">
     <label class="col-2 col-form-label required">{% trans 'Repeal date' %}</label>
-    <div class="col">
+    <div class="col-4">
       <input type="date" class="form-control"
              id="{{ form.repealed_date.id_for_label }}" name="{{ form.repealed_date.html_name }}"
              required
              value="{{ form.repealed_date.value|date:"Y-m-d"|default:'' }}">
     </div>
+    <div class="col-6 form-text text-muted">
+      {% trans 'The default date of repeal is the date of commencement of the selected repealing work.' %}
+    </div>
   </div>
 {% endif %}
 
 <div
-  id="work-repeal-modal"
-  class="modal modal-blur fade"
-  style="display: none"
-  tabindex="-1"
+    id="work-repeal-modal"
+    class="modal modal-blur fade"
+    style="display: none"
+    tabindex="-1"
 >
   <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
     <div class="modal-content">Loading...</div>
diff --git a/indigo_app/templates/indigo_api/work_form.html b/indigo_app/templates/indigo_api/work_form.html
index 3f84f8143..b005c1557 100644
--- a/indigo_app/templates/indigo_api/work_form.html
+++ b/indigo_app/templates/indigo_api/work_form.html
@@ -24,7 +24,6 @@
 
   <form id="edit-work-form" method="POST" enctype="multipart/form-data" data-component="WorkForm">
     {% csrf_token %}
-
     <input type="hidden" value="{{ form.frbr_uri.value|default:'' }}" name="{{ form.frbr_uri.html_name }}">
 
     <div class="mb-3">
@@ -32,12 +31,10 @@
         {% if work.pk %}
           <a class="btn btn-link" href="{% url 'work' frbr_uri=work.frbr_uri %}">{% trans 'Cancel' %}</a>
         {% endif %}
-
         {% if work.pk and perms.indigo_api.change_work or not work.pk and perms.indigo_api.add_work %}
           <button class="btn btn-success save" type="submit">{% if work.pk %}{% trans 'Save' %}{% else %}{% trans 'Create' %}{% endif %}</button>
         {% endif %}
       </div>
-
       <h3 class="work-title">{{ work.title }}</h3>
       <h4 class="text-muted work-frbr-uri">{{ work.frbr_uri }}</h4>
       <p>
@@ -47,172 +44,102 @@ <h4 class="text-muted work-frbr-uri">{{ work.frbr_uri }}</h4>
     </div>
 
     <div class="duplicate-wrapper"></div>
-    {% block work-form-details %}
-    <div class="card mb-3">
-      <h5 class="card-header">{% trans 'Work identification' %}</h5>
-      <div class="card-body">
-
-        <div class="form-row">
-          <div class="form-group col-12">
-            <label for="{{ form.title.id_for_label }}" class="required">{% trans 'Short title' %}</label>
-            <input
-                hx-trigger="load, change, keyup delay:500ms changed"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                type="text" class="form-control" id="{{ form.title.id_for_label }}"
-                name="{{ form.title.html_name }}"
-                value="{{ form.title.value|default:'' }}"
-                autofocus placeholder="{% trans 'Title' %}" required>
-          </div>
-        </div>
-
-        <div class="form-row">
-          <div class="form-group col-4">
-            <label for="{{ form.frbr_doctype.id_for_label }}" class="required">{% trans 'Work type' %}</label>
-            <select
-                hx-trigger="change"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                id="{{ form.frbr_doctype.id_for_label }}" name="{{ form.frbr_doctype.html_name }}" class="form-control">
-              {% for opt in form.frbr_doctype %}
-                {{ opt }}
-              {% endfor %}
-            </select>
-          </div>
-
-          <div class="form-group col-4">
-            <label for="{{ form.frbr_subtype.id_for_label }}">{% trans 'Work subtype' %}</label>
-            <select
-                hx-trigger="change"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                id="{{ form.frbr_subtype.id_for_label }}" name="{{ form.frbr_subtype.html_name }}" class="form-control">
-              <option value="">{% trans '(none)' %}</option>
-              {% for opt in form.frbr_subtype %}
-                {{ opt }}
-              {% endfor %}
-            </select>
-          </div>
-
-          <div class="form-group col-4">
-            <label for="{{ form.frbr_actor.id_for_label }}">{% trans 'Responsible organisation (actor)' %}</label>
-            <input
-                hx-trigger="change, keyup delay:500ms changed"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                type="text" class="form-control" id="{{ form.frbr_actor.id_for_label }}"
-                name="{{ form.frbr_actor.html_name }}"
-                value="{{ form.frbr_actor.value|default:'' }}">
-            <div class="form-text text-muted">{% trans 'Organisation that created this work. Not normally used for Acts.' %}</div>
-          </div>
-        </div>
-
-        <div class="form-row">
-          <div class="form-group col-md-3 mb-0">
-            <label for="{{ form.frbr_date.id_for_label }}" class="required">{% trans 'Year (or date) of introduction' %}</label>
-            <input
-                hx-trigger="change, keyup delay:500ms changed"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                type="text" class="form-control" id="{{ form.frbr_date.id_for_label }}"
-                required pattern="\d{4}(-\d{2}-\d{2})?" placeholder="yyyy(-mm-dd)"
-                name="{{ form.frbr_date.html_name }}"
-                value="{{ form.frbr_date.value|default:'' }}">
-          </div>
-
-          <div class="form-group col-md-6 offset-md-3 mb-0">
-            <label for="{{ form.frbr_number.id_for_label }}" class="required">{% trans 'Number within year' %}</label>
-            <input
-                hx-trigger="change, keyup delay:500ms changed"
-                hx-target=".duplicate-wrapper"
-                hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                type="text" class="form-control" id="{{ form.frbr_number.id_for_label }}"
-                required pattern="[^\s]+"
-                name="{{ form.frbr_number.html_name }}"
-                value="{{ form.frbr_number.value|default:'' }}">
-            <div class="form-text text-muted">
-              {% trans "Number or short name that uniquely identifies this legislation within the year of introduction. Numbers, letters and '-' only." %}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
 
-    <div class="card mb-3">
-      <h5 class="card-header">{% trans 'Classification' %}</h5>
-      <div class="card-body">
-
-        <div class="form-row">
-          <div class="form-group col-md-6">
-            <div class="form-check">
-              <input type="checkbox" class="form-check-input" id="{{ form.principal.id_for_label }}" name="{{ form.principal.html_name }}" value="on" {% if form.principal.value %}checked{% endif %}>
-              <label class="mb-0" for="{{ form.principal.id_for_label }}">{% trans 'Principal work' %}</label>
-              <p class="form-text text-muted">
-                {% trans "Principal works are not simply repeals, amendments or commencements, and should have full text content." %}
-              </p>
-            </div>
-          </div>
+    {% block work-form-details %}
+      <div class="card mb-3">
+        <div class="card-body">
 
-          <div class="form-group col-md-6">
-            <div id="work-form-parent">
-              {% include 'indigo_api/_work_parent_form.html' %}
+          <div class="form-group row">
+            <label for="{{ form.title.id_for_label }}" class="col-2 col-form-label required">{% trans 'Short title' %}</label>
+            <div class="col">
+              <input
+                  hx-trigger="load, change, keyup delay:500ms changed"
+                  hx-target=".duplicate-wrapper"
+                  hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                  type="text" class="form-control" id="{{ form.title.id_for_label }}"
+                  name="{{ form.title.html_name }}"
+                  value="{{ form.title.value|default:'' }}"
+                  autofocus placeholder="{% trans 'Title' %}" required>
             </div>
           </div>
-        </div>
 
-        <div class="form-row">
-          <div class="form-group col-md-6">
-            <div class="form-check">
-              <input type="checkbox" class="form-check-input" id="{{ form.stub.id_for_label }}" name="{{ form.stub.html_name }}" value="on" {% if form.stub.value %}checked{% endif %}>
-              <label class="mb-0" for="{{ form.stub.id_for_label }}">{% trans 'Stub – this work will have no content' %}</label>
-              <p class="form-text text-muted">
-                {% trans "Check this option for commencing or amending works that are not captured in detail." %}
-              </p>
+          <div class="form-group row">
+            <label for="{{ form.frbr_doctype.id_for_label }}" class="col-2 col-form-label required">{% trans 'Work type' %}</label>
+            <div class="col-4">
+              <select
+                  hx-trigger="change"
+                  hx-target=".duplicate-wrapper"
+                  hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                  id="{{ form.frbr_doctype.id_for_label }}" name="{{ form.frbr_doctype.html_name }}" class="form-control">
+                {% for opt in form.frbr_doctype %}
+                  {{ opt }}
+                {% endfor %}
+              </select>
             </div>
           </div>
 
-          <div class="form-group col-md-6">
-            {% regroup form.fields.taxonomies.queryset by vocabulary as topic_groups %}
-            {% if topic_groups %}
-              <label for="taxonomies">{% trans 'Taxonomy tags' %}</label>
-              <select id="taxonomies" name="work-taxonomies" class="form-control selectpicker" data-live-search="true" multiple data-selected-text-format="count > 3">
-                {% for topic in topic_groups %}
-                  <optgroup label="{{ topic.grouper }}">
-                    {% for taxonomy in topic.list %}
-                      <option {% if taxonomy.pk in form.taxonomies.value %}selected{% endif %} value="{{ taxonomy.pk }}">{{ taxonomy }}</option>
-                    {% endfor %}
-                  </optgroup>
+          <div class="form-group row">
+            <label for="{{ form.frbr_subtype.id_for_label }}" class="col-2 col-form-label">{% trans 'Work subtype' %}</label>
+            <div class="col-4">
+              <select
+                  hx-trigger="change"
+                  hx-target=".duplicate-wrapper"
+                  hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                  id="{{ form.frbr_subtype.id_for_label }}" name="{{ form.frbr_subtype.html_name }}" class="form-control">
+                <option value="">{% trans '(none)' %}</option>
+                {% for opt in form.frbr_subtype %}
+                  {{ opt }}
                 {% endfor %}
               </select>
-            {% endif %}
+            </div>
           </div>
 
-          <div class="form-group col-md-6">
-            <label for="taxonomy_topics">{% trans 'Taxonomy topics' %}</label>
-            <select id="taxonomy_topics" name="work-taxonomy_topics" class="form-control selectpicker" data-live-search="true" multiple data-selected-text-format="count > 3">
-              {% for topic in form.fields.taxonomy_topics.queryset %}
-                <option {% if topic.pk in form.taxonomy_topics.value %}selected{% endif %} value="{{ topic.pk }}">{% for s in topic.range_space %} &nbsp; {% endfor %}{{ topic.name }}</option>
-              {% endfor %}
-            </select>
+          <div class="form-group row">
+            <label for="{{ form.frbr_date.id_for_label }}" class="col-2 col-form-label required">{% trans 'Year (or date) of introduction' %}</label>
+            <div class="col-4">
+              <input
+                  hx-trigger="change, keyup delay:500ms changed"
+                  hx-target=".duplicate-wrapper"
+                  hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                  type="text" class="form-control" id="{{ form.frbr_date.id_for_label }}"
+                  required pattern="\d{4}(-\d{2}-\d{2})?" placeholder="yyyy(-mm-dd)"
+                  name="{{ form.frbr_date.html_name }}"
+                  value="{{ form.frbr_date.value|default:'' }}">
+            </div>
           </div>
 
-        </div>
-
-        <div class="form-row">
-          {% for fld in form.property_fields %}
-            <div class="form-group col-md-4">
-              <label for="{{ fld.id_for_label }}">{{ fld.label }}</label>
+          <div class="form-group row">
+            <label for="{{ form.frbr_number.id_for_label }}" class="col-2 col-form-label required">{% trans 'Number within year' %}</label>
+            <div class="col-4">
               <input
                   hx-trigger="change, keyup delay:500ms changed"
                   hx-target=".duplicate-wrapper"
                   hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
-                  type="text" class="form-control" id="{{ fld.id_for_label }}"
-                  name="{{ fld.html_name }}"
-                  value="{{ fld.value|default:'' }}"
-                  maxlength="1024">
+                  type="text" class="form-control" id="{{ form.frbr_number.id_for_label }}"
+                  required pattern="[^\s]+"
+                  name="{{ form.frbr_number.html_name }}"
+                  value="{{ form.frbr_number.value|default:'' }}">
+            </div>
+            <div class="col-6 form-text text-muted">
+              {% trans "Number or short name that uniquely identifies this legislation within the year of introduction. Numbers, letters and '-' only." %}
+            </div>
+          </div>
 
+          {% for fld in form.property_fields %}
+            <div class="form-group row">
+              <label for="{{ fld.id_for_label }}" class="col-2 col-form-label">{{ fld.label }}</label>
+              <div class="col-4">
+                <input
+                    hx-trigger="change, keyup delay:500ms changed"
+                    hx-target=".duplicate-wrapper"
+                    hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                    type="text" class="form-control" id="{{ fld.id_for_label }}"
+                    name="{{ fld.html_name }}"
+                    value="{{ fld.value|default:'' }}"
+                    maxlength="1024">
+              </div>
               {% if fld.errors %}
-                <div class="form-row mt-2 mb-4">
+                <div class="col-6">
                   {% for error in fld.errors %}
                     <div class="text-danger">{{ error }}</div>
                   {% endfor %}
@@ -220,285 +147,323 @@ <h5 class="card-header">{% trans 'Classification' %}</h5>
               {% endif %}
             </div>
           {% endfor %}
-        </div>
 
-      </div>
-    </div>
-    {% endblock work-form-details %}
-
-    {% block work-form-publication %}
-    <div class="card mb-3" id="publication">
-      <h5 class="card-header">{% trans 'Publication' %}</h5>
-      <div class="card-body">
-
-        {% block work-form-publication-details %}
           <div class="form-group row">
-          {% block publication-date %}
-            <label for="{{ form.publication_date.id_for_label }}"
-                   class="col-2 col-form-label {% if not work.pk and not publication_date_optional %}required{% endif %}"
-            >{% trans 'Publication date' %}</label>
-            <div class="col">
+            <label for="{{ form.frbr_actor.id_for_label }}" class="col-2 col-form-label">{% trans 'Responsible organisation (actor)' %}</label>
+            <div class="col-4">
               <input
-                  hx-target=".possible-documents-wrapper"
-                  hx-trigger="load, change, keyup delay:500ms changed"
-                  hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
-                  type="date" class="form-control"
-                  id="{{ form.publication_date.id_for_label }}"
-                  {% if not work.pk and not publication_date_optional %}required{% endif %}
-                  name="{{ form.publication_date.html_name }}"
-                  value="{{ form.publication_date.value|date:"Y-m-d"|default:'' }}">
-              <div class="form-text text-muted">{% trans 'Date when first published. '%}</div>
+                  hx-trigger="change, keyup delay:500ms changed"
+                  hx-target=".duplicate-wrapper"
+                  hx-post="{% url 'work_form_find_duplicates' place.place_code %}?pk={{ work.pk }}"
+                  type="text" class="form-control" id="{{ form.frbr_actor.id_for_label }}"
+                  name="{{ form.frbr_actor.html_name }}"
+                  value="{{ form.frbr_actor.value|default:'' }}">
             </div>
-          {% endblock %}
+            <div class="col-6 form-text text-muted">{% trans 'Organisation that created this work. Not normally used for national legislation.' %}</div>
           </div>
 
+          <hr>
+
           <div class="form-group row">
-            <label class="col-2 col-form-label" for="{{ form.publication_name.id_for_label }}">{% trans 'Publication name' %}</label>
-            <div class="col">
-              <input
-                  hx-target=".possible-documents-wrapper"
-                  hx-trigger="change, keyup delay:500ms changed"
-                  hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
-                  type="text"
-                  class="form-control" id="{{ form.publication_name.id_for_label }}"
-                  name="{{ form.publication_name.html_name }}" list="publication_list"
-                  value="{{ form.publication_name.value|default:'' }}">
-              <div class="form-text text-muted">{% trans 'Original publication, eg. national gazette.' %}</div>
-              <datalist id="publication_list">
-                {% for pub in country.publication_set.all %}
-                  <option value="{{ pub.name }}">
-                {% endfor %}
-              </datalist>
+            <label for="{{ form.principal.id_for_label }}" class="col-2 col-form-label">{% trans 'Principal work' %}</label>
+            <div class="col-4 mt-1">
+              <input type="checkbox" class="form-check-input" id="{{ form.principal.id_for_label }}" name="{{ form.principal.html_name }}" value="on" {% if form.principal.value %}checked{% endif %}>
             </div>
+            <div class="col-6 form-text text-muted">{% trans 'Principal works are not simply repeals, amendments or commencements, and should have full text content.' %}</div>
           </div>
 
           <div class="form-group row">
-            <label class="col-2 col-form-label" for="{{ form.publication_number.id_for_label }}">{% trans 'Publication number' %}</label>
-            <div class="col">
-              <input
-                hx-target=".possible-documents-wrapper"
-                hx-trigger="change, keyup delay:500ms changed"
-                hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
-                type="text" class="form-control" id="{{ form.publication_number.id_for_label }}"
-                name="{{ form.publication_number.html_name }}"
-                value="{{ form.publication_number.value|default:'' }}">
-              <div class="form-text text-muted">{% trans "The publication's sequence number, eg. gazette number." %}</div>
+            <label for="{{ form.stub.id_for_label }}" class="col-2 col-form-label">{% trans 'Stub' %}</label>
+            <div class="col-4 mt-1">
+              <input type="checkbox" class="form-check-input" id="{{ form.stub.id_for_label }}" name="{{ form.stub.html_name }}" value="on" {% if form.stub.value %}checked{% endif %}>
+            </div>
+            <div class="col-6 form-text text-muted">
+              {% trans "Check this option for commencing or amending works, or other works for which content won't be marked up." %}
             </div>
           </div>
-        {% endblock work-form-publication-details %}
 
-        {% block work-form-publication-file %}
-          <div class="publication-document-wrapper">
-            {% include 'indigo_api/_work_publication_document.html' %}
+          <hr>
+
+          <div id="work-form-parent">
+            {% include 'indigo_api/_work_parent_form.html' %}
           </div>
-          <div class="possible-documents-wrapper"></div>
-        {% endblock work-form-publication-file %}
-      </div>
-    </div>
-    {% endblock work-form-publication %}
 
-    {% block work-form-commencement %}
-    <div class="card mb-3" id="commencement">
-      <h5 class="card-header">{% trans 'Commencement' %}</h5>
-      <div class="card-body">
+          <hr>
 
-        {% if work.pk and work.commencements.count > 1 %}
-          <div class="mb-3">
-            <input type="hidden" name="{{ form.commenced.html_name }}" value="on" {% if form.commenced.value %}checked{% endif %}>
-            {% url 'work_commencements' frbr_uri=work.frbr_uri as comm_url %}
-            {% blocktrans trimmed %}
-              This work has mixed commencements, <a href="{{ comm_url }}">edit them in the Commencements page</a>.
-            {% endblocktrans %}
+          <div class="form-group row">
+            <label for="taxonomy_topics" class="col-2 col-form-label">{% trans 'Taxonomy topics' %}</label>
+            <div class="col-4">
+              <select id="taxonomy_topics" name="work-taxonomy_topics" class="form-control selectpicker" data-live-search="true" multiple data-selected-text-format="count > 3">
+                {% for topic in form.fields.taxonomy_topics.queryset %}
+                  <option {% if topic.pk in form.taxonomy_topics.value %}selected{% endif %} value="{{ topic.pk }}">{% for s in topic.range_space %} &nbsp; {% endfor %}{{ topic.name }}</option>
+                {% endfor %}
+              </select>
+            </div>
           </div>
-        {% else %}
-          <div class="form-row">
-            <div class="form-group">
-              <div class="form-check">
-                <input type="checkbox" class="form-check-input" id="{{ form.commenced.id_for_label }}" name="{{ form.commenced.html_name }}" value="on" {% if form.commenced.value %}checked{% endif %}>
-                <label class="ml-2 mr-2" for="{{ form.commenced.id_for_label }}">
-                  {% trans 'Commenced – this work has come into force, or has a future commencement date'%}
-                </label>
-              </div>
+
+          <hr>
+
+          <div class="form-group row">
+            <label for="{{ form.assent_date.id_for_label }}" class="col-2 col-form-label">{% trans 'Assent date' %}</label>
+            <div class="col-4">
+              <input type="date" class="form-control" id="{{ form.assent_date.id_for_label }}"
+                     name="{{ form.assent_date.html_name }}"
+                     value="{{ form.assent_date.value|date:"Y-m-d"|default:'' }}">
+            </div>
+            <div class="col-6 form-text text-muted">
+              {% trans 'Date when approved by the responsible authority.' %}
             </div>
           </div>
-          <div id="commencement_details" {% if not work.commenced %}class="d-none"{% endif %}>
+
+        </div>
+      </div>
+    {% endblock work-form-details %}
+
+    {% block work-form-publication %}
+      <div class="card mb-3" id="publication">
+        <div class="card-body">
+          {% block work-form-publication-details %}
+
             <div class="form-group row">
-              <label class="col-2 col-form-label">{% trans 'Commencement date' %}</label>
-              <div class="col">
-                <input type="date" class="form-control"
-                       id="{{ form.commencement_date.id_for_label }}"
-                       name="{{ form.commencement_date.html_name }}"
-                       value="{{ form.commencement_date.value|date:"Y-m-d"|default:'' }}">
-                <div class="form-text text-muted">{% trans 'Date when most of the work comes into force.' %}</div>
-
-                {% if work.pk and work.commencement_date %}
-                  {% if work.amendments_made.exists or work.repealed_works.exists %}
-                    <div class="alert alert-warning">
-                      {% url 'work_related' work.frbr_uri as work_url %}
-                      {% blocktrans trimmed %}
-                        If you change this commencement date, you may also have to manually change the dates for related <a href="{{ work_url }}">amendments and repeals</a> made by this work.
-                      {% endblocktrans %}
-                    </div>
-                  {% endif %}
-                {% endif %}
+              {% block publication-date %}
+                <label for="{{ form.publication_date.id_for_label }}"
+                       class="col-2 col-form-label {% if not work.pk and not publication_date_optional %}required{% endif %}"
+                >{% trans 'Publication date' %}</label>
+                <div class="col-4">
+                  <input
+                      hx-target=".possible-documents-wrapper"
+                      hx-trigger="load, change, keyup delay:500ms changed"
+                      hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
+                      type="date" class="form-control"
+                      id="{{ form.publication_date.id_for_label }}"
+                      {% if not work.pk and not publication_date_optional %}required{% endif %}
+                      name="{{ form.publication_date.html_name }}"
+                      value="{{ form.publication_date.value|date:"Y-m-d"|default:'' }}">
+                </div>
+              {% endblock %}
+            </div>
 
-              <div class="form-check mt-2">
-                <input type="checkbox" class="form-check-input" id="commencement_date_unknown">
-                <label class="form-check-label" for="commencement_date_unknown">
-                  {% trans 'Commencement date is unknown' %}
-                </label>
+            <div class="form-group row">
+              <label class="col-2 col-form-label" for="{{ form.publication_name.id_for_label }}">{% trans 'Publication name' %}</label>
+              <div class="col-4">
+                <input
+                    hx-target=".possible-documents-wrapper"
+                    hx-trigger="change, keyup delay:500ms changed"
+                    hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
+                    type="text"
+                    class="form-control" id="{{ form.publication_name.id_for_label }}"
+                    name="{{ form.publication_name.html_name }}" list="publication_list"
+                    value="{{ form.publication_name.value|default:'' }}">
+                <datalist id="publication_list">
+                  {% for pub in country.publication_set.all %}
+                    <option value="{{ pub.name }}">
+                  {% endfor %}
+                </datalist>
               </div>
-                <div class="form-text text-muted">
-                  {% trans "Check this box when a work has come into force, but the exact commencement date is unknown or open to interpretation." %}
-                </div>
+              <div class="col-6 form-text text-muted">{% trans 'Usually the Government Gazette.' %}</div>
+            </div>
+
+            <div class="form-group row">
+              <label class="col-2 col-form-label" for="{{ form.publication_number.id_for_label }}">{% trans 'Publication number' %}</label>
+              <div class="col-4">
+                <input
+                    hx-target=".possible-documents-wrapper"
+                    hx-trigger="change, keyup delay:500ms changed"
+                    hx-post="{% url 'work_form_find_publication_document' place.place_code %}?frbr_uri={{ work.frbr_uri }}"
+                    type="text" class="form-control" id="{{ form.publication_number.id_for_label }}"
+                    name="{{ form.publication_number.html_name }}"
+                    value="{{ form.publication_number.value|default:'' }}">
               </div>
+              <div class="col-6 form-text text-muted">{% trans "Usually the gazette number." %}</div>
+            </div>
+
+          {% endblock work-form-publication-details %}
+
+          {% block work-form-publication-file %}
+            <div class="publication-document-wrapper">
+              {% include 'indigo_api/_work_publication_document.html' %}
             </div>
+            <div class="possible-documents-wrapper"></div>
+          {% endblock work-form-publication-file %}
+        </div>
+      </div>
+    {% endblock work-form-publication %}
 
-            <div id="work-form-commencing-work">
-              {% include 'indigo_api/_work_commencement_form.html' with commencing_work=work.commencing_work %}
+    {% block work-form-commencement %}
+      <div class="card mb-3" id="commencement">
+        <div class="card-body">
+          {% if work.pk and work.commencements.count > 1 %}
+            <div class="mb-3">
+              <input type="hidden" name="{{ form.commenced.html_name }}" value="on" {% if form.commenced.value %}checked{% endif %}>
+              {% url 'work_commencements' frbr_uri=work.frbr_uri as comm_url %}
+              {% blocktrans trimmed %}
+                This work has mixed commencements, <a href="{{ comm_url }}">edit them in the Commencements page</a>.
+              {% endblocktrans %}
             </div>
+          {% else %}
 
             <div class="form-group row">
-              <label class="col-2 col-form-label">{% trans 'Commencement note' %}</label>
-              <div class="col">
-                <input type="text" class="form-control" id="{{ form.commencement_note.id_for_label }}" name="{{ form.commencement_note.html_name }}" placeholder="See section 1." value="{{ form.commencement_note.value|default:'' }}">
-                <div class="form-text text-muted">
+              <label for="{{ form.commenced.id_for_label }}" class="col-2 col-form-label">{% trans 'Commenced'%}</label>
+              <div class="col-4 mt-1">
+                <input type="checkbox" class="form-check-input" id="{{ form.commenced.id_for_label }}" name="{{ form.commenced.html_name }}" value="on" {% if form.commenced.value %}checked{% endif %}>
+              </div>
+              <div class="col-6 form-text text-muted">{% trans 'Check if this work has come into force, or has a future commencement date.' %}</div>
+            </div>
+
+            <div id="commencement_details" {% if not work.commenced %}class="d-none"{% endif %}>
+
+              <div class="form-group row">
+                <label for="{{ form.commencement_date.id_for_label }}" class="col-2 col-form-label">{% trans 'Commencement date' %}</label>
+                <div class="col-4">
+                  <input type="date" class="form-control"
+                         id="{{ form.commencement_date.id_for_label }}"
+                         name="{{ form.commencement_date.html_name }}"
+                         value="{{ form.commencement_date.value|date:"Y-m-d"|default:'' }}">
+                </div>
+                <div class="col-6">
+                  {% if work.pk and work.commencement_date %}
+                    {% if work.amendments_made.exists or work.repealed_works.exists %}
+                      <div class="alert alert-warning">
+                        {% url 'work_related' work.frbr_uri as work_url %}
+                        {% blocktrans trimmed %}
+                          If you change this commencement date, you may also have to manually change the dates for related <a href="{{ work_url }}">amendments and repeals</a> made by this work.
+                        {% endblocktrans %}
+                      </div>
+                    {% endif %}
+                  {% endif %}
+                  <p class="form-text text-muted">{% trans 'Date when most (or all) of the work comes into force.' %}</p>
+                  <p class="form-text text-muted">{% trans 'Leave this blank when a work has come into force, but the exact commencement date is unknown or open to interpretation.' %}</p>
+                </div>
+              </div>
+
+              <div id="work-form-commencing-work">
+                {% include 'indigo_api/_work_commencement_form.html' with commencing_work=work.commencing_work %}
+              </div>
+
+              <div class="form-group row">
+                <label for="{{ form.commencement_note.id_for_label }}" class="col-2 col-form-label">{% trans 'Commencement note' %}</label>
+                <div class="col-4">
+                  <input type="text" class="form-control" id="{{ form.commencement_note.id_for_label }}" name="{{ form.commencement_note.html_name }}" placeholder="See section 1." value="{{ form.commencement_note.value|default:'' }}">
+                </div>
+                <div class="col-6 form-text text-muted">
                   {% trans "When the commencement date is open to interpretation, give a reference to a provision of this or a commencing work for added context." %}
                 </div>
               </div>
+
             </div>
-          </div>
-        {% endif %}
+          {% endif %}
+        </div>
       </div>
-    </div>
     {% endblock work-form-commencement %}
 
-    <div class="card mb-3" id="key-dates">
-      <h5 class="card-header">{% trans 'Key dates' %}</h5>
-      <div class="card-body">
-        <div class="form-row">
-          <div class="form-group col-md-4">
-            <label for="{{ form.assent_date.id_for_label }}">{% trans 'Assent date' %}</label>
-            <input type="date" class="form-control" id="{{ form.assent_date.id_for_label }}"
-                   name="{{ form.assent_date.html_name }}"
-                   value="{{ form.assent_date.value|date:"Y-m-d"|default:'' }}">
-            <div class="form-text text-muted">
-              {% trans 'Date when approved by the responsible authority.' %}
-            </div>
+    {% block work-form-repeal %}
+      <div class="card mb-3" id="repeal">
+        <div class="card-body">
+          <div id="work-form-repeal">
+            {% include 'indigo_api/_work_repeal_form.html' %}
           </div>
+        </div>
+      </div>
+    {% endblock work-form-repeal %}
+
+    <div class="card mb-3">
+      <div class="card-body">
 
-          <div class="form-group col-md-4">
-            <label for="{{ form.as_at_date_override.id_for_label }}">{{ form.as_at_date_override.label }}</label>
+        <div class="form-group row">
+          <label for="{{ form.as_at_date_override.id_for_label }}" class="col-2 col-form-label">{{ form.as_at_date_override.label }}</label>
+          <div class="col-4">
             <input type="date" class="form-control" id="{{ form.as_at_date_override.id_for_label }}"
                    name="{{ form.as_at_date_override.html_name }}"
                    value="{{ form.as_at_date_override.value|default_if_none:''|stringformat:'s' }}">
-            <p class="form-text text-muted">
-              {% blocktrans trimmed with name=place.name %}
-                Date up to which this work was last checked for updates. Only set this if it should be different from {{ name }}'s as-at date.
-              {% endblocktrans %}
-            </p>
-            {% if form.as_at_date_override.errors %}
-              <div class="text-danger">
-                {% for error in form.as_at_date_override.errors %}
-                  <p>{{ error }}</p>
-                {% endfor %}
-              </div>
-            {% endif %}
           </div>
+          <div class="col-6 form-text text-muted">
+            {% blocktrans trimmed with name=place.name %}
+              Date up to which this work was last checked for updates. Only set this if it should be different from {{ name }}'s as-at date
+            {% endblocktrans %}{% if place.settings.as_at_date %}: {{ place.settings.as_at_date|date:'Y-m-d' }}{% endif %}.
+          </div>
+          {% if form.as_at_date_override.errors %}
+            <div class="text-danger">
+              {% for error in form.as_at_date_override.errors %}
+                <p>{{ error }}</p>
+              {% endfor %}
+            </div>
+          {% endif %}
         </div>
-      </div>
-    </div>
 
-    <div class="card mb-3" id="consolidation-note">
-      <h5 class="card-header">{% trans 'Consolidation note' %}</h5>
-      <div class="card-body">
-        <div class="form-row">
-          <div class="form-group col-md-4">
-            <label for="{{ form.consolidation_note_override.id_for_label }}">{{ form.consolidation_note_override.label }}</label>
+        <hr>
+
+        <div class="form-group row">
+          <label for="{{ form.consolidation_note_override.id_for_label }}" class="col-2 col-form-label">{{ form.consolidation_note_override.label }}</label>
+          <div class="col-4">
             <input type="text" class="form-control" id="{{ form.consolidation_note_override.id_for_label }}" placeholder="{{ place.settings.consolidation_note|default:'' }}" name="{{ form.consolidation_note_override.html_name }}" value="{{ form.consolidation_note_override.value|default_if_none:'' }}">
-            <p class="form-text text-muted">
-              {% blocktrans trimmed with name=place.name %}
-                Consolidation note that applies to just this work. Overrides a consolidation note in {{ name }} if set.
-              {% endblocktrans %}
-            </p>
-            {% if form.consolidation_note_override.errors %}
-              <div class="text-danger">
-                {% for error in form.consolidation_note_override.errors %}
-                  <p>{{ error }}</p>
-                {% endfor %}
-              </div>
-            {% endif %}
           </div>
+          <div class="col-6 form-text text-muted">
+            {% blocktrans trimmed with name=place.name %}
+              Consolidation note that applies to just this work. Overrides a consolidation note in {{ name }} if set.
+            {% endblocktrans %}
+          </div>
+          {% if form.consolidation_note_override.errors %}
+            <div class="text-danger">
+              {% for error in form.consolidation_note_override.errors %}
+                <p>{{ error }}</p>
+              {% endfor %}
+            </div>
+          {% endif %}
         </div>
-      </div>
-    </div>
 
-    <div class="card mb-3" id="disclaimer">
-      <h5 class="card-header">{% trans 'Disclaimer' %}</h5>
-      <div class="card-body">
-        <div class="form-row">
-          <div class="form-group col-md-4">
-            <label for="{{ form.disclaimer.id_for_label }}">{{ form.disclaimer.label }}</label>
+        <hr>
+
+        <div class="form-group row">
+          <label for="{{ form.disclaimer.id_for_label }}" class="col-2 col-form-label">{{ form.disclaimer.label }}</label>
+          <div class="col-4">
             <input type="text" class="form-control" id="{{ form.disclaimer.id_for_label }}" name="{{ form.disclaimer.html_name }}" value="{{ form.disclaimer.value|default:'' }}">
-            <p class="form-text text-muted">
-              {% blocktrans trimmed %}
-                Disclaimer for this work; it will be shown on all expressions.
-              {% endblocktrans %}
-            </p>
-            {% if form.disclaimer.errors %}
-              <div class="text-danger">
-                {% for error in form.disclaimer.errors %}
-                  <p>{{ error }}</p>
-                {% endfor %}
-              </div>
-            {% endif %}
           </div>
+          <div class="col-6 form-text text-muted">
+            {% trans 'Disclaimer for this work; it will be shown on all expressions.' %}
+          </div>
+          {% if form.disclaimer.errors %}
+            <div class="text-danger">
+              {% for error in form.disclaimer.errors %}
+                <p>{{ error }}</p>
+              {% endfor %}
+            </div>
+          {% endif %}
         </div>
-      </div>
-    </div>
 
-    {% block work-form-repeal %}
-    <div class="card mb-3" id="repeal">
-      <h5 class="card-header">{% trans 'Repeal' %}</h5>
-      <div class="card-body">
-        <div id="work-form-repeal">
-          {% include 'indigo_api/_work_repeal_form.html' %}
-        </div>
       </div>
     </div>
-    {% endblock work-form-repeal %}
 
     {% block work-form-place %}
-    <button type="button" class="btn btn-primary mb-3" data-target="#place-form" data-toggle="collapse">
-      {% trans 'Change country or locality' %}...
-    </button>
+      <button type="button" class="btn btn-primary mb-3" data-target="#place-form" data-toggle="collapse">
+        {% trans 'Change country or locality' %}...
+      </button>
 
-    <div class="card mb-3 collapse" id="place-form">
-      <h5 class="card-header">{% trans 'Country and locality (advanced)' %}</h5>
-      <div class="card-body">
+      <div class="card mb-3 collapse" id="place-form">
+        <h5 class="card-header">{% trans 'Country and locality (advanced)' %}</h5>
+        <div class="card-body">
 
-        <div class="form-row">
-          <div class="form-group col-4">
-            <label for="{{ form.country.id_for_label }}" class="required">{{ form.country.label }}</label>
-            <select
-                hx-trigger="change"
-                hx-target=".locality-options"
-                hx-swap="outerHTML"
-                hx-post="{% url 'work_form_locality' country.code %}"
-                id="{{ form.country.id_for_label }}"
-                class="form-control" name="{{ form.country.html_name }}">
-              {% for opt in form.country %}
-                {{ opt }}
-              {% endfor %}
-            </select>
-          </div>
+          <div class="form-row">
+            <div class="form-group col-4">
+              <label for="{{ form.country.id_for_label }}" class="required">{{ form.country.label }}</label>
+              <select
+                  hx-trigger="change"
+                  hx-target=".locality-options"
+                  hx-swap="outerHTML"
+                  hx-post="{% url 'work_form_locality' country.code %}"
+                  id="{{ form.country.id_for_label }}"
+                  class="form-control" name="{{ form.country.html_name }}">
+                {% for opt in form.country %}
+                  {{ opt }}
+                {% endfor %}
+              </select>
+            </div>
 
-        {% include 'indigo_api/_work_form_locality.html' %}
+            {% include 'indigo_api/_work_form_locality.html' %}
 
-        </div>
+          </div>
 
+        </div>
       </div>
-    </div>
     {% endblock work-form-place %}
   </form>
 

From ffdf8cbd9415a961b95f73a94e3a6ca84e66843f Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:06:20 +0200
Subject: [PATCH 15/28] tweak consolidation note override, disclaimer

---
 .../templates/indigo_api/work_form.html       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/indigo_app/templates/indigo_api/work_form.html b/indigo_app/templates/indigo_api/work_form.html
index b005c1557..1168d8459 100644
--- a/indigo_app/templates/indigo_api/work_form.html
+++ b/indigo_app/templates/indigo_api/work_form.html
@@ -394,32 +394,32 @@ <h4 class="text-muted work-frbr-uri">{{ work.frbr_uri }}</h4>
 
         <div class="form-group row">
           <label for="{{ form.consolidation_note_override.id_for_label }}" class="col-2 col-form-label">{{ form.consolidation_note_override.label }}</label>
-          <div class="col-4">
+          <div class="col">
             <input type="text" class="form-control" id="{{ form.consolidation_note_override.id_for_label }}" placeholder="{{ place.settings.consolidation_note|default:'' }}" name="{{ form.consolidation_note_override.html_name }}" value="{{ form.consolidation_note_override.value|default_if_none:'' }}">
+            <p class="form-text text-muted">
+              {% blocktrans trimmed with name=place.name %}
+                Consolidation note that applies to just this work. Overrides a consolidation note in {{ name }} if set.
+              {% endblocktrans %}
+            </p>
           </div>
-          <div class="col-6 form-text text-muted">
-            {% blocktrans trimmed with name=place.name %}
-              Consolidation note that applies to just this work. Overrides a consolidation note in {{ name }} if set.
-            {% endblocktrans %}
-          </div>
-          {% if form.consolidation_note_override.errors %}
-            <div class="text-danger">
-              {% for error in form.consolidation_note_override.errors %}
-                <p>{{ error }}</p>
-              {% endfor %}
-            </div>
-          {% endif %}
         </div>
+        {% if form.consolidation_note_override.errors %}
+          <div class="text-danger">
+            {% for error in form.consolidation_note_override.errors %}
+              <p>{{ error }}</p>
+            {% endfor %}
+          </div>
+        {% endif %}
 
         <hr>
 
         <div class="form-group row">
           <label for="{{ form.disclaimer.id_for_label }}" class="col-2 col-form-label">{{ form.disclaimer.label }}</label>
-          <div class="col-4">
+          <div class="col">
             <input type="text" class="form-control" id="{{ form.disclaimer.id_for_label }}" name="{{ form.disclaimer.html_name }}" value="{{ form.disclaimer.value|default:'' }}">
-          </div>
-          <div class="col-6 form-text text-muted">
-            {% trans 'Disclaimer for this work; it will be shown on all expressions.' %}
+            <p class="form-text text-muted">
+              {% trans 'Disclaimer for this work; it will be shown on all expressions.' %}
+            </p>
           </div>
           {% if form.disclaimer.errors %}
             <div class="text-danger">

From 2d5b02fda9d05aac3552cbee947d5790b696e11a Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:52:46 +0200
Subject: [PATCH 16/28] add approve, unapprove buttons, views

---
 .../templates/indigo_api/work_overview.html   | 20 ++++++++++---
 indigo_app/urls.py                            |  2 ++
 indigo_app/views/works.py                     | 29 +++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/indigo_app/templates/indigo_api/work_overview.html b/indigo_app/templates/indigo_api/work_overview.html
index 6e441b53b..504ce00f1 100644
--- a/indigo_app/templates/indigo_api/work_overview.html
+++ b/indigo_app/templates/indigo_api/work_overview.html
@@ -5,10 +5,22 @@
 
   <div class="float-right">
     {% block work-buttons %}
-      {% if perms.indigo_api.change_work or not work and perms.indigo_api.add_work %}
-        <a class="btn btn-success" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
-        <a class="btn btn-primary" href="{% url 'work_edit' frbr_uri=work.frbr_uri %}">{% trans 'Edit work' %}</a>
-      {% endif %}
+      <div class="row">
+        {% if perms.indigo_api.bulk_add_work %}
+          <form method="POST">
+            {% csrf_token %}
+            {% if work.work_in_progress %}
+              <button type="submit" class="btn btn-success mr-1" formaction="{% url 'work_approve' frbr_uri=work.frbr_uri %}">{% trans 'Approve' %}</button>
+            {% else %}
+              <button type="submit" class="btn btn-danger mr-1" formaction="{% url 'work_unapprove' frbr_uri=work.frbr_uri %}">{% trans 'Unapprove' %}</button>
+            {% endif %}
+          </form>
+        {% endif %}
+        {% if perms.indigo_api.change_work or not work and perms.indigo_api.add_work %}
+          <a class="btn btn-outline-info mr-1" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
+          <a class="btn btn-primary" href="{% url 'work_edit' frbr_uri=work.frbr_uri %}">{% trans 'Edit work' %}</a>
+        {% endif %}
+      </div>
     {% endblock %}
   </div>
 
diff --git a/indigo_app/urls.py b/indigo_app/urls.py
index a34965518..17c264222 100644
--- a/indigo_app/urls.py
+++ b/indigo_app/urls.py
@@ -100,6 +100,8 @@
     re_path(r'^works(?P<frbr_uri>/\S+?)/related/$', works.WorkRelatedView.as_view(), name='work_related'),
     re_path(r'^works(?P<frbr_uri>/\S+?)/import/$', works.ImportDocumentView.as_view(), name='import_document'),
     re_path(r'^works(?P<frbr_uri>/\S+?)/edit/$', works.EditWorkView.as_view(), name='work_edit'),
+    re_path(r'^works(?P<frbr_uri>/\S+?)/approve$', works.ApproveWorkView.as_view(), name='work_approve'),
+    re_path(r'^works(?P<frbr_uri>/\S+?)/unapprove$', works.UnapproveWorkView.as_view(), name='work_unapprove'),
     re_path(r'^works(?P<frbr_uri>/\S+?)/delete$', works.DeleteWorkView.as_view(), name='work_delete'),
     re_path(r'^works(?P<frbr_uri>/\S+?)/revisions/$', works.WorkVersionsView.as_view(), name='work_versions'),
     re_path(r'^works(?P<frbr_uri>/\S+?)/tasks/$', works.WorkTasksView.as_view(), name='work_tasks'),
diff --git a/indigo_app/views/works.py b/indigo_app/views/works.py
index 24192baa6..ec1410b95 100644
--- a/indigo_app/views/works.py
+++ b/indigo_app/views/works.py
@@ -175,6 +175,35 @@ def get_success_url(self):
         return reverse('work', kwargs={'frbr_uri': self.work.frbr_uri})
 
 
+class ApproveWorkView(WorkViewBase, View):
+    # TODO: add signals
+    permission_required = ('indigo_api.bulk_add_work',)
+    http_method_names = ['post']
+
+    def post(self, request, *args, **kwargs):
+        self.change_work_in_progress()
+        return redirect(reverse('work', kwargs={'frbr_uri': self.work.frbr_uri}))
+
+    def change_work_in_progress(self):
+        work = self.get_object()
+        user = self.request.user
+        work.work_in_progress = False
+        work.approved_by_user = user
+        work.approved_at = datetime.datetime.now()
+        work.save_with_revision(user)
+
+
+class UnapproveWorkView(ApproveWorkView):
+
+    def change_work_in_progress(self):
+        work = self.get_object()
+        user = self.request.user
+        work.work_in_progress = True
+        work.approved_by_user = None
+        work.approved_at = None
+        work.save_with_revision(user)
+
+
 class EditWorkModalView(EditWorkView):
     template_name = "indigo_api/_work_form_modal.html"
 

From 3f63341067c8eeba14e7a71e1fee073d193f26d5 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:05:28 +0200
Subject: [PATCH 17/28] add, send signals; unpublish documents on unapprove

---
 indigo_api/signals.py     | 10 ++++++++++
 indigo_app/views/works.py |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/indigo_api/signals.py b/indigo_api/signals.py
index 8d585b4e9..5906edff7 100644
--- a/indigo_api/signals.py
+++ b/indigo_api/signals.py
@@ -6,6 +6,16 @@
 """
 
 
+work_approved = Signal()
+""" A user has approved a work.
+"""
+
+
+work_unapproved = Signal()
+""" A user has unapproved a work (marked it as a work in progress).
+"""
+
+
 document_published = Signal(providing_args=["document", "request"])
 """ A user has changed a document from draft to published.
 """
diff --git a/indigo_app/views/works.py b/indigo_app/views/works.py
index ec1410b95..8512622fa 100644
--- a/indigo_app/views/works.py
+++ b/indigo_app/views/works.py
@@ -28,7 +28,7 @@
 from indigo_api.serializers import WorkSerializer
 from indigo_api.timeline import get_timeline
 from indigo_api.views.attachments import view_attachment
-from indigo_api.signals import work_changed
+from indigo_api.signals import work_changed, work_approved, work_unapproved
 from indigo_app.revisions import decorate_versions
 from indigo_app.forms import BatchCreateWorkForm, BatchUpdateWorkForm, ImportDocumentForm, WorkForm, CommencementForm, \
     NewCommencementForm, FindPubDocForm
@@ -176,7 +176,6 @@ def get_success_url(self):
 
 
 class ApproveWorkView(WorkViewBase, View):
-    # TODO: add signals
     permission_required = ('indigo_api.bulk_add_work',)
     http_method_names = ['post']
 
@@ -191,6 +190,7 @@ def change_work_in_progress(self):
         work.approved_by_user = user
         work.approved_at = datetime.datetime.now()
         work.save_with_revision(user)
+        work_approved.send(sender=work)
 
 
 class UnapproveWorkView(ApproveWorkView):
@@ -202,6 +202,11 @@ def change_work_in_progress(self):
         work.approved_by_user = None
         work.approved_at = None
         work.save_with_revision(user)
+        work_unapproved.send(sender=work)
+        # unpublish all documents
+        for document in Document.objects.undeleted().published().filter(work=work):
+            document.draft = True
+            document.save_with_revision(user, comment='This document was unpublished because its work was unapproved.')
 
 
 class EditWorkModalView(EditWorkView):

From 367f463ade7cda34c4bcb3f504d3f8a1e2add296 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:49:37 +0200
Subject: [PATCH 18/28] move approve, unapprove onto Work model

---
 indigo_api/models/works.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 17d3844d9..2fbedfeb0 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -1,5 +1,6 @@
 from copy import deepcopy
 from actstream import action
+from datetime import datetime
 from django.db.models import JSONField
 from django.db import models
 from django.db.models import signals, Q
@@ -16,6 +17,7 @@
 from treebeard.mp_tree import MP_Node
 
 from indigo.plugins import plugins
+from indigo_api.signals import work_approved, work_unapproved
 from indigo_api.timeline import TimelineCommencementEvent, describe_single_commencement, get_serialized_timeline
 
 
@@ -646,6 +648,25 @@ def versions(self):
     def as_at_date(self):
         return self.as_at_date_override or self.place.settings.as_at_date
 
+    def approve(self, user, request=None):
+        self.work_in_progress = False
+        self.approved_by_user = user
+        self.approved_at = datetime.now()
+        self.save_with_revision(user)
+        work_approved.send(sender=self, request=request)
+
+    def unapprove(self, user):
+        self.work_in_progress = True
+        self.approved_by_user = None
+        self.approved_at = None
+        self.save_with_revision(user)
+        work_unapproved.send(sender=self)
+
+        # unpublish all documents
+        for document in self.document_set.published():
+            document.draft = True
+            document.save_with_revision(user, comment='This document was unpublished because its work was unapproved.')
+
     def __str__(self):
         return '%s (%s)' % (self.frbr_uri, self.title)
 

From cb54c68aa03066c92eb8695ff60140d910e8ce73 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:53:47 +0200
Subject: [PATCH 19/28] use approve, unapprove for bulk updates too

---
 indigo_app/forms.py        | 14 ++++----------
 indigo_app/views/places.py |  2 +-
 indigo_app/views/works.py  | 18 +++---------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/indigo_app/forms.py b/indigo_app/forms.py
index d9b42d65b..ed4b53152 100644
--- a/indigo_app/forms.py
+++ b/indigo_app/forms.py
@@ -1,7 +1,7 @@
 import json
 import re
 import urllib.parse
-from datetime import date, datetime
+from datetime import date
 from lxml import etree
 
 from django import forms
@@ -841,7 +841,7 @@ class WorkBulkActionsForm(forms.Form):
     def clean_all_work_pks(self):
         return self.cleaned_data.get('all_work_pks').split() or []
 
-    def save_changes(self, user):
+    def save_changes(self, user, request):
         if self.cleaned_data.get('add_taxonomy_topics'):
             for work in self.cleaned_data['works']:
                 work.taxonomy_topics.add(*self.cleaned_data['add_taxonomy_topics'])
@@ -855,19 +855,13 @@ def save_changes(self, user):
                 for work in self.cleaned_data['works']:
                     # only save if it's changed
                     if work.work_in_progress:
-                        work.work_in_progress = False
-                        work.approved_by_user = user
-                        work.approved_at = datetime.now()
-                        work.save_with_revision(user)
+                        work.approve(user, request)
 
             else:
                 for work in self.cleaned_data['works']:
                     # only save if it's changed
                     if work.approved:
-                        work.work_in_progress = True
-                        work.approved_by_user = None
-                        work.approved_at = None
-                        work.save_with_revision(user)
+                        work.unapprove(user)
 
 
 class WorkChooserForm(forms.Form):
diff --git a/indigo_app/views/places.py b/indigo_app/views/places.py
index 69491116a..5e7c1b7eb 100644
--- a/indigo_app/views/places.py
+++ b/indigo_app/views/places.py
@@ -1192,7 +1192,7 @@ class WorkActionsView(PlaceViewBase, FormView):
 
     def form_valid(self, form):
         if form.cleaned_data['save'] and self.request.user.has_perm('indigo_api.change_work'):
-            form.save_changes(self.request.user)
+            form.save_changes(self.request.user, self.request)
             messages.success(self.request, f"Updated {form.cleaned_data['works'].count()} works.")
             return redirect(
                 self.request.META.get('HTTP_REFERER')
diff --git a/indigo_app/views/works.py b/indigo_app/views/works.py
index 8512622fa..6af5e6cfb 100644
--- a/indigo_app/views/works.py
+++ b/indigo_app/views/works.py
@@ -28,7 +28,7 @@
 from indigo_api.serializers import WorkSerializer
 from indigo_api.timeline import get_timeline
 from indigo_api.views.attachments import view_attachment
-from indigo_api.signals import work_changed, work_approved, work_unapproved
+from indigo_api.signals import work_changed
 from indigo_app.revisions import decorate_versions
 from indigo_app.forms import BatchCreateWorkForm, BatchUpdateWorkForm, ImportDocumentForm, WorkForm, CommencementForm, \
     NewCommencementForm, FindPubDocForm
@@ -186,11 +186,7 @@ def post(self, request, *args, **kwargs):
     def change_work_in_progress(self):
         work = self.get_object()
         user = self.request.user
-        work.work_in_progress = False
-        work.approved_by_user = user
-        work.approved_at = datetime.datetime.now()
-        work.save_with_revision(user)
-        work_approved.send(sender=work)
+        work.approve(user, self.request)
 
 
 class UnapproveWorkView(ApproveWorkView):
@@ -198,15 +194,7 @@ class UnapproveWorkView(ApproveWorkView):
     def change_work_in_progress(self):
         work = self.get_object()
         user = self.request.user
-        work.work_in_progress = True
-        work.approved_by_user = None
-        work.approved_at = None
-        work.save_with_revision(user)
-        work_unapproved.send(sender=work)
-        # unpublish all documents
-        for document in Document.objects.undeleted().published().filter(work=work):
-            document.draft = True
-            document.save_with_revision(user, comment='This document was unpublished because its work was unapproved.')
+        work.unapprove(user)
 
 
 class EditWorkModalView(EditWorkView):

From 382b71910e114bbfa29d1babc4ad6331d7d3e174 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:19:12 +0200
Subject: [PATCH 20/28] handle potential error from the work_approved signal
 being sent

---
 indigo_api/models/works.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 2fbedfeb0..222fcd2e5 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -2,7 +2,7 @@
 from actstream import action
 from datetime import datetime
 from django.db.models import JSONField
-from django.db import models
+from django.db import models, IntegrityError, transaction
 from django.db.models import signals, Q
 from django.core.exceptions import ValidationError
 from django.contrib.auth.models import User
@@ -649,11 +649,15 @@ def as_at_date(self):
         return self.as_at_date_override or self.place.settings.as_at_date
 
     def approve(self, user, request=None):
-        self.work_in_progress = False
-        self.approved_by_user = user
-        self.approved_at = datetime.now()
-        self.save_with_revision(user)
-        work_approved.send(sender=self, request=request)
+        try:
+            with transaction.atomic():
+                self.work_in_progress = False
+                self.approved_by_user = user
+                self.approved_at = datetime.now()
+                self.save_with_revision(user)
+                work_approved.send(sender=self, request=request)
+        except IntegrityError:
+            pass
 
     def unapprove(self, user):
         self.work_in_progress = True

From ad8f4bf2818e6be286190ab5b320ba2637fe8268 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:52:53 +0200
Subject: [PATCH 21/28] approve works on bulk import

---
 indigo/bulk_creator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indigo/bulk_creator.py b/indigo/bulk_creator.py
index 07b57fdc7..33045e115 100644
--- a/indigo/bulk_creator.py
+++ b/indigo/bulk_creator.py
@@ -477,6 +477,7 @@ def create_or_update(self, row):
     def provisionally_save(self, work, old_publication_date=None, new_publication_date=None, old_title=None, new_title=None):
         if not self.dry_run:
             if not work.pk:
+                work.work_in_progress = False
                 work.properties['created_in_bulk'] = True
             work.save_with_revision(self.user)
             if old_publication_date and new_publication_date:

From d633bd465f3f5467f2a0f421d1245df5de60927a Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 10:50:18 +0200
Subject: [PATCH 22/28] actions on approve/unapprove; show approval detail

---
 indigo_api/models/works.py                         |  2 ++
 indigo_app/templates/indigo_api/work_overview.html | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 222fcd2e5..06fb4ef84 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -655,6 +655,7 @@ def approve(self, user, request=None):
                 self.approved_by_user = user
                 self.approved_at = datetime.now()
                 self.save_with_revision(user)
+                action.send(user, verb='approved', action_object=self, place_code=self.place.place_code)
                 work_approved.send(sender=self, request=request)
         except IntegrityError:
             pass
@@ -664,6 +665,7 @@ def unapprove(self, user):
         self.approved_by_user = None
         self.approved_at = None
         self.save_with_revision(user)
+        action.send(user, verb='unapproved', action_object=self, place_code=self.place.place_code)
         work_unapproved.send(sender=self)
 
         # unpublish all documents
diff --git a/indigo_app/templates/indigo_api/work_overview.html b/indigo_app/templates/indigo_api/work_overview.html
index 504ce00f1..a359438ee 100644
--- a/indigo_app/templates/indigo_api/work_overview.html
+++ b/indigo_app/templates/indigo_api/work_overview.html
@@ -109,6 +109,16 @@ <h4 class="text-muted">{{ work.frbr_uri }}</h4>
                       {% endif %}
                     {% endwith %}
 
+                    {% if work.approved %}
+                      <dt>
+                        {% trans 'Approved' %}
+                      </dt>
+                      <dd>
+                        {% user_profile work.updated_by_user %}
+                        {{ work.approved_at|naturaltime }}
+                      </dd>
+                    {% endif %}
+
                     {% with work.taxonomy_topics.all as topics %}
                       {% if topics %}
                         <dt>{% trans 'Taxonomies' %}</dt>

From 4b135139280ccdd7a747da67c9544dbf68ed2fd5 Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 10:50:33 +0200
Subject: [PATCH 23/28] align work-in-progress colour to warning

---
 indigo_app/static/stylesheets/_works.scss          | 4 ++++
 indigo_app/templates/indigo_api/work_overview.html | 2 +-
 indigo_app/templates/indigo_app/place/_work.html   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indigo_app/static/stylesheets/_works.scss b/indigo_app/static/stylesheets/_works.scss
index 66e6b440a..02d10cb07 100644
--- a/indigo_app/static/stylesheets/_works.scss
+++ b/indigo_app/static/stylesheets/_works.scss
@@ -69,3 +69,7 @@
     overflow-y: auto;
   }
 }
+
+.bg-work-in-progress {
+  background-color: lighten($warning, 45%);
+}
diff --git a/indigo_app/templates/indigo_api/work_overview.html b/indigo_app/templates/indigo_api/work_overview.html
index a359438ee..b20ab2c1a 100644
--- a/indigo_app/templates/indigo_api/work_overview.html
+++ b/indigo_app/templates/indigo_api/work_overview.html
@@ -12,7 +12,7 @@
             {% if work.work_in_progress %}
               <button type="submit" class="btn btn-success mr-1" formaction="{% url 'work_approve' frbr_uri=work.frbr_uri %}">{% trans 'Approve' %}</button>
             {% else %}
-              <button type="submit" class="btn btn-danger mr-1" formaction="{% url 'work_unapprove' frbr_uri=work.frbr_uri %}">{% trans 'Unapprove' %}</button>
+              <button type="submit" class="btn btn-warning mr-1" formaction="{% url 'work_unapprove' frbr_uri=work.frbr_uri %}">{% trans 'Unapprove' %}</button>
             {% endif %}
           </form>
         {% endif %}
diff --git a/indigo_app/templates/indigo_app/place/_work.html b/indigo_app/templates/indigo_app/place/_work.html
index 2d9826866..3b4c2aaa8 100644
--- a/indigo_app/templates/indigo_app/place/_work.html
+++ b/indigo_app/templates/indigo_app/place/_work.html
@@ -7,7 +7,7 @@
     </div>
   {% endif %}
   <div class="flex-fill">
-    <div class="border {% if work.work_in_progress %}bg-transparent{% else %}bg-white{% endif %} mb-2">
+    <div class="border {% if work.work_in_progress %}bg-work-in-progress{% else %}bg-white{% endif %} mb-2">
       <div class="d-flex p-2 pl-3" type="button" data-toggle="collapse" id="work-heading-{{ work.pk }}"
            data-target="#work-detail-{{ work.pk }}" aria-expanded="true" aria-controls="work-detail-{{ work.pk }}"
            hx-get="{% url 'place_works_work_detail' place=place.place_code pk=work.pk %}"

From 005edae91e7595044663e452e02dfb3ae08de966 Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 10:52:34 +0200
Subject: [PATCH 24/28] standardise buttons

---
 indigo_app/templates/indigo_api/work_overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indigo_app/templates/indigo_api/work_overview.html b/indigo_app/templates/indigo_api/work_overview.html
index b20ab2c1a..efc4c083b 100644
--- a/indigo_app/templates/indigo_api/work_overview.html
+++ b/indigo_app/templates/indigo_api/work_overview.html
@@ -17,7 +17,7 @@
           </form>
         {% endif %}
         {% if perms.indigo_api.change_work or not work and perms.indigo_api.add_work %}
-          <a class="btn btn-outline-info mr-1" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
+          <a class="btn btn-success mr-1" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
           <a class="btn btn-primary" href="{% url 'work_edit' frbr_uri=work.frbr_uri %}">{% trans 'Edit work' %}</a>
         {% endif %}
       </div>

From 331cd2288f17389aaf686cba30fce228e1cb1177 Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 10:53:00 +0200
Subject: [PATCH 25/28] Update indigo_api/models/works.py

---
 indigo_api/models/works.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 06fb4ef84..d714c50ac 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -656,7 +656,7 @@ def approve(self, user, request=None):
                 self.approved_at = datetime.now()
                 self.save_with_revision(user)
                 action.send(user, verb='approved', action_object=self, place_code=self.place.place_code)
-                work_approved.send(sender=self, request=request)
+                work_approved.send(sender=self.__class__, work=self, request=request)
         except IntegrityError:
             pass
 

From ab06f967e31ad8d575a285c5ca434980b74a5044 Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 10:53:06 +0200
Subject: [PATCH 26/28] Update indigo_api/models/works.py

---
 indigo_api/models/works.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index d714c50ac..1a1c383a9 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -666,7 +666,7 @@ def unapprove(self, user):
         self.approved_at = None
         self.save_with_revision(user)
         action.send(user, verb='unapproved', action_object=self, place_code=self.place.place_code)
-        work_unapproved.send(sender=self)
+        work_unapproved.send(sender=self.__class__, work=self)
 
         # unpublish all documents
         for document in self.document_set.published():

From 1396fd78080325b1de03dde60ff1162d7c4f754b Mon Sep 17 00:00:00 2001
From: Greg Kempe <greg@kempe.net>
Date: Thu, 11 Jan 2024 15:48:25 +0200
Subject: [PATCH 27/28] fixes

---
 indigo_app/templates/indigo_api/_work_info_badges.html | 2 +-
 indigo_app/templates/indigo_api/work_form.html         | 2 +-
 indigo_app/templates/indigo_api/work_overview.html     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indigo_app/templates/indigo_api/_work_info_badges.html b/indigo_app/templates/indigo_api/_work_info_badges.html
index 04e0cf157..203152af8 100644
--- a/indigo_app/templates/indigo_api/_work_info_badges.html
+++ b/indigo_app/templates/indigo_api/_work_info_badges.html
@@ -13,5 +13,5 @@
   <span class="badge text-bg-info">{% trans 'commencement date unknown' %}</span>
 {% endif %}
 {% if work.work_in_progress %}
-  <span class="badge badge-warning">{% trans 'work in progress' %}</span>
+  <span class="badge text-bg-warning">{% trans 'work in progress' %}</span>
 {% endif %}
diff --git a/indigo_app/templates/indigo_api/work_form.html b/indigo_app/templates/indigo_api/work_form.html
index e2fafedae..ed8f1b915 100644
--- a/indigo_app/templates/indigo_api/work_form.html
+++ b/indigo_app/templates/indigo_api/work_form.html
@@ -210,7 +210,7 @@ <h4 class="text-muted work-frbr-uri">{{ work.frbr_uri }}</h4>
                      name="{{ form.assent_date.html_name }}"
                      value="{{ form.assent_date.value|date:"Y-m-d"|default:'' }}">
             </div>
-            <div class="col-6 form-text text-muted">
+          </div>
         </div>
       </div>
     {% endblock work-form-details %}
diff --git a/indigo_app/templates/indigo_api/work_overview.html b/indigo_app/templates/indigo_api/work_overview.html
index 106b1ea7b..ef52640a8 100644
--- a/indigo_app/templates/indigo_api/work_overview.html
+++ b/indigo_app/templates/indigo_api/work_overview.html
@@ -5,19 +5,19 @@
 
   <div class="float-end">
     {% block work-buttons %}
-      <div class="row">
+      <div class="d-flex">
         {% if perms.indigo_api.bulk_add_work %}
           <form method="POST">
             {% csrf_token %}
             {% if work.work_in_progress %}
-              <button type="submit" class="btn btn-success mr-1" formaction="{% url 'work_approve' frbr_uri=work.frbr_uri %}">{% trans 'Approve' %}</button>
+              <button type="submit" class="btn btn-success me-1" formaction="{% url 'work_approve' frbr_uri=work.frbr_uri %}">{% trans 'Approve' %}</button>
             {% else %}
-              <button type="submit" class="btn btn-warning mr-1" formaction="{% url 'work_unapprove' frbr_uri=work.frbr_uri %}">{% trans 'Unapprove' %}</button>
+              <button type="submit" class="btn btn-warning me-1" formaction="{% url 'work_unapprove' frbr_uri=work.frbr_uri %}">{% trans 'Unapprove' %}</button>
             {% endif %}
           </form>
         {% endif %}
         {% if perms.indigo_api.change_work or not work and perms.indigo_api.add_work %}
-          <a class="btn btn-success mr-1" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
+          <a class="btn btn-success me-1" href="{% url 'create_task' place=place.place_code %}?frbr_uri={{ work.frbr_uri|urlencode }}">{% trans 'Create task' %}</a>
           <a class="btn btn-primary" href="{% url 'work_edit' frbr_uri=work.frbr_uri %}">{% trans 'Edit work' %}</a>
         {% endif %}
       </div>

From be10a2f08274183d51895ee61409ac044bfbb1b8 Mon Sep 17 00:00:00 2001
From: goose-life <32566441+goose-life@users.noreply.github.com>
Date: Thu, 11 Jan 2024 22:15:52 +0200
Subject: [PATCH 28/28] approve work separately from sending work_approved
 signal

---
 indigo_api/models/works.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indigo_api/models/works.py b/indigo_api/models/works.py
index 1a1c383a9..89c7ce737 100644
--- a/indigo_api/models/works.py
+++ b/indigo_api/models/works.py
@@ -649,13 +649,13 @@ def as_at_date(self):
         return self.as_at_date_override or self.place.settings.as_at_date
 
     def approve(self, user, request=None):
+        self.work_in_progress = False
+        self.approved_by_user = user
+        self.approved_at = datetime.now()
+        self.save_with_revision(user)
+        action.send(user, verb='approved', action_object=self, place_code=self.place.place_code)
         try:
             with transaction.atomic():
-                self.work_in_progress = False
-                self.approved_by_user = user
-                self.approved_at = datetime.now()
-                self.save_with_revision(user)
-                action.send(user, verb='approved', action_object=self, place_code=self.place.place_code)
                 work_approved.send(sender=self.__class__, work=self, request=request)
         except IntegrityError:
             pass