From 08f7a7dfead5d8caca42c0748301912f044642a7 Mon Sep 17 00:00:00 2001 From: Wilson Gaturu Date: Tue, 4 Jun 2024 09:27:10 +0300 Subject: [PATCH 1/3] adds volume number and gazette resource --- peachjam/admin.py | 5 ++-- .../migrations/0137_gazette_volume_number.py | 28 +++++++++++++++++++ peachjam/models/gazette.py | 1 + peachjam/resources.py | 6 ++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 peachjam/migrations/0137_gazette_volume_number.py diff --git a/peachjam/admin.py b/peachjam/admin.py index d8f596ac8..dcaee4b95 100644 --- a/peachjam/admin.py +++ b/peachjam/admin.py @@ -80,6 +80,7 @@ from peachjam.resources import ( ArticleResource, AttorneyResource, + GazetteResource, GenericDocumentResource, JudgmentResource, UserResource, @@ -1057,8 +1058,8 @@ class AuthorAdmin(admin.ModelAdmin): @admin.register(Gazette) -class GazetteAdmin(DocumentAdmin): - pass +class GazetteAdmin(ImportExportMixin, DocumentAdmin): + resource_class = GazetteResource @admin.register(Book) diff --git a/peachjam/migrations/0137_gazette_volume_number.py b/peachjam/migrations/0137_gazette_volume_number.py new file mode 100644 index 000000000..aab701f81 --- /dev/null +++ b/peachjam/migrations/0137_gazette_volume_number.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.21 on 2024-06-03 10:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("peachjam", "0136_casehistory"), + ] + + operations = [ + migrations.AlterModelOptions( + name="casehistory", + options={ + "ordering": ["-date"], + "verbose_name": "case history", + "verbose_name_plural": "case histories", + }, + ), + migrations.AddField( + model_name="gazette", + name="volume_number", + field=models.IntegerField( + blank=True, null=True, verbose_name="volume number" + ), + ), + ] diff --git a/peachjam/models/gazette.py b/peachjam/models/gazette.py index 9762a10e6..8e6dc93b6 100644 --- a/peachjam/models/gazette.py +++ b/peachjam/models/gazette.py @@ -20,6 +20,7 @@ class Gazette(CoreDocument): key = models.CharField( _("key"), max_length=512, null=True, blank=True, db_index=True ) + volume_number = models.IntegerField(_("volume number"), null=True, blank=True) class Meta(CoreDocument.Meta): verbose_name = _("gazette") diff --git a/peachjam/resources.py b/peachjam/resources.py index 855fc7acd..7cc05f6eb 100644 --- a/peachjam/resources.py +++ b/peachjam/resources.py @@ -43,6 +43,7 @@ CourtRegistry, DocumentNature, DocumentTopic, + Gazette, GenericDocument, Judge, Judgment, @@ -675,6 +676,11 @@ class Meta: exclude = ("slug",) +class GazetteResource(BaseDocumentResource): + class Meta(BaseDocumentResource.Meta): + model = Gazette + + class UserResource(resources.ModelResource): groups = fields.Field( column_name="groups", From 927fb1fd294fa8c8645dd97132929c8a3aed4c13 Mon Sep 17 00:00:00 2001 From: Wilson Gaturu Date: Tue, 4 Jun 2024 14:17:14 +0300 Subject: [PATCH 2/3] changes volume field to charfield --- .../migrations/0137_gazette_volume_number.py | 28 ------------------- .../migrations/0138_gazette_volume_number.py | 20 +++++++++++++ peachjam/models/gazette.py | 4 ++- 3 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 peachjam/migrations/0137_gazette_volume_number.py create mode 100644 peachjam/migrations/0138_gazette_volume_number.py diff --git a/peachjam/migrations/0137_gazette_volume_number.py b/peachjam/migrations/0137_gazette_volume_number.py deleted file mode 100644 index aab701f81..000000000 --- a/peachjam/migrations/0137_gazette_volume_number.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.21 on 2024-06-03 10:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("peachjam", "0136_casehistory"), - ] - - operations = [ - migrations.AlterModelOptions( - name="casehistory", - options={ - "ordering": ["-date"], - "verbose_name": "case history", - "verbose_name_plural": "case histories", - }, - ), - migrations.AddField( - model_name="gazette", - name="volume_number", - field=models.IntegerField( - blank=True, null=True, verbose_name="volume number" - ), - ), - ] diff --git a/peachjam/migrations/0138_gazette_volume_number.py b/peachjam/migrations/0138_gazette_volume_number.py new file mode 100644 index 000000000..70edc001c --- /dev/null +++ b/peachjam/migrations/0138_gazette_volume_number.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.21 on 2024-06-04 10:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("peachjam", "0137_registry_court"), + ] + + operations = [ + migrations.AddField( + model_name="gazette", + name="volume_number", + field=models.CharField( + blank=True, max_length=512, null=True, verbose_name="volume number" + ), + ), + ] diff --git a/peachjam/models/gazette.py b/peachjam/models/gazette.py index 8e6dc93b6..db02ee8a7 100644 --- a/peachjam/models/gazette.py +++ b/peachjam/models/gazette.py @@ -20,7 +20,9 @@ class Gazette(CoreDocument): key = models.CharField( _("key"), max_length=512, null=True, blank=True, db_index=True ) - volume_number = models.IntegerField(_("volume number"), null=True, blank=True) + volume_number = models.CharField( + _("volume number"), max_length=512, null=True, blank=True + ) class Meta(CoreDocument.Meta): verbose_name = _("gazette") From a35bae25de65f09c785f97520d1bc28cc5c374b9 Mon Sep 17 00:00:00 2001 From: Wilson Gaturu Date: Tue, 4 Jun 2024 16:35:55 +0300 Subject: [PATCH 3/3] adds volume number to admin and year list --- peachjam/admin.py | 10 ++++++++++ peachjam/templates/peachjam/gazette_year.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/peachjam/admin.py b/peachjam/admin.py index f1f2a9c54..0b87a25c3 100644 --- a/peachjam/admin.py +++ b/peachjam/admin.py @@ -1059,6 +1059,16 @@ class AuthorAdmin(admin.ModelAdmin): @admin.register(Gazette) class GazetteAdmin(ImportExportMixin, DocumentAdmin): + fieldsets = copy.deepcopy(DocumentAdmin.fieldsets) + fieldsets[0][1]["fields"].extend( + [ + "volume_number", + "sub_publication", + "supplement", + "supplement_number", + "publication", + ] + ) resource_class = GazetteResource diff --git a/peachjam/templates/peachjam/gazette_year.html b/peachjam/templates/peachjam/gazette_year.html index 7040e5888..dc15b79f9 100644 --- a/peachjam/templates/peachjam/gazette_year.html +++ b/peachjam/templates/peachjam/gazette_year.html @@ -72,7 +72,7 @@

{{ month }} {{ year }}

{{ gazette.title }} - {{ gazette.sub_publication|default:"" }} + {{ gazette.sub_publication|default:"" }} {{ gazette.volume_number|default:"" }} {{ gazette.frbr_uri_number }}