Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
raylu
/
pyc
1
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Add lab view

raylu 14 жил өмнө
parent
8b7a1ebea2
commit
8300a1a664
6 өөрчлөгдсөн 51 нэмэгдсэн , 14 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 3 1
      pyc/grader/models.py
  2. 7 1
      pyc/grader/views.py
  3. 10 0
      pyc/templates/base.html
  4. 9 10
      pyc/templates/index.html
  5. 20 0
      pyc/templates/lab.html
  6. 2 2
      pyc/urls.py

+ 3 - 1
pyc/grader/models.py
Файл харах 

@@ -12,5 +12,7 @@ class Submission(models.Model):
 
 	user = models.ForeignKey(User)
 
 	time = models.DateTimeField()
 
 	grade = models.IntegerField()
 
+	class Meta:
 
+		unique_together = (('lab', 'user'),)
 
 	def __unicode__(self):
 
-		return "%d, %s" % (self.lab, self.user)
 
+		return "%d, %s" % (self.lab.id, self.user)

+ 7 - 1
pyc/grader/views.py
Файл харах 

@@ -1,4 +1,10 @@
 
 from django.shortcuts import render_to_response
 
+from grader.models import Lab
 
 
 def index(request):
 
-	return render_to_response('index.html')
 
+	return render_to_response('index.html', {'labs' : Lab.objects.all()})
 
+
 
+def lab(request, lab_id):
 
+	lab = Lab.objects.get(pk=lab_id)
 
+	submissions = lab.submission_set.filter(user__is_staff=False).order_by('-grade', '-time')
 
+	return render_to_response('lab.html', {'lab' : lab, 'submissions' : submissions})

+ 10 - 0
pyc/templates/base.html
Файл харах 

@@ -0,0 +1,10 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+	<meta charset="UTF-8">
 
+	<title>pyc</title>
 
+</head>
 
+<body>
 
+{% block body %}{% endblock %}
 
+</body>
 
+</html>

+ 9 - 10
pyc/templates/index.html
Файл харах 

@@ -1,10 +1,9 @@
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-	<meta charset="UTF-8">
 
-	<title>pyc</title>
 
-</head>
 
-<body>
 
-woo
 
-</body>
 
-</html>
 
+{% extends 'base.html' %}
 
+{% block body %}
 
+Labs:
 
+<ol>
 
+{% for lab in labs %}
 
+	<li><a href="/lab/{{ lab.id }}/">{{ lab.name }}</a></li>
 
+{% endfor %}
 
+</ol>
 
+{% endblock %}

+ 20 - 0
pyc/templates/lab.html
Файл харах 

@@ -0,0 +1,20 @@
 
+{% extends 'base.html' %}
 
+{% block body %}
 
+Lab {{ lab.id }} due {{ lab.due }} at 11:59:59 PDT (UTC-7):
 
+<br>{{ lab.name }}
 
+
 
+<table>
 
+<tr>
 
+	<th>User</th>
 
+	<th>Grade</th>
 
+	<th>Time</th>
 
+</tr>
 
+{% for s in submissions %}
 
+	<tr>
 
+	<td>{{ s.user }}</td>
 
+	<td>{{ s.grade }}</td>
 
+	<td>{{ s.time }}</td>
 
+	</tr>
 
+{% endfor %}
 
+</table>
 
+{% endblock %}

+ 2 - 2
pyc/urls.py
Файл харах 

@@ -4,8 +4,8 @@ from django.contrib import admin
 
 admin.autodiscover()
 
 
 urlpatterns = patterns('',
 
-	url(r'^$', 'pyc.grader.views.index', name='index'),
 
-	# url(r'^pyc/', include('pyc.foo.urls')),
 
+	url(r'^$', 'grader.views.index', name='index'),
 
+	url(r'^lab/(?P<lab_id>\d+)/$', 'grader.views.lab'),
 
 
 	# Uncomment the admin/doc line below to enable admin documentation:
 
 	# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),