Merge branch 'submission-table-view' into test

HyphaApp · Sep 5, 2024 · 729a2bd · 729a2bd
2 parents 17a0893 + c5f5044
commit 729a2bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
@@ -412,20 +412,24 @@
                     {% enddropdown_menu %}
                 {% endif %}
 
-                {% dropdown_menu title="Terms" heading="Filter by Terms" enable_search=True position="right" %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-meta-terms" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
+                {% if "meta_terms" not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
+                    {% dropdown_menu title="Terms" heading="Filter by Terms" enable_search=True position="right" %}
+                        {% slot "url" %}{% url "apply:submissions:submenu-meta-terms" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                    {% enddropdown_menu %}
+                {% endif %}
 
-                {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True position="right" %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
+                {% if 'lead' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
+                    {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True position="right" %}
+                        {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                    {% enddropdown_menu %}
+                {% endif %}
 
                 {% dropdown_menu title="Reviewers" heading="Filter by Reviewer" enable_search=True position="right" %}
                     {% slot "url" %}{% url "apply:submissions:submenu-reviewers" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
                 {% enddropdown_menu %}
 
 
-                {% dropdown_menu title="Sort" heading="Sort by" position="right" %}
+                {% dropdown_menu title="Sort" heading="Sort by" position="right" icon="arrows-up-down" %}
                     {% for sort_option in sort_options %}
                         <a
                             {% if sort_option.selected %}

diff --git a/hypha/apply/funds/workflow.py b/hypha/apply/funds/workflow.py
@@ -24,12 +24,12 @@
     "Need screening": "bg-cyan-200",
     "Ready for Determination": "bg-blue-200",
     "Ready For Discussion": "bg-blue-100",
-    "Invited for Proposal": "bg-yellow-100",
+    "Invited for Proposal": "bg-green-100",
     "Internal Review": "bg-yellow-200",
     "External Review": "bg-yellow-200",
-    "More information required": "bg-rose-200",
-    "Accepted but additional info required": "bg-rose-100",
-    "Dismissed": "bg-red-200",
+    "More information required": "bg-yellow-100",
+    "Accepted but additional info required": "bg-green-100",
+    "Dismissed": "bg-rose-200",
 }
 
 

diff --git a/hypha/core/templates/components/dropdown-menu.html b/hypha/core/templates/components/dropdown-menu.html
@@ -36,7 +36,7 @@
     >
         {{ attributes.title }}
 
-        {% heroicon_mini "chevron-down" aria_hidden="true" width=18 height=18 class="hidden md:inline-block" %}
+        {% heroicon_mini attributes.icon|default:"chevron-down" aria_hidden="true" width=18 height=18 class="hidden md:inline-block" %}
     </button>
 
     <!-- Panel -->
@@ -60,7 +60,7 @@
         {% endif %}
 
         {% if attributes.enable_search %}
-            <filter-input aria-owns="dd-content-{{ id }}" class='py-3 px-3 border-b flex grow'>
+            <filter-input aria-owns="dd-content-{{ id }}" class="py-3 px-3 border-b flex grow">
                 <label for="search-{{ id }}" class="sr-only">{% trans "Filter" %} {{ attributes.title }}</label>
                 <input type="text"
                        autofocus