Skip to content
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.

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

Add approve/disapprove buttons on HOD page #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 12 additions & 9 deletions swd/main/views.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django.shortcuts import render, redirect
from django.http import HttpResponse
from django.http import HttpResponse, JsonResponse
from django.contrib.auth import authenticate, login, logout
from django.contrib.auth.decorators import login_required, user_passes_test
from .models import *
from django.views.decorators.csrf import csrf_protect
from django.views.decorators.csrf import csrf_protect, csrf_exempt
from datetime import date, datetime, timedelta
from django.contrib import messages
from django.utils.timezone import make_aware
Expand Down Expand Up @@ -136,6 +136,7 @@ def project(request):
return render(request, "project.html", dict(context, **projectContext))

@login_required
@csrf_exempt
@user_passes_test(is_hod)
def hodprojectapprove(request, project):
project = Project.objects.get(id=project)
Expand All @@ -151,24 +152,26 @@ def hodprojectapprove(request, project):
}

if request.POST:
approved = request.POST.getlist('group1')
print(approved)
approved = request.POST["approved"]
print(approved, type(approved))

if '1' in approved:
if approved == '1':
project.approved=True
project.disapproved = False
project.inprocess = False
elif '2' in approved:
elif approved == '2':
project.disapproved=True
project.approved = False
project.inprocess = False
else:
elif approved == '3':
project.inprocess = True
project.approved = False
project.disapproved = False
else:
return JsonResponse({ "status": "approved field should be between 1 and 3" }, status=401)
project.save()
return redirect('hod')

return render(request, "hod.html", context)
return JsonResponse({ "status": "successful" })

return JsonResponse({ "status": "method not allowed" }, status=405)

20 changes: 18 additions & 2 deletions swd/templates/hod.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,32 @@
<th>Student Name </th>
<th>Course Code</th>
<th>Approval Status</th>
<th>Approve/Disprove</th>
</tr>
</thead>
<tbody>
{% for project in projects %}
<tr class="clickable" onclick="leaveclick(this)" data-id="{{ project.id }}">
<tr>
<td>{{ project.id }}</td>
<td>{{ project.faculty.name }}</td>
<td>{{ project.studentname }} | {{ project.studentId }}</td>
<td>{{ project.department }} | {{ project.courseCode }}</td>
<td>{% if project.approved == 1 %}Approved{% elif project.disapproved == 1 %}Disapproved{% else %}In Process{% endif %}</td>
<td id="status-{{project.id}}">
{% if project.approved == 1 %}Approved{% elif project.disapproved == 1 %}Disapproved{% else %}In Process{% endif %}
</td>
<td data-id="{{ project.id }}">
<!-- Click listeners are in hodbase.html -->
<button
class="btn {% if not project.inprocess %}disabled{% endif %} btn-{{project.id}}"
onclick="approveButton(this)">
Approve
</button>
<button
class="btn {% if not project.inprocess %}disabled{% endif %} btn-{{project.id}}"
onclick="disapproveButton(this)">
Disapprove
</button>
</td>
</tr>
{% endfor %}
</tbody>
Expand Down
22 changes: 22 additions & 0 deletions swd/templates/hodbase.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,28 @@
function leaveclick(d) {
window.location.href = '/hod/' + $(d).data('id') +'/';
}

function sendUpdateRequest(id, approved, text) {
$.post(`/hod/${id}/`, { "approved": approved })
.done(function() {
$(`#status-${id}`).text(text);
});
}

function approveButton(elem) {
let id = $(elem).parent().data('id');
sendUpdateRequest(id, 1, "Approved");

return true;
}

function disapproveButton(elem) {
let id = $(elem).parent().data('id');
sendUpdateRequest(id, 2, "Disapproved");

return true;
}

$(document).ready(function () {
$('select').material_select();
});
Expand Down