Change headnote and holding to case summary

laws-africa · Aug 15, 2023 · 8dc9170 · 8dc9170
1 parent 2f14860
commit 8dc9170
Show file tree

Hide file tree

Showing 10 changed files with 3,808 additions and 14 deletions.
diff --git a/peachjam/admin.py b/peachjam/admin.py
@@ -245,7 +245,7 @@ class DocumentForm(forms.ModelForm):
         required=False,
     )
     flynote = forms.CharField(widget=CKEditorWidget(), required=False)
-    headnote_holding = forms.CharField(widget=CKEditorWidget(), required=False)
+    case_summary = forms.CharField(widget=CKEditorWidget(), required=False)
     date = forms.DateField(widget=DateSelectorWidget())
 
     def __init__(self, data=None, *args, **kwargs):
@@ -671,7 +671,7 @@ class JudgmentAdmin(ImportExportMixin, DocumentAdmin):
 
     fieldsets[2][1]["classes"] = ["collapse"]
     fieldsets[3][1]["fields"].extend(
-        ["headnote_holding", "additional_citations", "flynote"]
+        ["case_summary", "additional_citations", "flynote"]
     )
     readonly_fields = [
         "mnc",

diff --git a/peachjam/fixtures/documents/sample_documents.json b/peachjam/fixtures/documents/sample_documents.json
@@ -8225,7 +8225,7 @@
             "case_name": "Obi vs Federal Republic of Nigeria",
             "court": 1,
             "flynote": "",
-            "headnote_holding": "",
+            "case_summary": "",
             "hearing_date": null,
             "judges": [
                 135
@@ -8243,7 +8243,7 @@
             "case_name": "Ababacar and Ors vs Senegal",
             "court": 1,
             "flynote": "",
-            "headnote_holding": "",
+            "case_summary": "",
             "hearing_date": null,
             "judges": [],
             "mnc": "[2018] ECOWASCJ 17",

diff --git a/peachjam/js/components/FindDocuments/AdvancedSearch.vue b/peachjam/js/components/FindDocuments/AdvancedSearch.vue
@@ -122,7 +122,7 @@ export default {
 
     disableDate () {
       // Disable dates if there are no search values
-      return !(['title', 'headnote_holding', 'flynote', 'content'].some(key => this.modelValue[key]) || this.globalSearchValue);
+      return !(['title', 'case_summary', 'flynote', 'content'].some(key => this.modelValue[key]) || this.globalSearchValue);
     }
   },
 

diff --git a/peachjam/js/components/FindDocuments/index.vue b/peachjam/js/components/FindDocuments/index.vue
@@ -218,7 +218,7 @@ import AdvancedSearch from './AdvancedSearch.vue';
 import { scrollToElement } from '../../utils/function';
 
 function resetAdvancedFields (fields) {
-  const advanced = ['all', 'title', 'judges', 'headnote_holding', 'flynote', 'content'];
+  const advanced = ['all', 'title', 'judges', 'case_summary', 'flynote', 'content'];
   for (const a of advanced) {
     fields[a] = {
       q: '',

diff --git a/peachjam/migrations/0097_auto_20230815_0818.py b/peachjam/migrations/0097_auto_20230815_0818.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.19 on 2023-08-15 08:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("peachjam", "0096_auto_20230814_1557"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="judgment",
+            name="headnote_holding",
+        ),
+        migrations.AddField(
+            model_name="judgment",
+            name="case_summary",
+            field=models.TextField(blank=True, null=True, verbose_name="case summary"),
+        ),
+    ]
diff --git a/peachjam/models/judgment.py b/peachjam/models/judgment.py
@@ -188,7 +188,7 @@ class Judgment(CoreDocument):
         related_name="judgments",
         blank=True,
     )
-    headnote_holding = models.TextField(_("headnote holding"), null=True, blank=True)
+    case_summary = models.TextField(_("case summary"), null=True, blank=True)
     additional_citations = models.TextField(
         _("additional citations"), null=True, blank=True
     )

diff --git a/peachjam/static/js/app-prod.js b/peachjam/static/js/app-prod.js
diff --git a/peachjam/templates/peachjam/judgment_detail.html b/peachjam/templates/peachjam/judgment_detail.html
@@ -77,13 +77,13 @@
   {% endwith %}
 {% endblock %}
 {% block extra-metadata %}
-  {% if document.headnote_holding %}
+  {% if document.case_summary %}
     <dl>
       <dt>
-        {% trans 'Headnote and Holding' %}
+        {% trans 'Case summary' %}
       </dt>
       <dd>
-        {{ document.headnote_holding|safe }}
+        {{ document.case_summary|safe }}
       </dd>
     </dl>
   {% endif %}

diff --git a/peachjam_search/documents.py b/peachjam_search/documents.py
@@ -65,7 +65,7 @@ class SearchableDocument(Document):
     case_number = fields.TextField()
     # this case party names etc. and so the standard analyzer is better than a language-based one
     case_name = fields.TextField(analyzer="standard")
-    headnote_holding = fields.TextField()
+    case_summary = fields.TextField()
     flynote = fields.TextField()
     judges = fields.KeywordField(attr="judge.name")
     attorneys = fields.KeywordField(attr="attorney.name")

diff --git a/peachjam_search/views.py b/peachjam_search/views.py
@@ -324,7 +324,7 @@ class DocumentSearchViewSet(BaseDocumentViewSet):
     }
 
     # TODO perhaps better to explicitly include specific fields
-    source = {"excludes": ["pages", "content", "flynote", "headnote_holding"]}
+    source = {"excludes": ["pages", "content", "flynote", "case_summary"]}
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)