Merge pull request #701 from nearbeach/develop

Develop

NearBeach/management/commands/runscheduler.py

@@ -146,10 +146,6 @@ def create_object(scheduled_object, *args, **kwargs):
         scheduled_object.last_run = datetime.date.today()
         scheduled_object.save()
 
-        # TODO: For those repeat tasks, we might need to add the run count :)
-
-        return
-
     def run_set_day_of_the_week(self):
         # Get today's date and day of the week
         todays_date = self.get_today()

NearBeach/migrations/0034_alter_tagassignment_object_enum.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.0.7 on 2024-10-25 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("NearBeach", "0033_permissionset_organisation_note"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tagassignment",
+            name="object_enum",
+            field=models.CharField(
+                choices=[
+                    ("requirement", "Requirement"),
+                    ("requirement_item", "Requirement Item"),
+                    ("project", "Project"),
+                    ("task", "Task"),
+                    ("kanban_board", "Kanban Board"),
+                    ("kanban_card", "Kanban Card"),
+                    ("request_for_change", "Request for Change"),
+                    ("customer", "Customer"),
+                    ("organisation", "Organisation"),
+                ],
+                default="requirement",
+                max_length=40,
+            ),
+        ),
+    ]

NearBeach/models.py

@@ -1846,12 +1846,12 @@ def __str__(self):
 class TagAssignment(models.Model):
     class ObjectEnum(models.TextChoices):
         REQUIREMENT = "requirement", _("Requirement")
-        REQUIREMENT_ITEM = "RequirementItem", _("Requirement Item")
+        REQUIREMENT_ITEM = "requirement_item", _("Requirement Item")
         PROJECT = "project", _("Project")
         TASK = "task", _("Task")
-        KANBAN = "KanbanBoard", _("Kanban Board")
-        CARD = "KanbanCard", _("Kanban Card")
-        REQUEST_FOR_CHANGE = "RequestForChange", _("Request for Change")
+        KANBAN = "kanban_board", _("Kanban Board")
+        CARD = "kanban_card", _("Kanban Card")
+        REQUEST_FOR_CHANGE = "request_for_change", _("Request for Change")
         CUSTOMER = "customer", _("Customer")
         ORGANISATION = "organisation", _("Organisation")