Merge pull request #263 from cal-itp/use-check-order

use reports_order field instead of hardcoded value
cal-itp · Jun 28, 2023 · 4346d3b · 4346d3b
2 parents e2c4bed + bc617ea
commit 4346d3b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/reports/generate_reports_data.py b/reports/generate_reports_data.py
@@ -148,32 +148,26 @@ def _guideline_check():
             _.check,
             _.reports_status,
             _.is_manual,
+            _.reports_order,
         )
         >> collect()
     )
 
 
 def generate_guideline_check(itp_id: int, publish_date):
-    importance = [
-        "A GTFS Schedule feed is listed",
-        "GTFS schedule feed downloads successfully",
-        "No errors in MobilityData GTFS Schedule Validator",
-        "GTFS Schedule feed is published at a stable URI (permalink) from which it can be “fetched” automatically by trip-planning applications*",
-        "Includes an open license that allows commercial use of GTFS Schedule feed*",
-        "GTFS Schedule feed ingested by Google Maps and/or a combination of Apple Maps, Transit App, Bing Maps, Moovit or local Open Trip Planner services*",
-    ]
-
     guideline_check = (
         _guideline_check()
         >> filtr(_.organization_itp_id == itp_id)
         >> filtr(_.publish_date == publish_date)
-        >> select(_.date_checked, _.check, _.reports_status, _.is_manual)
+        >> select(
+            _.date_checked, _.check, _.reports_status, _.is_manual, _.reports_order
+        )
         >> mutate(
             date_checked=_.date_checked.astype(str),
             check=np.where(_.is_manual, _.check + "*", _.check),
         )
         >> spread(_.date_checked, _.reports_status)
-        >> arrange(_.check.apply(importance.index))
+        >> arrange(_.reports_order)
         >> pipe(_.fillna(""))
     )
 

diff --git a/templates/report.html.jinja b/templates/report.html.jinja
@@ -310,10 +310,10 @@
                         </th>
 
                         <th class="whitespace-nowrap">
-                            {{ guideline_check["columns"][2] }}
+                            {{ guideline_check["columns"][3] }}
                         </th>
                         <th class="whitespace-nowrap">
-                            {{ guideline_check["columns"][3] }}
+                            {{ guideline_check["columns"][4] }}
                         </th>
                     </tr>
                 </thead>
@@ -324,10 +324,10 @@
                                 {{ row[0] }}
                             </td>
                             <td>
-                                {{ show_check_status(row[2]) }}
+                                {{ show_check_status(row[3]) }}
                             </td>
                             <td>
-                                {{ show_check_status(row[3]) }}
+                                {{ show_check_status(row[4]) }}
                             </td>
                         </tr>
                     {% endfor %}

diff --git a/tests/schemas/schema_4_guideline_check.json b/tests/schemas/schema_4_guideline_check.json
@@ -54,6 +54,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },
@@ -71,6 +74,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },
@@ -88,6 +94,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },
@@ -105,6 +114,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },
@@ -122,6 +134,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },
@@ -139,6 +154,9 @@
             {
               "type": "boolean"
             },
+            {
+              "type": "integer"
+            },
             {
               "type": "string"
             },