Multiple changes to Course:

- Allow a start and end time for Course enrollment
- Allow Course to be editable

1 files changed, 38 insertions, 0 deletions

diff --git a/yaksh/views.py b/yaksh/views.py
index 2adc2c3..7208e82 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -614,10 +614,43 @@ def add_course(request):
 
 
 @login_required
+def edit_course(request, course_id=None):
+    user = request.user
+    ci = RequestContext(request)
+    if course_id:
+        course = Course.objects.get(id=course_id)
+    else:
+        course = None
+
+    if not is_moderator(user):
+        raise Http404('You are not allowed to view this page')
+    if request.method == 'POST':
+        form = CourseForm(request.POST, instance=course)
+        if form.is_valid():
+            new_course = form.save(commit=False)
+            new_course.creator = user
+            new_course.save()
+            return my_redirect('/exam/manage/')
+        else:
+            return my_render_to_response('yaksh/add_course.html',
+                                         {'form': form},
+                                         context_instance=ci)
+    else:
+        form = CourseForm(instance=course)
+        return my_render_to_response('yaksh/add_course.html', {'form': form},
+                                     context_instance=ci)
+
+
+@login_required
 def enroll_request(request, course_id):
     user = request.user
     ci = RequestContext(request)
     course = get_object_or_404(Course, pk=course_id)
+    if not course.is_active_enrollment:
+        msg = 'Enrollment for this course has been closed, please contact your '\
+            'instructor/administrator.'
+        return complete(request, msg, attempt_num, questionpaper_id=None)
+
     course.request(user)
     if is_moderator(user):
         return my_redirect('/exam/manage/')
@@ -676,6 +709,11 @@ def enroll(request, course_id, user_id=None, was_rejected=False):
         raise Http404('You are not allowed to view this page')
 
     course = get_object_or_404(Course, pk=course_id)
+    if not course.is_active_enrollment:
+        msg = 'Enrollment for this course has been closed, please contact your '\
+            'instructor/administrator.'
+        return complete(request, msg, attempt_num, questionpaper_id=None)
+
     if not course.is_creator(user) and not course.is_teacher(user):
         raise Http404('This course does not belong to you')