#136

client/imports/ui/components/lablist/lablist.ts

@@ -38,8 +38,8 @@
 // Export LabList Class 
   export class LabList extends MeteorComponent {
     user: Meteor.User;
-    courseId: String;   // TODO: Get from URL
-    userId: String = Meteor.userId();
+    courseId: string; // TODO: Get from URL
+    userId: string = Meteor.userId();
     labs: Array<Object> = [];
     courseRecord;
 
@@ -58,7 +58,7 @@
 		// Method to subscribe to course_records database and set Lab data
     setLab(courseId: String, userId: String) {
       this.subscribe('course-records', [courseId, userId], () => {
-        this.courseRecord = course_records.findOne({ user_id: userId, course_id: courseId }); 
+        this.courseRecord = course_records.findOne({ course_id: courseId }); 
         if(typeof this.courseRecord !== "undefined") {
           let labs = this.courseRecord.labs;
           let totalCompleted = 0;
@@ -69,7 +69,7 @@
             let tasks = lab.tasks;
             for (let j = 0; j < tasks.length; j++) {
               let task = tasks[j];
-              if (task.status === 'SUCCESS') {
+              if (task.status === 'COMPLETED') {
                   tasksCompleted++;
               }
             }

client/imports/ui/components/markdown/markdown.html

@@ -20,17 +20,5 @@
 	<!--Markdown-->
 	<div class="markdown-content">
 		<div id="task-markdown" [innerHTML]="convertedData">Task loading...</div>
-		<div class="markdown-check-button">
-			<md-dialog #alert>
-				<md-dialog-title>Score: 3/10</md-dialog-title>
-				Truth be told you may fail the course, perhaps drop it
-				while you can?
-				<md-dialog-actions ok="Fine"></md-dialog-actions>
-			</md-dialog>
-			<button md-raised-button (click)="alert.show()">
-				Check
-				<md-icon fontIcon="tuxicon-tick"></md-icon>
-			</button>
-		</div>
 	</div>
 </div>

client/imports/ui/pages/course/course.html

@@ -19,6 +19,7 @@
         <a md-button [routerLink]="['/course']">More</a>
         <a md-button [routerLink]="['/course']">More</a>  
       </div>
+      <md-icon fontIcon="tuxicon-right"></md-icon>
     </md-toolbar>
   </div>
   <!--Course View Content-->

client/imports/ui/pages/course/course.routes.ts

@@ -1,17 +1,19 @@
 import { RouterConfig } from '@angular/router';
 import CourseView from './course.ts';
-import { GradeView } from './gradeview.ts';
+import { CourseGradeList } from './course_gradelist.ts';
+import { CourseLabList } from './course_lablist.ts';
+import { CourseDashboard } from './course_dashboard.ts';
 import { LabView } from './labview.ts';
-import { MainCourseView } from './mainview.ts';
 
 export const courseRoutes: RouterConfig = [
   {
     path: 'course',
     component: CourseView,
     children: [
-      { path: '', component: MainCourseView },
-      { path: 'grades', component: GradeView },
-      { path: 'labs', component: LabView }    
+      { path: '', component: CourseDashboard },
+      { path: 'grades', component: CourseGradeList },
+      { path: 'labs', component: CourseLabList },
+      { path: 'labs/lab', component: LabView }
   //  { path: '/:courseid', as: 'CourseView', component: CourseView },
   //  { path: '/:courseid/users', as: 'UserList', component: UserList },
   //  { path: '/:courseid/user/:userid', as: 'UserView', component: UserView },

client/imports/ui/pages/course/mainview.html → client/imports/ui/pages/course/course_dashboard.html

@@ -1,4 +1,4 @@
-<div class="tuxlab-maincourseview">
+<div class="tuxlab-course-dashboard">
   <!--Course Description Card-->
   <a name="description"></a>
   <md-card>

client/imports/ui/pages/course/mainview.ts → client/imports/ui/pages/course/course_dashboard.ts

@@ -28,10 +28,10 @@
 	import { courses } from "../../../../../collections/courses.ts";
 	import { course_records } from "../../../../../collections/course_records.ts";
 
-// Define CourseView Component
+// Define CourseDashboard Component
 	@Component({
-		selector: 'tuxlab-maincourseview',
-		templateUrl: '/client/imports/ui/pages/course/mainview.html',
+		selector: 'tuxlab-course-dashboard',
+		templateUrl: '/client/imports/ui/pages/course/course_dashboard.html',
 		directives: [
 			MATERIAL_DIRECTIVES,
 			MD_ICON_DIRECTIVES,
@@ -44,8 +44,8 @@
 		encapsulation: ViewEncapsulation.None
 	})
 
-// Export MainCourseView Class
-  export class MainCourseView extends MeteorComponent {
+// Export CourseDashboard Class
+  export class CourseDashboard extends MeteorComponent {
     course;
     courseNumber: String = '15-131'; // TODO: Get from URL
     courseDescription: String = "Course Description Not Found";

client/imports/ui/pages/course/gradeview.ts → client/imports/ui/pages/course/course_gradelist.ts

@@ -27,10 +27,14 @@
 	import { courses } from "../../../../../collections/courses.ts";
 	import { course_records } from "../../../../../collections/course_records.ts";
 
-// Define GradeView Component
+// Define CourseGradeList Component
 	@Component({
-		selector: 'tuxlab-gradeview',
-		templateUrl: '/client/imports/ui/pages/course/gradeview.html',
+		selector: 'tuxlab-course-gradelist',
+    template : `
+      <div class="tuxlab-course-gradelist">
+        <tuxlab-gradelist></tuxlab-gradelist>
+      </div>
+    `,
 		directives: [
 			MATERIAL_DIRECTIVES,
 			MD_ICON_DIRECTIVES,
@@ -42,8 +46,8 @@
 		encapsulation: ViewEncapsulation.None
 	})
 
-// Export GradeView Class
-  export class GradeView extends MeteorComponent {
+// Export CourseGradeList Class
+  export class CourseGradeList extends MeteorComponent {
     constructor(mdIconRegistry: MdIconRegistry) {
       super();
       // Create Icon Font

client/imports/ui/pages/course/course_lablist.ts

@@ -0,0 +1,57 @@
+// Meteor Imports
+	import { Meteor } from 'meteor/meteor';
+	import { Mongo } from 'meteor/mongo';
+	import 'reflect-metadata';
+	import 'zone.js/dist/zone';
+
+// Angular Imports
+	import { Component, ViewEncapsulation, provide } from '@angular/core';
+	import { bootstrap } from 'angular2-meteor-auto-bootstrap';
+	import { APP_BASE_HREF } from '@angular/common';
+	import { HTTP_PROVIDERS } from '@angular/http';
+	import { InjectUser } from 'angular2-meteor-accounts-ui';
+	import { ROUTER_DIRECTIVES } from '@angular/router';
+
+// Angular Material Imports
+	import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
+	import { MeteorComponent } from 'angular2-meteor';
+	import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
+
+// Icon
+  	import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
+
+// LabList and Grades import
+	import { LabList } from "../../components/lablist/lablist.ts";
+
+// Courses and Course Record Imports
+	import { courses } from "../../../../../collections/courses.ts";
+	import { course_records } from "../../../../../collections/course_records.ts";
+
+// Define CourseLabList Component
+	@Component({
+		selector: 'tuxlab-course-lablist',
+    template: `
+      <div class="tuxlab-course-lablist">
+        <tuxlab-lablist></tuxlab-lablist>
+      </div>
+    `,
+		directives: [
+			MATERIAL_DIRECTIVES,
+			MD_ICON_DIRECTIVES,
+			ROUTER_DIRECTIVES,
+			LabList
+		],
+		viewProviders: [MdIconRegistry],
+		providers: [OVERLAY_PROVIDERS],
+		encapsulation: ViewEncapsulation.None
+	})
+
+// Export CourseLabList Class
+  export class CourseLabList extends MeteorComponent {
+    constructor(mdIconRegistry: MdIconRegistry) {
+      super();
+      // Create Icon Font
+      mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
+      mdIconRegistry.setDefaultFontSetClass('tuxicon');
+    }
+  }

client/imports/ui/pages/course/labview.html

@@ -1,3 +1,3 @@
 <div class="tuxlab-labview">
-  <tuxlab-lablist></tuxlab-lablist>
+  Single lab here.
 </div>

client/imports/ui/pages/course/labview.ts

@@ -1,53 +1,18 @@
 // Meteor Imports
-	import { Meteor } from 'meteor/meteor';
-	import { Mongo } from 'meteor/mongo';
-	import 'reflect-metadata';
-	import 'zone.js/dist/zone';
-
+  import { MeteorComponent } from 'angular2-meteor';
+
 // Angular Imports
-	import { Component, ViewEncapsulation, provide } from '@angular/core';
-	import { bootstrap } from 'angular2-meteor-auto-bootstrap';
-	import { APP_BASE_HREF } from '@angular/common';
-	import { HTTP_PROVIDERS } from '@angular/http';
-	import { InjectUser } from 'angular2-meteor-accounts-ui';
-	import { ROUTER_DIRECTIVES } from '@angular/router';
-
-// Angular Material Imports
-	import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
-	import { MeteorComponent } from 'angular2-meteor';
-	import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
-
-// Icon
-  	import { MD_ICON_DIRECTIVES, MdIconRegistry } from '@angular2-material/icon';
-
-// LabList and Grades import
-	import { LabList } from "../../components/lablist/lablist.ts";
-
-// Courses and Course Record Imports
-	import { courses } from "../../../../../collections/courses.ts";
-	import { course_records } from "../../../../../collections/course_records.ts";
+  import { Component } from '@angular/core';
 
-// Define CourseView Component
-	@Component({
-		selector: 'tuxlab-labview',
-		templateUrl: '/client/imports/ui/pages/course/labview.html',
-		directives: [
-			MATERIAL_DIRECTIVES,
-			MD_ICON_DIRECTIVES,
-			ROUTER_DIRECTIVES,
-			LabList
-		],
-		viewProviders: [MdIconRegistry],
-		providers: [OVERLAY_PROVIDERS],
-		encapsulation: ViewEncapsulation.None
-	})
+// Define LabView Component
+  @Component({
+    selector: 'tuxlab-labview',
+    templateUrl: '/client/imports/ui/pages/course/labview.html' 
+  })
 
 // Export LabView Class
   export class LabView extends MeteorComponent {
-    constructor(mdIconRegistry: MdIconRegistry) {
+    constructor() {
       super();
-      // Create Icon Font
-      mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
-      mdIconRegistry.setDefaultFontSetClass('tuxicon');
     }
-  }
+  }