Update web/views.py

web/views.py

@@ -80,6 +80,62 @@ def home(request):
     }
     return render(request, "index.html", context)
 
+# def events(request):
+#     if request.user != None:
+#         try:
+#             profile = Profile.objects.filter(user=request.user).first()
+#             userName = request.user.first_name
+#             isUser = True
+#             isVolunteer = profile.isCampainVolunteer
+#             profilePic = profile.profilePic
+#         except:
+#             userName = "Anonymous"
+#             isUser = False
+#             isVolunteer = False
+#             profilePic = "0001"
+#     else:
+#         isUser = False
+#         isVolunteer = False
+#         userName = ""
+#         profilePic = "0001"
+#     departments = Department.objects.all()
+#     departmentArr = []
+#     impEvent = []
+#     for department in departments:
+#         events = Event.objects.filter(department=department).order_by('-name').all()
+#         eventArr = []
+#         tempDepartment = {
+#             "departmentName" : department.name
+#         }
+#         for event in events:
+#             tempEvent = {
+#                 "eventName" : event.name,
+#                 "eventPrice" : event.price,
+#                 "eventDescription" : event.description,
+#                 "eventTagline" : event.tagline,
+#                 "eventPosterImage" : event.posterImage,
+#                 "eventLink" : (event.name).replace(" ", "-").replace("---", ":"),
+#                 "isTeamEvent" : event.isTeamEvent,
+#                 "teamPrice" : event.teamPrice,
+#                 "isTeamPriceFull" : event.isTeamPriceFull,
+#                 "winnerPrice1" : event.winnerPrice1 if event.winnerPrice1 != None else 0 ,
+#                 "winnerPrice2" : event.winnerPrice2 if event.winnerPrice2 != None else 0 ,
+#                 "isClosed" : event.isClosed
+                
+#             }
+#             eventArr.append(tempEvent)
+#         tempDepartment["events"] = eventArr
+#         tempDepartment["eventCount"] = len(eventArr)
+#         departmentArr.append(tempDepartment)
+#     context = {
+#         "departmentArr": departmentArr,
+#         "isUser" : isUser,
+#         "isVolunteer" : isVolunteer,
+#         "userName" : userName,
+#         "profilePic" : profilePic
+#     }
+#     return HttpResponse(json.dumps(context), content_type="application/json")
+
 def events(request):
     if request.user != None:
         try:
@@ -104,29 +160,18 @@ def events(request):
     for department in departments:
         events = Event.objects.filter(department=department).order_by('-name').all()
         eventArr = []
-        tempDepartment = {
-            "departmentName" : department.name
-        }
+        flag = 0
         for event in events:
-            tempEvent = {
-                "eventName" : event.name,
-                "eventPrice" : event.price,
-                "eventDescription" : event.description,
-                "eventTagline" : event.tagline,
-                "eventPosterImage" : event.posterImage,
-                "eventLink" : (event.name).replace(" ", "-").replace("---", ":"),
-                "isTeamEvent" : event.isTeamEvent,
-                "teamPrice" : event.teamPrice,
-                "isTeamPriceFull" : event.isTeamPriceFull,
-                "winnerPrice1" : event.winnerPrice1 if event.winnerPrice1 != None else 0 ,
-                "winnerPrice2" : event.winnerPrice2 if event.winnerPrice2 != None else 0 ,
-                "isClosed" : event.isClosed
-                
-            }
-            eventArr.append(tempEvent)
-        tempDepartment["events"] = eventArr
-        tempDepartment["eventCount"] = len(eventArr)
-        departmentArr.append(tempDepartment)
+            if event.name != "X - Motion Game Mania":
+                eventArr.append([event.name, event.price, event.description, event.tagline, event.posterImage, (event.name).replace(" ", "-").replace("---", ":"),event.isTeamEvent,event.teamPrice,event.isTeamPriceFull,event.winnerPrice1,event.winnerPrice2,event.isClosed])
+            else:
+                impEvent = [[event.name, event.price, event.description, event.tagline, event.posterImage, (event.name).replace(" ", "-").replace("---", ":"),event.isTeamEvent,event.teamPrice,event.isTeamPriceFull,event.winnerPrice1,event.winnerPrice2,event.isClosed]]
+                flag = 1
+        if flag == 1:
+            impEvent.extend(eventArr)
+            departmentArr.append([department.name, impEvent, len(eventArr)])
+        else:
+            departmentArr.append([department.name, eventArr, len(eventArr)])
     context = {
         "departmentArr": departmentArr,
         "isUser" : isUser,
@@ -134,7 +179,6 @@ def events(request):
         "userName" : userName,
         "profilePic" : profilePic
     }
-    # return HttpResponse(json.dumps(context), content_type="application/json")
     return render(request, "event.html", context)
 
 def aboutus(request):