Skip to content

P
Pariksha
Commit c1706446 authored by Samarth Joshi's avatar Samarth Joshi
Browse files
Options

Merge conflicts

parents c0815514 20629bcb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
QuizSystem/urls.py
View file @ c1706446
......@@ -22,6 +22,7 @@ from django.conf.urls import url
from django.views.generic import TemplateView
from django.conf.urls.static import static
from django.urls import path,include
from django.contrib.auth import views as auth_views
urlpatterns = [
path('admin/', admin.site.urls),
......@@ -38,7 +39,10 @@ urlpatterns = [
path('uploaded/',a.upload_file,name="uploaded"), path('sign_up/',a.sign_up,name="sign-up"), path('accounts/',include('django.contrib.auth.urls')),
path('create_quiz/',a.create_quiz),
path('add_quiz/',a.add_quiz),
path('monitor/',a.monitor)
path('monitor/',a.monitor),
path('logout/', auth_views.LogoutView.as_view(), name='logout')
......
db.sqlite3
View file @ c1706446
No preview for this file type
quiz/models.py
View file @ c1706446
......@@ -15,7 +15,7 @@ class quiz(models.Model):
quizCode=models.CharField(max_length=100,default='Code') ##quiz Code set by instructor
quizDone=models.BooleanField(default=False)
quizInfo=models.CharField(max_length=100,default="No Info Available")
quizInstructor=models.ForeignKey(to=User, on_delete=models.CASCADE)
8ructor=models.ForeignKey(to=User, on_delete=models.CASCADE)
@property
def end_datetime( self ):
......
quiz/templates/upload.html
View file @ c1706446
......@@ -8,12 +8,13 @@
<script src="{% static 'js/quiz_create_page.js' %}"></script>
</head>
<body>
<a href="{% url "logout" %}?next=/">logout</a>
<form name = "form" enctype = "multipart/form-data"
action = "{% url "uploaded" %}" method = "POST" id="quiz_create_form">{% csrf_token %}
<div id="quiz_controls">
<p><a href="../create_quiz">Click here to manually add all questions</a></p>
<div style="padding: 20px">
<h3>Quiz Name:</h3>
......
quiz/views.py
View file @ c1706446
......@@ -159,7 +159,7 @@ def instructor(request):
allStudents.append(student['studentId'])
std=np.std(allMarks)
mean=np.mean(allMarks)
ax.scatter(allMarks,allStudents)
ax.hist(allMarks,allStudents)
html_graph = mpld3.fig_to_html(fig)
fig1, ax1 = plt.subplots()
mu = mean
......
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