Grading panel

client/app/courses/sections/edit/sectionedit.controller.js

@@ -14,7 +14,6 @@ export default class SectionEditCtrl {
       }, section => {
         $scope.course = section.course;
         $scope.section = section;
-
       }, () =>{
         $location.path('/courses');
       });

client/app/courses/sections/view/sectionview.controller.js

@@ -9,12 +9,14 @@ export default class SectionViewCtrl {
         withSectionsCourse:true,
         withSectionsEvent: true,
         withSectionsInstructors: true,
+        withSectionsAssistants: true,
         withSectionsStudents: true,
         withEnrollmentStatus: true,
         studentId: $scope.user._id
       }, section => {
         $scope.course = section.course;
         $scope.section = section;
+        console.log(section.teachingAssistants)
       }, () =>{
         $location.path('/courses');
       });
@@ -27,6 +29,7 @@ export default class SectionViewCtrl {
         $location.path('instructor/courses/'+$routeParams.id+'/sections/'+$routeParams.sectionId);
       }
       loadSection();
+
     });
 
     $scope.selecteEvent = function(event){
@@ -44,6 +47,7 @@ export default class SectionViewCtrl {
       });
     };
     $scope.viewCourse = function(){
+       console.log(section)
       $location.path('/courses/'+$routeParams.id);
     };
   }

client/app/courses/sections/view/sectionview.html

@@ -40,6 +40,14 @@ <h4 class="no-spacing">Section Info</h4>
                 </span>
               </td>
             </tr>
+            <tr>
+              <td class="text-right">Teaching Assistants<span ng-show="section.assistants.length > 1">s</span></td>
+              <td class="text-left">
+                <span ng-repeat="ta in section.assistants">
+                  <span ng-show="$last && !$first">& </span>{{ta.firstName}} {{ta.lastName}}<span ng-hide="$last">, </span>
+                </span>
+              </td>
+            </tr>
             <tr>
               <td class="text-right">Section Number<span ng-show="section.sectionNumbers.length > 1">s</span></td>
               <td class="text-left">
@@ -60,6 +68,7 @@ <h4 class="no-spacing">Section Info</h4>
               <td class="text-right">Enrollment Policy</td>
               <td class="text-left">{{(section.enrollmentPolicy === "approvalRequired")?"approval":section.enrollmentPolicy}}</td>
             </tr>
+
           </table>
         </div>
       </div>

client/app/courses/view/courseview.controller.js

@@ -44,6 +44,7 @@ export default class CourseViewCtrl {
             id: $routeParams.id,
             withSections:true,
             withSectionInstructors: true,
+            withSectionAssistants: true,
             withSectionEnrollmentStatus: true,
             studentid: user._id,
             checkRoles: true

client/app/courses/view/courseview.html

@@ -48,8 +48,9 @@ <h4 ng-show="!course.sections.length" class="no-spacing">No Sections Created</h4
 
                 <table class="course-section text-center table table-hover" ng-show="course.sections.length">
                     <tr>
-                        <th class="text-center">Number</th>
-                        <th class="text-center">Instructor</th>
+                        <th char="" lass="text-center">Number</th>
+                        <th class="text-center">Instructor</th>			
+                        <th class="text-center">Teaching Assistants</th>
                         <th class="text-center">Students</th>
                         <th class="text-center">Pending</th>
                         <th class="text-center">Info</th>
@@ -62,6 +63,12 @@ <h4 ng-show="!course.sections.length" class="no-spacing">No Sections Created</h4
                                 {{instructor.firstName}} {{instructor.lastName}}<span ng-hide="$last">, </span>
                             </span>
                         </td>
+
+                        <td>
+                            <span ng-repeat="assistant in section.teachingAssistants">
+                                {{assistant.firstName}} {{assistant.lastName}}<span ng-hide="$last">, </span>
+                            </span>
+                        </td>
                         <td>
                             <span class='studentCount'>{{section.students.length}}</span>
                         </td>
@@ -84,6 +91,7 @@ <h4 ng-show="!course.sections.length">No Sections Avalible</h4>
                     <tr>
                         <th class="text-center">Number</th>
                         <th class="text-center">Instructor</th>
+                        <th class="text-center">Teaching Assistants</th>
                         <th class="text-center">Students</th>
                         <th class="text-center">Enrollment Policy</th>
                         <th class="text-center">Info</th>
@@ -97,6 +105,11 @@ <h4 ng-show="!course.sections.length">No Sections Avalible</h4>
                                 {{instructor.firstName}} {{instructor.lastName}}
                             </span>
                         </td>
+                        <td>
+                            <span ng-repeat="assistant in section.teachingAssistants">
+                                {{assistant.firstName}} {{assistant.lastName}}<span ng-hide="$last">, </span>
+                            </span>
+                        </td>
                         <td>
                             <span class='studentCount'>{{section.students.length}}</span>
                         </td>

client/app/instructor/courses/sections/sectionview.controller.js

@@ -23,6 +23,7 @@ export default class InstructorSectionViewCtrl implements OnInit{
         withSectionsInstructors: true,
         withSectionsStudents: true,
         withSectionsPendingStudents: true,
+        withSectionsAssistants: true,
         withEnrollmentStatus: true,
         studentId: $scope.user._id
       }, section => {

client/app/instructor/courses/sections/sectionview.html

@@ -1,4 +1,4 @@
-<div class='container instructor'>
+  <div class='container instructor'>
   <div class="instructorSectionview">
     <course-title-banner section="section" course="course" link="/courses/{{course._id}}"></course-title-banner>
 
@@ -18,6 +18,14 @@ <h4><a href="/login">Log in</a> to learn more</h4>
                   <span ng-show="$last && !$first">& </span>{{instructor.firstName}} {{instructor.lastName}}<span ng-hide="$last">, </span>
                 </span>
               </td>
+            </tr>
+             <tr>
+              <td class="text-right section-info">Teaching Assistant(s)<span ng-show="section.teachingAssistants.length > 1">s</span></td>
+              <td class="text-left section-info">
+                <span ng-repeat="ta in section.teachingAssistants">
+                  <span ng-show="$last && !$first">& </span>{{ta.firstName}} {{ta.lastName}}<span ng-hide="$last">, </span>
+                </span>
+              </td>
             </tr>
             <tr>
               <td class="text-right">Section Number<span ng-show="section.sectionNumbers.length > 1">s</span></td>

client/app/student/dashboard/dashboard.html

@@ -2,6 +2,34 @@
     <div class="row">
       <div class="col-sm-12 dashboard">
         <h1 class="page-header">Dashboard</h1>
+          <div class="col-sm-12 top-rowst" ng-show="isTA" ng-cloak>
+          <h3>TA Sections</h3>
+          <h4 ng-hide="sections.length">You don't have any sections yet</h4>
+          <table class="course-section text-center table table-hover" ng-show="sections.length">
+            <tr>
+              <th class="text-center">Course</th>
+              <th class="text-center">Section</th>
+              <th class="text-center">Pending</th>
+              <th class="text-center">Students</th>
+              <th class="text-center">Edit</th>
+            </tr>
+            <tr class='btn-row-sm' ng-repeat="section in sections" ng-show="section.pendingStudents.length > 0">
+              <td>
+                <span class='studentCount'>{{section.course.name}}</span>
+              </td>
+              <td><span ng-repeat="number in section.sectionNumbers"><span ng-show="$last && !$first">& </span>{{number}}<span ng-hide="$last">, </span></span></td>
+              <td>
+                <span>{{section.pendingStudents.length}}</span>
+              </td>
+              <td>
+                <span>{{section.students.length}}</span>
+              </td>
+              <td>
+                <a href="#" class="btn btn-default btn-sm" ng-href="{{ viewSection(section) }}" role="button">View</a>
+              </td>
+            </tr>
+          </table>
+        </div>
         <div class="row">
           <div class="col-md-6 events" ng-cloak>
             <h3> Upcoming Events </h3>

client/app/student/grading/grading.controller.js

@@ -0,0 +1,18 @@
+'use strict';
+export default class GradingCtrl {
+
+  /*@ngInject*/
+  constructor($scope, $location, User, Auth, Submission) {
+    $scope.refreshSubmissions = function() {
+      Submission.getAll({'onlyTA':'me', 'withStudents': true, 'withSection':true, 'withSectionCourse':true}, (submissions)=>{
+        $scope.submissions = submissions;
+      });
+    }
+
+    $scope.refreshSubmissions();
+
+    $scope.goToEvent = (event) => {
+      $location.path("/events/" + event._id);
+    };
+  }
+}

client/app/student/grading/grading.controller.spec.js

@@ -0,0 +1,21 @@
+'use strict';
+
+describe('Controller: GradingCtrl', function () {
+
+  // load the controller's module
+  beforeEach(module('venueApp'));
+
+  var GradingCtrl, scope;
+
+  // Initialize the controller and a mock scope
+  beforeEach(inject(function ($controller, $rootScope) {
+    scope = $rootScope.$new();
+    GradingCtrl = $controller('GradingCtrl', {
+      $scope: scope
+    });
+  }));
+
+  it('should ...', function () {
+    expect(1).to.equal(1);
+  });
+});

client/app/student/grading/grading.html

@@ -0,0 +1,19 @@
+<div class='container student'>
+  <div class='row'>
+    <div class='col-sm-12 grading-panel' ng-cloak>
+      <h1 class="page-header">Grading</h1>
+      <h3 ng-hide="submissions.length">No student submissions yet</h3>
+      <h4 ng-hide="submissions.length">Contact your instructor to create an event</h4>
+      <div ng-show="submissions.length">
+        <uib-tabset active="active">
+          <uib-tab index="0" heading="Images" select="refreshSubmissions()">
+            <submission-card class="col-md-6" ng-repeat='submission in submissions | orderBy: "-createdAt"' data="submission" click="goToEvent(submission.sectionEvent)" short="false" />
+          </uib-tab>
+          <uib-tab index="1" heading="List" select="refreshSubmissions()">
+            <br/>
+            <submissionview></submissionview>
+          </uib-tab>
+      </uib-tabset>
+    </div>
+  </div>
+</div>

client/app/student/grading/grading.routes.js

@@ -0,0 +1,12 @@
+'use strict';
+
+export default function routes($routeProvider) {
+  'ngInject';
+
+  $routeProvider
+    .when('/student/grading', {
+      template: require('./grading.html'),
+      controller: 'GradingCtrl',
+      authenticate: 'student'
+    });
+}

client/app/student/grading/index.js

@@ -0,0 +1,10 @@
+'use strict';
+const ngRoute = require('angular-route');
+import routing from './grading.routes';
+
+import GradingCtrl from './grading.controller';
+
+export default angular.module('venueApp.grading', ['venueApp.auth', 'venueApp.SubmissionFactory', ngRoute, 'directives.submissionCard'])
+  .controller('GradingCtrl', GradingCtrl)
+  .config(routing)
+  .name;

client/app/student/index.js

@@ -10,8 +10,8 @@ import dashboard from './dashboard';
 import events from './events';
 import submissions from './submissions';
 import upload from './upload';
+import grading from './grading';
 
-export default angular.module('venueApp.student', [ngRoute, courses, dashboard, events, submissions, upload
-])
+export default angular.module('venueApp.student', [ngRoute, courses, dashboard, events, submissions, upload, grading])
   .config(routing)
   .name;

client/components/auth/auth.service.js

@@ -9,7 +9,11 @@ class User {
   $promise = undefined;
 }
 
-export function AuthService(Util, $location, $http, $cookies, $q, appConfig, User) {
+class Oblah {
+  name: string = '';
+}
+
+export function AuthService(Util, $location, $http, $cookies, $q, appConfig, User, Section) {
   'ngInject';
   var safeCb = Util.safeCb;
   var currentUser: User = new User();
@@ -229,7 +233,22 @@ export function AuthService(Util, $location, $http, $cookies, $q, appConfig, Use
      * @return {Bool}
      */
     isStudentSync() {
-      return currentUser.hasOwnProperty('isInstructor') ? (currentUser.isInstructor === false) : false;
+      return currentUser.hasOwnProperty('isInstructor') ? (currentUser.isInstructor === false ) : false;
+    },
+
+    isTA(callback: Function = () => {}) {
+      return Auth.getCurrentUser(undefined)
+        .then(user => {
+          var has = user.hasOwnProperty('taSections') ? (user.taSections != undefined && user.taSections.length > 0) : false;
+          safeCb(callback)(has);
+          return has;
+        });
+    },
+
+    isTASync() {
+      // console.log("TA SECTIONS: " + currentUser.taSections);
+      // if(currentUser.taSections != undefined) console.log("NUM SECTIONS: " + currentUser.taSections.length);
+      return currentUser.hasOwnProperty('taSections') ? (currentUser.taSections != undefined && currentUser.taSections.length > 0) : false;
     },
 
     /**

client/components/auth/user.service.js

@@ -3,7 +3,7 @@
 export function UserResource($resource) {
   'ngInject';
 
-  return $resource('/api/users/:id/:controller', {
+  var User = $resource('/api/users/:id/:controller', {
     id: '@_id'
   }, {
     changePassword: {
@@ -80,6 +80,13 @@ export function UserResource($resource) {
       params: {
         controller: 'unenroll'
       }
-    }
+    },
+    updateTASections: {
+      method: 'PUT',
+      params: {
+        controller: 'updateTASections'
+      }
+    } 
   });
-}
+  return User;
+}

client/components/courseform/courseform.html

@@ -51,10 +51,10 @@ <h4 ng-show="!updating">You can add sections later</h4>
       A course description is required
     </p>
   </div>
-  
+
   <div class="form-group" ng-if="isSupervisor">
     <label>Course Supervisor</label><br>
-    
+
     <a class="list-group-item" style="margin-bottom:10px; width:300px;">{{supervisor.name}}</a>
 
     <div class="instructor-add-field">
@@ -73,9 +73,7 @@ <h4 ng-show="!updating">You can add sections later</h4>
     </div>
 
   </div>
-
-
-
+
 
   <div class="form-group" ng-class="{ 'has-error': submitted && !file}">
     <label>Course Image</label>