New category groupings for the nofo_index

Instead of:

- all
- unpublished
- published

Now it is:

- in progress
- published
- paused
- cancelled

Author: pcraig3

CHANGELOG.md

@@ -5,15 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on Keep a Changelog, and this project adheres to Semantic
 Versioning since version 1.0.0.
 
-## Unreleased
+## Unversioned
 
 ### Added
 
 ### Changed
 
+### Migrations
+
+## [2.11.0] - 2025-03-21
+
+### Added
+
+- Add 2 new statuses: Paused and Cancelled
+
+### Changed
+
+- Change index page to show 4 groupings: in progress, published, paused, cancelled
+  - Remove "all", since probably nobody uses this
 - "Add modifications" now finds all instances of "Announcement type: New" and changes them to say "Announcement type: Modified"
 
-### Fixed
+### Migrations
+
+- Add migration for new statues
 
 ## [2.10.0] - 2025-03-19
 

bloom_nofos/nofos/templates/nofos/nofo_index.html

@@ -13,9 +13,10 @@
 	<h1 class="font-heading-xl margin-y-0">{{ nofo_group|title }}{% if nofo_status and nofo_status != 'all' %} {{ nofo_status }}{% endif %} NOFOs</h1>
 
 	<p class="nofo_index--filter">
-		<a href="{% url 'nofos:nofo_index' %}?status=all&group={{ nofo_group }}" {% if nofo_status == 'all' %}aria-current="page"{% endif %}>{{ nofo_group|title }} NOFOs</a> | 
-		<a href="{% url 'nofos:nofo_index' %}?group={{ nofo_group }}" {% if not nofo_status or nofo_status == 'unpublished' %}aria-current="page"{% endif %}>{{ nofo_group|title }} unpublished NOFOs</a> | 
-		<a href="{% url 'nofos:nofo_index' %}?status=published&group={{ nofo_group }}" {% if nofo_status == 'published' %}aria-current="page"{% endif %}>All{% if nofo_group != 'all' %} {{ nofo_group|title }}{% endif %} published NOFOs</a>
+		<a href="{% url 'nofos:nofo_index' %}?group={{ nofo_group }}" {% if not nofo_status or nofo_status == 'in progress' %}aria-current="page"{% endif %}>In progress NOFOs</a> |
+		<a href="{% url 'nofos:nofo_index' %}?status=published&group={{ nofo_group }}" {% if nofo_status == 'published' %}aria-current="page"{% endif %}>Published NOFOs</a> |
+		<a href="{% url 'nofos:nofo_index' %}?status=paused&group={{ nofo_group }}" {% if nofo_status == 'paused' %}aria-current="page"{% endif %}>Paused NOFOs</a> |
+		<a href="{% url 'nofos:nofo_index' %}?status=cancelled&group={{ nofo_group }}" {% if nofo_status == 'cancelled' %}aria-current="page"{% endif %}>Cancelled NOFOs</a>
 	</p>
 
 	{% if user.group == 'bloom' %}
@@ -31,12 +32,16 @@ <h1 class="font-heading-xl margin-y-0">{{ nofo_group|title }}{% if nofo_status a
 	{% if nofo_list %}
 		<table class="sortable usa-table usa-table--borderless width-full">
 			<caption>
-				{% if not nofo_status or nofo_status == 'unpublished' %}
+				{% if not nofo_status or nofo_status == 'in progress' %}
 					NOFOs being worked on or in review.
 				{% elif nofo_status == 'published' %}
-					NOFOs that made it across the finish line.
+					NOFOs that rode off into the sunset.
+				{% elif nofo_status == 'paused' %}
+					NOFOs cooling their heels at the saloon.
+				{% elif nofo_status == 'cancelled' %}
+					NOFOs that were put out to pasture.
 				{% elif nofo_status == 'all' %}
-					All the NOFOs fit to show.
+					Every NOFO in the corral.
 				{% else %}
 					List of NOFOs with status: {{ nofo_status }}
 				{% endif %}

bloom_nofos/nofos/views.py

@@ -189,15 +189,17 @@ def get_queryset(self):
         queryset = queryset.filter(archived__isnull=True)
 
         # default status: return unpublished NOFOs
-        self.status = self.request.GET.get("status", "unpublished")
+        self.status = self.request.GET.get("status", "in progress")
         # default group: 'all' nofos unless a bloom user. if bloom user, default to 'bloom'
         self.group = self.request.GET.get(
             "group", "bloom" if self.request.user.group == "bloom" else "all"
         )
 
         if self.status:
-            if self.status == "unpublished":
-                queryset = queryset.exclude(status="published")
+            if self.status == "in progress":
+                queryset = queryset.exclude(
+                    status__in=["published", "paused", "cancelled"]
+                )
             elif self.status == "all":
                 pass
             else:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bloom-nofos"
-version = "2.10.0"
+version = "2.11.0"
 description = "the no-code solo nofo web flow"
 authors = ["Paul Craig <paul@pcraig.ca>"]
 readme = "README.md"