From 5006a200da3585214630f9a668265761730237f3 Mon Sep 17 00:00:00 2001
From: Prabhat Suman <32027224+prabhatsuman@users.noreply.github.com>
Date: Mon, 22 Apr 2024 03:52:30 +0530
Subject: [PATCH] Revert "Revert "dashboard affected by AC-7 corrected""

---
 FusionIIIT/templates/dashboard/modules.html   | 234 ++++++++++--------
 .../templates/dashboard/sidenavbar.html       |   3 -
 2 files changed, 127 insertions(+), 110 deletions(-)

diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index b9c3228b4..1a0a493f7 100755
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -1,21 +1,21 @@
-    {% load static %}
-
-    {% block modules %}
-    {% comment %}The Modules start here!{% endcomment %}
-    <div class="stackable doubling ui internally celled grid">
-        <div class="column">
-            <div class="ui fluid card" style="padding-top: 12px; padding-bottom: 24px; max-width: 18vw;">
-                <a class="ui top attached black label">
-                    <span class="ui inverted header">Modules</span>
-                    <i class="setting icon right floated"></i>
-                    <i class="chevron up icon right floated" id="toggleIcon" onclick="toggleContent()"></i>
-                </a>
+{% load static %}
+
+{% block modules %}
+{% comment %}The Modules start here!{% endcomment %}
+<div class="stackable doubling ui internally celled grid">
+    <div class="column">
+        <div class="ui fluid card" style="padding-top: 12px; padding-bottom: 24px; max-width: 18vw;">
+            <a class="ui top attached black label">
+                <span class="ui inverted header">Modules</span>
+                <i class="setting icon right floated"></i>
+                <i class="chevron up icon right floated" id="toggleIcon" onclick="toggleContent()"></i>
+            </a>
 
-                <div class="content modulesContent">
-                    <div style="display: flex; flex-wrap: wrap;">
-                        {% comment %}A single modules row starts here!{% endcomment %}
+            <div class="content modulesContent">
+                <div style="display: flex; flex-wrap: wrap;">
+                    {% comment %}A single modules row starts here!{% endcomment %}
 
-                        {% comment %}A single modules row ends here!{% endcomment %}
+                    {% comment %}A single modules row ends here!{% endcomment %}
 
                     {% comment %}A single modules row starts here!{% endcomment %}
                  
@@ -46,16 +46,16 @@
                                         <i class="ui book icon big"></i>
                                     </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Programme And Curriculum </span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Programme And Curriculum </span>
                                     </div>
-                                </a>
-                            </div>
-                            {% endif %}
-                        
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                    
 
-                        {% comment %}A single modules row ends here!{% endcomment %}
+                    {% comment %}A single modules row ends here!{% endcomment %}
 
                     {% comment %}A single modules row starts here!{% endcomment %}
                   
@@ -69,30 +69,30 @@
                                         <i class="ui food icon big"></i>
                                     </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Central Mess</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Central Mess</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/visitorhostel">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui hotel icon big"></i>
                                     </div>
-                                </a>
-                            </div>
-                            {% endif %}
-                            <div style="width: calc(50% - 10px);
-                            margin: 5px;
-                            box-sizing: border-box;">
-                                <a class="ui large label" style="height: 120px; width:100%" href="/visitorhostel">
-                                    <div class="ui centered grid">
-                                        <div class="row">
-                                            <i class="ui hotel icon big"></i>
-                                        </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Visitor's Hostel</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Visitor's Hostel</span>
                                     </div>
-                                </a>
-                            </div>
-                    
-                        {% comment %}A single modules row ends here!{% endcomment %}
+                                </div>
+                            </a>
+                        </div>
+                  
+                    {% comment %}A single modules row ends here!{% endcomment %}
 
                     {% comment %}A single modules row starts here!{% endcomment %}
                         {% if request.user.extrainfo.user_type == "student" or request.user.extrainfo.user_type == "faculty" or request.user.extrainfo.user_type == "staff" or "Compounder" %}
@@ -122,15 +122,15 @@
                                         <i class="ui wpforms icon big"></i>
                                     </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">File Tracking</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">File Tracking</span>
                                     </div>
-                                </a>
-                            </div>
-                            {% endif %}
-                    
-                        {% comment %}A single modules row ends here!{% endcomment %}
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                
+                    {% comment %}A single modules row ends here!{% endcomment %}
 
                     {% comment %}A single modules row starts here!{% endcomment %}
                
@@ -180,41 +180,41 @@
                                         <i class="ui bitcoin icon big"></i>
                                     </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Placement Cell</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Placement Cell</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label disabled "  style="height: 120px; width:100%" href="{% url 'estate_module_home' %}">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui line industry icon big"></i>
                                     </div>
-                                </a>
-                            </div>
-                            {% endif %}
-                            <div style="width: calc(50% - 10px);
-                            margin: 5px;
-                            box-sizing: border-box;">
-                                <a class="ui large label disabled "  style="height: 120px; width:100%" href="{% url 'estate_module_home' %}">
-                                    <div class="ui centered grid">
-                                        <div class="row">
-                                            <i class="ui line industry icon big"></i>
-                                        </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Estate Management</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Estate Management</span>
                                     </div>
-                                </a>
-                            </div>
-                    
-                        {% comment %}A single modules row ends here!{% endcomment %}
+                                </div>
+                            </a>
+                        </div>
+                   
+                    {% comment %}A single modules row ends here!{% endcomment %}
 
-                        
-                            {% if request.user.extrainfo.user_type != "staff"   %}
-                            <div style="width: calc(50% - 10px);
-                            margin: 5px;
-                            box-sizing: border-box;">
-                                <a class="ui large label" style="height: 120px; width:100%" href="/dep">
-                                    <div class="ui centered grid">
-                                        <div class="row">
-                                            <i class="ui student icon big"></i>
-                                        </div>
+                    
+                        {% if request.user.extrainfo.user_type != "staff"   %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/dep">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui student icon big"></i>
+                                    </div>
 
                                     <div class="row">
                                         <span class="ui sub header centered">Department Portal</span>
@@ -242,31 +242,31 @@
                         {% endif %}
                     {% comment %}A single modules row ends here!{% endcomment %}
 
-                                        
-                            <div style="width: calc(50% - 10px);
-                            margin: 5px;
-                            box-sizing: border-box;">
-                                <a class="ui large label disabled"  style="height: 120px; width:100%" href="/counselling">
-                                    <div class="ui centered grid">
-                                        <div class="row">
-                                            <i class="ui edit outline icon big"></i>
-                                        </div>
+                                     
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label disabled"  style="height: 120px; width:100%" href="/counselling">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui edit outline icon big"></i>
+                                    </div>
 
-                                        <div class="row">
-                                            <span class="ui sub header centered">Counselling Cell</span>
-                                        </div>
+                                    <div class="row">
+                                        <span class="ui sub header centered">Counselling Cell</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% if request.user.extrainfo.user_type != "student"  %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/leave">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui file icon big"></i>
                                     </div>
-                                </a>
-                            </div>
-                            {% if request.user.extrainfo.user_type != "student"  %}
-                            <div style="width: calc(50% - 10px);
-                            margin: 5px;
-                            box-sizing: border-box;">
-                                <a class="ui large label" style="height: 120px; width:100%" href="/leave">
-                                    <div class="ui centered grid">
-                                        <div class="row">
-                                            <i class="ui file icon big"></i>
-                                        </div>
 
                                     <div class="row">
                                         <span class="ui sub header centered">Leave Module</span>
@@ -312,6 +312,26 @@
                                     </div>
                                 </a>
                             </div>
+                        {% endif %}
+                 
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                  
+                        {% if request.user.extrainfo.user_type == "faculty" or  "acadadmin" == global_var  %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/dashboard">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui edit outline icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Examination </span>
+                                    </div>
+                                </div>
+                            </a>
                         </div>
                         {% endif %}
                         {% if request.user.extrainfo.user_type != "staff" or "administrator" == global_var %}
diff --git a/FusionIIIT/templates/dashboard/sidenavbar.html b/FusionIIIT/templates/dashboard/sidenavbar.html
index c409e25d5..bcdb2d2e3 100644
--- a/FusionIIIT/templates/dashboard/sidenavbar.html
+++ b/FusionIIIT/templates/dashboard/sidenavbar.html
@@ -121,9 +121,6 @@ <h4>Hostel Module</h4>
 			    <a class="item" href="{% url 'filetracking:filetracking' %}">
 				<h4> File Tracking </h4>
 		            </a>
-                 <a class="item" href="{% url 'hostelmanagement:hostel_view' %}">
-                        <h4>Examination</h4>
-                    </a> 
                         </div>
                     </div>
                 </div>