fix: removed inventory and dean_s name

FusionIIIT · Apr 24, 2024 · 8710690 · 8710690
1 parent 4af9f6e
commit 8710690
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/FusionIIIT/applications/gymkhana/views.py b/FusionIIIT/applications/gymkhana/views.py
@@ -905,7 +905,7 @@ def return_content(request, roll, name, desig, club__, student_clubs, notificati
         "incharge__user",
         "incharge__department",
     ).all()
-    inventory1 = Inventory.objects.all()
+    # inventory1 = Inventory.objects.all()
     if "student" in desig or "Convenor" in desig:
         registration_form = Registration_form.objects.all()
         cpi = (
@@ -990,7 +990,7 @@ def return_content(request, roll, name, desig, club__, student_clubs, notificati
         "club_details": club__,
         "voting_polls": voting_polls,
         "roll": str(roll),
-        "Inventory": inventory1,
+        # "Inventory": inventory1,
         "student_clubs": student_clubs,
         "notifications": notifications,
     }

diff --git a/FusionIIIT/templates/gymkhanaModule/approvalrequests.html b/FusionIIIT/templates/gymkhanaModule/approvalrequests.html
@@ -1,9 +1,9 @@
 {% load static %} {% block approvalrequests %} {% comment %}The tab menu starts
 here!{% endcomment %}
 <div class="ui pointing secondary menu">
-  {% if "dean_s" not in global_var and "Counsellor" in global_var %}
+  {% if "Dean_s" not in global_var and "Counsellor" in global_var %}
   <a class="item" data-tab="clubbudget">Club Budget</a>
-  {%endif%} {%if "dean_s" in global_var and "Counsellor" not in global_var %}
+  {%endif%} {%if "Dean_s" in global_var and "Counsellor" not in global_var %}
   <a class="active item" data-tab="newclub">New Club Formation</a>
   {%endif%}
 </div>

diff --git a/FusionIIIT/templates/gymkhanaModule/clubbudget.html b/FusionIIIT/templates/gymkhanaModule/clubbudget.html
@@ -6,7 +6,7 @@
         <a class="active item" data-tab="viewbudget">
             View Budget
         </a>   
-        {% if "co-ordinator" in global_var or "Convener" in global_var and "Counsellor" not in global_var and "dean_s" not in global_var %}
+        {% if "co-ordinator" in global_var or "Convener" in global_var and "Counsellor" not in global_var and "Dean_s" not in global_var %}
         <a class="item" data-tab="clubbudgetform">
             Club Budget Form
         </a>   

diff --git a/FusionIIIT/templates/gymkhanaModule/gymkhana.html b/FusionIIIT/templates/gymkhanaModule/gymkhana.html
@@ -268,7 +268,7 @@
 
             {% endif %}
 
-            {%if "dean_s" in global_var%}
+            {%if "Dean_s" in global_var%}
             <a class="item" data-tab="delclub">
                 Delete Club
                 <i class="right floated chevron right icon"></i>
@@ -303,7 +303,7 @@
             {% endif %}
 
 
-            {% if "Counsellor" in global_var or "dean_s" in global_var%}
+            {% if "Counsellor" in global_var or "Dean_s" in global_var%}
             <a class="item" data-tab="seventh">
                 Approval Requests
                 <i class="right floated chevron right icon"></i>
@@ -361,14 +361,14 @@
             {% endif %}
 
 
-            {% if "co-ordinator" not in global_var and "Co-coordinator" not in global_var and "Counsellor" not in global_var and "student" not in global_var and "Convener" not in global_var and "dean_s" not in global_var %}
+            {% if "co-ordinator" not in global_var and "Co-coordinator" not in global_var and "Counsellor" not in global_var and "student" not in global_var and "Convener" not in global_var and "Dean_s" not in global_var %}
             <a class="item" data-tab="seventh">
                 Submitted requests
                 <i class="right floated chevron right icon"></i>
             </a>
             {% endif %}
 
-            {% if "Counsellor" in global_var or "Convener" in global_var or "co-ordinator" in global_var or "dean_s" in global_var  %}
+            {% if "Counsellor" in global_var or "Convener" in global_var or "co-ordinator" in global_var or "Dean_s" in global_var  %}
             <a class="item" data-tab="second">
                 Club Budget
                 <i class="right floated chevron right icon"></i>
@@ -430,7 +430,7 @@
             </a>
 
             {% endif %} {% endcomment %}
-            {% if "FIC" in global_var %}
+            <!-- {% if "FIC" in global_var %}
 
             <a class="item" data-tab="ficfirst">
                 View Inventory
@@ -445,7 +445,7 @@
                 <i class="right floated chevron right icon"></i>
             </a>
 
-            {% endif %}
+            {% endif %} -->
 
 
         </div>
@@ -510,7 +510,7 @@
 
         {% endif %}
 
-        {% if "dean_s" in global_var %}
+        {% if "Dean_s" in global_var %}
         <div class="ui tab segment" data-tab="delclub">
             {% block deleteclub %}
             {% include 'gymkhanaModule/delete_club.html' %}
@@ -549,7 +549,7 @@
         </div>
         {% endif %}
 
-        {% if "Convener" in global_var or "dean_s" in global_var or "Counsellor" in global_var%}
+        {% if "Convener" in global_var or "Dean_s" in global_var or "Counsellor" in global_var%}
 
         <div class="ui tab segment" data-tab="seventh">
             {% block approvalrequests %}
@@ -565,7 +565,7 @@
 
         {% endif %}
 
-        {% if "co-ordinator" in global_var or "co co-ordinator" in global_var or "Counsellor" in global_var or "Convener" in global_var or "dean_s" in global_var or "FIC" in global_var %}
+        {% if "co-ordinator" in global_var or "co co-ordinator" in global_var or "Counsellor" in global_var or "Convener" in global_var or "Dean_s" in global_var or "FIC" in global_var %}
 
         <div class="ui tab segment" data-tab="fifth">
             {% block newsession %}
@@ -604,7 +604,7 @@
         </div>
 
 
-        <div class="ui tab segment" data-tab="ficfirst">
+        <!-- <div class="ui tab segment" data-tab="ficfirst">
             {% block viewinventory %}
             {% include 'gymkhanaModule/viewinventory.html' %}
             {% endblock %}
@@ -613,7 +613,7 @@
             {% block updateinventory %}
             {% include 'gymkhanaModule/updateinventory.html' %}
             {% endblock %}
-        </div>
+        </div> -->
 
 
 

diff --git a/FusionIIIT/templates/gymkhanaModule/viewinventory.html b/FusionIIIT/templates/gymkhanaModule/viewinventory.html
@@ -1,4 +1,4 @@
-{% load static %}
+<!-- {% load static %}
 {% block viewinventory %}
 <h4 class="ui dividing header" style="margin-left: 32px; margin-right: 32px">Inventory Information</h4>
 
@@ -16,4 +16,4 @@ <h4 class="ui dividing header" style="margin-left: 32px; margin-right: 32px">Inv
         {% endfor %}
     </tbody>
 </table>
-{% endblock %}
+{% endblock %} -->