Merge pull request #1078 from rodekruis/develop

Create v24.07.1
rodekruis · Jul 18, 2024 · f23b1a9 · f23b1a9
2 parents 7f6b843 + ece0cfd
commit f23b1a9
Show file tree

Hide file tree

Showing 18 changed files with 2,960 additions and 2,660 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,15 @@ This project uses the [`CalVer`](https://calver.org/#scheme)-format: `YY.0M.MICR
 
 ---
 
-## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.07.0...main)
+## [Unreleased](https://github.com/rodekruis/helpful-information/compare/v24.07.1...main)
+
+---
+
+## 2024-07-18: [v24.07.1](https://github.com/rodekruis/helpful-information/releases/tag/v24.07.1)
+
+### Added
+
+- Offers can be grouped on Sub-Category-pages by setting an (optional!) "Chapter Name" for each Offer.
 
 ---
 
@@ -17,6 +25,8 @@ This project uses the [`CalVer`](https://calver.org/#scheme)-format: `YY.0M.MICR
 
 - Duplicate page-views and/or unique-users tracking/logging prevented. (Mostly)
 
+---
+
 ## 2024-06-28: [v24.06.1](https://github.com/rodekruis/helpful-information/releases/tag/v24.06.1)
 
 ### Added

diff --git a/README.md b/README.md
@@ -222,21 +222,23 @@ classDiagram
   }
 
   class Offer {
-    int offerId
-    slug
-    int subCategoryID
     int categoryID
+    int subCategoryID
+    chapterName
+    chapterSlug
     bool isVisible
+    int offerId
+    slug
     offerName
     icon
     + ...many more properties
   }
 
   class QASet {
-    int id
-    int subCategoryID
     int categoryID
+    int subCategoryID
     bool isVisible
+    int id
     slug
     parentSlug
     question
@@ -337,6 +339,8 @@ Each Offer
 - can have a URL-slug (`[a-z0-9._-]`);  
   This _needs_ to be unique within its parent Sub-Category _only_.
 - can be hidden by setting the "**Visible?**"-column to `Hide`.
+- can have a Chapter-name (in plain/normal text);  
+  This will be used to group Offers within their parent Sub-Category.
 - can have some multi-line fields, [Markdown syntax](#text-formatting) can be used for structure/formatting in those.
 
 ### Q&A features

diff --git a/data/test-sheet-id-1/values/Offers.json b/data/test-sheet-id-1/values/Offers.json
@@ -5,7 +5,8 @@
     [
       "\nSelect Sub-Category:",
       "Sub-Category ID\n#SUBCATEGORY",
-      "Category ID\n#CATEGORY\"",
+      "Category ID\n#CATEGORY",
+      "Chapter Name\n#CHAPTER",
       "Offer ID\n#ID",
       "Visible?\n#VISIBLE",
       "Unique URL (only \"a-z 0-9\" or \"-\")\n#SLUG",
@@ -25,6 +26,7 @@
       "Sub-Category",
       "1",
       "1",
+      "",
       "1",
       "Show",
       "the-servicename",
@@ -44,6 +46,7 @@
       "Sub-Category",
       "1",
       "1",
+      "",
       "2",
       "Show",
       "another-service",
@@ -63,6 +66,7 @@
       "Sub-Category",
       "1",
       "1",
+      "",
       "3",
       "Show",
       "",
@@ -80,6 +84,7 @@
       "Single Level",
       "4",
       "4",
+      "",
       "4",
       "Show",
       "single-service",
@@ -91,6 +96,7 @@
       "Sub-Category",
       "1",
       "1",
+      "",
       "5",
       "Hide",
       "temporary-service",
@@ -101,6 +107,7 @@
       "Another Sub-Category",
       "2",
       "1",
+      "",
       "4",
       "Show",
       "evil-service",
@@ -115,6 +122,50 @@
       "",
       "",
       "javascript:alert('evil #MOREINFO!');"
+    ],
+    [
+      "Sub-Category",
+      "1",
+      "1",
+      "Chapter C",
+      "5",
+      "Show",
+      "",
+      "",
+      "A service in Chapter C"
+    ],
+    [
+      "Sub-Category",
+      "1",
+      "1",
+      "Chapter B",
+      "7",
+      "Show",
+      "",
+      "",
+      "A service in Chapter B"
+    ],
+    [
+      "Sub-Category",
+      "1",
+      "1",
+      "Chapter C",
+      "6",
+      "Show",
+      "",
+      "",
+      "Another service in Chapter C"
+    ],
+    [
+      "Sub-Category",
+      "1",
+      "1",
+      "Chapter B",
+      "8",
+      "Show",
+      "",
+      "",
+      "Another service in Chapter B"
     ]
   ]
 }
diff --git a/data/test-sheet-id-1/values/Sub-Categories.json b/data/test-sheet-id-1/values/Sub-Categories.json
@@ -19,7 +19,7 @@
       "Sub-Category",
       "sub-category",
       "Show",
-      "The description of this sub-category.",
+      "The description of this sub-category.\n\n### Sub-heading\n\n...",
       "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 50'%3E%3Crect width='100' height='50' x='0' y='0' fill='%23ddd'%3E%3C/rect%3E%3C/svg%3E"
     ],
     [