Added Course Admin View

learnlinux · Aug 23, 2017 · 31e6510 · 31e6510
1 parent 392fd8d
commit 31e6510
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 22 deletions.
diff --git a/both/collections/user.collection.ts b/both/collections/user.collection.ts
@@ -72,11 +72,14 @@
       const user = Users.observable.findOne({ '_id' : user_id });
 
       // Iterate over Roles to get Courses
-      const courses = _.map(_.filter(user.roles, (priv : Privilege) => {
-        return priv.role >= Role.student;
-      }), (priv : Privilege) => {
-        return priv.course_id;
-      });
+      var courses = [];
+      if(user){
+        courses = _.map(_.filter(user.roles, (priv : Privilege) => {
+          return priv.role >= Role.student;
+        }), (priv : Privilege) => {
+          return priv.course_id;
+        });
+      }
 
       // Map to Find Courses
       return Courses.observable.find({ '_id' : { '$in' : courses }});

diff --git a/client/imports/account/login.component.html b/client/imports/account/login.component.html
@@ -23,6 +23,7 @@ <h1> Login </h1>
 
          <!-- Login Button -->
          <md-list-item fxLayout fxLayoutAlign="center">
+           <button md-raised-button [routerLink]="['/account','create']"><md-icon>person_add</md-icon>Create User</button>
            <button md-raised-button><md-icon>vpn_key</md-icon>Forgot Password</button>
            <button md-raised-button><md-icon>check</md-icon>Login</button>
          </md-list-item>

diff --git a/client/imports/account/login.component.ts b/client/imports/account/login.component.ts
@@ -76,6 +76,15 @@
 			})
 		}
 
+		private sendResetEmail(query){
+			Meteor.call('Users.sendPasswordEmail', query, (err) => {
+				if(err){
+					this.error = true;
+					this.errorText = err;
+				}
+			});
+		}
+
 		private LoginWithGoogle(){
 			this.accountService.loginWithGoogle()
 			.then(() => {

diff --git a/client/imports/admin/admin_user_list.component.ts b/client/imports/admin/admin_user_list.component.ts
@@ -497,7 +497,6 @@
 				}
 
 				button{
-					height: 30px;
 					font-size: 12px;
 					line-height: 30px;
 
@@ -596,15 +595,45 @@
 		private user_query : string;
 		private course_query : Course;
 
-    constructor( private zone : NgZone, private ref : ChangeDetectorRef ) {
+    constructor(private zone : NgZone,
+								private ref : ChangeDetectorRef,
+								private route : ActivatedRoute) {
 			super();
     }
 
 		ngOnInit(){
-			Meteor.subscribe('users.all', () => {
-				this.ref.markForCheck();
-			});
-			Meteor.subscribe('courses.all');
+
+			// Get Course Filter
+			this.route.params
+				.map(params => params['course_id'])
+				.subscribe((course_id) => {
+
+					if(course_id){
+
+						// Get Course
+						Meteor.subscribe('courses.id', course_id, () => {
+							this.course_query = Courses.findOne({ _id : course_id });
+							this.onSearch();
+						})
+
+						// Get Users for Course
+						Meteor.subscribe('users.course', course_id, () => {
+							this.ref.markForCheck();
+						});
+
+					} else {
+
+						// Get All Courses
+						Meteor.subscribe('courses.all');
+
+						// Get All Users
+						Meteor.subscribe('users.all', () => {
+							this.ref.markForCheck();
+						});
+
+					}
+				})
+
 			this.courses = Courses.observable.find({});
 			this.onSearch();
 		}

diff --git a/client/imports/app.routes.ts b/client/imports/app.routes.ts
@@ -69,6 +69,7 @@ export const AppRoutes : Routes = [
   { path: 'explore', component: CourseList },
   { path: 'courses', component: CourseList, canActivate: [AuthGuard] },
   { path: 'courses/:course_id', component: CourseView },
+  { path: 'courses/:course_id/users', component: UserList },
 
   // Labs
   { path: 'courses/:course_id/labs/:lab_id', component: LabView, canActivate: [AuthGuard] },

diff --git a/client/imports/course/course_view.component.html b/client/imports/course/course_view.component.html
@@ -58,18 +58,22 @@ <h4> Syllabus </h4>
         </div>
       </div>
 
-      <div class="right" fxLayout="row" fxLayoutAlign="end center">
-        <ng-container *ngIf="!edit_mode">
+      <div class="right" fxLayout="row" fxLayoutAlign="end center" [ngSwitch]="edit_mode">
+        <ng-container *ngSwitchCase="false">
+          <button md-button routerLink="./users">
+            <md-icon>people</md-icon>
+            User View
+          </button>
           <button md-button (click)="exportAsJSON()">
             <md-icon>get_app</md-icon>
-            Export
+            Export Grades
           </button>
           <button md-button (click)="edit_mode=true">
             <md-icon>mode_edit</md-icon>
             Edit
           </button>
         </ng-container>
-        <ng-container *ngIf="edit_mode">
+        <ng-container *ngSwitchCase="true">
           <button md-button *ngIf="role >= Role.course_admin" (click)="addCourseAdmin()">
             <md-icon>person_add</md-icon>
             Add Admin

diff --git a/client/imports/course/course_view.component.scss b/client/imports/course/course_view.component.scss
@@ -16,6 +16,13 @@ div.course_view{
 
    md-card.info {
 
+     input,textarea{
+       width: 100%;
+       border: none;
+       background-color: transparent;
+       color: #000 !important;
+     }
+
      div.title{
        font-size: 21px;
        font-weight: 400;
@@ -87,13 +94,6 @@ div.course_view{
          margin:10px 0px;
        }
 
-       input,textarea{
-         width: 100%;
-         border: none;
-         background-color: transparent;
-         color: #000 !important;
-       }
-
        textarea{
          resize: none;
        }

diff --git a/server/methods/user.methods.ts b/server/methods/user.methods.ts
@@ -1,5 +1,6 @@
 import * as _ from "lodash";
 import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
 
 import { User, Role } from "../../both/models/user.model";
 import { Users } from "../../both/collections/user.collection";
@@ -35,6 +36,29 @@ Meteor.publish("users.instructors", (course_id) => {
   }
 })
 
+// COURSE USERS
+Meteor.publish("users.course", (course_id) => {
+  if(!Meteor.userId()){
+    throw new Meteor.Error("Unauthorized");
+  }
+
+  switch(Users.getRoleFor(course_id, Meteor.userId())){
+    case Role.instructor:
+    case Role.course_admin:
+    case Role.global_admin:
+      return Users.find({
+        "roles" : {
+          "$elemMatch" : {
+            "course_id" : course_id
+          }
+        }
+      })
+    case Role.student:
+    case Role.guest:
+      throw new Meteor.Error("Unauthorized");
+  }
+})
+
 // ALL USERS
 Meteor.publish("users.all", () => {
   if(!Meteor.userId()){
@@ -209,6 +233,23 @@ Meteor.publish("users.all", () => {
       }).fetch();
     },
 
+    'Users.sendPasswordEmail'({query}){
+
+      var user = Users.findOne({
+        $or : [
+          { "_id" : query },
+          { "profile.email " : query }
+        ]
+      })
+
+      if(user){
+        Accounts.sendResetPasswordEmail(user._id);
+      } else {
+        throw new Meteor.Error("No Matching User Found");
+      }
+
+    },
+
     'Users.remove'({user_id}){
       if(!Meteor.userId()){
         throw new Meteor.Error("Unauthorized");