Merge branch 'master' of github.com:MITx/mitx into discussion2

lms/djangoapps/dashboard/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

lms/djangoapps/dashboard/tests.py

@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)

lms/djangoapps/dashboard/views.py

@@ -0,0 +1,31 @@
+# Create your views here.
+import json
+from datetime import datetime
+from django.http import HttpResponse, Http404
+
+def dictfetchall(cursor):
+    '''Returns all rows from a cursor as a dict.
+    Borrowed from Django documentation'''
+    desc = cursor.description
+    return [
+        dict(zip([col[0] for col in desc], row))
+        for row in cursor.fetchall()
+    ]
+
+def dashboard(request):
+    """
+    Quick hack to show staff enrollment numbers.  This should be
+    replaced with a real dashboard later. This version is a short-term
+    bandaid for the next couple weeks. 
+    """
+    if not request.user.is_staff:
+        raise Http404
+
+    query = "select count(user_id) as students, course_id from student_courseenrollment group by course_id order by students desc"
+
+    from django.db import connection
+    cursor = connection.cursor()
+    cursor.execute(query)
+    results = dictfetchall(cursor)
+
+    return HttpResponse(json.dumps(results, indent=4))

lms/static/sass/multicourse/_dashboard.scss

@@ -2,6 +2,27 @@
   @include clearfix;
   padding: 60px 0px 120px;
 
+  .dashboard-banner {
+    background: $yellow;
+    border: 1px solid rgb(200,200,200);
+    @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
+    padding: 10px;
+    margin-bottom: 30px;
+
+    &:empty {
+      display: none;
+      background-color: #FFF;
+    }
+
+    h2 {
+      margin-bottom: 0;
+    }
+
+    p {
+      margin-bottom: 0;
+    }
+  }
+
   .profile-sidebar {
     background: transparent;
     float: left;

lms/templates/dashboard.html

@@ -34,10 +34,11 @@
 
 <section class="container dashboard">
   
-  <section class="dashboard-banner">
-    ${message}
-    <br/>
-  </section>
+  %if message:
+    <section class="dashboard-banner">
+      ${message}
+    </section>
+  %endif
 
   <section class="profile-sidebar">
     <header class="profile">

lms/urls.py

@@ -14,6 +14,8 @@ urlpatterns = ('',
     url(r'^$', 'student.views.index', name="root"), # Main marketing page, or redirect to courseware
     url(r'^dashboard$', 'student.views.dashboard', name="dashboard"),
 
+    url(r'^admin_dashboard$', 'dashboard.views.dashboard'),
+    
     url(r'^change_email$', 'student.views.change_email_request'),
     url(r'^email_confirm/(?P<key>[^/]*)$', 'student.views.confirm_email_change'),
     url(r'^change_name$', 'student.views.change_name_request'),