Add instructor dashboard

* dashboard links to gradebook and dummy grade summary page

lms/djangoapps/courseware/courses.py

@@ -145,6 +145,8 @@ def has_staff_access_to_course(user, course):
     '''
     Returns True if the given user has staff access to the course.
     This means that user is in the staff_* group, or is an overall admin.
+    TODO (vshnayder): this needs to be changed to allow per-course_id permissions, not per-course
+    (e.g. staff in 2012 is different from 2013, but maybe some people always have access)
 
     course is the course field of the location being accessed.
     '''
@@ -160,7 +162,14 @@ def has_staff_access_to_course(user, course):
         return True
     return False
 
-def has_access_to_course(user,course):
+def has_staff_access_to_course_id(user, course_id):
+    """Helper method that takes a course_id instead of a course name"""
+    loc = CourseDescriptor.id_to_location(course_id)
+    return has_staff_access_to_course(user, loc.course)
+
+
+def has_access_to_course(user, course):
+    '''course is the .course element of a location'''
     if course.metadata.get('ispublic'):
         return True
     return has_staff_access_to_course(user,course)

lms/djangoapps/courseware/views.py

@@ -28,7 +28,7 @@ from util.cache import cache, cache_if_anonymous
 from student.models import UserTestGroup, CourseEnrollment
 from courseware import grades
 from courseware.courses import (check_course, get_courses_by_university,
-                                has_staff_access_to_course)
+                                has_staff_access_to_course_id)
 
 
 log = logging.getLogger("mitx.courseware")
@@ -36,6 +36,9 @@ log = logging.getLogger("mitx.courseware")
 template_imports = {'urllib': urllib}
 
 def user_groups(user):
+    """
+    TODO (vshnayder): This is not used. When we have a new plan for groups, adjust appropriately.
+    """
     if not user.is_authenticated():
         return []
 
@@ -65,65 +68,6 @@ def courses(request):
     universities = get_courses_by_university(request.user)
     return render_to_response("courses.html", {'universities': universities})
 
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-def gradebook(request, course_id):
-    if 'course_admin' not in user_groups(request.user):
-        raise Http404
-    course = check_course(course_id)
-
-    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).order_by('username')
-
-    # TODO (vshnayder): implement pagination.
-    enrolled_students = enrolled_students[:1000]   # HACK!
-
-    student_info = [{'username': student.username,
-                     'id': student.id,
-                     'email': student.email,
-                     'grade_summary': grades.grade(student, request, course),
-                     'realname': UserProfile.objects.get(user=student).name
-                     }
-                     for student in enrolled_students]
-
-    return render_to_response('gradebook.html', {'students': student_info,
-                                                 'course': course, 'course_id': course_id})
-
-
-@login_required
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-def profile(request, course_id, student_id=None):
-    ''' User profile. Show username, location, etc, as well as grades .
-        We need to allow the user to change some of these settings .'''
-    course = check_course(course_id)
-
-    if student_id is None:
-        student = request.user
-    else:
-        if 'course_admin' not in user_groups(request.user):
-            raise Http404
-        student = User.objects.get(id=int(student_id))
-
-    user_info = UserProfile.objects.get(user=student)
-
-    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
-    course_module = get_module(request.user, request, course.location, student_module_cache)
-
-    courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
-    grade_summary = grades.grade(request.user, request, course, student_module_cache)
-
-    context = {'name': user_info.name,
-               'username': student.username,
-               'location': user_info.location,
-               'language': user_info.language,
-               'email': student.email,
-               'course': course,
-               'csrf': csrf(request)['csrf_token'],
-               'courseware_summary' : courseware_summary,
-               'grade_summary' : grade_summary
-               }
-    context.update()
-
-    return render_to_response('profile.html', context)
-
 
 def render_accordion(request, course, chapter, section):
     ''' Draws navigation bar. Takes current position in accordion as
@@ -298,3 +242,104 @@ def university_profile(request, org_id):
     template_file = "university_profile/{0}.html".format(org_id).lower()
 
     return render_to_response(template_file, context)
+
+
+@login_required
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def profile(request, course_id, student_id=None):
+    """ User profile. Show username, location, etc, as well as grades .
+        We need to allow the user to change some of these settings.
+
+    Course staff are allowed to see the profiles of students in their class.
+    """
+    course = check_course(course_id)
+
+    if student_id is None or student_id == request.user.id:
+        # always allowed to see your own profile
+        student = request.user
+    else:
+        # Requesting access to a different student's profile
+        if not has_staff_access_to_course_id(request.user, course_id):
+            raise Http404
+        student = User.objects.get(id=int(student_id))
+
+    user_info = UserProfile.objects.get(user=student)
+
+    student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(request.user, course)
+    course_module = get_module(request.user, request, course.location, student_module_cache)
+
+    courseware_summary = grades.progress_summary(student, course_module, course.grader, student_module_cache)
+    grade_summary = grades.grade(request.user, request, course, student_module_cache)
+
+    context = {'name': user_info.name,
+               'username': student.username,
+               'location': user_info.location,
+               'language': user_info.language,
+               'email': student.email,
+               'course': course,
+               'csrf': csrf(request)['csrf_token'],
+               'courseware_summary' : courseware_summary,
+               'grade_summary' : grade_summary
+               }
+    context.update()
+
+    return render_to_response('profile.html', context)
+
+
+
+# ======== Instructor views =============================================================================
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def gradebook(request, course_id):
+    """
+    Show the gradebook for this course:
+    - only displayed to course staff
+    - shows students who are enrolled.
+    """
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    enrolled_students = User.objects.filter(courseenrollment__course_id=course_id).order_by('username')
+
+    # TODO (vshnayder): implement pagination.
+    enrolled_students = enrolled_students[:1000]   # HACK!
+
+    student_info = [{'username': student.username,
+                     'id': student.id,
+                     'email': student.email,
+                     'grade_summary': grades.grade(student, request, course),
+                     'realname': UserProfile.objects.get(user=student).name
+                     }
+                     for student in enrolled_students]
+
+    return render_to_response('gradebook.html', {'students': student_info,
+                                                 'course': course, 'course_id': course_id})
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def grade_summary(request, course_id):
+    """Display the grade summary for a course."""
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    # For now, just a static page
+    context = {'course': course }
+    return render_to_response('grade_summary.html', context)
+
+
+@cache_control(no_cache=True, no_store=True, must_revalidate=True)
+def instructor_dashboard(request, course_id):
+    """Display the instructor dashboard for a course."""
+    if not has_staff_access_to_course_id(request.user, course_id):
+        raise Http404
+
+    course = check_course(course_id)
+
+    # For now, just a static page
+    context = {'course': course }
+    return render_to_response('instructor_dashboard.html', context)
+

lms/templates/course_navigation.html

@@ -7,6 +7,7 @@ def url_class(url):
   return ""
 %>
 <%! from django.core.urlresolvers import reverse %>
+<%! from courseware.courses import has_staff_access_to_course_id %>
 
 <nav class="${active_page} course-material">
   <div class="inner-wrapper">
@@ -16,10 +17,10 @@ def url_class(url):
 % if user.is_authenticated():
 % if settings.MITX_FEATURES.get('ENABLE_TEXTBOOK'):
       <li class="book"><a href="${reverse('book', args=[course.id])}" class="${url_class('book')}">Textbook</a></li>
-% endif 
+% endif
 % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION'):
       <li class="discussion"><a href="${reverse('questions')}">Discussion</a></li>
-% endif 
+% endif
 % endif
 % if settings.WIKI_ENABLED:
       <li class="wiki"><a href="${reverse('wiki_root', args=[course.id])}" class="${url_class('wiki')}">Wiki</a></li>
@@ -27,6 +28,10 @@ def url_class(url):
 % if user.is_authenticated():
       <li class="profile"><a href="${reverse('profile', args=[course.id])}" class="${url_class('profile')}">Profile</a></li>
 % endif
+% if has_staff_access_to_course_id(user, course.id):
+      <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}" class="${url_class('profile')}">Instructor</a></li>
+% endif
+
     </ol>
   </div>
 </nav>

lms/templates/grade_summary.html

+<%inherit file="main.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%namespace name='static' file='static_content.html'/>
+
+<%include file="course_navigation.html" args="active_page=''" />
+
+<section class="container">
+<div class="gradebook-summary-wrapper">
+  <section class="gradebook-summary-content">
+    <h1>Grade summary</h1>
+
+    <p>Not implemented yet</p>
+
+  </section>
+</div>
+</section>

lms/templates/instructor_dashboard.html

+<%inherit file="main.html" />
+<%! from django.core.urlresolvers import reverse %>
+<%namespace name='static' file='static_content.html'/>
+
+<%block name="headextra">
+  <%static:css group='course'/>
+</%block>
+
+<%include file="course_navigation.html" args="active_page=''" />
+
+<section class="container">
+<div class="instructor-dashboard-wrapper">
+  <section class="instructor-dashboard-content">
+    <h1>Instructor Dashboard</h1>
+
+    <p>
+    <a href="${reverse('gradebook', kwargs={'course_id': course.id})}">Gradebook</a>
+
+    <p>
+    <a href="${reverse('grade_summary', kwargs={'course_id': course.id})}">Grade summary</a>
+
+  </section>
+</div>
+</section>

lms/urls.py

@@ -140,8 +140,13 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.profile', name="student_profile"),
 
         # For the instructor
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/instructor$',
+            'courseware.views.instructor_dashboard', name="instructor_dashboard"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/gradebook$',
-            'courseware.views.gradebook'),
+            'courseware.views.gradebook', name='gradebook'),
+        url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/grade_summary$',
+            'courseware.views.grade_summary', name='grade_summary'),
+
     )
 
     # Multicourse wiki