Commit 710cf218 authored by Samarth Joshi's avatar Samarth Joshi

Adding links to logout button and Dashboard button

parent b1937448
......@@ -171,7 +171,7 @@
</div>
</div>
</a>
<a class="menu_card" id="menucard_dashboard" href="/instructor?quiz_id=0">
<a class="menu_card" id="menucard_dashboard" href="/instructor">
<div class="menu_card_wrapper">
<div class="img_wrapper"><img height="100px" src="{% static 'img/menu_dashboard.svg' %}"></div>
<div class="menu_card_content">
......@@ -189,7 +189,7 @@
</div>
</div>
</a>
<a class="menu_card" id="menucard_logout" href="#">
<a class="menu_card" id="menucard_logout" href='{% url "logout" %}?next=/'>
<div class="menu_card_wrapper">
<div class="img_wrapper"><img height="90px" src="{% static 'img/menu_logout.svg' %}"></div>
<div class="menu_card_content">
......
......@@ -142,13 +142,23 @@ def upload_file(request):
def instructor(request):
print('Hello World')
q_id = request.GET['quiz_id']
quizId = int(q_id)
q_id = request.GET.get('quiz_id')
quizId = 0
allquizs = quiz.objects.all().filter(quizInstructor=request.user).order_by('-date', '-startTime')
if q_id:
quizId = int(q_id)
print(quizId)
else:
#quizId = quiz.objects.all().filter(quizInstructor=request.user)[0]
if True:
quizId = allquizs[0].quizId
else:
print(quizId)
quizInstance = quiz.objects.all().filter(quizId=quizId, quizInstructor=request.user)[0]
allquizs = quiz.objects.all().filter(quizInstructor=request.user).order_by('-date', '-startTime');
students = results.objects.all().filter(quizId=q_id).values('studentId')
marks = results.objects.all().filter(quizId=q_id).values('marks')
cribs=crib.objects.raw('select 1 as id, c.cribs,c.studentId,q.question from cribs c ,Questions q where c.quizId_id=q.quizId_id and c.quizId_id='+str(q_id))
students = results.objects.all().filter(quizId=quizId).values('studentId')
marks = results.objects.all().filter(quizId=quizId).values('marks')
cribs=crib.objects.raw('select 1 as id, c.cribs,c.studentId,q.question from cribs c ,Questions q where c.quizId_id=q.quizId_id and c.quizId_id='+str(quizId))
cribbs= list()
for cribb in cribs:
result=(cribb.question,cribb.studentId,cribb.cribs)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment