Merge pull request #113 from kippnorcal/staging

HH Tweaks - Remove Priority; Fix Menu Order

high_health/views.py

@@ -328,7 +328,7 @@ def high_health(request, school_level=None):
         schools = Site.objects.filter(school_level=school_level).order_by("id")
     else:
         # Filtering out Stockton HS
-        schools = Site.objects.filter(school_level=school_level).exclude(id=36)
+        schools = Site.objects.filter(school_level=school_level).exclude(id=36).order_by("id")
     context = {
         "school_level": school_level,
         "schools": schools,

templates/high_health.html

@@ -27,7 +27,6 @@ <h1><strong>High Health:</strong> {{ school_level.display_name }}</h1>
       <thead>
         <tr class="small text-center">
                     <!--Essential Question renamed to Priority, but is still called EQ in models-->
-          <th>Priority</th>
           <th>Metric</th>
           <th>Updated</th>
           {% for school in schools %}
@@ -39,17 +38,6 @@ <h1><strong>High Health:</strong> {{ school_level.display_name }}</h1>
       <tbody>
         {% for metric in metrics %}
         <tr>
-          {% if metric.metric.essential_question.name == "Priority" %}
-            <td class="text-center eq" data-toggle="popover" data-trigger="hover"
-              title="{{ metric.metric.essential_question }}"
-              data-content="{{ metric.metric.essential_question.description }}">
-              P
-            </td>
-          {% else %}
-            <td class="text-center eq">
-              <!-- Intentionally left blank -->
-            </td>
-          {% endif %}
           <td style="min-width:240px">
             <i class="fas fa-info-circle text-primary pl-1 metric-def" data-toggle="popover" data-trigger="hover"
               title="{{ metric.metric }}" data-content="{{ metric.metric.definition }}"></i>