Skip to content

Fix attendance and registration unmarking bug on participants list #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Naman-56-56 wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −27
Open

Fix attendance and registration unmarking bug on participants list #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions training/templates/list_event_participants.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

{% if is_tr_ongoing%}
<input type="hidden" id="event_status" name="event_status" value="reg">
<input type="hidden" name="displayed_users" value="{{record.id}}">
{% if record.reg_approval_status == 1 %}
<td><input type='checkbox' name="user_reg" value="{{record.id}}" checked="checked"></td>
{% else %}
Expand All @@ -53,6 +54,7 @@

{% if is_tr_completed %}
<input type="hidden" id="event_status" name="event_status" value="attend">
<input type="hidden" name="displayed_users" value="{{record.id}}">
{% if record.attendance_marked %}
<td><input type='checkbox' name="user" value="{{record.id}}" checked="checked"></td>
{% else %}
Expand Down
60 changes: 33 additions & 27 deletions training/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,48 +862,54 @@ def get_context_data(self, **kwargs):
context['is_tr_completed'] = is_tr_completed(self.event.id)
context['is_event_closed'] = is_event_closed(self.event.id)



return context

def post(self, request, *args, **kwargs):
self.object = None
self.user = request.user
eventid = kwargs['eventid']
attendance_type = request.POST.get('event_status', None)
displayed_users = request.POST.getlist('displayed_users', [])

if attendance_type == 'attend':
if request.POST and 'user' in request.POST:
marked_participant = request.POST.getlist('user', None)
# delete un marked record if exits
EventAttendance.objects.filter(event_id =eventid).exclude(participant_id__in = marked_participant).delete()
# insert new record if not exits
marked_participant = request.POST.getlist('user', [])
if displayed_users:
# delete unmarked record if exists, only for displayed users on this page
EventAttendance.objects.filter(
event_id=eventid,
participant_id__in=displayed_users
).exclude(
participant_id__in=marked_participant
).delete()
# insert new record if not exists
for record in marked_participant:
event_attend = EventAttendance.objects.filter(event_id =eventid, participant_id = record)
if not event_attend.exists():
EventAttendance.objects.create(event_id =eventid, participant_id = record)
#print marked_participant
success_url = '/training/event/rp/completed'
if record in displayed_users:
event_attend = EventAttendance.objects.filter(event_id=eventid, participant_id=record)
if not event_attend.exists():
EventAttendance.objects.create(event_id=eventid, participant_id=record)
else:
EventAttendance.objects.filter(event_id = eventid).delete()
success_url = '/training/event/rp/completed'
EventAttendance.objects.filter(event_id=eventid).delete()
success_url = '/training/event/rp/completed'

elif attendance_type == 'reg':
if request.POST and 'user_reg' in request.POST:
marked_registrations = request.POST.getlist('user_reg', None)
# delete un marked record if exits
remove_reg = Participant.objects.filter(event_id =eventid, reg_approval_status=1).exclude(id__in = marked_registrations).update(reg_approval_status=0)

# insert new record if not exits
marked_registrations = request.POST.getlist('user_reg', [])
if displayed_users:
# update reg_approval_status to 0 for displayed users that are not marked
Participant.objects.filter(
event_id=eventid,
id__in=displayed_users
).exclude(
id__in=marked_registrations
).update(reg_approval_status=0)
# insert new record if not exists
for record in marked_registrations:
reg_attend = Participant.objects.filter(event_id =eventid, id = record, reg_approval_status=1)
if not reg_attend.exists():
mark_reg_approval(record, eventid)
#print marked_registrations
success_url = '/training/event/rp/ongoing'
if record in displayed_users:
reg_attend = Participant.objects.filter(event_id=eventid, id=record, reg_approval_status=1)
if not reg_attend.exists():
mark_reg_approval(record, eventid)
else:
Participant.objects.filter(event_id =eventid).update(reg_approval_status=0)
success_url = '/training/event/rp/ongoing'
Participant.objects.filter(event_id=eventid).update(reg_approval_status=0)
success_url = '/training/event/rp/ongoing'
return HttpResponseRedirect(success_url)


Expand Down