fix: Fragment Program Reports menu to Inventory and Program Activitie…

…s menu
savannahghi · Sep 1, 2021 · 386cf0d · 386cf0d
1 parent 1de7311
commit 386cf0d
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 15 deletions.
diff --git a/fahari/ops/tests/test_views.py b/fahari/ops/tests/test_views.py
@@ -143,5 +143,5 @@ def test_ticket_resolve_view_post_with_note(user_with_all_permissions, client):
 def test_commodities_context_data():
     v = CommoditiesListView()
     ctx = v.get_context_data()
-    assert ctx["active"] == "program-nav"
+    assert ctx["active"] == "inventory-nav"
     assert ctx["selected"] == "commodities"
diff --git a/fahari/ops/views.py b/fahari/ops/views.py
@@ -203,7 +203,7 @@ class FacilitySystemTicketViewSet(BaseView):
 class StockReceiptVerificationContextMixin:
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)  # type: ignore
-        context["active"] = "program-nav"  # id of active nav element
+        context["active"] = "inventory-nav"  # id of active nav element
         context["selected"] = "stock-receipt-verification"  # id of selected page
         return context
 
@@ -521,7 +521,7 @@ class WeeklyProgramUpdateViewSet(BaseView):
 class CommodityContextMixin:
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)  # type: ignore
-        context["active"] = "program-nav"  # id of active nav element
+        context["active"] = "inventory-nav"  # id of active nav element
         context["selected"] = "commodities"  # id of selected page
         return context
 

diff --git a/fahari/templates/fragments/atoms/inventory_menu.html b/fahari/templates/fragments/atoms/inventory_menu.html
@@ -0,0 +1,48 @@
+{% load static i18n compress%}
+
+<li class="nav-item {% if active == "inventory-nav" %}active {% endif %}" id="inventory-nav">
+    <a class="nav-link collapsed" href="#" data-toggle="collapse" id="inventory-menu-link" data-target="#inventory-menu" aria-expanded="true" aria-controls="inventory-menu">
+        <i class="fas fa-fw fa-tasks"></i>
+        <span>Inventory</span>
+    </a>
+    <div id="inventory-menu" class="collapse {% if active == "inventory-nav" %}show{% endif %}"  data-parent="#accordionSidebar">
+        <div class="bg-white py-2 collapse-inner rounded">
+            {% if perms.ops.view_commodity %}
+                <a class="collapse-item {% if selected == "commodities" %}active {% endif %}" id="commodities" href="{% url 'ops:commodities' %}">
+                    Commodities
+                </a>
+            {% endif %}
+
+            {% if perms.ops.view_stockreceiptverification %}
+                <a class="collapse-item {% if selected == "stock-receipt-verification" %}active {% endif %}" id="stock-receipt-verification" href="{% url 'ops:stock_receipt_verifications' %}">
+                    Stock Receipts
+                </a>
+            {% endif %}
+
+        </div>
+    </div>
+</li>
+
+
+<script>
+
+
+
+
+function collapseMenu(){
+const inventory_menu_link = document.getElementById("inventory-menu-link");
+inventory_menu_link.className = "nav-link collapsed";
+const inventory_menu = document.getElementById("inventory-menu");
+inventory_menu.className = "collapse";
+}
+
+const inventory_items = document.querySelectorAll('.collapse-item');
+inventory_items.forEach(input => input.addEventListener('click', collapseMenu()));
+
+
+document.addEventListener("DOMContentLoaded", () => {
+collapseMenu()
+});
+
+
+</script>
diff --git a/fahari/templates/fragments/atoms/program_menu.html b/fahari/templates/fragments/atoms/program_menu.html
@@ -3,21 +3,10 @@
 <li class="nav-item {% if active == "program-nav" %}active {% endif %}" id="program-nav">
     <a class="nav-link collapsed" href="#" data-toggle="collapse" id="program-menu-link" data-target="#program-menu" aria-expanded="true" aria-controls="program-menu">
         <i class="fas fa-fw fa-tasks"></i>
-        <span>Program Reports</span>
+        <span>Program Activities</span>
     </a>
     <div id="program-menu" class="collapse {% if active == "program-nav" %}show{% endif %}"  data-parent="#accordionSidebar">
         <div class="bg-white py-2 collapse-inner rounded">
-            {% if perms.ops.view_commodity %}
-                <a class="collapse-item {% if selected == "commodities" %}active {% endif %}" id="commodities" href="{% url 'ops:commodities' %}">
-                    Commodities
-                </a>
-            {% endif %}
-
-            {% if perms.ops.view_stockreceiptverification %}
-                <a class="collapse-item {% if selected == "stock-receipt-verification" %}active {% endif %}" id="stock-receipt-verification" href="{% url 'ops:stock_receipt_verifications' %}">
-                    Stock Receipts
-                </a>
-            {% endif %}
 
             {% if perms.ops.view_activitylog %}
                 <a class="collapse-item {% if selected == "activity-log" %}active {% endif %}" id="activity-log" href="{% url 'ops:activity_logs' %}">

diff --git a/fahari/templates/fragments/sidebar.html b/fahari/templates/fragments/sidebar.html
@@ -9,6 +9,8 @@
     <hr class="sidebar-divider">
     <div class="sidebar-heading">Operations</div>
     {% include "fragments/atoms/facilities_menu.html" %}
+    {% comment %} {% include "fragments/atoms/program_menu.html" %} {% endcomment %}
+    {% include "fragments/atoms/inventory_menu.html" %}
     {% include "fragments/atoms/program_menu.html" %}
 
     <hr class="sidebar-divider">