From a4479fabb1d2cf662fac5d5b323e5bbaf95360b4 Mon Sep 17 00:00:00 2001
From: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com>
Date: Fri, 16 Feb 2024 18:47:36 +0530
Subject: [PATCH 1/2] removed conflicts from approve request from dean
---
.../templates/gymkhanaModule/clubsessions.html | 0
.../templates/gymkhanaModule/gymkhana.html | 16 ++++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
delete mode 100644 FusionIIIT/templates/gymkhanaModule/clubsessions.html
diff --git a/FusionIIIT/templates/gymkhanaModule/clubsessions.html b/FusionIIIT/templates/gymkhanaModule/clubsessions.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/FusionIIIT/templates/gymkhanaModule/gymkhana.html b/FusionIIIT/templates/gymkhanaModule/gymkhana.html
index bedfe767f..141ac70b9 100644
--- a/FusionIIIT/templates/gymkhanaModule/gymkhana.html
+++ b/FusionIIIT/templates/gymkhanaModule/gymkhana.html
@@ -355,19 +355,23 @@
Update Activity Calender
-
-
+
+
+
-
+
+
+
Submit Event report To Convener
From f76c737168d592f10b1c6333415bd90312df7311 Mon Sep 17 00:00:00 2001
From: RishabhSharma96 <114917946+RishabhSharma96@users.noreply.github.com>
Date: Sat, 17 Feb 2024 14:46:15 +0530
Subject: [PATCH 2/2] change co and coco api working
---
FusionIIIT/applications/gymkhana/views.py | 60 ++++++++++++-----------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/FusionIIIT/applications/gymkhana/views.py b/FusionIIIT/applications/gymkhana/views.py
index 90c2c8e0b..4f38f06b4 100644
--- a/FusionIIIT/applications/gymkhana/views.py
+++ b/FusionIIIT/applications/gymkhana/views.py
@@ -1041,20 +1041,19 @@ def change_head(request):
And adds to the database.
@param:
- request - trivial
+ request - trivial
@variables:
-
- club - name of the club
- co_ordinator - new co_ordinator of the club
- co_coordinator - new co_cordinator of the club
- date - date at which the heads of the clubs changes
- time - time at which the heads changes
- desc - description on change of heads
- old_co_ordinator - HoldsDesignation object and after deletes this co_ordinator
- old_co_coordinator - HoldsDesignation object and after deletes this co_coordinator
- new_co_ordinator - HoldsDesignation object and after saves this object as co_ordinator
- new_co_coordinator - HoldsDesignation object and after saves this object as co_coordinator
+ club - name of the club
+ co_ordinator - new co_ordinator of the club
+ co_coordinator - new co_cordinator of the club
+ date - date at which the heads of the clubs changes
+ time - time at which the heads changes
+ desc - description on change of heads
+ old_co_ordinator - HoldsDesignation object and after deletes this co_ordinator
+ old_co_coordinator - HoldsDesignation object and after deletes this co_coordinator
+ new_co_ordinator - HoldsDesignation object and after saves this object as co_ordinator
+ new_co_coordinator - HoldsDesignation object and after saves this object as co_coordinator
"""
if request.method == "POST":
@@ -1063,44 +1062,49 @@ def change_head(request):
co_coordinator = request.POST.get('coco')
date = request.POST.get("date")
time = request.POST.get("time")
- desc = "co-ordinator and co co-ordinator changed on "+date+" at "+time
+ desc = f"co-ordinator and co co-ordinator changed on {date} at {time}"
message = ""
- # club_name = get_object_or_404(Club_info, club_name=club)
-
co_ordinator_student = get_object_or_404(Student, id__user__username=co_ordinator)
-
co_coordinator_student = get_object_or_404(Student, id__user__username=co_coordinator)
-
club_info = get_object_or_404(Club_info, club_name=club)
old_co_ordinator = club_info.co_ordinator
old_co_coordinator = club_info.co_coordinator
+
club_info.co_ordinator = co_ordinator_student
club_info.co_coordinator = co_coordinator_student
club_info.save()
message += "Successfully changed !!!"
-
- new_co_ordinator = HoldsDesignation(user=User.objects.get(username=co_ordinator), working=User.objects.get(username=co_ordinator), designation=Designation.objects.get(name="co-ordinator"))
+
+ new_co_ordinator = HoldsDesignation(
+ user=User.objects.get(username=co_ordinator),
+ working=User.objects.get(username=co_ordinator),
+ designation=Designation.objects.get(name="co-ordinator")
+ )
new_co_ordinator.save()
- new_co_coordinator = HoldsDesignation(user=User.objects.get(username=co_coordinator), working=User.objects.get(username=co_coordinator), designation=Designation.objects.get(name="co co-ordinator"))
+
+ new_co_coordinator = HoldsDesignation(
+ user=User.objects.get(username=co_coordinator),
+ working=User.objects.get(username=co_coordinator),
+ designation=Designation.objects.get(name="co co-ordinator")
+ )
new_co_coordinator.save()
- old_co_ordinator = HoldsDesignation.objects.select_related('user','working','designation').filter(user__username=old_co_ordinator, designation__name="co-ordinator")
- old_co_ordinator.delete()
- old_co_coordinator = HoldsDesignation.objects.select_related('user','working','designation').filter(user__username=old_co_coordinator, designation__name="co co-ordinator")
- old_co_coordinator.delete()
+ HoldsDesignation.objects.filter(user__username=old_co_ordinator, designation__name="co-ordinator").delete()
+ HoldsDesignation.objects.filter(user__username=old_co_coordinator, designation__name="co co-ordinator").delete()
content = {
- 'status':"success",
- 'message':message,
- }
+ 'status': "success",
+ 'message': message,
+ }
content = json.dumps(content)
return HttpResponse(content)
- # return redirect('/gymkhana/')
+ # Handle non-POST requests or redirect if needed
+ # return redirect('/gymkhana/')
@login_required