summaryrefslogtreecommitdiff
path: root/yaksh
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh')
-rw-r--r--yaksh/models.py16
-rw-r--r--yaksh/templates/yaksh/grade_user.html4
-rw-r--r--yaksh/templates/yaksh/view_answerpaper.html2
-rw-r--r--yaksh/urls.py13
-rw-r--r--yaksh/views.py35
5 files changed, 40 insertions, 30 deletions
diff --git a/yaksh/models.py b/yaksh/models.py
index 49a2384..480a111 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -94,8 +94,10 @@ MOD_GROUP_NAME = 'moderator'
def get_assignment_dir(instance, filename):
- upload_dir = instance.question_paper.quiz.description.replace(" ", "_")
- return os.sep.join((upload_dir, instance.user.username,
+ folder_name = instance.course.name.replace(" ", "_")
+ sub_folder_name = instance.question_paper.quiz.description.replace(
+ " ", "_")
+ return os.sep.join((folder_name, sub_folder_name, instance.user.username,
str(instance.assignmentQuestion.id),
filename
))
@@ -2234,20 +2236,19 @@ class AnswerPaper(models.Model):
##############################################################################
class AssignmentUploadManager(models.Manager):
- def get_assignments(self, qp, que_id=None, user_id=None):
+ def get_assignments(self, qp, que_id=None, user_id=None, course_id=None):
if que_id and user_id:
assignment_files = AssignmentUpload.objects.filter(
assignmentQuestion_id=que_id, user_id=user_id,
- question_paper=qp
+ question_paper=qp, course_id=course_id
)
file_name = User.objects.get(id=user_id).get_full_name()
else:
assignment_files = AssignmentUpload.objects.filter(
- question_paper=qp
+ question_paper=qp, course_id=course_id
)
-
file_name = "{0}_Assignment_files".format(
- assignment_files[0].question_paper.quiz.description
+ assignment_files[0].course.name
)
return assignment_files, file_name
@@ -2259,6 +2260,7 @@ class AssignmentUpload(models.Model):
assignmentQuestion = models.ForeignKey(Question)
assignmentFile = models.FileField(upload_to=get_assignment_dir)
question_paper = models.ForeignKey(QuestionPaper, blank=True, null=True)
+ course = models.ForeignKey(Course, null=True, blank=True)
objects = AssignmentUploadManager()
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 8430e91..2e5a403 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -62,7 +62,7 @@ $(document).ready(function()
{% if has_quiz_assignments %}
-<a href="{{URL_ROOT}}/exam/manage/download/quiz_assignments/{{quiz_id}}/">
+<a href="{{URL_ROOT}}/exam/manage/download/quiz_assignments/{{quiz_id}}/{{course_id}}">
Download All Assignments</a>
{% endif %}
@@ -194,7 +194,7 @@ Status : <b style="color: red;"> Failed </b><br/>
<h5>Student answer: </h5>
{% if question.type == "upload" %}
{% if has_user_assignments %}
- <a href="{{URL_ROOT}}/exam/manage/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}">
+ <a href="{{URL_ROOT}}/exam/manage/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}/{{course_id}}">
<div class="panel">
Assignment File for {{ data.user.get_full_name.title }}
</div>
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 7cbec91..8f3fad7 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -124,7 +124,7 @@
{% endfor %}
</div>
{% elif question.type == "upload" and has_user_assignment %}
- <a href="{{URL_ROOT}}/exam/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}">
+ <a href="{{URL_ROOT}}/exam/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}/{{course_id}}">
<div class="well well-sm">
<div class="panel">
Assignment File for {{ data.user.get_full_name.title }}
diff --git a/yaksh/urls.py b/yaksh/urls.py
index 8f3401b..8397017 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -8,7 +8,8 @@ urlpatterns = [
url(r'^update_email/$', views.update_email, name="update_email"),
url(r'^activate/(?P<key>.+)$', views.activate_user, name="activate"),
url(r'^new_activation/$', views.new_activation, name='new_activation'),
- url(r'^toggle_moderator/$', views.toggle_moderator_role, name='toggle_moderator'),
+ url(r'^toggle_moderator/$', views.toggle_moderator_role,
+ name='toggle_moderator'),
url(r'^quizzes/$', views.quizlist_user, name='quizlist_user'),
url(r'^quizzes/(?P<enrolled>\w+)/$', views.quizlist_user,
name='quizlist_user'),
@@ -41,6 +42,9 @@ urlpatterns = [
name='self_enroll'),
url(r'^view_answerpaper/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)$',
views.view_answerpaper, name='view_answerpaper'),
+ url(r'^download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/'
+ '(?P<quiz_id>\d+)/(?P<course_id>\d+)$',
+ views.download_assignment_file, name="download_user_assignment"),
url(r'^show_lesson/(?P<lesson_id>\d+)/(?P<module_id>\d+)/'
'(?P<course_id>\d+)/$', views.show_lesson, name='show_lesson'),
url(r'^quizzes/view_module/(?P<module_id>\d+)/(?P<course_id>\d+)/$',
@@ -160,10 +164,11 @@ urlpatterns = [
url(r'^manage/courses/download_course_csv/(?P<course_id>\d+)/$',
views.download_course_csv, name="download_course_csv"),
url(r'^manage/download/user_assignment/(?P<question_id>\d+)/'
- '(?P<user_id>\d+)/(?P<quiz_id>\d+)/$',
+ '(?P<user_id>\d+)/(?P<quiz_id>\d+)/(?P<course_id>\d+)$',
views.download_assignment_file, name="download_user_assignment"),
- url(r'^manage/download/quiz_assignments/(?P<quiz_id>\d+)/$',
- views.download_assignment_file, name="download_quiz_assignment"),
+ url(r'^manage/download/quiz_assignments/(?P<quiz_id>\d+)/'
+ '(?P<course_id>\d+)$', views.download_assignment_file,
+ name="download_quiz_assignment"),
url(r'^manage/courses/download_yaml_template/',
views.download_yaml_template, name="download_yaml_template"),
url(r'^manage/download_sample_csv/',
diff --git a/yaksh/views.py b/yaksh/views.py
index ecd7efd..521096e 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -30,8 +30,8 @@ from yaksh.code_server import get_result as get_result_from_code_server
from yaksh.models import (
Answer, AnswerPaper, AssignmentUpload, Course, FileUpload, Profile,
QuestionPaper, QuestionSet, Quiz, Question, TestCase, User,
- FIXTURES_DIR_PATH, MOD_GROUP_NAME, Lesson, LessonFile, LearningUnit, LearningModule,
- CourseStatus
+ FIXTURES_DIR_PATH, MOD_GROUP_NAME, Lesson, LessonFile, LearningUnit,
+ LearningModule, CourseStatus
)
from yaksh.forms import (
UserRegisterForm, UserLoginForm, QuizForm, QuestionForm,
@@ -77,7 +77,7 @@ def is_moderator(user, group_name=MOD_GROUP_NAME):
def add_as_moderator(users, group_name=MOD_GROUP_NAME):
""" add users to moderator group """
try:
- group = Group.objects.get(name=group_name)
+ Group.objects.get(name=group_name)
except Group.DoesNotExist:
raise Http404('The Group {0} does not exist.'.format(group_name))
for user in users:
@@ -729,19 +729,17 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None,
for fname in assignment_filename:
fname._name = fname._name.replace(" ", "_")
assignment_files = AssignmentUpload.objects.filter(
- assignmentQuestion=current_question,
- assignmentFile__icontains=fname, user=user,
- question_paper=questionpaper_id)
+ assignmentQuestion=current_question, course_id=course_id,
+ assignmentFile__icontains=fname, user=user,
+ question_paper=questionpaper_id)
if assignment_files.exists():
- assign_file = assignment_files.get(
- assignmentQuestion=current_question,
- assignmentFile__icontains=fname, user=user,
- question_paper=questionpaper_id)
+ assign_file = assignment_files.first()
if os.path.exists(assign_file.assignmentFile.path):
os.remove(assign_file.assignmentFile.path)
assign_file.delete()
AssignmentUpload.objects.create(
user=user, assignmentQuestion=current_question,
+ course_id=course_id,
assignmentFile=fname, question_paper_id=questionpaper_id
)
user_answer = 'ASSIGNMENT UPLOADED'
@@ -1890,10 +1888,10 @@ def view_answerpaper(request, questionpaper_id, course_id):
data = AnswerPaper.objects.get_user_data(user, questionpaper_id,
course_id)
has_user_assignment = AssignmentUpload.objects.filter(
- user=user,
+ user=user, course_id=course.id,
question_paper_id=questionpaper_id
).exists()
- context = {'data': data, 'quiz': quiz,
+ context = {'data': data, 'quiz': quiz, 'course_id': course.id,
"has_user_assignment": has_user_assignment}
return my_render_to_response(
request, 'yaksh/view_answerpaper.html', context
@@ -2100,13 +2098,18 @@ def update_email(request):
@login_required
@email_verified
-def download_assignment_file(request, quiz_id, question_id=None, user_id=None):
+def download_assignment_file(request, quiz_id, course_id=None,
+ question_id=None, user_id=None):
user = request.user
- if not is_moderator(user):
- raise Http404("You are not allowed to view this page")
+ course = Course.objects.get(id=course_id)
+ if (not course.is_creator(user) and not course.is_teacher(user) and
+ not course.is_student(user)):
+ raise Http404("You are not allowed to download {}".format(
+ course.name.replace(" ", "_"))
+ )
qp = QuestionPaper.objects.get(quiz_id=quiz_id)
assignment_files, file_name = AssignmentUpload.objects.get_assignments(
- qp, question_id, user_id
+ qp, question_id, user_id, course_id
)
zipfile_name = string_io()
zip_file = zipfile.ZipFile(zipfile_name, "w")
generated by cgit (git 2.34.1) at 2024-12-22 01:05:29 +0000