Fixed Router Params, Issue #161 (#174)

sandershihacker · DerekTBrown · commit ecadc23a1b07 · 2016-07-25T16:36:59.000-04:00
* Updated Schemas * Load Screen * Loading Screen * publish subscribe and dynamic explore page * deleted swap file * publish subscribe * template fixes * added start for reactive publication * template issue * . * . * course_records publish * course_records reactively publish * revert meteor update * publish subscribe and lineheight for searchpage icons * fixed indentation and removed test file * indentation * indentation * Accounts page and fixed random erro * toolbar for mobile devices * toolbar * account.html fixes * Toolbar made responsive * Responsive toolbar fixes * created userlist component * course_records course_id validation * indentation * markdown * import changes * validation addition * Forms Module Deprecated Warning. Issue #110 * indentation * Use routerLink * api changes (#126) * issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * method implementations (#127) * issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * method implementations * course pages now uses Child Routing * deleted LabData class * school name * search function * icon size and #136 * dashboard pull data from database * fix inappropriate file naming for gradelist and lablist * more templating issues * . * . * markdown default * lablist and gradelist * template changes * explore page changes * delete instructor page * user schema * indentation * indentation * explore publish and taskview sidenav * explore view links to course/courseId * taskview sidenav * taskview * taskview sidenav changes * Extend terminal on small width * . * . * Added UserList Component in Courses * Edit Course * . * course dashboard get courseid from url * delete userlist * input * delete userlist * publish for global admin * Fixed router params * Issue 161 fixed: instructor field in courses * . * fix nextButton * .
diff --git a/client/imports/ui/components/explore/explore.html b/client/imports/ui/components/explore/explore.html
@@ -7,7 +7,10 @@
       <template md-tab-content>
         <md-content class="md-padding">
           <h2>{{ course.course_number }} | {{ course.course_name }}</h2>
-          <p>{{ course.instructor_name }}</p>
+          <p *ngFor="let instructor of course.instructors" class="instructors">
+            {{ instructor.name }}
+          </p>
+          <br><br>
           <p>
             {{ course.course_description.content }}
           </p>
diff --git a/client/imports/ui/components/explore/search.html b/client/imports/ui/components/explore/search.html
@@ -18,15 +18,19 @@ <h2 id="search-string">Search Results for '{{ searchQuery }}'</h2>
         <tr>
           <th class="md-text-cell">Course Number</th>
           <th class="md-text-cell">Course Name</th>
-          <th>Instructor</th>
+          <th>Instructor(s)</th>
           <th></th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let course of searchResults">
           <td class="md-text-cell">{{ course.course_number }}</td>
           <td class="md-text-cell">{{ course.course_name }}</td>
-          <td>{{ course.instructor_ids }}</td>
+          <td>
+            <div *ngFor="let instructor of course.instructors">
+              {{ instructor.name }}
+            </div>
+          </td>
           <td>
             <a md-button [routerLink]="['/course/' + course._id]">Enroll</a>
           </td>
diff --git a/client/imports/ui/pages/course/course.ts b/client/imports/ui/pages/course/course.ts
@@ -48,6 +48,6 @@
       mdIconRegistry.setDefaultFontSetClass('tuxicon');
     }
     ngOnInit() {
-      this.courseId = <string>((<any>(this.route.snapshot.params)).courseid);
+      this.courseId = (<any>(this.route.snapshot.params)).courseid;
     }
   }
diff --git a/client/imports/ui/pages/course/course_dashboard.html b/client/imports/ui/pages/course/course_dashboard.html
@@ -62,6 +62,8 @@
   <!--Lab List Card-->
   <tuxlab-lablist></tuxlab-lablist>
   
+  <!--Edit Course Card-->
+  <!--
   <md-card>
     <md-card-title>
       <md-card-title-text>
@@ -76,5 +78,6 @@
       </form>  
     </md-card-content>
   </md-card>
+  -->
   
 </div>
diff --git a/client/imports/ui/pages/course/course_dashboard.ts b/client/imports/ui/pages/course/course_dashboard.ts
@@ -10,7 +10,7 @@
   import { APP_BASE_HREF, FORM_DIRECTIVES } from '@angular/common';
   import { HTTP_PROVIDERS } from '@angular/http';
   import { InjectUser } from 'angular2-meteor-accounts-ui';
-  import { ROUTER_DIRECTIVES, ActivatedRoute } from '@angular/router';
+  import { ROUTER_DIRECTIVES, ActivatedRoute, Router, RouterState } from '@angular/router';
 
 // Angular Material Imports
   import { MATERIAL_PROVIDERS, MATERIAL_DIRECTIVES } from 'ng2-material';
@@ -52,11 +52,8 @@ declare var Collections: any;
     courseDescription: String = "";
     courseName: String = "";
 
-    constructor(mdIconRegistry: MdIconRegistry, private route: ActivatedRoute) {
+    constructor(private route: ActivatedRoute, private router: Router) {
       super();
-      // Create Icon Font
-      mdIconRegistry.registerFontClassAlias('tux', 'tuxicon');
-      mdIconRegistry.setDefaultFontSetClass('tuxicon');
       // Subscribe to courses database and set current course
       this.subscribe('user-courses', this.courseId, () => {
         this.course = Collections.courses.findOne({ _id: this.courseId });
@@ -67,6 +64,7 @@ declare var Collections: any;
       }, true);
     }
     ngOnInit() {
-      this.courseId = (<any>(this.route.snapshot.params)).courseid;
+      this.courseId = this.router.routerState.parent(this.route).snapshot.params['courseid'];
+      console.log(this.courseId);
     }
   }
diff --git a/client/imports/ui/pages/lab/taskview.ts b/client/imports/ui/pages/lab/taskview.ts
@@ -107,11 +107,11 @@ export default class TaskView extends MeteorComponent {
       }
       else{
         if(res.verified){
-	  slf.nextButton = true;
-	}
-	else{
-	  slf.nextButton = false;
-	}
+          slf.nextButton = true;
+        }
+        else{
+          slf.nextButton = false;
+        }
         slf.taskUpdates = res.taskUpdates;
       }
     });
diff --git a/client/imports/ui/routes/routes.ts b/client/imports/ui/routes/routes.ts
@@ -21,10 +21,10 @@ import { provideRouter, RouterConfig } from '@angular/router';
 
   // Explore
   import Explore from '../pages/explore/explore.ts';
-  import Terms from '../pages/static/terms.ts';
 
   // Static
   import Privacy from '../pages/static/privacy.ts';
+  import Terms from '../pages/static/terms.ts';
 
 /* ROUTES */
 const routes : RouterConfig = [
diff --git a/client/style/explore/_explore.scss b/client/style/explore/_explore.scss
@@ -1,145 +1,146 @@
 .tuxlab-explore {
-	width:100%;
-	max-width:$tuxlab-max-width;
-	margin:0 auto;
+  width:100%;
+  max-width:$tuxlab-max-width;
+  margin:0 auto;
 
-	md-tab-group {
-		background-color: white;
-		margin: 30px;
-		.md-active.md-tab-label {
-			background-color: #ffd54f;
-		}
-		md-ink-bar {
-			background-color: white;
-		}
-	}
-	.md-tab-header {
-		background-color: #ffc400;
-	}
+  md-tab-group {
+    background-color: white;
+    margin: 30px;
+    .md-active.md-tab-label {
+      background-color: #ffd54f;
+    }
+    md-ink-bar {
+      background-color: white;
+    }
+  }
+  .md-tab-header {
+    background-color: #ffc400;
+  }
 
-	#search-view {
-		display: none;
-	}
+  #search-view {
+    display: none;
+  }
 }
 
 
 // Searchbar
 .search-toolbar{
-	margin-bottom: 30px;
-	md-toolbar{
-		min-height:inherit;
-		background-color: white;
-		.search-toolbar-nav {
-			height: 100%;
-			width: 100%;
-			.wrapper{
-				display: flex;
-				flex-direction: row;
-				flex-wrap: nowrap;
-				justify-content: flex-start;
-				width:100%;
-				height: 100%;
-				max-width:$tuxlab-max-width;
-				margin: 0 auto;
-				.icon {
-					cursor: pointer;
-					margin-left: 20px;
-				}
-				.icon:hover {
-					background-color: #efefef;
-				}
-
-				.tuxicon:before {
-					font-size: 48px;
-				}
-				md-icon {
-					margin-right: 20px;
-					color: dimgrey;
-					line-height: 50px;
-				}
-				div{
-					height: 100%;
-				}
-				.searchbar {
-					width: 100%;
-					height: 100%;
-					form {
-						height: 100%;
-						input {
-							width: 100%;
-							height: 100%;
-							background-color: white;
-							border: 0;
-							transition: 500ms;
-							padding-top: 0;
-							padding-bottom: 0;
-							padding-left: 20px;
-							margin-right: 10px;
-						}
-						input:focus {
-							background-color: #efefef;
-							transition: 500ms;
-							outline: none;
-						}
-					}
-				}
-			}
-		}
-	}
+  margin-bottom: 30px;
+  md-toolbar{
+    min-height:inherit;
+    background-color: white;
+    .search-toolbar-nav {
+      height: 100%;
+      width: 100%;
+      .wrapper{
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+        width:100%;
+        height: 100%;
+        max-width:$tuxlab-max-width;
+        margin: 0 auto;
+        .icon {
+          cursor: pointer;
+          margin-left: 20px;
+        }
+        .icon:hover {
+          background-color: #efefef;
+        }
+        .tuxicon:before {
+          font-size: 48px;
+        }
+        md-icon {
+          margin-right: 20px;
+          color: dimgrey;
+          line-height: 50px;
+        }
+        div{
+          height: 100%;
+        }
+        .searchbar {
+          width: 100%;
+          height: 100%;
+          form {
+            height: 100%;
+            input {
+              width: 100%;
+              height: 100%;
+              background-color: white;
+              border: 0;
+              transition: 500ms;
+              padding-top: 0;
+              padding-bottom: 0;
+              padding-left: 20px;
+              margin-right: 10px;
+            }
+            input:focus {
+              background-color: #efefef;
+              transition: 500ms;
+              outline: none;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 .tuxlab-searchview {
-	.course-search-list {
-		background-color: white;
-		padding: 40px;
-		margin-bottom: 40px;
+  .course-search-list {
+    background-color: white;
+    padding: 40px;
+    margin-bottom: 40px;
 
-		h2 {
-			color: #999999;
-		}
+    h2 {
+      color: #999999;
+    }
 
-		.selector {
-			text-align: right;
-			color: #999999;
-			button {
-				color: #999999;
-			}
-			md-icon {
-				line-height: 16px;
-			}
-			.tuxicon:before {
-				font-size: 36px;
-			}
-		}
+    .selector {
+      text-align: right;
+      color: #999999;
+      button {
+        color: #999999;
+      }
+      md-icon {
+        line-height: 16px;
+      }
+      .tuxicon:before {
+        font-size: 36px;
+      }
+    }
 
-	}
-	md-data-table {
-		tbody {
-			td {
-				a {
-					color: black;
-				}
-			}
-		}
-	}
+  }
+  md-data-table {
+    tbody {
+      td {
+        a {
+          color: black;
+        }
+      }
+    }
+  }
 }
 
 .tuxlab-exploreview {
-	md-content {
-		h1 {
-			padding: 10px;
-		}
-		p {
-			padding: 10px;
-			text-indent: 1em;
-		}
-		.course-link {
-			text-align: right;
-			a {
-				color: black;
-				align-self: right;
-			}	
-		}
-		
-	}
+  md-content {
+    h1 {
+      padding: 10px;
+    }
+    p {
+      padding: 10px;
+      text-indent: 1em;
+    }
+    .course-link {
+      text-align: right;
+      a {
+        color: black;
+        align-self: right;
+      } 	
+    }
+    p.instructors {
+      float: left;
+    }
+  }
 }
diff --git a/collections/README.md b/collections/README.md
diff --git a/collections/courses.ts b/collections/courses.ts
diff --git a/server/imports/course/search.ts b/server/imports/course/search.ts

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@`
`48`	`48`	`mdIconRegistry.setDefaultFontSetClass('tuxicon');`
`49`	`49`	`}`
`50`	`50`	`ngOnInit() {`
`51`		`- this.courseId = <string>((<any>(this.route.snapshot.params)).courseid);`
	`51`	`+ this.courseId = (<any>(this.route.snapshot.params)).courseid;`
`52`	`52`	`}`
`53`	`53`	`}`