From e99bc53e0971be61e047edb690c14ac2c632cb76 Mon Sep 17 00:00:00 2001
From: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com>
Date: Fri, 17 Feb 2023 16:25:12 +0530
Subject: [PATCH 1/6] Enabled all modules for access (#1120)

---
 FusionIIIT/templates/dashboard/modules.html   | 24 ++++++-------
 .../templates/dashboard/sidenavbar.html       | 34 +++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index 73fc33d85..a8680958a 100755
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -52,7 +52,7 @@
                     {% comment %}A single modules row starts here!{% endcomment %}
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/mess">
+                            <a class="ui large label" href="/mess">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui food icon big"></i>
@@ -66,7 +66,7 @@
                         </div>
 
                         <div class="column">
-                            <a class="ui large label disabled" href="/visitorhostel">
+                            <a class="ui large label" href="/visitorhostel">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui hotel icon big"></i>
@@ -84,7 +84,7 @@
                     {% comment %}A single modules row starts here!{% endcomment %}
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/healthcenter">
+                            <a class="ui large label" href="/healthcenter">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui first aid icon big"></i>
@@ -98,7 +98,7 @@
                         </div>
 
                         <div class="column">
-                            <a class="ui large label disabled" href="/filetracking">
+                            <a class="ui large label" href="/filetracking">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui wpforms icon big"></i>
@@ -116,7 +116,7 @@
                     {% comment %}A single modules row starts here!{% endcomment %}
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/spacs">
+                            <a class="ui large label" href="/spacs">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui student icon big"></i>
@@ -130,7 +130,7 @@
                         </div>
 
                         <div class="column">
-                            <a class="ui large label disabled" href="/complaint">
+                            <a class="ui large label" href="/complaint">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui line chart icon big"></i>
@@ -146,7 +146,7 @@
                     {% comment %}A single modules row ends here!{% endcomment %}
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/placement">
+                            <a class="ui large label" href="/placement">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui bitcoin icon big"></i>
@@ -160,7 +160,7 @@
                         </div>
 
                         <div class="column">
-                            <a class="ui large label disabled" href="{% url 'estate_module_home' %}">
+                            <a class="ui large label" href="{% url 'estate_module_home' %}">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui line industry icon big"></i>
@@ -177,7 +177,7 @@
 
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/dep">
+                            <a class="ui large label" href="/dep">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui student icon big"></i>
@@ -190,7 +190,7 @@
                             </a>
                         </div>
                         <div class="column">
-                            <a class="ui large label disabled" href="/research_procedures">
+                            <a class="ui large label" href="/research_procedures">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui university icon big"></i>
@@ -207,7 +207,7 @@
 
                     <div class="row">
                         <div class="column">
-                            <a class="ui large label disabled" href="/counselling">
+                            <a class="ui large label" href="/counselling">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui edit outline icon big"></i>
@@ -220,7 +220,7 @@
                             </a>
                         </div>
                         <div class="column">
-                            <a class="ui large label disabled" href="/leave">
+                            <a class="ui large label" href="/leave">
                                 <div class="ui centered grid">
                                     <div class="row">
                                         <i class="ui file icon big"></i>
diff --git a/FusionIIIT/templates/dashboard/sidenavbar.html b/FusionIIIT/templates/dashboard/sidenavbar.html
index 81cecbe94..8febe7cdf 100644
--- a/FusionIIIT/templates/dashboard/sidenavbar.html
+++ b/FusionIIIT/templates/dashboard/sidenavbar.html
@@ -50,75 +50,75 @@ <h4> Academics Module </h4>
                 <a class="item" href="/programme_curriculum">
                     <h4> Programme & Curriculum Module </h4>
                 </a>
-                <a class = "item disabled" href="/gymkhana">
+                <a class = "item" href="/gymkhana">
                     <h4> Gymkhana Module </h4>
                 </a>
-				<a class="item disabled" href="/iwdModuleV2">
+				<a class="item" href="/iwdModuleV2">
                                 <h4>IWD Module</h4>
                             </a>
                 {% if request.user.extrainfo.user_type == 'faculty' or request.user.extrainfo.user_type == 'staff' %}
-                <a class = "item disabled" href="{% url 'establishment:establishment' %}">
+                <a class = "item" href="{% url 'establishment:establishment' %}">
                     <h4> Establishment Module </h4>
                 </a>
                 {% endif %}
                 {% if request.user.extrainfo.user_type == 'faculty' %}
                 {%for desig in designat%}
                 {% if 'hradmin' == desig.designation.name %}
-                <a class = "item disabled" href="/hr2/hradmin/">
+                <a class = "item" href="/hr2/hradmin/">
                     <h4> HR2 Module </h4>
                 </a>
                 {% endif %}
                 {%endfor %}
                 {% endif %}
-                <a class = "item disabled" href="/library/library">
+                <a class = "item" href="/library/library">
                     <h4> Library Module </h4>
                 </a>
-    			    <a class="item disabled" href="{% url 'spacs:spacs' %}">
+    			    <a class="item" href="{% url 'spacs:spacs' %}">
                                 <h4>Awards & Scholarship</h4>
                             </a>
 
-                            <a class="item disabled" href="{% url 'complaint:complaint' %}">
+                            <a class="item" href="{% url 'complaint:complaint' %}">
                                 <h4>Complaint Module</h4>
                             </a>
                               {% if user.extrainfo.user_type != 'faculty' %}
-                            <a class="item disabled" href="{% url 'mess:mess' %}">
+                            <a class="item" href="{% url 'mess:mess' %}">
                                 <h4>Central Mess Module</h4>
                             </a>
                             {% endif %}
 
-                            <a class="item disabled" href="{% url 'feeds:feeds' %}">
+                            <a class="item" href="{% url 'feeds:feeds' %}">
                                 <h4>Feeds Module</h4>
                             </a>
                             
 
-                            <a class="item disabled" href="{% url 'healthcenter:healthcenter' %}">
+                            <a class="item" href="{% url 'healthcenter:healthcenter' %}">
                                 <h4>Health Center Module</h4>
                             </a>
 
-                            <a class="item disabled" href="{% url 'leave:leave' %}">
+                            <a class="item" href="{% url 'leave:leave' %}">
                                 <h4>Leave Module</h4>
                             </a>
 
-                             <a class="item disabled" href="/counselling">
+                             <a class="item" href="/counselling">
                                 <h4>Counselling cell Module</h4>
                             </a>
 
-                            <a class="item disabled" href="{% url 'placement:placement' %}">
+                            <a class="item" href="{% url 'placement:placement' %}">
                                 <h4>Placement Module</h4>
                             </a>
 			    
-		            <a class="item disabled" href="/purchase-and-store">
+		            <a class="item" href="/purchase-and-store">
                                 <h4> Purchase and Store </h4>
                             </a>	
 
-                            <a class="item disabled" href="{% url 'visitorhostel:visitorhostel' %}">
+                            <a class="item" href="{% url 'visitorhostel:visitorhostel' %}">
                                 <h4>Visitor Hostel Module</h4>
                             </a>
 
-                            <a class="item disabled" href="{% url 'hostelmanagement:hostel_view' %}">
+                            <a class="item" href="{% url 'hostelmanagement:hostel_view' %}">
                                 <h4>Hostel Module</h4>
                             </a>
-			    <a class="item disabled" href="{% url 'filetracking:filetracking' %}">
+			    <a class="item" href="{% url 'filetracking:filetracking' %}">
 				<h4> File Tracking </h4>
 		            </a>
                         </div>

From 5c61a5425b067fb33b60f6fddedb64391dedeb4d Mon Sep 17 00:00:00 2001
From: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:32:15 +0530
Subject: [PATCH 2/6] GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com>
Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com>
---
 .../academic_procedures/academic.html         |  44 +-
 FusionIIIT/templates/dashboard/dashboard.html | 327 ++++++-------
 FusionIIIT/templates/dashboard/modules.html   | 447 ++++++++----------
 FusionIIIT/templates/dashboard/navbar.html    |  95 ++--
 FusionIIIT/templates/globals/usercard.html    | 101 ++--
 5 files changed, 517 insertions(+), 497 deletions(-)
 mode change 100755 => 100644 FusionIIIT/templates/academic_procedures/academic.html
 mode change 100755 => 100644 FusionIIIT/templates/dashboard/dashboard.html
 mode change 100755 => 100644 FusionIIIT/templates/dashboard/modules.html
 mode change 100755 => 100644 FusionIIIT/templates/dashboard/navbar.html
 mode change 100755 => 100644 FusionIIIT/templates/globals/usercard.html

diff --git a/FusionIIIT/templates/academic_procedures/academic.html b/FusionIIIT/templates/academic_procedures/academic.html
old mode 100755
new mode 100644
index 6b04a54fb..35eebf446
--- a/FusionIIIT/templates/academic_procedures/academic.html
+++ b/FusionIIIT/templates/academic_procedures/academic.html
@@ -22,6 +22,39 @@
     }
 
 </style>
+
+<style>
+    .dashboard-container {
+        margin: 0 3rem;
+        display: grid;
+        gap: 3rem;
+        grid-template-columns: 1fr;
+    }
+
+    .card-container {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+
+    @media (min-width:800px) {
+        .dashboard-container {
+            grid-template-columns: 3fr 7fr;
+        }
+        .module-container {
+            grid-column: 1/-1;
+        }
+    }
+
+    @media (min-width:1200px) {
+        .dashboard-container {
+            grid-template-columns: 3fr 7fr 3fr;
+        }
+        .module-container {
+            grid-column:auto;
+        }
+    }
+</style>
 {% endblock css %}
 
 
@@ -30,13 +63,12 @@
         {% include 'dashboard/navbar.html' %}
     {% endblock %}
 
-    <div class="ui stackable doubling grid">
+    <div class="dashboard-container">
 
-        {% comment %}The left-margin segment!{% endcomment %}
-        <div class="column"></div>
+        
 
         {% comment %}The left-rail segment starts here!{% endcomment %}
-        <div class="three wide column">
+        <div class="card-container">
             {% comment %}The user image card starts here!{% endcomment %}
             {% block usercard %}
                 {% include 'globals/usercard.html' %}
@@ -46,8 +78,8 @@
             <div class="ui divider"></div>
 
             {% comment %}The Tab-Menu starts here!{% endcomment %}
-            <div class="ui huge fluid vertical pointing menu" id="vtab" 
-                 style="max-width: 320px;">
+            <div class="ui huge fluid vertical pointing menu" style="max-width: 25rem;">
+
                 {% if student_flag %}
                     <a class="active item" data-tab="one">
                         <B>Current Semester</B>
diff --git a/FusionIIIT/templates/dashboard/dashboard.html b/FusionIIIT/templates/dashboard/dashboard.html
old mode 100755
new mode 100644
index 2b940cdbb..658ec2e6e
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -1,148 +1,140 @@
 {% extends 'globals/base.html' %}
 {% load static %}
 
-
 {% block title %}
-Dashboard
+    Dashboard
 {% endblock %}
 
 {% block css %}
+    <link href="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.css"
+        rel="stylesheet" type="text/css" />
+
+    <style>
+        .dashboard-container {
+            margin: 0 3rem;
+            display: grid;
+            gap: 3rem;
+            grid-template-columns: 1fr;
+        }
 
-<link href="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.css"
-    rel="stylesheet" type="text/css" />
+        .card-container {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
 
-{% endblock %}
+        @media (min-width:800px) {
+            .dashboard-container {
+                grid-template-columns: 3fr 7fr;
+            }
+            .module-container {
+                grid-column: 1/-1;
+            }
+        }
 
-{% block body %}
-{% block navBar %}
-{% include 'dashboard/navbar.html' %}
+        @media (min-width:1200px) {
+            .dashboard-container {
+                grid-template-columns: 3fr 7fr 3fr;
+            }
+            .module-container {
+                grid-column:auto;
+            }
+        }
+    </style>
 {% endblock %}
 
-
-{% comment %}The grid starts here!{% endcomment %}
-<div class="ui stackable doubling grid">
-
-    {% comment %}The left-margin segment!{% endcomment %}
-    <div class="column"></div>
-
-    {% comment %}
-    The left-rail segment starts here!
-    {% endcomment %}
-    <div class="three wide column">
-
-        {% comment %}The user image card starts here!{% endcomment %}
-        {% block usercard %}
-        {% include 'globals/usercard.html' %}
-        {% endblock %}
-        {% comment %}The user image card ends here!{% endcomment %}
-
-        <div class="ui divider"></div>
-
-        {% comment %}The Tab-Menu starts here!{% endcomment %}
-        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
-
-            <a class="item disabled" href="{% url 'globals:profile' %}">
-                View Professional Profile
-                <i class="right floated chevron right icon"></i>
-            </a>
-            {% if "dean_rspc" in designation %}
-            <a class="item" href = "../office/officeOfDeanRSPC">
-               Project Requests
-               <i class="right floated chevron right icon"></i>
-           </a>
-            {% endif %}
-       {% if "dean_rspc" in designation %}
-            <a class="item" href = "../eis/rspc_profile">
-               RSPC Profile
-               <i class="right floated chevron right icon"></i>
-           </a>
-       {% endif %}
-
-        </div>
-        {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-        {% if 'student' != request.user.extrainfo.user_type %}
-
-        {% comment %}The Tab-Menu starts here!{% endcomment %}
-        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
-            <a class="item disabled" href="/hr2/administrativeProfile">
-                View Administrative Profile
-                <i class="right floated chevron right icon"></i>
-            </a>
-        </div>
-        {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-        {% endif %}
-
-        {% comment %}The Tab-Menu starts here!{% endcomment %}
-
-
-        {% if request.user.extrainfo.user_type == 'faculty' %}
-        {%for desig in designat%}
-        {% if 'hradmin' == desig.designation.name %}
-
-        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
-
-            <a class="item" href="{% url 'hr2:hradmin' %}">
-                Hr-Admin
-                <i class="right floated chevron right icon"></i>
-            </a>
-
-        </div>
-        {% endif %}
-        {%endfor %}
-        {% endif %}
-        {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-
-
-
-
-
-
-    </div>
-    {% comment %}
-    The left-rail segment ends here!
-    {% endcomment %}
+{% block body %}
+    {% block navBar %}
+        {% include 'dashboard/navbar.html' %}
+    {% endblock %}
 
 
+    {% comment %} The grid starts here! {% endcomment %}
+    <div class="dashboard-container">
 
-    {% comment %}
-    The central-rail segment starts here!
-    {% endcomment %}
+        {% comment %} The left-rail segment starts here! {% endcomment %}
+        <div class="card-container">
+            
+            {% comment %} The user image card starts here! {% endcomment %}
+            {% block usercard %}
+                {% include 'globals/usercard.html' %}
+            {% endblock %}
+            {% comment %}The user image card ends here!{% endcomment %}
+
+            <div class="ui divider"></div>
+
+            {% comment %}The Tab-Menu starts here!{% endcomment %}
+            <div class="ui huge fluid vertical pointing menu" style="max-width: 25rem;">
+                <a class="item disabled" href="{% url 'globals:profile' %}" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
+                    View Professional Profile
+                    <i class="right floated chevron right icon"></i>
+                </a>
+
+                {% if "dean_rspc" in designation %}
+                    <a class="item" href = "../office/officeOfDeanRSPC" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
+                        Project Requests
+                        <i class="right floated chevron right icon"></i>
+                    </a>
+                    <a class="item" href = "../eis/rspc_profile" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
+                        RSPC Profile
+                        <i class="right floated chevron right icon"></i>
+                    </a>
+                {% endif %}
+
+                {% if 'student' != request.user.extrainfo.user_type %}
+                    <a class="item disabled" href="/hr2/administrativeProfile" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
+                        View Administrative Profile
+                        <i class="right floated chevron right icon"></i>
+                    </a>
+                {% endif %}
+
+                {% if request.user.extrainfo.user_type == 'faculty' %}
+                    {% for desig in designat %}
+                        {% if 'hradmin' == desig.designation.name %}
+                            <a class="item" href="{% url 'hr2:hradmin' %}" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
+                                Hr-Admin
+                                <i class="right floated chevron right icon"></i>
+                            </a>
+                        {% endif %}
+                    {% endfor %}
+                {% endif %}
+            </div>
+            {% comment %}The Tab-Menu ends here!{% endcomment %}
 
-    <div class="eight wide column">
-        <div class="ui top attached tabular large menu">
-            <a class="active item" data-tab="first">Notifications</a>
-            <a class="item" data-tab="second">News</a>
-            <a class="item" data-tab="third">Announcements</a>
         </div>
-        <div class="ui bottom attached active tab segment" data-tab="first">
-            <div id="textSegmentDiv">
+        {% comment %} The left-rail segment ends here! {% endcomment %}
+
+        {% comment %} The central-rail segment starts here! {% endcomment %}
+        <div class="menus-container">
+            <div class="ui top attached tabular large menu">
+                <a class="active item" data-tab="first">Notifications</a>
+                <a class="item" data-tab="second">News</a>
+                <a class="item" data-tab="third">Announcements</a>
+            </div>
 
-                {% comment %}
-                TODO: Loader required?
-                <div class="ui active large text loader" id="loader">
-                    Loading ...
-                </div>
-                {% endcomment %}
+            <div class="ui bottom attached active tab segment" data-tab="first">
+                <div id="textSegmentDiv">
+                    {% comment %}
+                    TODO: Loader required?
+                    <div class="ui active large text loader" id="loader">
+                        Loading ...
+                    </div>
+                    {% endcomment %}
 
-                <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
-                    {% block alerts %}
-                    {% include 'dashboard/alerts.html' %}
-                    {% endblock %}
+                    <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
+                        {% block alerts %}
+                            {% include 'dashboard/alerts.html' %}
+                        {% endblock %}
+                    </div>
                 </div>
             </div>
-
-        </div>
-        <div class="ui bottom attached tab segment" data-tab="second">
-            Work in Progress, coming soon!
-        </div>
-        <div class="ui bottom attached tab segment" data-tab="third">
+            
+            <div class="ui bottom attached tab segment" data-tab="second">
+                Work in Progress, coming soon!
+            </div>
+            
+            <div class="ui bottom attached tab segment" data-tab="third">
                 <div id="textSegmentDiv">
-
                     <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
                         {% block alerts1 %}
                             {% include 'dashboard/alerts1.html' %}
@@ -150,64 +142,51 @@
                     </div>
                 </div>
             </div>
-    </div>
-
-    {% comment %}The central-rail segment ends here!{% endcomment %}
+        </div>
+        {% comment %} The central-rail segment ends here! {% endcomment %}
 
-    {% comment %}The right-rail segment starts here!{% endcomment %}
-    <div class="three wide column">
-        <div class="row">
-            {% comment %}The Modules:{% endcomment %}
+        {% comment %} The right-rail segment starts here! {% endcomment %}
+        <div class="module-container">
             {% block modules %}
-            {% include 'dashboard/modules.html' %}
+                {% include 'dashboard/modules.html' %}
             {% endblock %}
         </div>
-
+        {% comment %}The right-rail segment ends here!{% endcomment %}
     </div>
-    {% comment %}The right-rail segment ends here!{% endcomment %}
-
-    {% comment %}The right-margin segment!{% endcomment %}
-    <div class="column"></div>
-
-</div>
-{% comment %}The grid ends here!{% endcomment %}
-
-
-
+    {% comment %}The grid ends here!{% endcomment %}
 {% endblock %}
 
 {% block javascript %}
-<script
-    src="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.js"></script>
-<script>
-    //----------------------calender--------------------------------
-
-    $('#rangestart').calendar({
-        monthFirst: false,
-        type: 'date',
-        minDate: new Date(getToday().getFullYear(), getToday().getMonth(), getToday().getDate()),
-        formatter: {
-            date: function (date, settings) {
-                if (!date) return '';
-                var day = date.getDate();
-                var month = date.getMonth() + 1;
-                var year = date.getFullYear();
-                return year + '-' + month + '-' + day;
+    <script
+        src="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.js"></script>
+    <script>
+        //----------------------calender--------------------------------
+
+        $('#rangestart').calendar({
+            monthFirst: false,
+            type: 'date',
+            minDate: new Date(getToday().getFullYear(), getToday().getMonth(), getToday().getDate()),
+            formatter: {
+                date: function (date, settings) {
+                    if (!date) return '';
+                    var day = date.getDate();
+                    var month = date.getMonth() + 1;
+                    var year = date.getFullYear();
+                    return year + '-' + month + '-' + day;
+                }
             }
-        }
-    });
-
-    /*$(document).ready(function(){
-        $("#textLoader").toggle();
-        $("#replacement-card").toggle();
-        setTimeout(loader, 1750);
-    });
-    function loader() {
-        $("#textLoader").toggle();
-        $("#replacement-card").toggle();
-        $("#loader").removeClass("active");
-        $("#loader").addClass("disabled");
-    }*/
-</script>
-
+        });
+
+        /*$(document).ready(function(){
+            $("#textLoader").toggle();
+            $("#replacement-card").toggle();
+            setTimeout(loader, 1750);
+        });
+        function loader() {
+            $("#textLoader").toggle();
+            $("#replacement-card").toggle();
+            $("#loader").removeClass("active");
+            $("#loader").addClass("disabled");
+        }*/
+    </script>
 {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
old mode 100755
new mode 100644
index a8680958a..e83995749
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -1,246 +1,217 @@
 {% load static %}
 
+{% block css %}
+    <style>
+        .moduleAllContainer {
+            display: flex !important;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            padding: 1rem !important;
+        }
+
+        .moduleSpan {
+            margin: 0.25rem;
+            padding: 0.25rem;
+            width: 10rem;
+        }
+
+        .moduleSpan > a {
+            display: flex !important;
+            flex-direction: column;
+            align-items: center;
+            height: 9rem;
+            justify-content: space-evenly;
+        }
+
+        .tcenter {
+            text-align: center;
+        }
+    </style>
+{% endblock %}
+
+{% comment %} The Modules start here! {% endcomment %}
 {% 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="ui fluid card moduleAllContainer">
+        <a class="ui top attached black label">
+            <span class="ui inverted header" style="padding-left: 2rem;">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" style="padding-top: 1.5rem; display: flex; flex-wrap: wrap; justify-content: center">
+            <span class="moduleSpan">
+                <a class="ui large label" href="/academic-procedures">
+                    <div>
+                        <i class="ui university icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Academics Module
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/programme_curriculum">
+                    <div>
+                        <i class="ui book icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Programme And Curriculum Module
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/mess">
+                    <div>
+                        <i class="ui food icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Central Mess
+                    </div>
+                </a>
+            </span>
+
+            <span class="moduleSpan">
+                <a class="ui large label" href="/visitorhostel">
+                    <div>
+                        <i class="ui hotel icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Visitor's Hostel
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/healthcenter">
+                    <div>
+                        <i class="ui first aid icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Healthcare Center
+                    </div>
+                </a>
+            </span>
+
+            <span class="moduleSpan">
+                <a class="ui large label" href="/filetracking">
+                    <div>
+                        <i class="ui wpforms icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        File Tracking
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/spacs">
+                    <div>
+                        <i class="ui student icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Scholarship Portal
+                    </div>
+                </a>
+            </span>
+
+            <span class="moduleSpan">
+                <a class="ui large label" href="/complaint">
+                    <div>
+                        <i class="ui line chart icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Complaint System
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/placement">
+                    <div>
+                        <i class="ui bitcoin icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Placement Cell
+                    </div>
+                </a>
+            </span>
+
+            <span class="moduleSpan">
+                <a class="ui large label" href="{% url 'estate_module_home' %}">
+                    <div>
+                        <i class="ui line industry icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Estate Management
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/dep">
+                    <div>
+                        <i class="ui student icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Department Portal
+                    </div>
+                </a>
+            </span>
 
-            <div class="content modulesContent">
-                <div class="ui two column stackable doubling grid">
-                    {% comment %}A single modules row starts here!{% endcomment %}
-
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    {% comment %}A single modules row starts here!{% endcomment %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/academic-procedures">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui university icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Academics Module</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/programme_curriculum">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui book icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Programme And Curriculum Module</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    {% comment %}A single modules row starts here!{% endcomment %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/mess">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui food icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Central Mess</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-
-                        <div class="column">
-                            <a class="ui large label" 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>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    {% comment %}A single modules row starts here!{% endcomment %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/healthcenter">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui first aid icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Healthcare Center</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/filetracking">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui wpforms icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">File Tracking</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    {% comment %}A single modules row starts here!{% endcomment %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/spacs">
-                                <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">Scholarship Portal</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/complaint">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui line chart icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Complaint System</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/placement">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui bitcoin icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Placement Cell</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-
-                        <div class="column">
-                            <a class="ui large label" 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>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" 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>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                        <div class="column">
-                            <a class="ui large label" href="/research_procedures">
-                                <div class="ui centered grid">
-                                    <div class="row">
-                                        <i class="ui university icon big"></i>
-                                    </div>
-
-                                    <div class="row">
-                                        <span class="ui sub header centered">Research Module</span>
-                                    </div>
-                                </div>
-                            </a>
-                        </div>
-                    </div>
-                    {% comment %}A single modules row ends here!{% endcomment %}
-
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" 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>
-                            </a>
-                        </div>
-                        <div class="column">
-                            <a class="ui large label" 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>
-                                    </div>
-                                </div>
-                            </a>
-                    </div>
-                </div>
-            </div>
-            {% comment %}
+            <span class="moduleSpan">
+                <a class="ui large label" href="/research_procedures">
+                    <div>
+                        <i class="ui university icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Research Module
+                    </div>
+                </a>
+            </span>
+            
+            <span class="moduleSpan">
+                <a class="ui large label" href="/counselling">
+                    <div>
+                        <i class="ui edit outline icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Counselling Cell
+                    </div>
+                </a>
+            </span>
+
+            <span class="moduleSpan">
+                <a class="ui large label" href="/leave">
+                    <div>
+                        <i class="ui file icon big"></i>
+                    </div>
+
+                    <div class="ui small header tcenter">
+                        Leave Module
+                    </div>
+                </a>
+            </span>
+        </div>
+        {% comment %}
             <a class="ui bottom attached blue label">
                 <i class="right arrow icon right floated"></i>
             </a>
-            {% endcomment %}
-        </div>
+        {% endcomment %}
     </div>
-</div>
-{% comment %}The Modules End here!{% endcomment %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% comment %}The Modules End here!{% endcomment %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html
old mode 100755
new mode 100644
index 7d0e7e3f9..8aba787ba
--- a/FusionIIIT/templates/dashboard/navbar.html
+++ b/FusionIIIT/templates/dashboard/navbar.html
@@ -1,14 +1,59 @@
 {% load static %}
+
+{% block css %}
+    <style>
+        .menu1 {
+            display: flex;
+        }
+
+        .user-logo {
+            margin-left: auto !important;
+            display: flex;
+            flex-wrap: nowrap;
+            flex-direction: row;
+        }
+
+        .sizer {
+            font-size: 1.35rem !important;
+        }
+
+        @media (max-width:1200px) {
+            .menu1 {
+                display: flex;
+                flex-wrap: wrap;
+            }
+            
+            .user-logo {
+                margin-left: 0 !important;
+            }
+
+            .sizer {
+                font-size: clamp(1.1rem, 1.5vw, 1.35rem) !important;
+            }
+        }
+
+        @media (max-width:1000px) {
+            .menu1 {
+                display: flex;
+                flex-direction: column;
+            }
+
+            .sizer {
+                font-size: clamp(1.1rem, 1.5vw, 1.35rem) !important;
+            }
+        }
+    </style>
+{% endblock %}
+
 {% block navBar %}
     {% include 'dashboard/sidenavbar.html' %}
 
     <div>
-        <div class="ui stackable massive inverted top attached menu" id="navbar">
+        <div class="ui inverted menu sizer menu1" id="navbar">
             <a class="item" id="sidebartrigger">
                 <i class="sidebar icon"></i>
             </a>
 
-
             <a class="item" href="{% url 'globals:dashboard' %}">
                 {% load notifications_tags %}
                 {% register_notify_callbacks badge_class='badge' callbacks='fill_notification_badge' %}
@@ -16,10 +61,12 @@
                 Dashboard
                 <div class="ui red circular label">{% live_notify_badge badge_class='badge' %}</div>
             </a>
+
             <div class="item">
                 <a class="icon mail" href = '/feedback'>
                 <i class="comment icon"></i>Feedback</a>
             </div>
+            
             <div class="item">
                 <form method="GET" action="{% url 'globals:search' %}">
                     <div class="ui search">
@@ -28,11 +75,11 @@
                           <button type="submit" class="ui button"><i class="search icon"></i></button>
                         </div>
                         <div class="results"></div>
-                    </div>
-                    
+                    </div>        
                 </form>
             </div>
-            <div class="right inverted menu">
+
+            <div class="user-logo">
                 <a class="item" href="{% url 'globals:profile' %}">
                     {% comment %}
                         TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF!
@@ -40,18 +87,19 @@
                     <img class="ui avatar image" src="{% static 'globals/img/zlatan.jpg' %}">
                     {{request.user.first_name}} {{request.user.last_name}}
                 </a>
+                
                 {% comment %}
-                <a class="item ui pointed dropdown link" href="{% url 'globals:dashboard' %}" id="new-notification">
-                    <div class="text">Notifications</div>
-                    <i class="dropdown"></i>
-                    <div class="ui red circular label">22</div>
-                        TODO: Make dropdown menu
-                    <div class="menu">
-                        <div class="item">Notification1</div>
-                        <div class="item">Notification1</div>
-                    </div>
-                    {% endcomment %}
-                </a>
+                    <a class="item ui pointed dropdown link" href="{% url 'globals:dashboard' %}" id="new-notification">
+                        <div class="text">Notifications</div>
+                        <i class="dropdown"></i>
+                        <div class="ui red circular label">22</div>
+                            TODO: Make dropdown menu
+                        <div class="menu">
+                            <div class="item">Notification1</div>
+                            <div class="item">Notification1</div>
+                        </div>
+                    </a>
+                {% endcomment %}
                     
                 <div class="ui fluid popup bottom left transition">
                     <div class="ui four column relaxed equal height stackable doubling grid">
@@ -106,7 +154,6 @@ <h3 class="ui dividing header" style="margin: auto; margin-top: 8px;">Notificati
                             </div>
                         </div>
                     </div>
-
                 </div>
 
                 <a class="right item" href="/accounts/logout">
@@ -116,22 +163,10 @@ <h3 class="ui dividing header" style="margin: auto; margin-top: 8px;">Notificati
                     <i class="ui inverted sign out icon"></i>
                     Logout
                 </a>
-
             </div>
         </div>
 
         <div class="ui divider"></div>
-
-
-
-
-        {% block data%}
-
-        {% endblock %}
-
-
-
+        {% block data %} {% endblock %}
     </div>
-
-
 {% endblock %}
diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
old mode 100755
new mode 100644
index ecb758bd3..8d1e54ef9
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -1,14 +1,12 @@
 {% load static %}
 
 {% block usercard %}
-
     {% comment %}
         TODO: Something!
     {% endcomment %}
-    {% comment %}The Employee Image Card starts here!{% endcomment %}
-    <div class="ui large fluid raised card"
-         style="max-width: 320px;">
 
+    {% comment %}The Employee Image Card starts here!{% endcomment %}
+    <div class="ui large fluid raised card" style="max-width: 25rem;">
         <div class="image">
             <img src="{% static 'globals/img/zlatan.jpg' %}">
         </div>
@@ -18,61 +16,66 @@
                 TODO: Add a If-Else here!
             {% endcomment %}
             {% if user %}
-            <div class="ui large header" href="">
-                {{ user.first_name}}
-                {{ user.last_name}}
-                <span class="right floated meta">
-                    {{ user.extrainfo.department.name}}
-                    
-                </span>
-                <span class="left floated meta">
+                <div style="display:flex;flex-wrap:wrap;justify-content:space-between;" class="ui large header">
+                    <div style="padding: 0.25rem;">
+                        {{ user.first_name }}
+                        {{ user.last_name }}
+                    </div>
+                
+                    <div class="meta" style="padding: 0.25rem;">
+                        {{ user.extrainfo.department.name }}
+                    </div>
+                </div>
+
+                <div class="ui large header">
                     {% if user.extrainfo.user_type == 'student' %}
-                    {{user.extrainfo.student.programme}}
-                    {{ user.extrainfo.student.batch}}
-                    <br/>
-                    Sem - {{user.extrainfo.student.curr_semester_no}}
+                        {{ user.extrainfo.student.programme }}
+                        {{ user.extrainfo.student.batch }}
+                        <br/>
+                        Sem - {{ user.extrainfo.student.curr_semester_no }}
                     {% endif %}
-                </span>
-                
-            </div>
+                </div>
             {% else %}
-            <div class="ui large header" href="">
-                {{ request.user.first_name}}
-                {{ request.user.last_name}}
-                <span class="right floated meta">
-                    {{ request.user.extrainfo.department.name}}
-                    <span class="right floated meta">
-                        {% if request.user.extrainfo.user_type == 'student' %}
-                        {{request.user.extrainfo.student.programme}}
-                        {{ request.user.extrainfo.student.batch}}
-                        <br/>
-                        Sem - {{request.user.extrainfo.student.curr_semester_no}}
+                <div style="display:flex;flex-wrap:wrap;justify-content:space-between;" class="ui large header">
+                    <div>
+                        {{ request.user.first_name }}
+                        {{ request.user.last_name }}
+                    </div>
+                    
+                    <div class="meta">
+                        {{ request.user.extrainfo.department.name }}
+                    </div>
+                </div>
+                
+                <div class="ui large header">
+                    {% if user.extrainfo.user_type == 'student' %}
+                        {{ request.user.extrainfo.student.programme }}
+                        {{ request.user.extrainfo.student.batch }}
                         <br/>
-                        {% endif %}
-                </span>
+                        Sem - {{ request.user.extrainfo.student.curr_semester_no }}
+                    {% endif %}
+                </div>
+                
                 <span class="right floated meta">
-                    {{user.extrainfo.student.programme}}
-                    {{ user.extrainfo.student.batch}}
-                    {{user.extrainfo.student.curr_semester_no}}
+                    {{ user.extrainfo.student.programme }}
+                    {{ user.extrainfo.student.batch }}
+                    {{ user.extrainfo.student.curr_semester_no }}
                 </span>
-            </div>
             {% endif %}
-            <br/>
-            <div class="meta">
+            <div class="ui large header">
                 {% for i in Curr_desig %}
-                <span> {% comment %}Should this be inside if else?{% endcomment %}
-                    {% if i == "co-ordinator" or  i == "co co-ordinator" %}
-                        {{ i }} of {{ club_details }} club
-                    {% else %}
-                        {{ i }}
-                    {% endif %}
-                </span>
-                <br>
+                    {% comment %} Should this be inside if else? {% endcomment %}
+                    <span class="meta" style="text-transform: uppercase;">
+                        {% if i == "co-ordinator" or i == "co co-ordinator" %}
+                            {{ i }} of {{ club_details }} club
+                        {% else %}
+                            {{ i }}
+                        {% endif %}
+                    </span>
+                    <br>
                 {% endfor %}
             </div>
         </div>
     </div>
-    {% comment %}The Employee Image Card ends here!{% endcomment %}
-
-
+    {% comment %} The Employee Image Card ends here! {% endcomment %}
 {% endblock %}

From 47af12cd4664252453c3bc173ea041191c5a1087 Mon Sep 17 00:00:00 2001
From: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com>
Date: Mon, 11 Mar 2024 22:09:02 +0530
Subject: [PATCH 3/6] GAD -5 Dashboard Changes (#1325)

---
 FusionIIIT/Fusion/context_processors.py       |   5 +
 .../Fusion/middleware/custom_middleware.py    |  48 ++
 FusionIIIT/Fusion/settings/common.py          |   2 +
 FusionIIIT/applications/globals/urls.py       |   3 +-
 FusionIIIT/applications/globals/views.py      |  87 ++-
 FusionIIIT/templates/dashboard/dashboard.html | 327 ++++-----
 FusionIIIT/templates/dashboard/modules.html   | 626 ++++++++++++------
 FusionIIIT/templates/dashboard/navbar.html    | 246 +++----
 .../templates/dashboard/sidenavbar.html       |  46 +-
 FusionIIIT/templates/globals/usercard.html    |  18 +-
 10 files changed, 862 insertions(+), 546 deletions(-)
 create mode 100644 FusionIIIT/Fusion/context_processors.py
 create mode 100644 FusionIIIT/Fusion/middleware/custom_middleware.py

diff --git a/FusionIIIT/Fusion/context_processors.py b/FusionIIIT/Fusion/context_processors.py
new file mode 100644
index 000000000..54566d56e
--- /dev/null
+++ b/FusionIIIT/Fusion/context_processors.py
@@ -0,0 +1,5 @@
+def global_vars(request):
+    return {
+        'global_var': request.session.get('currentDesignationSelected', 'default_value'),
+        'global_var2': request.session.get('allDesignations', 'default_value2'),
+    }
\ No newline at end of file
diff --git a/FusionIIIT/Fusion/middleware/custom_middleware.py b/FusionIIIT/Fusion/middleware/custom_middleware.py
new file mode 100644
index 000000000..f77873534
--- /dev/null
+++ b/FusionIIIT/Fusion/middleware/custom_middleware.py
@@ -0,0 +1,48 @@
+# custom_middleware.py
+from django.contrib.auth.signals import user_logged_in
+from django.dispatch import receiver
+from applications.globals.models import (ExtraInfo, Feedback, HoldsDesignation,
+                                         Issue, IssueImage, DepartmentInfo)
+from django.shortcuts import get_object_or_404, redirect, render
+
+def user_logged_in_middleware(get_response):
+    @receiver(user_logged_in)
+    def user_logged_in_handler(sender, user, request, **kwargs):
+        if 'function_executed' not in request.session:
+            # Run the function only if the flag is not set
+            # Assuming user is a model with the desired data field, retrieve the data
+            # For example, if your User model has a field named 'custom_field', you can access it like:
+            if user.is_authenticated:
+                desig = list(HoldsDesignation.objects.select_related('user','working','designation').all().filter(working = request.user).values_list('designation'))
+                print(desig)
+                b = [i for sub in desig for i in sub]
+                design = HoldsDesignation.objects.select_related('user','designation').filter(working=request.user)
+
+                designation=[]
+                
+                designation.append(str(user.extrainfo.user_type))
+                for i in design:
+                    if str(i.designation) != str(user.extrainfo.user_type):
+                        print('-------')
+                        print(i.designation)
+                        print(user.extrainfo.user_type)
+                        print('')
+                        designation.append(str(i.designation))
+
+                for i in designation:
+                    print(i)
+
+                request.session['currentDesignationSelected'] = designation[0]
+                request.session['allDesignations'] = designation               
+                print("logged iN")
+                
+            # Set the flag in the session to indicate that the function has bee+n executed
+            request.session['function_executed'] = True
+        
+    def middleware(request):
+        if request.user.is_authenticated:
+            user_logged_in_handler(request.user, request.user, request)
+        response = get_response(request)
+        return response
+    
+    return middleware
\ No newline at end of file
diff --git a/FusionIIIT/Fusion/settings/common.py b/FusionIIIT/Fusion/settings/common.py
index b98ea6960..fabe81ec2 100644
--- a/FusionIIIT/Fusion/settings/common.py
+++ b/FusionIIIT/Fusion/settings/common.py
@@ -163,6 +163,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'Fusion.middleware.custom_middleware.user_logged_in_middleware',
 ]
 
 ROOT_URLCONF = 'Fusion.urls'
@@ -178,6 +179,7 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'Fusion.context_processors.global_vars',
             ],
         },
     },
diff --git a/FusionIIIT/applications/globals/urls.py b/FusionIIIT/applications/globals/urls.py
index f8d82ee71..2dea4e77d 100644
--- a/FusionIIIT/applications/globals/urls.py
+++ b/FusionIIIT/applications/globals/urls.py
@@ -23,5 +23,6 @@
     # Endpoint to reset all passwords in DEV environment
     url(r'^resetallpass/$', views.reset_all_pass, name='resetallpass'),
     # API urls
-    url(r'^api/', include('applications.globals.api.urls'))
+    url(r'^api/', include('applications.globals.api.urls')),
+    url(r'^update_global_variable/$', views.update_global_variable, name='update_global_var'),
 ]
diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py
index a7f3886c9..5b023abb5 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -740,21 +740,26 @@ def dashboard(request):
         
     }
     # a=HoldsDesignation.objects.select_related('user','working','designation').filter(designation = user)
+    print(context)
+    print(type(user.extrainfo.user_type))
     if(request.user.get_username() == 'director'):
         return render(request, "dashboard/director_dashboard2.html", {})
     elif( "dean_rspc" in designation):
         return render(request, "dashboard/dashboard.html", context)
-    elif user.extrainfo.user_type != 'student':
+    elif user.extrainfo.user_type != "student":
+        print ("inside")
         designat = HoldsDesignation.objects.select_related().filter(user=user)
         response = {'designat':designat}
         context.update(response)
         return render(request, "dashboard/dashboard.html", context)
     else:
+        print ("inside2")
+        
         return render(request, "dashboard/dashboard.html", context)
 
 
 @login_required(login_url=LOGIN_URL)
-def profile(request, username=None):
+def   profile(request, username=None):
     """
     Generic endpoint for views.
     If it's a faculty, redirects to /eis/profile/*
@@ -768,16 +773,76 @@ def profile(request, username=None):
     """
     user = get_object_or_404(User, Q(username=username)) if username else request.user
 
-
     editable = request.user == user
+    print("editable",editable)
     profile = get_object_or_404(ExtraInfo, Q(user=user))
+    print("profile",profile)
     if(str(user.extrainfo.user_type)=='faculty'):
+        print("profile")
         return HttpResponseRedirect('/eis/profile/' + (username if username else ''))
     if(str(user.extrainfo.department)=='department: Academics'):
+        print("profile2")
         return HttpResponseRedirect('/aims')
-    current = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user, designation__name="student"))
+    
+    array = [
+     "student",
+    "CC convenor",
+    "Mechatronic convenor",
+    "mess_committee",
+    "mess_convener",
+    "alumini",
+    "Electrical_AE",
+    "Electrical_JE",
+    "Civil_AE",
+    "Civil_JE",
+    "co-ordinator",
+    "co co-ordinator",
+    "Convenor",
+    "Convener",
+    "cc1convener",
+    "CC2 convener",
+    "mess_convener_mess2",
+    "mess_committee_mess2"
+]
+
+    # queryset = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user))
+
+    # for obj in queryset:
+    #     designation_name = obj.designation.name
+    #     print("designation_name",designation_name)
+        
+    # design = False
+    # if designation_name in array:
+    #     design = True
+    #     print("design",design)
+    #     print("designation_name",designation_name)
+    # if design:
+    #     current = HoldsDesignation.objects.select_relapted('user','working','designation').filter(Q(working=user, designation__name=designation_name))
+    #     for obj in current:
+    #         obj.designation.name = obj.designation.name.replace(designation_name, 'student')
+    
+    designation_name = ""
+    design = False
+
+    current = HoldsDesignation.objects.select_related('user', 'working', 'designation').filter(Q(working=user))
+
+    for obj in current:
+        designation_name = obj.designation.name
+        if designation_name in array:
+            design = True
+            break
+
+    if design:
+        current = HoldsDesignation.objects.filter(working=user, designation__name=designation_name)
+        for obj in current:
+            obj.designation.name = obj.designation.name.replace(designation_name, 'student')
+    
+    print(user.extrainfo.user_type)
+    print("current",current)
     if current:
+        print("profile3")
         student = get_object_or_404(Student, Q(id=profile.id))
+        print("student",student)
         if editable and request.method == 'POST':
             if 'studentapprovesubmit' in request.POST:
                 status = PlacementStatus.objects.select_related('notify_id','unique_id__id__user','unique_id__id__department').filter(pk=request.POST['studentapprovesubmit']).update(invitation='ACCEPTED', timestamp=timezone.now())
@@ -979,6 +1044,7 @@ def profile(request, username=None):
             return render(request, "globals/student_profile4.html", context)
         if 'achievementsubmit' in request.POST or 'deleteach' in request.POST:
             return render(request, "globals/student_profile5.html", context)
+        print("context",context)
         return render(request, "globals/student_profile.html", context)
     else:
         return redirect("/")
@@ -1176,4 +1242,15 @@ def search(request):
     if len(search_results) == 0:
         search_results = []
     context = {'sresults':search_results}
-    return render(request, "globals/search.html", context)
+    return render(request, "globals/search.html", context),
+
+@login_required(login_url=LOGIN_URL)
+def update_global_variable(request):
+    if request.method == 'POST':
+        selected_option = request.POST.get('dropdown')
+        request.session['currentDesignationSelected'] = selected_option
+        print(selected_option)
+        print(request.session['currentDesignationSelected'])
+        return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
+    # Redirect to home if not a POST request or some issue occurs
+    return HttpResponseRedirect(reverse('home'))
diff --git a/FusionIIIT/templates/dashboard/dashboard.html b/FusionIIIT/templates/dashboard/dashboard.html
index 658ec2e6e..62fa752bd 100644
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -1,140 +1,148 @@
 {% extends 'globals/base.html' %}
 {% load static %}
 
+
 {% block title %}
-    Dashboard
+Dashboard
 {% endblock %}
 
 {% block css %}
-    <link href="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.css"
-        rel="stylesheet" type="text/css" />
-
-    <style>
-        .dashboard-container {
-            margin: 0 3rem;
-            display: grid;
-            gap: 3rem;
-            grid-template-columns: 1fr;
-        }
-
-        .card-container {
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-        }
 
-        @media (min-width:800px) {
-            .dashboard-container {
-                grid-template-columns: 3fr 7fr;
-            }
-            .module-container {
-                grid-column: 1/-1;
-            }
-        }
+<link href="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.css"
+    rel="stylesheet" type="text/css" />
 
-        @media (min-width:1200px) {
-            .dashboard-container {
-                grid-template-columns: 3fr 7fr 3fr;
-            }
-            .module-container {
-                grid-column:auto;
-            }
-        }
-    </style>
 {% endblock %}
 
 {% block body %}
-    {% block navBar %}
-        {% include 'dashboard/navbar.html' %}
-    {% endblock %}
+{% block navBar %}
+{% include 'dashboard/navbar.html' %}
+{% endblock %}
 
 
-    {% comment %} The grid starts here! {% endcomment %}
-    <div class="dashboard-container">
+{% comment %}The grid starts here!{% endcomment %}
+<div class="ui stackable doubling grid" style="justify-content: space-around;">
+
+    {% comment %}The left-margin segment!{% endcomment %}
+    {% comment %} <div class="column"></div> {% endcomment %}
+
+    {% comment %}
+    The left-rail segment starts here!
+    {% endcomment %}
+    <div class="four wide column">
+
+        {% comment %}The user image card starts here!{% endcomment %}
+        {% block usercard %}
+        {% comment %} {% include 'globals/usercard.html' %} {% endcomment %}
+        {% endblock %}
+        {% comment %}The user image card ends here!{% endcomment %}
+
+        {% if 'staff' != request.user.extrainfo.user_type %}
+        {% comment %}The Tab-Menu starts here!{% endcomment %}
+        <div class="ui huge fluid vertical pointing menu" ">
+
+            <a class="item" href="{% url 'globals:profile' %}">
+                View Professional Profile 
+                <i class="right floated chevron right icon"></i>
+            </a>
+            {% if "dean_rspc" in designation %}
+            <a class="item" href = "../office/officeOfDeanRSPC">
+               Project Requests
+               <i class="right floated chevron right icon"></i>
+           </a>
+            {% endif %}
+       {% if "dean_rspc" in designation %}
+            <a class="item" href = "../eis/rspc_profile">
+               RSPC Profile
+               <i class="right floated chevron right icon"></i>
+           </a>
+       {% endif %}
 
-        {% comment %} The left-rail segment starts here! {% endcomment %}
-        <div class="card-container">
-            
-            {% comment %} The user image card starts here! {% endcomment %}
-            {% block usercard %}
-                {% include 'globals/usercard.html' %}
-            {% endblock %}
-            {% comment %}The user image card ends here!{% endcomment %}
-
-            <div class="ui divider"></div>
-
-            {% comment %}The Tab-Menu starts here!{% endcomment %}
-            <div class="ui huge fluid vertical pointing menu" style="max-width: 25rem;">
-                <a class="item disabled" href="{% url 'globals:profile' %}" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
-                    View Professional Profile
-                    <i class="right floated chevron right icon"></i>
-                </a>
-
-                {% if "dean_rspc" in designation %}
-                    <a class="item" href = "../office/officeOfDeanRSPC" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
-                        Project Requests
-                        <i class="right floated chevron right icon"></i>
-                    </a>
-                    <a class="item" href = "../eis/rspc_profile" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
-                        RSPC Profile
-                        <i class="right floated chevron right icon"></i>
-                    </a>
-                {% endif %}
-
-                {% if 'student' != request.user.extrainfo.user_type %}
-                    <a class="item disabled" href="/hr2/administrativeProfile" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
-                        View Administrative Profile
-                        <i class="right floated chevron right icon"></i>
-                    </a>
-                {% endif %}
-
-                {% if request.user.extrainfo.user_type == 'faculty' %}
-                    {% for desig in designat %}
-                        {% if 'hradmin' == desig.designation.name %}
-                            <a class="item" href="{% url 'hr2:hradmin' %}" style="display: flex; flex-wrap: nowrap; justify-content: space-between;">
-                                Hr-Admin
-                                <i class="right floated chevron right icon"></i>
-                            </a>
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
-            </div>
-            {% comment %}The Tab-Menu ends here!{% endcomment %}
+        </div>
+        {% comment %}The Tab-Menu ends here!{% endcomment %}
+        {% endif %}
+
+        {% if 'student' != request.user.extrainfo.user_type %}
+
+        {% comment %}The Tab-Menu starts here!{% endcomment %}
+        <div class="ui huge fluid vertical pointing menu" ">
+            <a class="item
+            " href="/hr2/administrativeProfile">
+                View Administrative Profile
+                <i class="right floated chevron right icon"></i>
+            </a>
+        </div>
+        {% comment %}The Tab-Menu ends here!{% endcomment %}
+
+        {% endif %}
+
+        {% comment %}The Tab-Menu starts here!{% endcomment %}
+
+        
+        {% if request.user.extrainfo.user_type == 'faculty' %}
+        {%for desig in designat%}
+        {% if 'hradmin' == desig.designation.name %}
+
+        <div class="ui huge fluid vertical pointing menu" ">
+
+            <a class="item" href="{% url 'hr2:hradmin' %}">
+                Hr-Admin
+                <i class="right floated chevron right icon"></i>
+            </a>
 
         </div>
-        {% comment %} The left-rail segment ends here! {% endcomment %}
-
-        {% comment %} The central-rail segment starts here! {% endcomment %}
-        <div class="menus-container">
-            <div class="ui top attached tabular large menu">
-                <a class="active item" data-tab="first">Notifications</a>
-                <a class="item" data-tab="second">News</a>
-                <a class="item" data-tab="third">Announcements</a>
-            </div>
+        {% endif %}
+        {%endfor %}
+        {% endif %}
+        {% comment %}The Tab-Menu ends here!{% endcomment %}
 
-            <div class="ui bottom attached active tab segment" data-tab="first">
-                <div id="textSegmentDiv">
-                    {% comment %}
-                    TODO: Loader required?
-                    <div class="ui active large text loader" id="loader">
-                        Loading ...
-                    </div>
-                    {% endcomment %}
 
-                    <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
-                        {% block alerts %}
-                            {% include 'dashboard/alerts.html' %}
-                        {% endblock %}
-                    </div>
+
+
+
+
+
+
+    </div>
+    {% comment %}
+    The left-rail segment ends here!
+    {% endcomment %}
+
+
+
+    {% comment %}
+    The central-rail segment starts here!
+    {% endcomment %}
+
+    <div class="eight wide column">
+        <div class="ui top attached tabular large menu">
+            <a class="active item" data-tab="first">Notifications</a>
+            <a class="item" data-tab="second">News</a>
+            <a class="item" data-tab="third">Announcements</a>
+        </div>
+        <div class="ui bottom attached active tab segment" data-tab="first">
+            <div id="textSegmentDiv">
+
+                {% comment %}
+                TODO: Loader required?
+                <div class="ui active large text loader" id="loader">
+                    Loading ...
+                </div>
+                {% endcomment %}
+
+                <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
+                    {% block alerts %}
+                    {% include 'dashboard/alerts.html' %}
+                    {% endblock %}
                 </div>
             </div>
-            
-            <div class="ui bottom attached tab segment" data-tab="second">
-                Work in Progress, coming soon!
-            </div>
-            
-            <div class="ui bottom attached tab segment" data-tab="third">
+
+        </div>
+        <div class="ui bottom attached tab segment" data-tab="second">
+            Work in Progress, coming soon!
+        </div>
+        <div class="ui bottom attached tab segment" data-tab="third">
                 <div id="textSegmentDiv">
+
                     <div id="textLoader" style="max-height: 75vh; overflow-y: auto; overflow-x: hidden;">
                         {% block alerts1 %}
                             {% include 'dashboard/alerts1.html' %}
@@ -142,51 +150,64 @@
                     </div>
                 </div>
             </div>
-        </div>
-        {% comment %} The central-rail segment ends here! {% endcomment %}
+    </div>
+
+    {% comment %}The central-rail segment ends here!{% endcomment %}
 
-        {% comment %} The right-rail segment starts here! {% endcomment %}
-        <div class="module-container">
+    {% comment %}The right-rail segment starts here!{% endcomment %}
+    <div class="three wide column">
+        <div class="row">
+            {% comment %}The Modules:{% endcomment %}
             {% block modules %}
-                {% include 'dashboard/modules.html' %}
+            {% include 'dashboard/modules.html' %}
             {% endblock %}
         </div>
-        {% comment %}The right-rail segment ends here!{% endcomment %}
+
     </div>
-    {% comment %}The grid ends here!{% endcomment %}
+    {% comment %}The right-rail segment ends here!{% endcomment %}
+
+    {% comment %}The right-margin segment!{% endcomment %}
+    {% comment %} <div class="column"></div> {% endcomment %}
+
+</div>
+{% comment %}The grid ends here!{% endcomment %}
+
+
+
 {% endblock %}
 
 {% block javascript %}
-    <script
-        src="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.js"></script>
-    <script>
-        //----------------------calender--------------------------------
-
-        $('#rangestart').calendar({
-            monthFirst: false,
-            type: 'date',
-            minDate: new Date(getToday().getFullYear(), getToday().getMonth(), getToday().getDate()),
-            formatter: {
-                date: function (date, settings) {
-                    if (!date) return '';
-                    var day = date.getDate();
-                    var month = date.getMonth() + 1;
-                    var year = date.getFullYear();
-                    return year + '-' + month + '-' + day;
-                }
+<script
+    src="https://cdn.rawgit.com/mdehoog/Semantic-UI/6e6d051d47b598ebab05857545f242caf2b4b48c/dist/semantic.min.js"></script>
+<script>
+    //----------------------calender--------------------------------
+
+    $('#rangestart').calendar({
+        monthFirst: false,
+        type: 'date',
+        minDate: new Date(getToday().getFullYear(), getToday().getMonth(), getToday().getDate()),
+        formatter: {
+            date: function (date, settings) {
+                if (!date) return '';
+                var day = date.getDate();
+                var month = date.getMonth() + 1;
+                var year = date.getFullYear();
+                return year + '-' + month + '-' + day;
             }
-        });
-
-        /*$(document).ready(function(){
-            $("#textLoader").toggle();
-            $("#replacement-card").toggle();
-            setTimeout(loader, 1750);
-        });
-        function loader() {
-            $("#textLoader").toggle();
-            $("#replacement-card").toggle();
-            $("#loader").removeClass("active");
-            $("#loader").addClass("disabled");
-        }*/
-    </script>
+        }
+    });
+
+    /*$(document).ready(function(){
+        $("#textLoader").toggle();
+        $("#replacement-card").toggle();
+        setTimeout(loader, 1750);
+    });
+    function loader() {
+        $("#textLoader").toggle();
+        $("#replacement-card").toggle();
+        $("#loader").removeClass("active");
+        $("#loader").addClass("disabled");
+    }*/
+</script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index e83995749..8c2ca9174 100644
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -1,217 +1,423 @@
 {% load static %}
 
-{% block css %}
-    <style>
-        .moduleAllContainer {
-            display: flex !important;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            padding: 1rem !important;
-        }
-
-        .moduleSpan {
-            margin: 0.25rem;
-            padding: 0.25rem;
-            width: 10rem;
-        }
-
-        .moduleSpan > a {
-            display: flex !important;
-            flex-direction: column;
-            align-items: center;
-            height: 9rem;
-            justify-content: space-evenly;
-        }
-
-        .tcenter {
-            text-align: center;
-        }
-    </style>
-{% endblock %}
-
-{% comment %} The Modules start here! {% endcomment %}
 {% block modules %}
-    <div class="ui fluid card moduleAllContainer">
-        <a class="ui top attached black label">
-            <span class="ui inverted header" style="padding-left: 2rem;">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" style="padding-top: 1.5rem; display: flex; flex-wrap: wrap; justify-content: center">
-            <span class="moduleSpan">
-                <a class="ui large label" href="/academic-procedures">
-                    <div>
-                        <i class="ui university icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Academics Module
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/programme_curriculum">
-                    <div>
-                        <i class="ui book icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Programme And Curriculum Module
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/mess">
-                    <div>
-                        <i class="ui food icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Central Mess
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="/visitorhostel">
-                    <div>
-                        <i class="ui hotel icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Visitor's Hostel
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/healthcenter">
-                    <div>
-                        <i class="ui first aid icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Healthcare Center
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="/filetracking">
-                    <div>
-                        <i class="ui wpforms icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        File Tracking
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/spacs">
-                    <div>
-                        <i class="ui student icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Scholarship Portal
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="/complaint">
-                    <div>
-                        <i class="ui line chart icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Complaint System
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/placement">
-                    <div>
-                        <i class="ui bitcoin icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Placement Cell
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="{% url 'estate_module_home' %}">
-                    <div>
-                        <i class="ui line industry icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Estate Management
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/dep">
-                    <div>
-                        <i class="ui student icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Department Portal
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="/research_procedures">
-                    <div>
-                        <i class="ui university icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Research Module
-                    </div>
-                </a>
-            </span>
-            
-            <span class="moduleSpan">
-                <a class="ui large label" href="/counselling">
-                    <div>
-                        <i class="ui edit outline icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Counselling Cell
-                    </div>
-                </a>
-            </span>
-
-            <span class="moduleSpan">
-                <a class="ui large label" href="/leave">
-                    <div>
-                        <i class="ui file icon big"></i>
-                    </div>
-
-                    <div class="ui small header tcenter">
-                        Leave Module
-                    </div>
-                </a>
-            </span>
-        </div>
-        {% comment %}
+{% 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 %}
+
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                    {% comment %}A single modules row starts here!{% endcomment %}
+                 
+                        {% if request.user.extrainfo.user_type != "staff" or "acadadmin" == global_var or "corelabcaretaker" == global_var %}
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" style="height: 120px; width:100%" href="/academic-procedures">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui university icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Academics</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                        {% if request.user.extrainfo.user_type == "student" 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="/programme_curriculum">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui book icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Programme And Curriculum </span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                    
+
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                    {% comment %}A single modules row starts here!{% endcomment %}
+                  
+                        {% if request.user.extrainfo.user_type == "student" or "mess_manager" == global_var  or "mess_warden" == 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="/mess">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui food icon big"></i>
+                                    </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>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Visitor's Hostel</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                  
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                    {% comment %}A single modules row starts here!{% endcomment %}
+                                       
+                        <div style="width: calc(50% - 10px);
+                        margin: 5px;
+                        box-sizing: border-box;">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/healthcenter">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui first aid icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Healthcare Center</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="/filetracking">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui wpforms icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">File Tracking</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                    {% comment %}A single modules row starts here!{% endcomment %}
+               
+                        {% if request.user.extrainfo.user_type == "student" or "spacsconvenor" == global_var  or "spacsassistant" == 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="/spacs">
+                                <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">Scholarship Portal</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="/complaint">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui line chart icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Complaint System</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                   
+                    {% comment %}A single modules row ends here!{% endcomment %}
+                  
+                        {% if request.user.extrainfo.user_type == "student" or "placement chairman" == global_var  or "placement officer" == 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="/placement">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui bitcoin icon big"></i>
+                                    </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>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Estate Management</span>
+                                    </div>
+                                </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>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Department Portal</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="/research_procedures">
+                                <div class="ui centered grid">
+                                    <div class="row">
+                                        <i class="ui university icon big"></i>
+                                    </div>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Research Module</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                   
+                    {% 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 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>
+
+                                    <div class="row">
+                                        <span class="ui sub header centered">Leave Module</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                         {% endif %}
+                 
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                          
+                        {% 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="/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">Purchase and Store</span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                        {% 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="/dashboard">
+                                    <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">Human Resource</span>
+                                        </div>
+                                    </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"  %}
+                            <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 file icon big"></i>
+                                        </div>
+
+                                        <div class="row">
+                                            <span class="ui sub header centered">Course Management</span>
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                        {% endif %}
+                
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                          
+                        {% if request.user.extrainfo.user_type == "student" or  "Dean_s" == global_varor or   "DeanPnD" == global_var or "dean_rspc" == global_var or "mess_warden" == global_var or "dean_s" == 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">Gymkhana </span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                        {% if "Executive Engineer (Civil)" == global_var or  "EE" == global_var or  "Admin IWD" == global_var or  "Electrical_AE" == global_var or  "Electrical_JE" == global_var or  "Civil_AE" == global_var or  "Civil_JE" == global_var or "Director" == global_var or  "Dean_s" == global_var or  "dean_s" == global_var or  "DeanPnD" == 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 file icon big"></i>
+                                        </div>
+
+                                        <div class="row">
+                                            <span class="ui sub header centered">IWD</span>
+                                        </div>
+                                    </div>
+                                </a>
+                            </div>
+                        {% endif %}
+                 
+                    {% comment %}A single modules row ends here!{% endcomment %}
+
+                                     
+                        {% if request.user.extrainfo.user_type == "student"  or  "hall1caretaker" == global_var  or "hall2caretaker" == global_var or "hall3caretaker" == 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">Hostel Management </span>
+                                    </div>
+                                </div>
+                            </a>
+                        </div>
+                        {% endif %}
+                   
+                    {% comment %}A single modules row ends here!{% endcomment %}
+                </div>
+            {% comment %}
             <a class="ui bottom attached blue label">
                 <i class="right arrow icon right floated"></i>
             </a>
-        {% endcomment %}
+            {% endcomment %}
+            </div>
+        </div>
     </div>
-{% endblock %}
-{% comment %}The Modules End here!{% endcomment %}
\ No newline at end of file
+</div>
+{% comment %}The Modules End here!{% endcomment %}
+{% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html
index 8aba787ba..f277b5046 100644
--- a/FusionIIIT/templates/dashboard/navbar.html
+++ b/FusionIIIT/templates/dashboard/navbar.html
@@ -1,94 +1,43 @@
 {% load static %}
 
-{% block css %}
-    <style>
-        .menu1 {
-            display: flex;
-        }
-
-        .user-logo {
-            margin-left: auto !important;
-            display: flex;
-            flex-wrap: nowrap;
-            flex-direction: row;
-        }
-
-        .sizer {
-            font-size: 1.35rem !important;
-        }
-
-        @media (max-width:1200px) {
-            .menu1 {
-                display: flex;
-                flex-wrap: wrap;
-            }
-            
-            .user-logo {
-                margin-left: 0 !important;
-            }
-
-            .sizer {
-                font-size: clamp(1.1rem, 1.5vw, 1.35rem) !important;
-            }
-        }
-
-        @media (max-width:1000px) {
-            .menu1 {
-                display: flex;
-                flex-direction: column;
-            }
-
-            .sizer {
-                font-size: clamp(1.1rem, 1.5vw, 1.35rem) !important;
-            }
-        }
-    </style>
-{% endblock %}
-
-{% block navBar %}
-    {% include 'dashboard/sidenavbar.html' %}
-
-    <div>
-        <div class="ui inverted menu sizer menu1" id="navbar">
-            <a class="item" id="sidebartrigger">
-                <i class="sidebar icon"></i>
-            </a>
-
-            <a class="item" href="{% url 'globals:dashboard' %}">
-                {% load notifications_tags %}
-                {% register_notify_callbacks badge_class='badge' callbacks='fill_notification_badge' %}
-                <i class="ui active inverted large home icon"></i>
-                Dashboard
-                <div class="ui red circular label">{% live_notify_badge badge_class='badge' %}</div>
-            </a>
-
-            <div class="item">
-                <a class="icon mail" href = '/feedback'>
-                <i class="comment icon"></i>Feedback</a>
-            </div>
+    {% block navBar %}
+        {% include 'dashboard/sidenavbar.html' %}
+
+        <div>
+            <div class="ui stackable massive inverted top attached menu" id="navbar">
+                <a class="item" id="sidebartrigger">
+                    <i class="sidebar icon"></i>
+                </a>
+
+
+                <a class="item" href="{% url 'globals:dashboard' %}">
+                    {% load notifications_tags %}
+                    {% register_notify_callbacks badge_class='badge' callbacks='fill_notification_badge' %}
+                    <i class="ui active inverted large home icon"></i>
+                    Dashboard
+                    <div class="ui red circular label">{% live_notify_badge badge_class='badge' %}</div>
+                </a>
             
-            <div class="item">
-                <form method="GET" action="{% url 'globals:search' %}">
-                    <div class="ui search">
-                        <div class="ui action input">
-                          <input type="text" name="q" placeholder="Search...">
-                          <button type="submit" class="ui button"><i class="search icon"></i></button>
+                <div class="right inverted menu">
+                    <form method="POST" action="/update_global_variable/">
+                        {% csrf_token %}
+                        <div class="item">
+
+                            <select class="ui dropdown"  name="dropdown" onchange="this.form.submit()">
+                            {% for d in global_var2 %}
+                                <option value="{{ d }}" {% if global_var == d %}selected{% endif %}>{{ d|capfirst }}</option>
+                            {% endfor %}
+                            </select>
                         </div>
-                        <div class="results"></div>
-                    </div>        
-                </form>
-            </div>
-
-            <div class="user-logo">
-                <a class="item" href="{% url 'globals:profile' %}">
+                    </form>
+                    <a class="item" href="{% url 'globals:profile' %}">
+                        {% comment %}
+                            TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF!
+                        {% endcomment %}
+                        <img class="ui avatar image" src="{% static 'globals/img/zlatan.jpg' %}">
+                        {{request.user.first_name}} {{request.user.last_name}}
+                    </a>
                     {% comment %}
-                        TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF!
-                    {% endcomment %}
-                    <img class="ui avatar image" src="{% static 'globals/img/zlatan.jpg' %}">
-                    {{request.user.first_name}} {{request.user.last_name}}
-                </a>
-                
-                {% comment %}
                     <a class="item ui pointed dropdown link" href="{% url 'globals:dashboard' %}" id="new-notification">
                         <div class="text">Notifications</div>
                         <i class="dropdown"></i>
@@ -98,75 +47,88 @@
                             <div class="item">Notification1</div>
                             <div class="item">Notification1</div>
                         </div>
+                        {% endcomment %}
                     </a>
-                {% endcomment %}
-                    
-                <div class="ui fluid popup bottom left transition">
-                    <div class="ui four column relaxed equal height stackable doubling grid">
-                        <div class="row">
-                            <h3 class="ui dividing header" style="margin: auto; margin-top: 8px;">Notifications</h3>
-                        </div>
-
-                        <div class="row">
-                            <div class="column">
-                                <div class="ui secondary vertical pointing compact menu">
-                                    <a class="active item" data-tab="leaveModule">
-                                        <span style="color: #000;">
-                                            Leave
-                                        </span>
-                                    </a>
-
-                                    <a class="item" data-tab="complaintModule">
-                                        <span style="color: #000;">
-                                            Complaint
-                                        </span>
-                                    </a>
-
-                                    <a class="item" data-tab="messModule">
-                                        <span style="color: #000;">
-                                            Mess
-                                        </span>
-                                    </a>
-
-                                    <a class="item" data-tab="placementModule">
-                                        <span style="color: #000;">
-                                            Placement
-                                        </span>
-                                    </a>
-                                </div>
+                        
+                    <div class="ui fluid popup bottom left transition">
+                        <div class="ui four column relaxed equal height stackable doubling grid">
+                            <div class="row">
+                                <h3 class="ui dividing header" style="margin: auto; margin-top: 8px;">Notifications</h3>
                             </div>
 
-                            <div class="three wide column">
-                                <div class="ui active tab" data-tab="leaveModule">
-                                    <div class="ui animated fluid list"
-                                         id="new-message-list" style="min-width: 20vw; max-height: 28.5vh; overflow-y: auto;">
+                            <div class="row">
+                                <div class="column">
+                                    <div class="ui secondary vertical pointing compact menu">
+                                        <a class="active item" data-tab="leaveModule">
+                                            <span style="color: #000;">
+                                                Leave
+                                            </span>
+                                        </a>
+
+                                        <a class="item" data-tab="complaintModule">
+                                            <span style="color: #000;">
+                                                Complaint
+                                            </span>
+                                        </a>
+
+                                        <a class="item" data-tab="messModule">
+                                            <span style="color: #000;">
+                                                Mess
+                                            </span>
+                                        </a>
+
+                                        <a class="item" data-tab="placementModule">
+                                            <span style="color: #000;">
+                                                Placement
+                                            </span>
+                                        </a>
                                     </div>
                                 </div>
 
-                                <div class="ui tab"  data-tab="complaintModule">
-                                </div>
+                                <div class="three wide column">
+                                    <div class="ui active tab" data-tab="leaveModule">
+                                        <div class="ui animated fluid list"
+                                            id="new-message-list" style="min-width: 20vw; max-height: 28.5vh; overflow-y: auto;">
+                                        </div>
+                                    </div>
 
-                                <div class="ui tab"  data-tab="messModule">
-                                </div>
+                                    <div class="ui tab"  data-tab="complaintModule">
+                                    </div>
+
+                                    <div class="ui tab"  data-tab="messModule">
+                                    </div>
 
-                                <div class="ui tab"  data-tab="placementModule">
+                                    <div class="ui tab"  data-tab="placementModule">
+                                    </div>
                                 </div>
                             </div>
                         </div>
+
                     </div>
-                </div>
 
-                <a class="right item" href="/accounts/logout">
-                    {% comment %}
-                        TODO: LOGOUT!
-                    {% endcomment %}
-                    <i class="ui inverted sign out icon"></i>
-                    Logout
-                </a>
+                    <a class="right item" href="/accounts/logout">
+                        {% comment %}
+                            TODO: LOGOUT!
+                        {% endcomment %}
+                        <i class="ui inverted sign out icon"></i>
+                        Logout
+                    </a>
+
+                </div>
             </div>
+
+            <div class="ui divider"></div>
+
+
+
+
+            {% block data%}
+
+            {% endblock %}
+
+
+
         </div>
 
-        <div class="ui divider"></div>
-        {% block data %} {% endblock %}
-    </div>
-{% endblock %}
+
+    {% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/sidenavbar.html b/FusionIIIT/templates/dashboard/sidenavbar.html
index 8febe7cdf..19ee052c1 100644
--- a/FusionIIIT/templates/dashboard/sidenavbar.html
+++ b/FusionIIIT/templates/dashboard/sidenavbar.html
@@ -18,7 +18,7 @@
                         TODO: User Details!
                     {% endcomment %}
 		    <h2 class="ui inverted header">{{request.user.first_name}} {{request.user.last_name}}</h2>
-		    <span class="ui inverted meta">{{request.user.extrainfo.user_type}}</span>
+		    <span class="ui inverted meta">{{global_var}}</span>
                 </div>
 
             </div>
@@ -128,77 +128,77 @@ <h4> File Tracking </h4>
             {% comment %}The Modules Accordian ends here!{% endcomment %}
 
             {% comment %}The Profile Item starts here!{% endcomment %}
-            <a class="centered raised item" href="/dashboard">
+            {% comment %} <a class="centered raised item" href="/dashboard">
                 <span class="inverted header">Profile</span>
                 <i class="large inverted user icon right floated"></i>
-            </a>
+            </a> {% endcomment %}
             {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanStudents'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanStudents'%}">
     <span class="inverted header">Office Of Dean Students</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
-{% if "Dean (RSPC)" in desig %}
+{% comment %} {% if "Dean (RSPC)" in desig %} {% endcomment %}
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanRSPC'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanRSPC'%}">
     <span class="inverted header">Office Of Dean RSPC</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 
-{% endif %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanAcademics'%}">
+{% comment %} {% endif %} {% endcomment %}
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanAcademics'%}">
     <span class="inverted header">Office Of Dean Academics</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
 
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:directorOffice'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:directorOffice'%}">
     <span class="inverted header">Director Office</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
 
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfPurchaseOfficer'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfPurchaseOfficer'%}">
     <span class="inverted header">Office Of Purchase Officer</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
 
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfRegistrar'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfRegistrar'%}">
     <span class="inverted header">Office Of Registrar</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
 
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanPnD'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfDeanPnD'%}">
     <span class="inverted header">Office Of P & D</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
 {% comment %}The email Item ends here!{% endcomment %}
 
 
 {% comment %}The Profile Item starts here!{% endcomment %}
-<a class="centered raised item disabled" href="{% url 'office_module:officeOfHOD'%}">
+{% comment %} <a class="centered raised item disabled" href="{% url 'office_module:officeOfHOD'%}">
     <span class="inverted header">Office Of HOD {Branch}</span>
     <i class="large inverted briefcase icon right floated"></i>
 </a>
 <a class="centered raised item disabled" href="/finance/finance">
     <span class="inverted header">Finance and Accounts</span>
     <i class="large inverted briefcase icon right floated"></i>
-</a>
+</a> {% endcomment %}
             {% comment %}The email Item ends here!{% endcomment %}
 
 
 
             {% comment %}The Activity Log Item starts here!{% endcomment %}
-            <a class="centered raised item disabled" href='/about'%}>
+            {% comment %} <a class="centered raised item disabled" href='/about'%}>
                 <span class="inverted header">Meet our team!</span>
                   <i class="briefcase icon right floated"></i>
-            </a>
+            </a> {% endcomment %}
             {% comment %}The Activity Log Item ends here!{% endcomment %}
 
             {% comment %}The Logout Item starts here!{% endcomment %}
diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
index 8d1e54ef9..2fc061d7f 100644
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -62,18 +62,12 @@
                     {{ user.extrainfo.student.curr_semester_no }}
                 </span>
             {% endif %}
-            <div class="ui large header">
-                {% for i in Curr_desig %}
-                    {% comment %} Should this be inside if else? {% endcomment %}
-                    <span class="meta" style="text-transform: uppercase;">
-                        {% if i == "co-ordinator" or i == "co co-ordinator" %}
-                            {{ i }} of {{ club_details }} club
-                        {% else %}
-                            {{ i }}
-                        {% endif %}
-                    </span>
-                    <br>
-                {% endfor %}
+            <br/>
+            <div class="meta">
+               
+                <span> 
+                    {{global_var|capfirst}}
+                </span>
             </div>
         </div>
     </div>

From ed642ee707d3b900b136189036ac384086074d8e Mon Sep 17 00:00:00 2001
From: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com>
Date: Tue, 12 Mar 2024 16:38:25 +0530
Subject: [PATCH 4/6] dashboard and usercard updated (#1329)

---
 FusionIIIT/templates/dashboard/dashboard.html | 23 ++++++++++---------
 FusionIIIT/templates/globals/usercard.html    |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/FusionIIIT/templates/dashboard/dashboard.html b/FusionIIIT/templates/dashboard/dashboard.html
index 62fa752bd..172465aca 100644
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -20,25 +20,26 @@
 
 
 {% comment %}The grid starts here!{% endcomment %}
-<div class="ui stackable doubling grid" style="justify-content: space-around;">
+<div class="ui stackable doubling grid">
 
     {% comment %}The left-margin segment!{% endcomment %}
-    {% comment %} <div class="column"></div> {% endcomment %}
+    <div class="column"></div>
 
     {% comment %}
     The left-rail segment starts here!
     {% endcomment %}
-    <div class="four wide column">
+    <div class="three wide column">
 
         {% comment %}The user image card starts here!{% endcomment %}
         {% block usercard %}
-        {% comment %} {% include 'globals/usercard.html' %} {% endcomment %}
+        {% include 'globals/usercard.html' %}
         {% endblock %}
         {% comment %}The user image card ends here!{% endcomment %}
 
-        {% if 'staff' != request.user.extrainfo.user_type %}
+        <div class="ui divider"></div>
+
         {% comment %}The Tab-Menu starts here!{% endcomment %}
-        <div class="ui huge fluid vertical pointing menu" ">
+        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
 
             <a class="item" href="{% url 'globals:profile' %}">
                 View Professional Profile 
@@ -59,12 +60,12 @@
 
         </div>
         {% comment %}The Tab-Menu ends here!{% endcomment %}
-        {% endif %}
 
-        {% if 'student' != request.user.extrainfo.user_type %}
+
+        {% if 'student' == request.user.extrainfo.user_type %}
 
         {% comment %}The Tab-Menu starts here!{% endcomment %}
-        <div class="ui huge fluid vertical pointing menu" ">
+        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
             <a class="item
             " href="/hr2/administrativeProfile">
                 View Administrative Profile
@@ -82,7 +83,7 @@
         {%for desig in designat%}
         {% if 'hradmin' == desig.designation.name %}
 
-        <div class="ui huge fluid vertical pointing menu" ">
+        <div class="ui huge fluid vertical pointing menu" style="max-width: 320px;">
 
             <a class="item" href="{% url 'hr2:hradmin' %}">
                 Hr-Admin
@@ -167,7 +168,7 @@
     {% comment %}The right-rail segment ends here!{% endcomment %}
 
     {% comment %}The right-margin segment!{% endcomment %}
-    {% comment %} <div class="column"></div> {% endcomment %}
+    <div class="column"></div>
 
 </div>
 {% comment %}The grid ends here!{% endcomment %}
diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
index 2fc061d7f..e1cceb817 100644
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -16,7 +16,7 @@
                 TODO: Add a If-Else here!
             {% endcomment %}
             {% if user %}
-                <div style="display:flex;flex-wrap:wrap;justify-content:space-between;" class="ui large header">
+                <div style="display:flex;justify-content:space-between;" class="ui large header">
                     <div style="padding: 0.25rem;">
                         {{ user.first_name }}
                         {{ user.last_name }}
@@ -72,4 +72,4 @@
         </div>
     </div>
     {% comment %} The Employee Image Card ends here! {% endcomment %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file

From d40e94d1f9f8ab0120677eb9c871328fd2fd4bf4 Mon Sep 17 00:00:00 2001
From: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
Date: Mon, 18 Mar 2024 00:25:14 +0530
Subject: [PATCH 5/6] Fixing ui bugs (#1335)

---
 FusionIIIT/templates/globals/usercard.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
index e1cceb817..a910fa4c3 100644
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -16,13 +16,13 @@
                 TODO: Add a If-Else here!
             {% endcomment %}
             {% if user %}
-                <div style="display:flex;justify-content:space-between;" class="ui large header">
-                    <div style="padding: 0.25rem;">
+                <div style="display:flex;justify-content:space-between;flex-direction: column;" class="ui large header">
+                    <div style="padding: 0.25rem; word-wrap: break-word;">
                         {{ user.first_name }}
                         {{ user.last_name }}
                     </div>
                 
-                    <div class="meta" style="padding: 0.25rem;">
+                    <div class="meta" style="padding: 0.25rem;word-wrap: break-word;">
                         {{ user.extrainfo.department.name }}
                     </div>
                 </div>

From 69d33576450d1bb2021b949ec8c4e457ea3175ac Mon Sep 17 00:00:00 2001
From: ANKIT <kumarankit0327@gmail.com>
Date: Mon, 18 Mar 2024 19:25:14 +0530
Subject: [PATCH 6/6] Synced with new Dashboard

Some changes made to dashboard module in terms of UI and context updated.
---
 FusionIIIT/applications/globals/views.py          | 15 +++++++++++++++
 .../applications/hostel_management/views.py       |  9 ++++-----
 FusionIIIT/templates/dashboard/modules.html       |  5 +++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py
index 5b023abb5..91bba456f 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -28,6 +28,7 @@
 from Fusion.settings.common import LOGIN_URL
 from notifications.models import Notification
 from .models import *
+from applications.hostel_management.models import (HallCaretaker,HallWarden)
 
 def index(request):
     context = {}
@@ -732,11 +733,25 @@ def dashboard(request):
     for i in b :
         name_ = get_object_or_404(Designation, id = i)
         roll_.append(str(name_.name))
+
+    hall_caretakers = HallCaretaker.objects.all().select_related()
+    hall_wardens = HallWarden.objects.all().select_related()
+
+    hall_caretaker_user = []
+    for caretaker in hall_caretakers:
+        hall_caretaker_user.append(caretaker.staff.id.user)
+
+    hall_warden_user = []
+    for warden in hall_wardens:
+        hall_warden_user.append(warden.faculty.id.user)
+
     context={
         'notifications':notifs,
         'Curr_desig' : roll_,
         'club_details' : coordinator_club(request),
         'designation' : designation,
+        'hall_caretaker': hall_caretaker_user,
+        'hall_warden': hall_warden_user,
         
     }
     # a=HoldsDesignation.objects.select_related('user','working','designation').filter(designation = user)
diff --git a/FusionIIIT/applications/hostel_management/views.py b/FusionIIIT/applications/hostel_management/views.py
index 26c15680d..cd41f964d 100644
--- a/FusionIIIT/applications/hostel_management/views.py
+++ b/FusionIIIT/applications/hostel_management/views.py
@@ -356,8 +356,7 @@ def hostel_view(request, context={}):
     }
 
     return render(request, 'hostelmanagement/hostel.html', context)
-
-
+    
 def staff_edit_schedule(request):
     """
     This function is responsible for creating a new or updating an existing staff schedule.
@@ -649,7 +648,7 @@ def get(self, request, *args, **kwargs):
         hall_caretakers = HallCaretaker.objects.all()
         get_hall = ""
         get_hall = get_caretaker_hall(hall_caretakers, request.user)
-        print(get_hall)
+        
         if months < current_month:
             worker_report = WorkerReport.objects.filter(
                 hall=get_hall, month__gte=current_month-months, year=current_year)
@@ -699,7 +698,7 @@ def all_leave_data(request):
 
 @login_required
 def create_hostel_leave(request):
-    print(request.user.username)
+    
     if request.method == 'GET':
         return render(request, 'hostelmanagement/create_leave.html')
     elif request.method == 'POST':
@@ -878,7 +877,7 @@ def post(self, request, *args, **kwargs):
 
             # Retrieve the previous caretaker for the hall, if any
             prev_hall_caretaker = HallCaretaker.objects.filter(hall=hall).first()
-            print('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
+            
             # print(prev_hall_caretaker.staff.id)
             # Delete any previous assignments of the caretaker in HallCaretaker table
             HallCaretaker.objects.filter(staff=caretaker_staff).delete()
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index 8c2ca9174..7462d2fcd 100644
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -390,11 +390,12 @@
                     {% comment %}A single modules row ends here!{% endcomment %}
 
                                      
-                        {% if request.user.extrainfo.user_type == "student"  or  "hall1caretaker" == global_var  or "hall2caretaker" == global_var or "hall3caretaker" == global_var%}
+                       {% if request.user.extrainfo.user_type == "student"  or user in hall_caretaker or user in hall_warden %}
+                        
                         <div style="width: calc(50% - 10px);
                         margin: 5px;
                         box-sizing: border-box;">
-                            <a class="ui large label" style="height: 120px; width:100%" href="/dashboard">
+                            <a class="ui large label" style="height: 120px; width:100%" href="/hostelmanagement">
                                 <div class="ui centered grid">   
                                     <div class="row">
                                         <i class="ui edit outline icon big"></i>