From 07750f7f5d81f45547a4502aca07fb1ef5be6ac5 Mon Sep 17 00:00:00 2001
From: gaur-abhi524 <82049206+gaur-abhi524@users.noreply.github.com>
Date: Fri, 10 Feb 2023 23:50:21 +0530
Subject: [PATCH 01/17] =?UTF-8?q?Fix=20problem=20regarding=20fetching=20ba?=
 =?UTF-8?q?tch=20for=20students=20enrolled=20in=20batch=202=E2=80=A6=20(#1?=
 =?UTF-8?q?030)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FusionIIIT/applications/scholarships/helpers.py | 14 ++++++++++++++
 FusionIIIT/applications/scholarships/views.py   | 10 ++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 FusionIIIT/applications/scholarships/helpers.py

diff --git a/FusionIIIT/applications/scholarships/helpers.py b/FusionIIIT/applications/scholarships/helpers.py
new file mode 100644
index 000000000..489f340a4
--- /dev/null
+++ b/FusionIIIT/applications/scholarships/helpers.py
@@ -0,0 +1,14 @@
+import subprocess
+from datetime import datetime
+
+from django.conf import settings
+
+
+def getBatch(roll):
+    batch = "20"
+    if(str(roll)[2].isdigit()):
+        return str(roll)[0:4]
+        
+    else:
+        batch+=str(roll)[0:2]
+    return batch
\ No newline at end of file
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 5f547149f..ba5d4bec5 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -23,6 +23,7 @@
 from .validations import MCM_list, MCM_schema, gold_list, gold_schema, silver_list, silver_schema, proficiency_list,proficiency_schema
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
+from .helpers import getBatch
 # Create your views here.
 
 
@@ -1039,24 +1040,25 @@ def sendStudentRenderRequest(request, additionalParams={}):
     update_con_flag = False
     x_notif_mcm_flag = False
     x_notif_con_flag = False
+    student_batch = getBatch(request.user.extrainfo.student)
     for dates in release:
         if checkDate(dates.startdate, dates.enddate):
-            if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == str(request.user.extrainfo.student)[0:4] and dates.programme == request.user.extrainfo.student.programme:
+            if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == student_batch and dates.programme == request.user.extrainfo.student.programme:
                 x_notif_mcm_flag = True
                 if no_of_mcm_filled > 0:
                     update_mcm_flag = True
-            elif dates.award == 'Convocation Medals' and dates.batch == str(request.user.extrainfo.student)[0:4] and dates.programme == request.user.extrainfo.student.programme:
+            elif dates.award == 'Convocation Medals' and dates.batch == student_batch and dates.programme == request.user.extrainfo.student.programme:
                 x_notif_con_flag = True
                 if no_of_con_filled > 0:
                     update_con_flag = True
         else:
-            if dates.award == "Merit-cum-Means Scholarship" and dates.batch == str(request.user.extrainfo.student)[0:4]:
+            if dates.award == "Merit-cum-Means Scholarship" and dates.batch == student_batch:
                 try:
                     x = Notification.objects.select_related('student_id','release_id').get(
                         student_id=request.user.extrainfo.id, release_id=dates.id).delete()
                 except:
                     pass
-            elif dates.award == 'Convocation Medals' and dates.batch == str(request.user.extrainfo.student)[0:4]:
+            elif dates.award == 'Convocation Medals' and dates.batch == student_batch:
                 try:
                     x = Notification.objects.select_related('student_id','release_id').get(
                         student_id=request.user.extrainfo.id, release_id=dates.id).delete()

From 91e248c3dba56d2a8db04cdaf5f774d202803e73 Mon Sep 17 00:00:00 2001
From: gaur-abhi524 <82049206+gaur-abhi524@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:52:01 +0530
Subject: [PATCH 02/17] Fix form render for students of 2020 batch and later
 (#1103)

---
 FusionIIIT/applications/scholarships/views.py | 9 +++------
 FusionIIIT/templates/dashboard/modules.html   | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index ba5d4bec5..ef9c33c87 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -99,13 +99,11 @@ def convener_view(request):
             )
             
             # It updates the student Notification table on the spacs head sending the mcm invitation
-            if batch == 'all':
+            if batch.lower() == 'all':
                 active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1)
-                query = reduce(or_, (Q(id__id__startswith=batch) for batch in active_batches))
-                recipient = Student.objects.filter(programme=programme).filter(query)
+                recipient = Student.objects.filter(programme=programme).filter(batch__in=active_batches)
             else:
-                recipient = Student.objects.filter(programme=programme, id__id__startswith=batch)
-            
+                recipient = Student.objects.filter(programme=programme, batch=batch)
             # Notification starts
             convenor = request.user
             for student in recipient:
@@ -1013,7 +1011,6 @@ def sendConvenerRenderRequest(request, additionalParams={}):
     source = Constants.FATHER_OCC_CHOICE
     time = Constants.TIME
     release = Release.objects.all()
-    notification = Notification.objects.select_related('student_id','release_id').all()
     spi = Spi.objects.all()
     context.update({ 'source': source, 'time': time, 'ch': ch, 'spi': spi, 'release': release})
     context.update(additionalParams)
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index 73fc33d85..3a33bda1b 100755
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -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>

From bcd84d36b0b36c9d70c77039bab85ee9867ce930 Mon Sep 17 00:00:00 2001
From: sudheer dagar <sandstormarriving101@gmail.com>
Date: Tue, 20 Feb 2024 13:20:34 +0530
Subject: [PATCH 03/17] debugging and refactoring

---
 .../migrations/0002_auto_20231116_2323.py     | 18 +++++
 FusionIIIT/applications/scholarships/urls.py  |  1 +
 FusionIIIT/applications/scholarships/views.py | 65 +++++++++++++++++--
 FusionIIIT/notification/views.py              |  2 +
 FusionIIIT/templates/dashboard/modules.html   |  2 +-
 .../scholarshipsModule/applyNew.html          |  6 +-
 .../templates/scholarshipsModule/invite.html  | 35 +++++++++-
 7 files changed, 119 insertions(+), 10 deletions(-)
 create mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py

diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
new file mode 100644
index 000000000..51f5a76b5
--- /dev/null
+++ b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2023-11-16 23:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
+        ),
+    ]
diff --git a/FusionIIIT/applications/scholarships/urls.py b/FusionIIIT/applications/scholarships/urls.py
index fd5a3516f..77a292977 100755
--- a/FusionIIIT/applications/scholarships/urls.py
+++ b/FusionIIIT/applications/scholarships/urls.py
@@ -17,5 +17,6 @@
     url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
     url(r'^getContent/$', views.getContent, name='getContent'),
     url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
+    url(r'^deleteRelease/$', views.deleteRelease, name='deleteRelease'),
 
 ]
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 5f547149f..4369e68f2 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -3,6 +3,7 @@
 from operator import or_
 from functools import reduce
 
+from django.http import JsonResponse
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
@@ -70,6 +71,8 @@ def spacs(request):
 
 @login_required(login_url='/accounts/login')
 def convener_view(request):
+    print(request)
+    
     try:
         convener = Designation.objects.get(name='spacsconvenor')
         hd = HoldsDesignation.objects.get(
@@ -77,8 +80,11 @@ def convener_view(request):
     except:
         return HttpResponseRedirect('/logout')
     if request.method == 'POST':
+        print("this is a check for post request")
         if 'Submit' in request.POST:
+            print("this is a check for post xfhjgisdfkhlsjk request")
             award = request.POST.get('type')
+            print("award " + award)
             programme = request.POST.get('programme')
             batch = request.POST.get('batch')
             from_date = request.POST.get('From')
@@ -98,14 +104,26 @@ def convener_view(request):
             )
             
             # It updates the student Notification table on the spacs head sending the mcm invitation
-            if batch == 'all':
+            if batch == 'All':
                 active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1)
-                query = reduce(or_, (Q(id__id__startswith=batch) for batch in active_batches))
+                # active_batches=str(active_batches)
+                # active_batches.split(',')
+                querybatch = []
+                for batch in active_batches:
+                    if batch > 2019:
+                        batch=batch%2000
+                        querybatch.append(batch)
+                print( active_batches)
+                query = reduce(or_, (Q(id__id__startswith=batch) for batch in querybatch))
+                print(query)
                 recipient = Student.objects.filter(programme=programme).filter(query)
             else:
+                if(batch>2019):
+                    batch=batch%2000
                 recipient = Student.objects.filter(programme=programme, id__id__startswith=batch)
             
             # Notification starts
+            print(recipient)
             convenor = request.user
             for student in recipient:
                 scholarship_portal_notif(convenor, student.id.user, 'award_' + award)  # Notification
@@ -126,7 +144,7 @@ def convener_view(request):
             # Notification ends
             
             messages.success(request, 
-                    award + ' applications are invited successfully for ' + batch + ' batch(es)')
+                    award + ' applications are invited successfully for ' + str(batch) + ' batch(es)')
             return HttpResponseRedirect('/spacs/convener_view')
 
         elif 'Email' in request.POST:
@@ -257,6 +275,7 @@ def convener_view(request):
 
 @login_required(login_url='/accounts/login')
 def student_view(request):
+
     if request.method == 'POST':
         if 'Submit_MCM' in request.POST:
             return submitMCM(request)
@@ -481,6 +500,18 @@ def updateEndDate(request):
         context['result'] = 'Failure'
     return HttpResponse(json.dumps(context), content_type='updateEndDate/json')
 
+def deleteRelease(request):
+    print("deleteRelease")
+    id = request.GET.get('id')
+    is_deleted = Release.objects.filter(pk=id).delete()
+    request.session['last_clicked'] = "Release_deleted"
+    context = {}
+    if is_deleted:
+        context['result'] = 'Success'
+    else:
+        context['result'] = 'Failure'
+    return HttpResponse(json.dumps(context), content_type='deleteRelease/json')
+
 def getAwardId(request):
     award = request.POST.get('award')
     a = Award_and_scholarship.objects.get(award_name=award).id
@@ -1020,6 +1051,7 @@ def sendConvenerRenderRequest(request, additionalParams={}):
 
 def sendStudentRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
+
     ch = Constants.BATCH
     time = Constants.TIME
     mother_occ = Constants.MOTHER_OCC_CHOICES
@@ -1041,7 +1073,30 @@ def sendStudentRenderRequest(request, additionalParams={}):
     x_notif_con_flag = False
     for dates in release:
         if checkDate(dates.startdate, dates.enddate):
-            if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == str(request.user.extrainfo.student)[0:4] and dates.programme == request.user.extrainfo.student.programme:
+            curBatch = dates.batch
+            checkBatch = str(request.user.extrainfo.student)[0:4]
+            batchCondition = False
+            if checkBatch[2:4] == "BC":
+                if(curBatch == 'All'):
+                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
+                    for batches in batchRange :
+                        if int(checkBatch[0:2]) == batches % 2000:
+                            batchCondition = True
+                elif curBatch == checkBatch:
+                    batchCondition = True
+            else:
+                if(curBatch == 'All'):
+                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
+                    for batch in batchRange:
+                        if str(checkBatch) == batch:
+                            batchCondition = True
+                elif curBatch == checkBatch:
+                    True
+                print("bye")
+            
+            
+            print(curBatch, checkBatch)
+            if dates.award == 'Merit-cum-Means Scholarship' and batchCondition and dates.programme == request.user.extrainfo.student.programme:
                 x_notif_mcm_flag = True
                 if no_of_mcm_filled > 0:
                     update_mcm_flag = True
@@ -1081,7 +1136,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_student.html',context)
 
-def sendStaffRenderRequest(request, additionalParams={}):
+def sendStaffRenderRequest(request, additionalParams={}):    
     context = getCommonParams(request)
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_staff.html', context)
diff --git a/FusionIIIT/notification/views.py b/FusionIIIT/notification/views.py
index 0480575b8..4d55c2b9b 100644
--- a/FusionIIIT/notification/views.py
+++ b/FusionIIIT/notification/views.py
@@ -148,6 +148,8 @@ def scholarship_portal_notif(sender, recipient, type):
 
     if type.startswith('award'):
         s = type.split('_')
+        # print("psss")
+        # print(type, s)
         verb = "Invitation to apply for " + s[1]
     elif type == 'Accept_MCM':
         verb = "Your Mcm form has been accepted "
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
index 73fc33d85..ca37247d7 100755
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -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>
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index 652e3bb6f..adada746e 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -33,7 +33,7 @@
             <a class="right floated item" style="padding-left:50px" href="https://drive.google.com/open?id=1Ylcj_ZX_h-0TTZ_zOGVF1JLEJE1_YQGD" target="_blank">
                 <button class="ui primary button">
                     Form A
-                    <i class="right floated download icon"></i>
+                    <i class="right floated download icon"></i> 
                 </button>
             </a>
             <a class="right floated item" href="https://drive.google.com/open?id=1AfSw3S5xXgbDn81hg6f2qgQiT_digXT9" target="_blank">
@@ -318,7 +318,7 @@
                 </div>
               {% endif %}
             {% else %}
-            <div class="ui disabled button">
+            <div class="ui  button">
               Applications not invited or has already been submitted
             </div>
             {% endif %}
@@ -368,7 +368,7 @@
                  </div>
                {% endif %}
                {% else %}
-               <div class="ui disabled button">
+               <div class="ui  button">
                  Apply
                </div>
                {% endif %}
diff --git a/FusionIIIT/templates/scholarshipsModule/invite.html b/FusionIIIT/templates/scholarshipsModule/invite.html
index a57a21f04..d5f6f10bb 100755
--- a/FusionIIIT/templates/scholarshipsModule/invite.html
+++ b/FusionIIIT/templates/scholarshipsModule/invite.html
@@ -210,6 +210,7 @@
                       <td>{{ i.date_time }}</td>
                       <td>{{ i.programme}} - {{ i.batch }}</td>
                       <td> <button class="ui primary button" id = 'update_release_btn' value='{{ i.id}}'>Update</button> </td>
+                      <td> <button class="ui primary button" id = 'delete_release_btn' value='{{ i.id}}'>Delete</button> </td>
                   </tr>
                       {% endfor %}
               </tbody>
@@ -227,6 +228,17 @@
         <div class="ui cancel button">Cancel</div>
       </div>
     </div>
+    <div class="ui modal1">
+        <div class="header">Delete Of Application </div>
+        <div class="content">
+          <button type='date' name = 'updated_enddate' id= "enddate_up" required>
+          <input type="hidden" name="delete_release_id" id= "delete_release_id" value="">
+        </div>
+        <div class="actions">
+          <div class="ui approve button" id = "update_enddate_modal_btn">Update</div>
+          <div class="ui cancel button">Cancel</div>
+        </div>
+      </div>
   </div>
 
 <script>
@@ -237,7 +249,28 @@
           $('.ui.modal')
             .modal('show');
       });
-  $(document).on('click','#update_enddate_modal_btn',function (event) {
+  $(document).on('click','#delete_release_btn',function (event) {
+          event.preventDefault();
+          var x = $(this).val();
+            $.ajax({
+                url: '/spacs/deleteRelease/',
+                type: 'DELETE',
+                data:{
+                    id:x,
+                    },
+                success: function (response) {
+                    if(response.result==='Success'){
+                        location.reload();
+                        console.log(response.result)
+                    }
+                    else{
+                        console.log(response.result);
+                    }
+    
+                }
+            });
+      });
+      $(document).on('click','#update_enddate_modal_btn',function (event) {
           event.preventDefault();
           var x = $('#update_release_id').val();
           var y = $('#enddate_up').val();

From 037f6bc606d39badbf539c5fcb5d77345b8bce5e Mon Sep 17 00:00:00 2001
From: Nitya Tiwari <nityasdl002@gmail.com>
Date: Tue, 20 Feb 2024 14:08:59 +0530
Subject: [PATCH 04/17] resolved invitation notifications error

---
 FusionIIIT/applications/scholarships/views.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 4369e68f2..5135e938f 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -108,11 +108,12 @@ def convener_view(request):
                 active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1)
                 # active_batches=str(active_batches)
                 # active_batches.split(',')
+                print(active_batches)
                 querybatch = []
-                for batch in active_batches:
-                    if batch > 2019:
-                        batch=batch%2000
-                        querybatch.append(batch)
+                for curbatch in active_batches:
+                    if curbatch > 2019:
+                        curbatch=curbatch%2000
+                        querybatch.append(curbatch)
                 print( active_batches)
                 query = reduce(or_, (Q(id__id__startswith=batch) for batch in querybatch))
                 print(query)
@@ -142,7 +143,7 @@ def convener_view(request):
                     notification_convocation_flag=True,
                     invite_convocation_accept_flag=False) for student in recipient])
             # Notification ends
-            
+            print(batch)
             messages.success(request, 
                     award + ' applications are invited successfully for ' + str(batch) + ' batch(es)')
             return HttpResponseRedirect('/spacs/convener_view')

From 6f24ede8c2eec604c54fd42f00e8d46c935b386f Mon Sep 17 00:00:00 2001
From: Nitya Tiwari <nityasdl002@gmail.com>
Date: Tue, 20 Feb 2024 14:59:44 +0530
Subject: [PATCH 05/17] added apply convocation functionality

---
 FusionIIIT/applications/scholarships/views.py         | 8 ++++----
 FusionIIIT/templates/scholarshipsModule/applyNew.html | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 5135e938f..40c8ab42f 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -119,9 +119,9 @@ def convener_view(request):
                 print(query)
                 recipient = Student.objects.filter(programme=programme).filter(query)
             else:
-                if(batch>2019):
-                    batch=batch%2000
-                recipient = Student.objects.filter(programme=programme, id__id__startswith=batch)
+                if(int(batch)>2019):
+                    curbatch=int(batch)%2000
+                recipient = Student.objects.filter(programme=programme, id__id__startswith=curbatch)
             
             # Notification starts
             print(recipient)
@@ -451,7 +451,7 @@ def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     # return HttpResponseRedirect('/spacs/student_view')
 
 def getConvocationFlag(request):  # Here we are extracting convocation_flag
-    x = Notification.objects.filter(student_id=request.user.extrainfo.id)
+    x = Notification.objects.select_related('student_id', 'release_id').filter(student_id=request.user.extrainfo.id)
     for i in x:
         i.invite_convocation_accept_flag = True
         i.save()
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index adada746e..79a025673 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -368,7 +368,7 @@
                  </div>
                {% endif %}
                {% else %}
-               <div class="ui  button">
+               <div class="ui  button" id="apply_convocation_btn">
                  Apply
                </div>
                {% endif %}
@@ -1077,7 +1077,7 @@
                             success: function (response) {
                                 if(response.result==='Success'){
                                   location.reload();
-                                    console.log(response.result)
+                                    console.log("reuk", response.result)
                                 }
                                 else{
                                     console.log(response.result);

From 3a13ee2ddf600be560eb36c31a174958194b060c Mon Sep 17 00:00:00 2001
From: sudheer dagar <sandstormarriving101@gmail.com>
Date: Tue, 20 Feb 2024 16:49:19 +0530
Subject: [PATCH 06/17] fixed profile redirection issue

---
 FusionIIIT/applications/eis/views.py                |  4 +++-
 FusionIIIT/applications/globals/api/views.py        |  6 +++++-
 FusionIIIT/applications/globals/views.py            | 13 +++++++++++--
 .../templates/scholarshipsModule/aboutspacs.html    |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/FusionIIIT/applications/eis/views.py b/FusionIIIT/applications/eis/views.py
index 76a4532c2..e76b148fa 100644
--- a/FusionIIIT/applications/eis/views.py
+++ b/FusionIIIT/applications/eis/views.py
@@ -275,9 +275,11 @@
 
 # Main profile landing view
 def profile(request, username=None):
+    print("eis",username)
     user = get_object_or_404(User, username=username) if username else request.user
+
     extra_info = get_object_or_404(ExtraInfo, user=user)
-    if extra_info.user_type != 'faculty':
+    if extra_info.user_type != 'fx':
         return redirect('/')
     pf = extra_info.id
 
diff --git a/FusionIIIT/applications/globals/api/views.py b/FusionIIIT/applications/globals/api/views.py
index 12d78e088..3f30c1028 100644
--- a/FusionIIIT/applications/globals/api/views.py
+++ b/FusionIIIT/applications/globals/api/views.py
@@ -76,12 +76,15 @@ def profile(request, username=None):
     user = get_object_or_404(User, username=username) if username else request.user
     user_detail = serializers.UserSerializer(user).data
     profile = serializers.ExtraInfoSerializer(user.extrainfo).data
+
+    print(user)
+    
     if profile['user_type'] == 'student':
         student = user.extrainfo.student
         skills = serializers.HasSerializer(student.has_set.all(),many=True).data
         education = serializers.EducationSerializer(student.education_set.all(), many=True).data
         course = serializers.CourseSerializer(student.course_set.all(), many=True).data
-        experience = serializers.ExperienceSerializer(student.experience_set.all(), many=True).data
+        experience = serializers.ExperienceSerializer(student.experience_set.all(), many=True).datap
         project = serializers.ProjectSerializer(student.project_set.all(), many=True).data
         achievement = serializers.AchievementSerializer(student.achievement_set.all(), many=True).data
         publication = serializers.PublicationSerializer(student.publication_set.all(), many=True).data
@@ -102,6 +105,7 @@ def profile(request, username=None):
         }
         return Response(data=resp, status=status.HTTP_200_OK)
     elif profile['user_type'] == 'faculty':
+        print(username)
         return redirect('/eis/api/profile/' + (username+'/' if username else ''))
 
 @api_view(['PUT'])
diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py
index a7f3886c9..89fda97c1 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -766,15 +766,24 @@ def profile(request, username=None):
         username: Username of the user. If None,
             displays the profile of currently logged-in user
     """
+
+    print(username)
     user = get_object_or_404(User, Q(username=username)) if username else request.user
 
+    print("user1" ,user)
 
     editable = request.user == user
+
     profile = get_object_or_404(ExtraInfo, Q(user=user))
-    if(str(user.extrainfo.user_type)=='faculty'):
-        return HttpResponseRedirect('/eis/profile/' + (username if username else ''))
+    print("user2",user.extrainfo.user_type)
+
+    if(str(user.extrainfo.user_type)=='fx'):
+        print("user3")
+        return HttpResponseRedirect('/eis/profile/' + (username if username else '') + '/')
+    
     if(str(user.extrainfo.department)=='department: Academics'):
         return HttpResponseRedirect('/aims')
+    
     current = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user, designation__name="student"))
     if current:
         student = get_object_or_404(Student, Q(id=profile.id))
diff --git a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
index 6d98bc1d4..37f00fd03 100755
--- a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
+++ b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
@@ -21,7 +21,7 @@
                     </div>
 
                     <div class="content">
-                        <a class="header"  href="/profile/{{hd.user}}"><h2>{{hd.user}}</h2></a>
+                        <a class="header"  href="/profile/{{hd.user}}/"><h2>{{hd.user}}</h2></a>
                         <div class="meta">
                             <span>{{hd.user.extrainfo.user_type}}</span>
                         </div>

From e6e9d2f6c182c4d8480b09ed292c21e942d99b97 Mon Sep 17 00:00:00 2001
From: sudheer dagar <sandstormarriving101@gmail.com>
Date: Wed, 21 Feb 2024 16:40:44 +0530
Subject: [PATCH 07/17] fixed profile redirection issues

---
 FusionIIIT/applications/eis/views.py                  |  4 ++--
 FusionIIIT/applications/globals/views.py              | 11 ++++++++++-
 .../templates/scholarshipsModule/aboutspacs.html      |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/FusionIIIT/applications/eis/views.py b/FusionIIIT/applications/eis/views.py
index e76b148fa..eb72b94cf 100644
--- a/FusionIIIT/applications/eis/views.py
+++ b/FusionIIIT/applications/eis/views.py
@@ -279,8 +279,8 @@ def profile(request, username=None):
     user = get_object_or_404(User, username=username) if username else request.user
 
     extra_info = get_object_or_404(ExtraInfo, user=user)
-    if extra_info.user_type != 'fx':
-        return redirect('/')
+    # if extra_info.user_type != 'fx':
+    #     return redirect('/')
     pf = extra_info.id
 
     form = ConfrenceForm()
diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py
index 89fda97c1..4292b7a76 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -779,7 +779,16 @@ def profile(request, username=None):
 
     if(str(user.extrainfo.user_type)=='fx'):
         print("user3")
-        return HttpResponseRedirect('/eis/profile/' + (username if username else '') + '/')
+        if username:
+            return HttpResponseRedirect('/eis/profile/' + username+'/')
+        else:
+            return HttpResponseRedirect('/eis/profile/' )
+    if(str(user.extrainfo.user_type)=='staff'):
+        print("staff")
+        if username:
+            return HttpResponseRedirect('/profile/' + username+'/')
+        else:
+            return HttpResponseRedirect('/eis/profile/' )
     
     if(str(user.extrainfo.department)=='department: Academics'):
         return HttpResponseRedirect('/aims')
diff --git a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
index 37f00fd03..bdde67f5f 100755
--- a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
+++ b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
@@ -63,7 +63,7 @@
                     </div>
 
                     <div class="content">
-                        <a class="header"  href="/profile/{{hd1.user}}"><h2>{{hd1.user}}</h2></a>
+                        <a class="header"  href="/eis/profile/{{hd1.user}}/"><h2>{{hd1.user}}</h2></a>
                         <div class="meta">
                             <span>{{hd1.user.extrainfo.user_type}}</span>
                         </div>

From dfdc6b3660e122066670859f1c7e27608f0f036f Mon Sep 17 00:00:00 2001
From: sudheer dagar <sandstormarriving101@gmail.com>
Date: Thu, 22 Feb 2024 18:45:56 +0530
Subject: [PATCH 08/17] refactoring and other changes

---
 FusionIIIT/applications/globals/api/urls.py   |  1 +
 FusionIIIT/applications/scholarships/views.py | 52 +++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/FusionIIIT/applications/globals/api/urls.py b/FusionIIIT/applications/globals/api/urls.py
index 72d32c89e..46ebd1ea0 100644
--- a/FusionIIIT/applications/globals/api/urls.py
+++ b/FusionIIIT/applications/globals/api/urls.py
@@ -7,6 +7,7 @@
     url(r'^auth/login/', views.login, name='login-api'),
     url(r'^auth/logout/', views.logout, name='logout-api'),
     # generic profile endpoint
+    #code of corresponding view is modifiedtemporary because of mismatched designations
     url(r'^profile/(?P<username>.+)/', views.profile, name='profile-api'),
     # current user profile
     url(r'^profile/', views.profile, name='profile-api'),
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 40c8ab42f..5dda095c2 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -27,6 +27,9 @@
 # Create your views here.
 
 
+
+
+
 @login_required(login_url='/accounts/login')
 def spacs(request):
     convener = Designation.objects.get(name='spacsconvenor')
@@ -402,37 +405,52 @@ def convenerCatalogue(request):
             context['result'] = 'Failure'
         return HttpResponse(json.dumps(context), content_type='convenerCatalogue/json')
 
+
+
+#below function is refactored and changed as it is not used by the user interface 
+#it will be changed later for other testing and download of winners
 def getWinners(request):
+    # Extract parameters from the request
     award_name = request.GET.get('award_name')
     batch_year = int(request.GET.get('batch'))
     programme_name = request.GET.get('programme')
-    award = Award_and_scholarship.objects.get(award_name=award_name)
-    winners = Previous_winner.objects.select_related('student','award_id').filter(
+    
+    # Get the Award_and_scholarship object based on the provided award name
+    try:
+        award = Award_and_scholarship.objects.get(award_name=award_name)
+    except Award_and_scholarship.DoesNotExist:
+        return JsonResponse({'result': 'Failure', 'message': 'Award not found'})
+
+    # Query for previous winners based on the provided criteria
+    winners = Previous_winner.objects.select_related('student__extra_info').filter(
         year=batch_year, award_id=award, programme=programme_name)
-    context = {}
-    context['student_name'] = []
-    context['student_program'] = []
-    context['roll'] = []
 
-#  If-Else Condition for previous winner if there is or no data in the winner table
+    context = {
+        'result': 'Success',
+        'winners': [],
+    }
+
+    # Process the winners if any found
     if winners:
         for winner in winners:
-
-            extra_info = ExtraInfo.objects.get(id=winner.student_id)
-            student_id = Student.objects.get(id=extra_info)
+            # Fetch extra information for the student
+            extra_info = winner.student.extra_info
             student_name = extra_info.user.first_name
             student_roll = winner.student_id
-            student_program = student_id.programme
-            context['student_name'].append(student_name)
-            context['roll'].append(student_roll)
-            context['student_program'].append(student_program)
-
-        context['result'] = 'Success'
+            student_program = winner.student.programme
+            
+            # Append student details to the context
+            context['winners'].append({
+                'student_name': student_name,
+                'roll': student_roll,
+                'student_program': student_program,
+            })
 
     else:
         context['result'] = 'Failure'
+        context['message'] = 'No winners found for the provided criteria'
 
-    return HttpResponse(json.dumps(context), content_type='getWinners/json')
+    return JsonResponse(context)
 
 def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id)

From 01ef828dbe3a3bcc1b04206ba256190916e1cfb8 Mon Sep 17 00:00:00 2001
From: Nitya Tiwari <nityasdl002@gmail.com>
Date: Thu, 22 Feb 2024 13:03:15 +0530
Subject: [PATCH 09/17] resolved routing error

---
 FusionIIIT/applications/eis/views.py                   |  3 ++-
 FusionIIIT/applications/feeds/views.py                 |  1 +
 FusionIIIT/applications/globals/views.py               | 10 ++++++----
 .../templates/scholarshipsModule/aboutspacs.html       |  2 +-
 FusionIIIT/templates/scholarshipsModule/applyNew.html  |  8 +++++++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/FusionIIIT/applications/eis/views.py b/FusionIIIT/applications/eis/views.py
index 76a4532c2..5fd451fff 100644
--- a/FusionIIIT/applications/eis/views.py
+++ b/FusionIIIT/applications/eis/views.py
@@ -276,8 +276,9 @@
 # Main profile landing view
 def profile(request, username=None):
     user = get_object_or_404(User, username=username) if username else request.user
+    print("eir", user, username)
     extra_info = get_object_or_404(ExtraInfo, user=user)
-    if extra_info.user_type != 'faculty':
+    if extra_info.user_type != 'fx':
         return redirect('/')
     pf = extra_info.id
 
diff --git a/FusionIIIT/applications/feeds/views.py b/FusionIIIT/applications/feeds/views.py
index 4ef9c62c9..fea8f5f42 100644
--- a/FusionIIIT/applications/feeds/views.py
+++ b/FusionIIIT/applications/feeds/views.py
@@ -689,6 +689,7 @@ def profile(request, string):
         string- user's username
     @variables
     """
+    print("user is this", request)
     if request.method == "POST":
         profile = Profile.objects.select_related().all().filter(user=request.user)
         Pr = None
diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py
index a7f3886c9..e26c93c0d 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -767,12 +767,14 @@ def profile(request, username=None):
             displays the profile of currently logged-in user
     """
     user = get_object_or_404(User, Q(username=username)) if username else request.user
-
-
+    print(username)
+    print("user1",user)
     editable = request.user == user
     profile = get_object_or_404(ExtraInfo, Q(user=user))
-    if(str(user.extrainfo.user_type)=='faculty'):
-        return HttpResponseRedirect('/eis/profile/' + (username if username else ''))
+    print("user2", profile)
+    print(user.extrainfo.user_type)
+    if(str(user.extrainfo.user_type)=='fx'):
+        return HttpResponseRedirect('/eis/profile/' + (username + "/" if username else ''))
     if(str(user.extrainfo.department)=='department: Academics'):
         return HttpResponseRedirect('/aims')
     current = HoldsDesignation.objects.select_related('user','working','designation').filter(Q(working=user, designation__name="student"))
diff --git a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
index 6d98bc1d4..37f00fd03 100755
--- a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
+++ b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
@@ -21,7 +21,7 @@
                     </div>
 
                     <div class="content">
-                        <a class="header"  href="/profile/{{hd.user}}"><h2>{{hd.user}}</h2></a>
+                        <a class="header"  href="/profile/{{hd.user}}/"><h2>{{hd.user}}</h2></a>
                         <div class="meta">
                             <span>{{hd.user.extrainfo.user_type}}</span>
                         </div>
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index 79a025673..7313aa0aa 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -957,7 +957,7 @@
                             <div class="field">
                               <a class="right floated item">
                                         <label><br></label>
-                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button">
+                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button" id="submit_silver">
                                             Submit
                                         </button>
                                 </a>
@@ -1104,6 +1104,12 @@
                                 }
                             });
                         });
+
+                    $(document).on('click', '#submit_silver', function (event){
+                        event.preventDefault();
+                        $.ajax()
+                    })
+                    
         </script>
     <script>
     function dis(aval) {

From e1c716a189fcb1de8c3d54f49242e0334be287da Mon Sep 17 00:00:00 2001
From: Nitya Tiwari <nityasdl002@gmail.com>
Date: Fri, 15 Mar 2024 19:39:20 +0530
Subject: [PATCH 10/17] removed delete button

---
 FusionIIIT/applications/scholarships/views.py       | 2 +-
 FusionIIIT/templates/scholarshipsModule/invite.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 40c8ab42f..866bd82ce 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -1077,7 +1077,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
             curBatch = dates.batch
             checkBatch = str(request.user.extrainfo.student)[0:4]
             batchCondition = False
-            if checkBatch[2:4] == "BC":
+            if checkBatch[2] >= "A" and checkBatch[2] <= "Z":
                 if(curBatch == 'All'):
                     batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
                     for batches in batchRange :
diff --git a/FusionIIIT/templates/scholarshipsModule/invite.html b/FusionIIIT/templates/scholarshipsModule/invite.html
index d5f6f10bb..a928c3f29 100755
--- a/FusionIIIT/templates/scholarshipsModule/invite.html
+++ b/FusionIIIT/templates/scholarshipsModule/invite.html
@@ -210,7 +210,7 @@
                       <td>{{ i.date_time }}</td>
                       <td>{{ i.programme}} - {{ i.batch }}</td>
                       <td> <button class="ui primary button" id = 'update_release_btn' value='{{ i.id}}'>Update</button> </td>
-                      <td> <button class="ui primary button" id = 'delete_release_btn' value='{{ i.id}}'>Delete</button> </td>
+                    
                   </tr>
                       {% endfor %}
               </tbody>

From ec7e7eec2662e7f3aabb1883974378dbc8de485e Mon Sep 17 00:00:00 2001
From: Sudheer dagar <60738162+sudheerdagar@users.noreply.github.com>
Date: Mon, 18 Mar 2024 19:04:31 +0530
Subject: [PATCH 11/17]  AC-5 (spacs) :  dashboard integration  and invitations
 and application update issues  (#1345)

* 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>

* debugging and refactoring

* resolved invitation notifications error

* added apply convocation functionality

* fixed profile redirection issue

* fixed profile redirection issues

* refactoring and other changes

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* resolved routing error

* removed delete button

---------

Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com>
Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com>
Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com>
Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in>
Co-authored-by: Nitya Tiwari <nityasdl002@gmail.com>
Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com>
Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com>
---
 FusionIIIT/Fusion/context_processors.py       |   5 +
 .../Fusion/middleware/custom_middleware.py    |  48 +++
 FusionIIIT/Fusion/settings/common.py          |   2 +
 FusionIIIT/applications/eis/views.py          |   6 +-
 FusionIIIT/applications/feeds/views.py        |   1 +
 FusionIIIT/applications/globals/api/urls.py   |   1 +
 FusionIIIT/applications/globals/api/views.py  |   6 +-
 .../migrations/0002_auto_20231116_2323.py     |  18 ++
 FusionIIIT/applications/globals/urls.py       |   3 +-
 FusionIIIT/applications/globals/views.py      |  90 +++++-
 FusionIIIT/applications/scholarships/urls.py  |   1 +
 FusionIIIT/applications/scholarships/views.py | 126 ++++++--
 FusionIIIT/notification/views.py              |   2 +
 .../academic_procedures/academic.html         |  44 ++-
 FusionIIIT/templates/dashboard/dashboard.html |  11 +-
 FusionIIIT/templates/dashboard/modules.html   | 279 ++++++++++++++----
 FusionIIIT/templates/dashboard/navbar.html    | 213 +++++++------
 .../templates/dashboard/sidenavbar.html       |  46 +--
 FusionIIIT/templates/globals/usercard.html    |  95 +++---
 .../scholarshipsModule/aboutspacs.html        |   4 +-
 .../scholarshipsModule/applyNew.html          |  16 +-
 .../templates/scholarshipsModule/invite.html  |  35 ++-
 22 files changed, 768 insertions(+), 284 deletions(-)
 create mode 100644 FusionIIIT/Fusion/context_processors.py
 create mode 100644 FusionIIIT/Fusion/middleware/custom_middleware.py
 create mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
 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/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/eis/views.py b/FusionIIIT/applications/eis/views.py
index 76a4532c2..656eee099 100644
--- a/FusionIIIT/applications/eis/views.py
+++ b/FusionIIIT/applications/eis/views.py
@@ -275,10 +275,12 @@
 
 # Main profile landing view
 def profile(request, username=None):
+    print("eis",username)
     user = get_object_or_404(User, username=username) if username else request.user
+
     extra_info = get_object_or_404(ExtraInfo, user=user)
-    if extra_info.user_type != 'faculty':
-        return redirect('/')
+#     if extra_info.user_type != 'fx':
+#         return redirect('/')
     pf = extra_info.id
 
     form = ConfrenceForm()
diff --git a/FusionIIIT/applications/feeds/views.py b/FusionIIIT/applications/feeds/views.py
index 4ef9c62c9..fea8f5f42 100644
--- a/FusionIIIT/applications/feeds/views.py
+++ b/FusionIIIT/applications/feeds/views.py
@@ -689,6 +689,7 @@ def profile(request, string):
         string- user's username
     @variables
     """
+    print("user is this", request)
     if request.method == "POST":
         profile = Profile.objects.select_related().all().filter(user=request.user)
         Pr = None
diff --git a/FusionIIIT/applications/globals/api/urls.py b/FusionIIIT/applications/globals/api/urls.py
index 72d32c89e..46ebd1ea0 100644
--- a/FusionIIIT/applications/globals/api/urls.py
+++ b/FusionIIIT/applications/globals/api/urls.py
@@ -7,6 +7,7 @@
     url(r'^auth/login/', views.login, name='login-api'),
     url(r'^auth/logout/', views.logout, name='logout-api'),
     # generic profile endpoint
+    #code of corresponding view is modifiedtemporary because of mismatched designations
     url(r'^profile/(?P<username>.+)/', views.profile, name='profile-api'),
     # current user profile
     url(r'^profile/', views.profile, name='profile-api'),
diff --git a/FusionIIIT/applications/globals/api/views.py b/FusionIIIT/applications/globals/api/views.py
index 12d78e088..3f30c1028 100644
--- a/FusionIIIT/applications/globals/api/views.py
+++ b/FusionIIIT/applications/globals/api/views.py
@@ -76,12 +76,15 @@ def profile(request, username=None):
     user = get_object_or_404(User, username=username) if username else request.user
     user_detail = serializers.UserSerializer(user).data
     profile = serializers.ExtraInfoSerializer(user.extrainfo).data
+
+    print(user)
+    
     if profile['user_type'] == 'student':
         student = user.extrainfo.student
         skills = serializers.HasSerializer(student.has_set.all(),many=True).data
         education = serializers.EducationSerializer(student.education_set.all(), many=True).data
         course = serializers.CourseSerializer(student.course_set.all(), many=True).data
-        experience = serializers.ExperienceSerializer(student.experience_set.all(), many=True).data
+        experience = serializers.ExperienceSerializer(student.experience_set.all(), many=True).datap
         project = serializers.ProjectSerializer(student.project_set.all(), many=True).data
         achievement = serializers.AchievementSerializer(student.achievement_set.all(), many=True).data
         publication = serializers.PublicationSerializer(student.publication_set.all(), many=True).data
@@ -102,6 +105,7 @@ def profile(request, username=None):
         }
         return Response(data=resp, status=status.HTTP_200_OK)
     elif profile['user_type'] == 'faculty':
+        print(username)
         return redirect('/eis/api/profile/' + (username+'/' if username else ''))
 
 @api_view(['PUT'])
diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
new file mode 100644
index 000000000..51f5a76b5
--- /dev/null
+++ b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2023-11-16 23:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
+        ),
+    ]
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..3b992f6f8 100644
--- a/FusionIIIT/applications/globals/views.py
+++ b/FusionIIIT/applications/globals/views.py
@@ -1,3 +1,4 @@
+from audioop import reverse
 import json
 
 from django.contrib.auth import logout
@@ -740,21 +741,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/*
@@ -766,18 +772,80 @@ def profile(request, username=None):
         username: Username of the user. If None,
             displays the profile of currently logged-in user
     """
-    user = get_object_or_404(User, Q(username=username)) if username else request.user
 
+    print(username)
+    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 +1047,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 +1245,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/applications/scholarships/urls.py b/FusionIIIT/applications/scholarships/urls.py
index fd5a3516f..77a292977 100755
--- a/FusionIIIT/applications/scholarships/urls.py
+++ b/FusionIIIT/applications/scholarships/urls.py
@@ -17,5 +17,6 @@
     url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
     url(r'^getContent/$', views.getContent, name='getContent'),
     url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
+    url(r'^deleteRelease/$', views.deleteRelease, name='deleteRelease'),
 
 ]
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index ef9c33c87..0d95daa96 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -3,6 +3,7 @@
 from operator import or_
 from functools import reduce
 
+from django.http import JsonResponse
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
@@ -27,6 +28,9 @@
 # Create your views here.
 
 
+
+
+
 @login_required(login_url='/accounts/login')
 def spacs(request):
     convener = Designation.objects.get(name='spacsconvenor')
@@ -71,6 +75,8 @@ def spacs(request):
 
 @login_required(login_url='/accounts/login')
 def convener_view(request):
+    print(request)
+    
     try:
         convener = Designation.objects.get(name='spacsconvenor')
         hd = HoldsDesignation.objects.get(
@@ -78,8 +84,11 @@ def convener_view(request):
     except:
         return HttpResponseRedirect('/logout')
     if request.method == 'POST':
+        print("this is a check for post request")
         if 'Submit' in request.POST:
+            print("this is a check for post xfhjgisdfkhlsjk request")
             award = request.POST.get('type')
+            print("award " + award)
             programme = request.POST.get('programme')
             batch = request.POST.get('batch')
             from_date = request.POST.get('From')
@@ -99,12 +108,27 @@ def convener_view(request):
             )
             
             # It updates the student Notification table on the spacs head sending the mcm invitation
-            if batch.lower() == 'all':
+            if batch == 'All':
                 active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1)
-                recipient = Student.objects.filter(programme=programme).filter(batch__in=active_batches)
+                # active_batches=str(active_batches)
+                # active_batches.split(',')
+                print(active_batches)
+                querybatch = []
+                for curbatch in active_batches:
+                    if curbatch > 2019:
+                        curbatch=curbatch%2000
+                        querybatch.append(curbatch)
+                print( active_batches)
+                query = reduce(or_, (Q(id__id__startswith=batch) for batch in querybatch))
+                print(query)
+                recipient = Student.objects.filter(programme=programme).filter(query)
             else:
-                recipient = Student.objects.filter(programme=programme, batch=batch)
+                if(int(batch)>2019):
+                    curbatch=int(batch)%2000
+                recipient = Student.objects.filter(programme=programme, id__id__startswith=curbatch)
+            
             # Notification starts
+            print(recipient)
             convenor = request.user
             for student in recipient:
                 scholarship_portal_notif(convenor, student.id.user, 'award_' + award)  # Notification
@@ -123,9 +147,9 @@ def convener_view(request):
                     notification_convocation_flag=True,
                     invite_convocation_accept_flag=False) for student in recipient])
             # Notification ends
-            
+            print(batch)
             messages.success(request, 
-                    award + ' applications are invited successfully for ' + batch + ' batch(es)')
+                    award + ' applications are invited successfully for ' + str(batch) + ' batch(es)')
             return HttpResponseRedirect('/spacs/convener_view')
 
         elif 'Email' in request.POST:
@@ -256,6 +280,7 @@ def convener_view(request):
 
 @login_required(login_url='/accounts/login')
 def student_view(request):
+
     if request.method == 'POST':
         if 'Submit_MCM' in request.POST:
             return submitMCM(request)
@@ -381,37 +406,52 @@ def convenerCatalogue(request):
             context['result'] = 'Failure'
         return HttpResponse(json.dumps(context), content_type='convenerCatalogue/json')
 
+
+
+#below function is refactored and changed as it is not used by the user interface 
+#it will be changed later for other testing and download of winners
 def getWinners(request):
+    # Extract parameters from the request
     award_name = request.GET.get('award_name')
     batch_year = int(request.GET.get('batch'))
     programme_name = request.GET.get('programme')
-    award = Award_and_scholarship.objects.get(award_name=award_name)
-    winners = Previous_winner.objects.select_related('student','award_id').filter(
+    
+    # Get the Award_and_scholarship object based on the provided award name
+    try:
+        award = Award_and_scholarship.objects.get(award_name=award_name)
+    except Award_and_scholarship.DoesNotExist:
+        return JsonResponse({'result': 'Failure', 'message': 'Award not found'})
+
+    # Query for previous winners based on the provided criteria
+    winners = Previous_winner.objects.select_related('student__extra_info').filter(
         year=batch_year, award_id=award, programme=programme_name)
-    context = {}
-    context['student_name'] = []
-    context['student_program'] = []
-    context['roll'] = []
 
-#  If-Else Condition for previous winner if there is or no data in the winner table
+    context = {
+        'result': 'Success',
+        'winners': [],
+    }
+
+    # Process the winners if any found
     if winners:
         for winner in winners:
-
-            extra_info = ExtraInfo.objects.get(id=winner.student_id)
-            student_id = Student.objects.get(id=extra_info)
+            # Fetch extra information for the student
+            extra_info = winner.student.extra_info
             student_name = extra_info.user.first_name
             student_roll = winner.student_id
-            student_program = student_id.programme
-            context['student_name'].append(student_name)
-            context['roll'].append(student_roll)
-            context['student_program'].append(student_program)
-
-        context['result'] = 'Success'
+            student_program = winner.student.programme
+            
+            # Append student details to the context
+            context['winners'].append({
+                'student_name': student_name,
+                'roll': student_roll,
+                'student_program': student_program,
+            })
 
     else:
         context['result'] = 'Failure'
+        context['message'] = 'No winners found for the provided criteria'
 
-    return HttpResponse(json.dumps(context), content_type='getWinners/json')
+    return JsonResponse(context)
 
 def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id)
@@ -430,7 +470,7 @@ def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     # return HttpResponseRedirect('/spacs/student_view')
 
 def getConvocationFlag(request):  # Here we are extracting convocation_flag
-    x = Notification.objects.filter(student_id=request.user.extrainfo.id)
+    x = Notification.objects.select_related('student_id', 'release_id').filter(student_id=request.user.extrainfo.id)
     for i in x:
         i.invite_convocation_accept_flag = True
         i.save()
@@ -480,6 +520,18 @@ def updateEndDate(request):
         context['result'] = 'Failure'
     return HttpResponse(json.dumps(context), content_type='updateEndDate/json')
 
+def deleteRelease(request):
+    print("deleteRelease")
+    id = request.GET.get('id')
+    is_deleted = Release.objects.filter(pk=id).delete()
+    request.session['last_clicked'] = "Release_deleted"
+    context = {}
+    if is_deleted:
+        context['result'] = 'Success'
+    else:
+        context['result'] = 'Failure'
+    return HttpResponse(json.dumps(context), content_type='deleteRelease/json')
+
 def getAwardId(request):
     award = request.POST.get('award')
     a = Award_and_scholarship.objects.get(award_name=award).id
@@ -1018,6 +1070,7 @@ def sendConvenerRenderRequest(request, additionalParams={}):
 
 def sendStudentRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
+
     ch = Constants.BATCH
     time = Constants.TIME
     mother_occ = Constants.MOTHER_OCC_CHOICES
@@ -1040,7 +1093,30 @@ def sendStudentRenderRequest(request, additionalParams={}):
     student_batch = getBatch(request.user.extrainfo.student)
     for dates in release:
         if checkDate(dates.startdate, dates.enddate):
-            if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == student_batch and dates.programme == request.user.extrainfo.student.programme:
+            curBatch = dates.batch
+            checkBatch = str(request.user.extrainfo.student)[0:4]
+            batchCondition = False
+            if checkBatch[2] >= "A" and checkBatch[2] <= "Z":
+                if(curBatch == 'All'):
+                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
+                    for batches in batchRange :
+                        if int(checkBatch[0:2]) == batches % 2000:
+                            batchCondition = True
+                elif curBatch == checkBatch:
+                    batchCondition = True
+            else:
+                if(curBatch == 'All'):
+                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
+                    for batch in batchRange:
+                        if str(checkBatch) == batch:
+                            batchCondition = True
+                elif curBatch == checkBatch:
+                    True
+                print("bye")
+            
+            
+            print(curBatch, checkBatch)
+            if dates.award == 'Merit-cum-Means Scholarship' and batchCondition and dates.programme == request.user.extrainfo.student.programme:
                 x_notif_mcm_flag = True
                 if no_of_mcm_filled > 0:
                     update_mcm_flag = True
@@ -1080,7 +1156,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_student.html',context)
 
-def sendStaffRenderRequest(request, additionalParams={}):
+def sendStaffRenderRequest(request, additionalParams={}):    
     context = getCommonParams(request)
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_staff.html', context)
diff --git a/FusionIIIT/notification/views.py b/FusionIIIT/notification/views.py
index 0480575b8..4d55c2b9b 100644
--- a/FusionIIIT/notification/views.py
+++ b/FusionIIIT/notification/views.py
@@ -148,6 +148,8 @@ def scholarship_portal_notif(sender, recipient, type):
 
     if type.startswith('award'):
         s = type.split('_')
+        # print("psss")
+        # print(type, s)
         verb = "Invitation to apply for " + s[1]
     elif type == 'Accept_MCM':
         verb = "Your Mcm form has been accepted "
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..172465aca
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -41,8 +41,8 @@
         {% 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
+            <a class="item" href="{% url 'globals:profile' %}">
+                View Professional Profile 
                 <i class="right floated chevron right icon"></i>
             </a>
             {% if "dean_rspc" in designation %}
@@ -62,11 +62,12 @@
         {% comment %}The Tab-Menu ends here!{% endcomment %}
 
 
-        {% 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" style="max-width: 320px;">
-            <a class="item disabled" href="/hr2/administrativeProfile">
+            <a class="item
+            " href="/hr2/administrativeProfile">
                 View Administrative Profile
                 <i class="right floated chevron right icon"></i>
             </a>
@@ -77,7 +78,7 @@
 
         {% comment %}The Tab-Menu starts here!{% endcomment %}
 
-
+        
         {% if request.user.extrainfo.user_type == 'faculty' %}
         {%for desig in designat%}
         {% if 'hradmin' == desig.designation.name %}
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
old mode 100755
new mode 100644
index a8680958a..8c2ca9174
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -12,47 +12,58 @@
             </a>
 
             <div class="content modulesContent">
-                <div class="ui two column stackable doubling grid">
+                <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 %}
-                    <div class="row">
-                        <div class="column">
-                            <a class="ui large label" href="/academic-procedures">
+                 
+                        {% 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 Module</span>
+                                        <span class="ui sub header centered">Academics</span>
                                     </div>
                                 </div>
                             </a>
                         </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/programme_curriculum">
+                        {% 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 Module</span>
+                                        <span class="ui sub header centered">Programme And Curriculum </span>
                                     </div>
                                 </div>
                             </a>
                         </div>
-                    </div>
+                        {% endif %}
+                    
+
                     {% 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">
+                  
+                        {% 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>
@@ -64,9 +75,11 @@
                                 </div>
                             </a>
                         </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/visitorhostel">
+                        {% 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>
@@ -78,13 +91,15 @@
                                 </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 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>
@@ -96,9 +111,11 @@
                                 </div>
                             </a>
                         </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/filetracking">
+                        {% 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>
@@ -110,13 +127,17 @@
                                 </div>
                             </a>
                         </div>
-                    </div>
+                        {% endif %}
+                
                     {% 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">
+               
+                        {% 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>
@@ -128,9 +149,11 @@
                                 </div>
                             </a>
                         </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="/complaint">
+                        {% 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>
@@ -142,11 +165,14 @@
                                 </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">
+                  
+                        {% 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>
@@ -158,9 +184,11 @@
                                 </div>
                             </a>
                         </div>
-
-                        <div class="column">
-                            <a class="ui large label" href="{% url 'estate_module_home' %}">
+                        {% 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>
@@ -172,12 +200,15 @@
                                 </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">
+                    
+                        {% 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>
@@ -189,8 +220,11 @@
                                 </div>
                             </a>
                         </div>
-                        <div class="column">
-                            <a class="ui large label" href="/research_procedures">
+                        {% 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>
@@ -202,12 +236,14 @@
                                 </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 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>
@@ -219,8 +255,11 @@
                                 </div>
                             </a>
                         </div>
-                        <div class="column">
-                            <a class="ui large label" href="/leave">
+                        {% 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>
@@ -231,14 +270,152 @@
                                     </div>
                                 </div>
                             </a>
-                    </div>
+                        </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>
-            </div>
             {% comment %}
             <a class="ui bottom attached blue label">
                 <i class="right arrow icon right floated"></i>
             </a>
             {% endcomment %}
+            </div>
         </div>
     </div>
 </div>
diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html
old mode 100755
new mode 100644
index 7d0e7e3f9..f277b5046
--- a/FusionIIIT/templates/dashboard/navbar.html
+++ b/FusionIIIT/templates/dashboard/navbar.html
@@ -1,137 +1,134 @@
 {% load static %}
-{% 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">
-                <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">
-                        <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>
-                        <div class="results"></div>
-                    </div>
-                    
-                </form>
-            </div>
-            <div class="right inverted menu">
-                <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}}
+
+    {% 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>
-                {% 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 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="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 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="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>
+                    </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 %}
+                    <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>
+                        
+                    <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="placementModule">
+                                    <div class="ui tab"  data-tab="messModule">
+                                    </div>
+
+                                    <div class="ui tab"  data-tab="placementModule">
+                                    </div>
                                 </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>
 
-        <div class="ui divider"></div>
+            <div class="ui divider"></div>
 
 
 
 
-        {% block data%}
+            {% block data%}
 
-        {% endblock %}
+            {% endblock %}
 
 
 
-    </div>
+        </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
old mode 100755
new mode 100644
index ecb758bd3..e1cceb817
--- 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,60 @@
                 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;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">
-                {% 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> 
+                    {{global_var|capfirst}}
                 </span>
-                <br>
-                {% endfor %}
             </div>
         </div>
     </div>
-    {% comment %}The Employee Image Card ends here!{% endcomment %}
-
-
-{% endblock %}
+    {% comment %} The Employee Image Card ends here! {% endcomment %}
+{% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
index 6d98bc1d4..bdde67f5f 100755
--- a/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
+++ b/FusionIIIT/templates/scholarshipsModule/aboutspacs.html
@@ -21,7 +21,7 @@
                     </div>
 
                     <div class="content">
-                        <a class="header"  href="/profile/{{hd.user}}"><h2>{{hd.user}}</h2></a>
+                        <a class="header"  href="/profile/{{hd.user}}/"><h2>{{hd.user}}</h2></a>
                         <div class="meta">
                             <span>{{hd.user.extrainfo.user_type}}</span>
                         </div>
@@ -63,7 +63,7 @@
                     </div>
 
                     <div class="content">
-                        <a class="header"  href="/profile/{{hd1.user}}"><h2>{{hd1.user}}</h2></a>
+                        <a class="header"  href="/eis/profile/{{hd1.user}}/"><h2>{{hd1.user}}</h2></a>
                         <div class="meta">
                             <span>{{hd1.user.extrainfo.user_type}}</span>
                         </div>
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index 652e3bb6f..7313aa0aa 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -33,7 +33,7 @@
             <a class="right floated item" style="padding-left:50px" href="https://drive.google.com/open?id=1Ylcj_ZX_h-0TTZ_zOGVF1JLEJE1_YQGD" target="_blank">
                 <button class="ui primary button">
                     Form A
-                    <i class="right floated download icon"></i>
+                    <i class="right floated download icon"></i> 
                 </button>
             </a>
             <a class="right floated item" href="https://drive.google.com/open?id=1AfSw3S5xXgbDn81hg6f2qgQiT_digXT9" target="_blank">
@@ -318,7 +318,7 @@
                 </div>
               {% endif %}
             {% else %}
-            <div class="ui disabled button">
+            <div class="ui  button">
               Applications not invited or has already been submitted
             </div>
             {% endif %}
@@ -368,7 +368,7 @@
                  </div>
                {% endif %}
                {% else %}
-               <div class="ui disabled button">
+               <div class="ui  button" id="apply_convocation_btn">
                  Apply
                </div>
                {% endif %}
@@ -957,7 +957,7 @@
                             <div class="field">
                               <a class="right floated item">
                                         <label><br></label>
-                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button">
+                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button" id="submit_silver">
                                             Submit
                                         </button>
                                 </a>
@@ -1077,7 +1077,7 @@
                             success: function (response) {
                                 if(response.result==='Success'){
                                   location.reload();
-                                    console.log(response.result)
+                                    console.log("reuk", response.result)
                                 }
                                 else{
                                     console.log(response.result);
@@ -1104,6 +1104,12 @@
                                 }
                             });
                         });
+
+                    $(document).on('click', '#submit_silver', function (event){
+                        event.preventDefault();
+                        $.ajax()
+                    })
+                    
         </script>
     <script>
     function dis(aval) {
diff --git a/FusionIIIT/templates/scholarshipsModule/invite.html b/FusionIIIT/templates/scholarshipsModule/invite.html
index a57a21f04..a928c3f29 100755
--- a/FusionIIIT/templates/scholarshipsModule/invite.html
+++ b/FusionIIIT/templates/scholarshipsModule/invite.html
@@ -210,6 +210,7 @@
                       <td>{{ i.date_time }}</td>
                       <td>{{ i.programme}} - {{ i.batch }}</td>
                       <td> <button class="ui primary button" id = 'update_release_btn' value='{{ i.id}}'>Update</button> </td>
+                    
                   </tr>
                       {% endfor %}
               </tbody>
@@ -227,6 +228,17 @@
         <div class="ui cancel button">Cancel</div>
       </div>
     </div>
+    <div class="ui modal1">
+        <div class="header">Delete Of Application </div>
+        <div class="content">
+          <button type='date' name = 'updated_enddate' id= "enddate_up" required>
+          <input type="hidden" name="delete_release_id" id= "delete_release_id" value="">
+        </div>
+        <div class="actions">
+          <div class="ui approve button" id = "update_enddate_modal_btn">Update</div>
+          <div class="ui cancel button">Cancel</div>
+        </div>
+      </div>
   </div>
 
 <script>
@@ -237,7 +249,28 @@
           $('.ui.modal')
             .modal('show');
       });
-  $(document).on('click','#update_enddate_modal_btn',function (event) {
+  $(document).on('click','#delete_release_btn',function (event) {
+          event.preventDefault();
+          var x = $(this).val();
+            $.ajax({
+                url: '/spacs/deleteRelease/',
+                type: 'DELETE',
+                data:{
+                    id:x,
+                    },
+                success: function (response) {
+                    if(response.result==='Success'){
+                        location.reload();
+                        console.log(response.result)
+                    }
+                    else{
+                        console.log(response.result);
+                    }
+    
+                }
+            });
+      });
+      $(document).on('click','#update_enddate_modal_btn',function (event) {
           event.preventDefault();
           var x = $('#update_release_id').val();
           var y = $('#enddate_up').val();

From e78b2f67ca3673178d6046fdb887d341aa061079 Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Fri, 19 Apr 2024 23:39:44 +0530
Subject: [PATCH 12/17] fixed convocation flag errors updated recent invite Ui

---
 FusionIIIT/applications/scholarships/urls.py  |   3 +-
 FusionIIIT/applications/scholarships/views.py | 146 +++++-------------
 .../scholarshipsModule/applyNew.html          |  18 +--
 .../templates/scholarshipsModule/invite.html  |  37 +----
 4 files changed, 50 insertions(+), 154 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/urls.py b/FusionIIIT/applications/scholarships/urls.py
index 77a292977..121cdd116 100755
--- a/FusionIIIT/applications/scholarships/urls.py
+++ b/FusionIIIT/applications/scholarships/urls.py
@@ -17,6 +17,5 @@
     url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
     url(r'^getContent/$', views.getContent, name='getContent'),
     url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
-    url(r'^deleteRelease/$', views.deleteRelease, name='deleteRelease'),
 
-]
+]
\ No newline at end of file
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 0d95daa96..142687e6e 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -3,7 +3,6 @@
 from operator import or_
 from functools import reduce
 
-from django.http import JsonResponse
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
@@ -24,13 +23,9 @@
 from .validations import MCM_list, MCM_schema, gold_list, gold_schema, silver_list, silver_schema, proficiency_list,proficiency_schema
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
-from .helpers import getBatch
 # Create your views here.
 
 
-
-
-
 @login_required(login_url='/accounts/login')
 def spacs(request):
     convener = Designation.objects.get(name='spacsconvenor')
@@ -75,8 +70,6 @@ def spacs(request):
 
 @login_required(login_url='/accounts/login')
 def convener_view(request):
-    print(request)
-    
     try:
         convener = Designation.objects.get(name='spacsconvenor')
         hd = HoldsDesignation.objects.get(
@@ -84,11 +77,8 @@ def convener_view(request):
     except:
         return HttpResponseRedirect('/logout')
     if request.method == 'POST':
-        print("this is a check for post request")
         if 'Submit' in request.POST:
-            print("this is a check for post xfhjgisdfkhlsjk request")
             award = request.POST.get('type')
-            print("award " + award)
             programme = request.POST.get('programme')
             batch = request.POST.get('batch')
             from_date = request.POST.get('From')
@@ -108,31 +98,19 @@ def convener_view(request):
             )
             
             # It updates the student Notification table on the spacs head sending the mcm invitation
-            if batch == 'All':
+            if batch == 'all':
                 active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1)
-                # active_batches=str(active_batches)
-                # active_batches.split(',')
-                print(active_batches)
-                querybatch = []
-                for curbatch in active_batches:
-                    if curbatch > 2019:
-                        curbatch=curbatch%2000
-                        querybatch.append(curbatch)
-                print( active_batches)
-                query = reduce(or_, (Q(id__id__startswith=batch) for batch in querybatch))
-                print(query)
+                query = reduce(or_, (Q(id__id__startswith=int(batch)-2000) for batch in active_batches))
                 recipient = Student.objects.filter(programme=programme).filter(query)
             else:
-                if(int(batch)>2019):
-                    curbatch=int(batch)%2000
-                recipient = Student.objects.filter(programme=programme, id__id__startswith=curbatch)
+                recipient = Student.objects.filter(programme=programme, id__id__startswith=int(batch)-2000)
             
             # Notification starts
-            print(recipient)
             convenor = request.user
             for student in recipient:
                 scholarship_portal_notif(convenor, student.id.user, 'award_' + award)  # Notification
             if award == 'Merit-cum-Means Scholarship':
+                print("MCM")
                 rel = Release.objects.get(date_time=d_time)
                 Notification.objects.select_related('student_id','release_id').bulk_create([Notification(
                     release_id=rel,
@@ -140,6 +118,7 @@ def convener_view(request):
                     notification_mcm_flag=True,
                     invite_mcm_accept_flag=False) for student in recipient])
             else:
+                print("convo")
                 rel = Release.objects.get(date_time=d_time)
                 Notification.objects.select_related('student_id','release_id').bulk_create([Notification(
                     release_id=rel,
@@ -147,9 +126,9 @@ def convener_view(request):
                     notification_convocation_flag=True,
                     invite_convocation_accept_flag=False) for student in recipient])
             # Notification ends
-            print(batch)
+            
             messages.success(request, 
-                    award + ' applications are invited successfully for ' + str(batch) + ' batch(es)')
+                    award + ' applications are invited successfully for ' + batch + ' batch(es)')
             return HttpResponseRedirect('/spacs/convener_view')
 
         elif 'Email' in request.POST:
@@ -280,7 +259,6 @@ def convener_view(request):
 
 @login_required(login_url='/accounts/login')
 def student_view(request):
-
     if request.method == 'POST':
         if 'Submit_MCM' in request.POST:
             return submitMCM(request)
@@ -406,54 +384,40 @@ def convenerCatalogue(request):
             context['result'] = 'Failure'
         return HttpResponse(json.dumps(context), content_type='convenerCatalogue/json')
 
-
-
-#below function is refactored and changed as it is not used by the user interface 
-#it will be changed later for other testing and download of winners
 def getWinners(request):
-    # Extract parameters from the request
     award_name = request.GET.get('award_name')
     batch_year = int(request.GET.get('batch'))
     programme_name = request.GET.get('programme')
-    
-    # Get the Award_and_scholarship object based on the provided award name
-    try:
-        award = Award_and_scholarship.objects.get(award_name=award_name)
-    except Award_and_scholarship.DoesNotExist:
-        return JsonResponse({'result': 'Failure', 'message': 'Award not found'})
-
-    # Query for previous winners based on the provided criteria
-    winners = Previous_winner.objects.select_related('student__extra_info').filter(
+    award = Award_and_scholarship.objects.get(award_name=award_name)
+    winners = Previous_winner.objects.select_related('student','award_id').filter(
         year=batch_year, award_id=award, programme=programme_name)
+    context = {}
+    context['student_name'] = []
+    context['student_program'] = []
+    context['roll'] = []
 
-    context = {
-        'result': 'Success',
-        'winners': [],
-    }
-
-    # Process the winners if any found
+#  If-Else Condition for previous winner if there is or no data in the winner table
     if winners:
         for winner in winners:
-            # Fetch extra information for the student
-            extra_info = winner.student.extra_info
+
+            extra_info = ExtraInfo.objects.get(id=winner.student_id)
+            student_id = Student.objects.get(id=extra_info)
             student_name = extra_info.user.first_name
             student_roll = winner.student_id
-            student_program = winner.student.programme
-            
-            # Append student details to the context
-            context['winners'].append({
-                'student_name': student_name,
-                'roll': student_roll,
-                'student_program': student_program,
-            })
+            student_program = student_id.programme
+            context['student_name'].append(student_name)
+            context['roll'].append(student_roll)
+            context['student_program'].append(student_program)
+
+        context['result'] = 'Success'
 
     else:
         context['result'] = 'Failure'
-        context['message'] = 'No winners found for the provided criteria'
 
-    return JsonResponse(context)
+    return HttpResponse(json.dumps(context), content_type='getWinners/json')
 
 def get_MCM_Flag(request):  # Here we are extracting mcm_flag
+    print("get mcm_flags here")
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id)
     for i in x:
         i.invite_mcm_accept_flag = True
@@ -470,7 +434,8 @@ def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     # return HttpResponseRedirect('/spacs/student_view')
 
 def getConvocationFlag(request):  # Here we are extracting convocation_flag
-    x = Notification.objects.select_related('student_id', 'release_id').filter(student_id=request.user.extrainfo.id)
+    print("get convo_flags here")
+    x = Notification.objects.filter(student_id=request.user.extrainfo.id)
     for i in x:
         i.invite_convocation_accept_flag = True
         i.save()
@@ -520,18 +485,6 @@ def updateEndDate(request):
         context['result'] = 'Failure'
     return HttpResponse(json.dumps(context), content_type='updateEndDate/json')
 
-def deleteRelease(request):
-    print("deleteRelease")
-    id = request.GET.get('id')
-    is_deleted = Release.objects.filter(pk=id).delete()
-    request.session['last_clicked'] = "Release_deleted"
-    context = {}
-    if is_deleted:
-        context['result'] = 'Success'
-    else:
-        context['result'] = 'Failure'
-    return HttpResponse(json.dumps(context), content_type='deleteRelease/json')
-
 def getAwardId(request):
     award = request.POST.get('award')
     a = Award_and_scholarship.objects.get(award_name=award).id
@@ -1063,6 +1016,7 @@ def sendConvenerRenderRequest(request, additionalParams={}):
     source = Constants.FATHER_OCC_CHOICE
     time = Constants.TIME
     release = Release.objects.all()
+    notification = Notification.objects.select_related('student_id','release_id').all()
     spi = Spi.objects.all()
     context.update({ 'source': source, 'time': time, 'ch': ch, 'spi': spi, 'release': release})
     context.update(additionalParams)
@@ -1070,7 +1024,6 @@ def sendConvenerRenderRequest(request, additionalParams={}):
 
 def sendStudentRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
-
     ch = Constants.BATCH
     time = Constants.TIME
     mother_occ = Constants.MOTHER_OCC_CHOICES
@@ -1090,48 +1043,29 @@ def sendStudentRenderRequest(request, additionalParams={}):
     update_con_flag = False
     x_notif_mcm_flag = False
     x_notif_con_flag = False
-    student_batch = getBatch(request.user.extrainfo.student)
     for dates in release:
         if checkDate(dates.startdate, dates.enddate):
-            curBatch = dates.batch
-            checkBatch = str(request.user.extrainfo.student)[0:4]
-            batchCondition = False
-            if checkBatch[2] >= "A" and checkBatch[2] <= "Z":
-                if(curBatch == 'All'):
-                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
-                    for batches in batchRange :
-                        if int(checkBatch[0:2]) == batches % 2000:
-                            batchCondition = True
-                elif curBatch == checkBatch:
-                    batchCondition = True
-            else:
-                if(curBatch == 'All'):
-                    batchRange = range(datetime.datetime.now().year - 4, datetime.datetime.now().year + 1)
-                    for batch in batchRange:
-                        if str(checkBatch) == batch:
-                            batchCondition = True
-                elif curBatch == checkBatch:
-                    True
-                print("bye")
-            
-            
-            print(curBatch, checkBatch)
-            if dates.award == 'Merit-cum-Means Scholarship' and batchCondition and dates.programme == request.user.extrainfo.student.programme:
+            print("sudheer's test --->")
+            print(request.user.extrainfo.student)
+            print(str(request.user.extrainfo.student)[0:2])
+            if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == "20"+str(request.user.extrainfo.student)[0:2]and dates.programme == request.user.extrainfo.student.programme:
                 x_notif_mcm_flag = True
                 if no_of_mcm_filled > 0:
                     update_mcm_flag = True
-            elif dates.award == 'Convocation Medals' and dates.batch == student_batch and dates.programme == request.user.extrainfo.student.programme:
+            elif dates.award == 'Convocation Medals' and dates.batch == "20"+str(request.user.extrainfo.student)[0:2]and dates.programme == request.user.extrainfo.student.programme:
+                
                 x_notif_con_flag = True
                 if no_of_con_filled > 0:
                     update_con_flag = True
         else:
-            if dates.award == "Merit-cum-Means Scholarship" and dates.batch == student_batch:
+           
+            if dates.award == "Merit-cum-Means Scholarship" and dates.batch =="20"+ str(request.user.extrainfo.student)[0:2]:
                 try:
                     x = Notification.objects.select_related('student_id','release_id').get(
                         student_id=request.user.extrainfo.id, release_id=dates.id).delete()
                 except:
                     pass
-            elif dates.award == 'Convocation Medals' and dates.batch == student_batch:
+            elif dates.award == 'Convocation Medals' and dates.batch == "20"+str(request.user.extrainfo.student)[0:2]:
                 try:
                     x = Notification.objects.select_related('student_id','release_id').get(
                         student_id=request.user.extrainfo.id, release_id=dates.id).delete()
@@ -1139,9 +1073,11 @@ def sendStudentRenderRequest(request, additionalParams={}):
                     pass
 
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id).order_by('-release_id__date_time')
+    print(x)
     show_mcm_flag = False
     show_convocation_flag = False
     for i in x:
+        print(i.invite_convocation_accept_flag)
         if i.invite_mcm_accept_flag == True:
             show_mcm_flag = True
             break
@@ -1156,7 +1092,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_student.html',context)
 
-def sendStaffRenderRequest(request, additionalParams={}):    
+def sendStaffRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_staff.html', context)
@@ -1187,4 +1123,4 @@ def getCommonParams(request):
     context = {'mcm': mcm, 'awards': awards, 'student': student, 'gold': gold, 'silver': silver, 
                 'dandm': dandm, 'con': con, 'assis': assis, 'hd': hd, 'hd1': hd1, 
                 'last_clicked': last_clicked, 'year_range': year_range, 'active_batches': active_batches}
-    return context
+    return context
\ No newline at end of file
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index 7313aa0aa..b240a9157 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -33,7 +33,7 @@
             <a class="right floated item" style="padding-left:50px" href="https://drive.google.com/open?id=1Ylcj_ZX_h-0TTZ_zOGVF1JLEJE1_YQGD" target="_blank">
                 <button class="ui primary button">
                     Form A
-                    <i class="right floated download icon"></i> 
+                    <i class="right floated download icon"></i>
                 </button>
             </a>
             <a class="right floated item" href="https://drive.google.com/open?id=1AfSw3S5xXgbDn81hg6f2qgQiT_digXT9" target="_blank">
@@ -318,7 +318,7 @@
                 </div>
               {% endif %}
             {% else %}
-            <div class="ui  button">
+            <div class="ui disabled button">
               Applications not invited or has already been submitted
             </div>
             {% endif %}
@@ -368,7 +368,7 @@
                  </div>
                {% endif %}
                {% else %}
-               <div class="ui  button" id="apply_convocation_btn">
+               <div class="ui disabled button">
                  Apply
                </div>
                {% endif %}
@@ -957,7 +957,7 @@
                             <div class="field">
                               <a class="right floated item">
                                         <label><br></label>
-                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button" id="submit_silver">
+                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button">
                                             Submit
                                         </button>
                                 </a>
@@ -1077,7 +1077,7 @@
                             success: function (response) {
                                 if(response.result==='Success'){
                                   location.reload();
-                                    console.log("reuk", response.result)
+                                    console.log(response.result)
                                 }
                                 else{
                                     console.log(response.result);
@@ -1104,12 +1104,6 @@
                                 }
                             });
                         });
-
-                    $(document).on('click', '#submit_silver', function (event){
-                        event.preventDefault();
-                        $.ajax()
-                    })
-                    
         </script>
     <script>
     function dis(aval) {
@@ -1129,4 +1123,4 @@
     </script>
 
 </body>
-{%  endblock %}
+{%  endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/scholarshipsModule/invite.html b/FusionIIIT/templates/scholarshipsModule/invite.html
index a928c3f29..bfcf6795e 100755
--- a/FusionIIIT/templates/scholarshipsModule/invite.html
+++ b/FusionIIIT/templates/scholarshipsModule/invite.html
@@ -210,7 +210,6 @@
                       <td>{{ i.date_time }}</td>
                       <td>{{ i.programme}} - {{ i.batch }}</td>
                       <td> <button class="ui primary button" id = 'update_release_btn' value='{{ i.id}}'>Update</button> </td>
-                    
                   </tr>
                       {% endfor %}
               </tbody>
@@ -228,17 +227,6 @@
         <div class="ui cancel button">Cancel</div>
       </div>
     </div>
-    <div class="ui modal1">
-        <div class="header">Delete Of Application </div>
-        <div class="content">
-          <button type='date' name = 'updated_enddate' id= "enddate_up" required>
-          <input type="hidden" name="delete_release_id" id= "delete_release_id" value="">
-        </div>
-        <div class="actions">
-          <div class="ui approve button" id = "update_enddate_modal_btn">Update</div>
-          <div class="ui cancel button">Cancel</div>
-        </div>
-      </div>
   </div>
 
 <script>
@@ -249,28 +237,7 @@
           $('.ui.modal')
             .modal('show');
       });
-  $(document).on('click','#delete_release_btn',function (event) {
-          event.preventDefault();
-          var x = $(this).val();
-            $.ajax({
-                url: '/spacs/deleteRelease/',
-                type: 'DELETE',
-                data:{
-                    id:x,
-                    },
-                success: function (response) {
-                    if(response.result==='Success'){
-                        location.reload();
-                        console.log(response.result)
-                    }
-                    else{
-                        console.log(response.result);
-                    }
-    
-                }
-            });
-      });
-      $(document).on('click','#update_enddate_modal_btn',function (event) {
+  $(document).on('click','#update_enddate_modal_btn',function (event) {
           event.preventDefault();
           var x = $('#update_release_id').val();
           var y = $('#enddate_up').val();
@@ -304,4 +271,4 @@
   }
 </script>
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file

From eabf67e6af366097fe1131852a21e8b5c2ac7d59 Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Sat, 20 Apr 2024 12:19:02 +0530
Subject: [PATCH 13/17] fixed previous winners data duplications

---
 FusionIIIT/applications/scholarships/views.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 142687e6e..99ed99131 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -148,8 +148,10 @@ def convener_view(request):
             year = datetime.datetime.now().year
             Mcm.objects.select_related('award_id','student').filter(id=pk).update(status='Accept')
             request.session['last_clicked'] = 'Accept_MCM'
-            Previous_winner.objects.create(
-                student=student_id, year=year, award_id=award)
+            zest=Previous_winner.objects.filter(student = student_id, year=year, award_id=award)
+            print(zest)
+            if(len(zest)==0):
+                Previous_winner.objects.create(student=student_id, year=year, award_id=award)
             convenor = request.user
             recipient = student_id
             scholarship_portal_notif(convenor, recipient.id.user, 'Accept_MCM')

From 839f35b3d67cb86df521a7e8cf0344b5f10fbd0a Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Sat, 20 Apr 2024 14:31:06 +0530
Subject: [PATCH 14/17] fixed update issues with convocation medals

---
 FusionIIIT/applications/scholarships/views.py | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 99ed99131..bbcbffb16 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -175,8 +175,10 @@ def convener_view(request):
             student_id = Director_gold.objects.select_related('student','award_id').get(id=pk).student
             year = datetime.datetime.now().year
             Director_gold.objects.select_related('student','award_id').filter(id=pk).update(status='Accept')
-            Previous_winner.objects.create(
-                student=student_id, year=year, award_id=award)
+            zest=Previous_winner.objects.filter(student = student_id, year=year, award_id=award)
+            print(zest)
+            if(len(zest)==0):
+                Previous_winner.objects.create(student=student_id, year=year, award_id=award)
             convenor = request.user
             recipient = student_id
             scholarship_portal_notif(
@@ -203,12 +205,13 @@ def convener_view(request):
             student_id = Director_silver.objects.select_related('student','award_id').get(id=pk).student
             year = datetime.datetime.now().year
             Director_silver.objects.select_related('student','award_id').filter(id=pk).update(status='Accept')
-            Previous_winner.objects.create(
-                student=student_id, year=year, award_id=award)
+            zest=Previous_winner.objects.filter(student = student_id, year=year, award_id=award)
+            print(zest)
+            if(len(zest)==0):
+                Previous_winner.objects.create(student=student_id, year=year, award_id=award)
             convenor = request.user
             recipient = student_id
-            scholarship_portal_notif(
-                convenor, recipient.id.user, 'Accept_Silver')
+            scholarship_portal_notif(convenor, recipient.id.user, 'Accept_Silver')
             request.session['last_clicked'] = 'Accept_Silver'
             messages.success(request, 'Application is accepted')
             return HttpResponseRedirect('/spacs/convener_view')
@@ -219,8 +222,7 @@ def convener_view(request):
             Director_silver.objects.select_related('student','award_id').filter(id=pk).update(status='Reject')
             convenor = request.user
             recipient = student_id
-            scholarship_portal_notif(
-                convenor, recipient.id.user, 'Reject_Silver')
+            scholarship_portal_notif(convenor, recipient.id.user, 'Reject_Silver')
             request.session['last_clicked'] = 'Reject_Silver'
             messages.success(request, 'Application is rejected')
             return HttpResponseRedirect('/spacs/convener_view')
@@ -231,8 +233,10 @@ def convener_view(request):
             student_id = Proficiency_dm.objects.select_related('student','award_id').get(id=pk).student
             year = datetime.datetime.now().year
             Proficiency_dm.objects.select_related('student','award_id').filter(id=pk).update(status='Accept')
-            Previous_winner.objects.create(
-                student=student_id, year=year, award_id=award)
+            zest=Previous_winner.objects.filter(student = student_id, year=year, award_id=award)
+            print(zest)
+            if(len(zest)==0):
+                Previous_winner.objects.create(student=student_id, year=year, award_id=award)
             convenor = request.user
             recipient = student_id
             scholarship_portal_notif(convenor, recipient.id.user, 'Accept_DM')

From f93a37f8efb2bf95c6fd1ca0086e788c0bbcdca4 Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Sat, 20 Apr 2024 14:35:34 +0530
Subject: [PATCH 15/17] refactoring

---
 .../migrations/0002_auto_20231116_2323.py      | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py

diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
deleted file mode 100644
index 51f5a76b5..000000000
--- a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.1.5 on 2023-11-16 23:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('globals', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='extrainfo',
-            name='user_status',
-            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
-        ),
-    ]

From cbfbfbcdbcbe95b20a19afc440155f82434496af Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Sat, 20 Apr 2024 21:31:35 +0530
Subject: [PATCH 16/17] final changes and refactoring

---
 FusionIIIT/applications/scholarships/urls.py  |  1 -
 FusionIIIT/applications/scholarships/views.py |  3 +-
 .../scholarshipsModule/applyNew.html          | 16 +++------
 .../templates/scholarshipsModule/invite.html  | 35 +------------------
 4 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/urls.py b/FusionIIIT/applications/scholarships/urls.py
index 769dec040..121cdd116 100755
--- a/FusionIIIT/applications/scholarships/urls.py
+++ b/FusionIIIT/applications/scholarships/urls.py
@@ -17,6 +17,5 @@
     url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
     url(r'^getContent/$', views.getContent, name='getContent'),
     url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
-    url(r'^deleteRelease/$', views.deleteRelease, name='deleteRelease'),
 
 ]
\ No newline at end of file
diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 9fc2f60db..2818832d6 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -648,7 +648,7 @@ def submitMCM(request):
                     status="INCOMPLETE",
                 )
                 messages.success(
-                    request, award + ' Application is successfully submitted'
+                    request, award + ' Application is successfully Updated'
                 )
                 break
             else:
@@ -1120,7 +1120,6 @@ def sendStudentRenderRequest(request, additionalParams={}):
                     pass
 
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id).order_by('-release_id__date_time')
-    print(x)
     show_mcm_flag = False
     show_convocation_flag = False
     for i in x:
diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html
index 503c8b365..b240a9157 100755
--- a/FusionIIIT/templates/scholarshipsModule/applyNew.html
+++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html
@@ -33,7 +33,7 @@
             <a class="right floated item" style="padding-left:50px" href="https://drive.google.com/open?id=1Ylcj_ZX_h-0TTZ_zOGVF1JLEJE1_YQGD" target="_blank">
                 <button class="ui primary button">
                     Form A
-                    <i class="right floated download icon"></i> 
+                    <i class="right floated download icon"></i>
                 </button>
             </a>
             <a class="right floated item" href="https://drive.google.com/open?id=1AfSw3S5xXgbDn81hg6f2qgQiT_digXT9" target="_blank">
@@ -318,7 +318,7 @@
                 </div>
               {% endif %}
             {% else %}
-            <div class="ui  button">
+            <div class="ui disabled button">
               Applications not invited or has already been submitted
             </div>
             {% endif %}
@@ -368,7 +368,7 @@
                  </div>
                {% endif %}
                {% else %}
-               <div class="ui  button" id="apply_convocation_btn">
+               <div class="ui disabled button">
                  Apply
                </div>
                {% endif %}
@@ -957,7 +957,7 @@
                             <div class="field">
                               <a class="right floated item">
                                         <label><br></label>
-                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button" id="submit_silver">
+                                        <button type="submit" name="Submit_Silver" class="ui primary large right floated button">
                                             Submit
                                         </button>
                                 </a>
@@ -1077,7 +1077,7 @@
                             success: function (response) {
                                 if(response.result==='Success'){
                                   location.reload();
-                                    console.log("reuk", response.result)
+                                    console.log(response.result)
                                 }
                                 else{
                                     console.log(response.result);
@@ -1104,12 +1104,6 @@
                                 }
                             });
                         });
-
-                    $(document).on('click', '#submit_silver', function (event){
-                        event.preventDefault();
-                        $.ajax()
-                    })
-                    
         </script>
     <script>
     function dis(aval) {
diff --git a/FusionIIIT/templates/scholarshipsModule/invite.html b/FusionIIIT/templates/scholarshipsModule/invite.html
index 479a0bd04..bfcf6795e 100755
--- a/FusionIIIT/templates/scholarshipsModule/invite.html
+++ b/FusionIIIT/templates/scholarshipsModule/invite.html
@@ -210,7 +210,6 @@
                       <td>{{ i.date_time }}</td>
                       <td>{{ i.programme}} - {{ i.batch }}</td>
                       <td> <button class="ui primary button" id = 'update_release_btn' value='{{ i.id}}'>Update</button> </td>
-                    
                   </tr>
                       {% endfor %}
               </tbody>
@@ -228,17 +227,6 @@
         <div class="ui cancel button">Cancel</div>
       </div>
     </div>
-    <div class="ui modal1">
-        <div class="header">Delete Of Application </div>
-        <div class="content">
-          <button type='date' name = 'updated_enddate' id= "enddate_up" required>
-          <input type="hidden" name="delete_release_id" id= "delete_release_id" value="">
-        </div>
-        <div class="actions">
-          <div class="ui approve button" id = "update_enddate_modal_btn">Update</div>
-          <div class="ui cancel button">Cancel</div>
-        </div>
-      </div>
   </div>
 
 <script>
@@ -249,28 +237,7 @@
           $('.ui.modal')
             .modal('show');
       });
-  $(document).on('click','#delete_release_btn',function (event) {
-          event.preventDefault();
-          var x = $(this).val();
-            $.ajax({
-                url: '/spacs/deleteRelease/',
-                type: 'DELETE',
-                data:{
-                    id:x,
-                    },
-                success: function (response) {
-                    if(response.result==='Success'){
-                        location.reload();
-                        console.log(response.result)
-                    }
-                    else{
-                        console.log(response.result);
-                    }
-    
-                }
-            });
-      });
-      $(document).on('click','#update_enddate_modal_btn',function (event) {
+  $(document).on('click','#update_enddate_modal_btn',function (event) {
           event.preventDefault();
           var x = $('#update_release_id').val();
           var y = $('#enddate_up').val();

From 85f5d36c6165c890cbbb755a8bd3f651d701ce3b Mon Sep 17 00:00:00 2001
From: sudheerdagar <sandstormarriving101@gmail.com>
Date: Sat, 20 Apr 2024 21:36:26 +0530
Subject: [PATCH 17/17] modified get_mcm_flags functionalities

---
 FusionIIIT/applications/scholarships/views.py | 84 +++++--------------
 1 file changed, 22 insertions(+), 62 deletions(-)

diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py
index 2818832d6..bbcbffb16 100755
--- a/FusionIIIT/applications/scholarships/views.py
+++ b/FusionIIIT/applications/scholarships/views.py
@@ -3,7 +3,6 @@
 from operator import or_
 from functools import reduce
 
-from django.http import JsonResponse
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
@@ -27,9 +26,6 @@
 # Create your views here.
 
 
-
-
-
 @login_required(login_url='/accounts/login')
 def spacs(request):
     convener = Designation.objects.get(name='spacsconvenor')
@@ -74,8 +70,6 @@ def spacs(request):
 
 @login_required(login_url='/accounts/login')
 def convener_view(request):
-    print(request)
-    
     try:
         convener = Designation.objects.get(name='spacsconvenor')
         hd = HoldsDesignation.objects.get(
@@ -83,11 +77,8 @@ def convener_view(request):
     except:
         return HttpResponseRedirect('/logout')
     if request.method == 'POST':
-        print("this is a check for post request")
         if 'Submit' in request.POST:
-            print("this is a check for post xfhjgisdfkhlsjk request")
             award = request.POST.get('type')
-            print("award " + award)
             programme = request.POST.get('programme')
             batch = request.POST.get('batch')
             from_date = request.POST.get('From')
@@ -115,7 +106,6 @@ def convener_view(request):
                 recipient = Student.objects.filter(programme=programme, id__id__startswith=int(batch)-2000)
             
             # Notification starts
-            print(recipient)
             convenor = request.user
             for student in recipient:
                 scholarship_portal_notif(convenor, student.id.user, 'award_' + award)  # Notification
@@ -136,9 +126,9 @@ def convener_view(request):
                     notification_convocation_flag=True,
                     invite_convocation_accept_flag=False) for student in recipient])
             # Notification ends
-            print(batch)
+            
             messages.success(request, 
-                    award + ' applications are invited successfully for ' + str(batch) + ' batch(es)')
+                    award + ' applications are invited successfully for ' + batch + ' batch(es)')
             return HttpResponseRedirect('/spacs/convener_view')
 
         elif 'Email' in request.POST:
@@ -275,7 +265,6 @@ def convener_view(request):
 
 @login_required(login_url='/accounts/login')
 def student_view(request):
-
     if request.method == 'POST':
         if 'Submit_MCM' in request.POST:
             return submitMCM(request)
@@ -401,52 +390,37 @@ def convenerCatalogue(request):
             context['result'] = 'Failure'
         return HttpResponse(json.dumps(context), content_type='convenerCatalogue/json')
 
-
-
-#below function is refactored and changed as it is not used by the user interface 
-#it will be changed later for other testing and download of winners
 def getWinners(request):
-    # Extract parameters from the request
     award_name = request.GET.get('award_name')
     batch_year = int(request.GET.get('batch'))
     programme_name = request.GET.get('programme')
-    
-    # Get the Award_and_scholarship object based on the provided award name
-    try:
-        award = Award_and_scholarship.objects.get(award_name=award_name)
-    except Award_and_scholarship.DoesNotExist:
-        return JsonResponse({'result': 'Failure', 'message': 'Award not found'})
-
-    # Query for previous winners based on the provided criteria
-    winners = Previous_winner.objects.select_related('student__extra_info').filter(
+    award = Award_and_scholarship.objects.get(award_name=award_name)
+    winners = Previous_winner.objects.select_related('student','award_id').filter(
         year=batch_year, award_id=award, programme=programme_name)
+    context = {}
+    context['student_name'] = []
+    context['student_program'] = []
+    context['roll'] = []
 
-    context = {
-        'result': 'Success',
-        'winners': [],
-    }
-
-    # Process the winners if any found
+#  If-Else Condition for previous winner if there is or no data in the winner table
     if winners:
         for winner in winners:
-            # Fetch extra information for the student
-            extra_info = winner.student.extra_info
+
+            extra_info = ExtraInfo.objects.get(id=winner.student_id)
+            student_id = Student.objects.get(id=extra_info)
             student_name = extra_info.user.first_name
             student_roll = winner.student_id
-            student_program = winner.student.programme
-            
-            # Append student details to the context
-            context['winners'].append({
-                'student_name': student_name,
-                'roll': student_roll,
-                'student_program': student_program,
-            })
+            student_program = student_id.programme
+            context['student_name'].append(student_name)
+            context['roll'].append(student_roll)
+            context['student_program'].append(student_program)
+
+        context['result'] = 'Success'
 
     else:
         context['result'] = 'Failure'
-        context['message'] = 'No winners found for the provided criteria'
 
-    return JsonResponse(context)
+    return HttpResponse(json.dumps(context), content_type='getWinners/json')
 
 def get_MCM_Flag(request):  # Here we are extracting mcm_flag
     print("get mcm_flags here")
@@ -468,7 +442,6 @@ def get_MCM_Flag(request):  # Here we are extracting mcm_flag
 def getConvocationFlag(request):  # Here we are extracting convocation_flag
     print("get convo_flags here")
     x = Notification.objects.filter(student_id=request.user.extrainfo.id)
-
     for i in x:
         i.invite_convocation_accept_flag = True
         i.save()
@@ -518,18 +491,6 @@ def updateEndDate(request):
         context['result'] = 'Failure'
     return HttpResponse(json.dumps(context), content_type='updateEndDate/json')
 
-def deleteRelease(request):
-    print("deleteRelease")
-    id = request.GET.get('id')
-    is_deleted = Release.objects.filter(pk=id).delete()
-    request.session['last_clicked'] = "Release_deleted"
-    context = {}
-    if is_deleted:
-        context['result'] = 'Success'
-    else:
-        context['result'] = 'Failure'
-    return HttpResponse(json.dumps(context), content_type='deleteRelease/json')
-
 def getAwardId(request):
     award = request.POST.get('award')
     a = Award_and_scholarship.objects.get(award_name=award).id
@@ -648,7 +609,7 @@ def submitMCM(request):
                     status="INCOMPLETE",
                 )
                 messages.success(
-                    request, award + ' Application is successfully Updated'
+                    request, award + ' Application is successfully submitted'
                 )
                 break
             else:
@@ -1069,7 +1030,6 @@ def sendConvenerRenderRequest(request, additionalParams={}):
 
 def sendStudentRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
-
     ch = Constants.BATCH
     time = Constants.TIME
     mother_occ = Constants.MOTHER_OCC_CHOICES
@@ -1095,7 +1055,6 @@ def sendStudentRenderRequest(request, additionalParams={}):
             print(request.user.extrainfo.student)
             print(str(request.user.extrainfo.student)[0:2])
             if dates.award == 'Merit-cum-Means Scholarship' and dates.batch == "20"+str(request.user.extrainfo.student)[0:2]and dates.programme == request.user.extrainfo.student.programme:
-
                 x_notif_mcm_flag = True
                 if no_of_mcm_filled > 0:
                     update_mcm_flag = True
@@ -1120,6 +1079,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
                     pass
 
     x = Notification.objects.select_related('student_id','release_id').filter(student_id=request.user.extrainfo.id).order_by('-release_id__date_time')
+    print(x)
     show_mcm_flag = False
     show_convocation_flag = False
     for i in x:
@@ -1138,7 +1098,7 @@ def sendStudentRenderRequest(request, additionalParams={}):
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_student.html',context)
 
-def sendStaffRenderRequest(request, additionalParams={}):    
+def sendStaffRenderRequest(request, additionalParams={}):
     context = getCommonParams(request)
     context.update(additionalParams)
     return render(request, 'scholarshipsModule/scholarships_staff.html', context)