Clean up some variables and text

Issue #3989
HyphaApp · Aug 9, 2024 · 3865e71 · 3865e71
1 parent c2172ce
commit 3865e71
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/hypha/apply/projects/management/commands/notify_report_due.py b/hypha/apply/projects/management/commands/notify_report_due.py
@@ -42,7 +42,7 @@ def handle(self, *args, **options):
                 == ProjectReminderFrequency.FrequencyRelation.AFTER
                 else 1
             )
-            delta = frequency.num_days * multiplier
+            delta = frequency.reminder_days * multiplier
 
             due_date = today + relativedelta(days=delta)
             for project in Project.objects.in_progress():

diff --git a/hypha/apply/projects/migrations/0086_projectreminderfrequency.py b/hypha/apply/projects/migrations/0086_projectreminderfrequency.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.11 on 2024-06-14 14:22
+# Generated by Django 4.2.11 on 2024-08-08 20:57
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
                     "sort_order",
                     models.IntegerField(blank=True, editable=False, null=True),
                 ),
-                ("num_days", models.IntegerField()),
+                ("reminder_days", models.IntegerField()),
                 (
                     "relation",
                     models.CharField(

diff --git a/hypha/apply/projects/models/project.py b/hypha/apply/projects/models/project.py
@@ -517,7 +517,7 @@ def __str__(self):
 
 
 class ProjectReminderFrequency(Orderable, ClusterableModel):
-    num_days = models.IntegerField()
+    reminder_days = models.IntegerField()
     page = ParentalKey("ProjectSettings", related_name="reminder_frequencies")
 
     class FrequencyRelation(models.TextChoices):
@@ -531,8 +531,8 @@ class FrequencyRelation(models.TextChoices):
     )
 
     panels = [
-        FieldPanel("num_days", heading=_("Number of Days")),
-        FieldPanel("relation", heading=_("Relation to Project Due Date")),
+        FieldPanel("reminder_days", heading=_("Number of days")),
+        FieldPanel("relation", heading=_("Relation to report due date")),
     ]
 
 
@@ -569,8 +569,8 @@ class ProjectSettings(BaseSiteSetting, ClusterableModel):
         ),
         InlinePanel(
             "reminder_frequencies",
-            label=_("Report Reminder Frequency"),
-            heading=_("Report Reminder Frequency"),
+            label=_("Report reminder frequency"),
+            heading=_("Report reminder frequency"),
         ),
     ]
 

diff --git a/hypha/apply/projects/tests/test_commands.py b/hypha/apply/projects/tests/test_commands.py
@@ -23,7 +23,7 @@ def setUpTestData(cls):
         cls.project_settings.reminder_frequencies = [
             ProjectReminderFrequency.objects.create(
                 page=cls.project_settings,
-                num_days=7,
+                reminder_days=7,
                 relation=ProjectReminderFrequency.FrequencyRelation.BEFORE,
             ),
         ]