diff --git a/src/app/degree-planner/degree-planner.module.ts b/src/app/degree-planner/degree-planner.module.ts index 26ae0532b03b7826e7a90f01cc92cfd3994bbef5..f70201ca1efb8cad77234b22c0e9653e2ba4b33d 100644 --- a/src/app/degree-planner/degree-planner.module.ts +++ b/src/app/degree-planner/degree-planner.module.ts @@ -5,7 +5,7 @@ import { SharedModule } from '@app/shared/shared.module'; import { DegreePlannerRoutingModule } from './degree-planner.routing.module'; import { TermContainerComponent } from './term-container/term-container.component'; import { SidenavMenuItemComponent } from './sidenav-menu-item/sidenav-menu-item.component'; -import { SavedForLaterContainerComponent } from './favorites-container/favorites-container.component'; +import { SavedForLaterContainerComponent } from './saved-for-later-container/saved-for-later-container.component'; import { CourseItemComponent } from './shared/course-item/course-item.component'; import { NotesDialogComponent } from './dialogs/notes-dialog/notes-dialog.component'; import { DragDropModule } from '@angular/cdk/drag-drop'; diff --git a/src/app/degree-planner/dialogs/remove-course-confirm-dialog/remove-course-confirm-dialog.component.ts b/src/app/degree-planner/dialogs/remove-course-confirm-dialog/remove-course-confirm-dialog.component.ts index a6fbbe67fb8b4c300124516e529b99f5b68fcf93..8b709258d816362d5845a94200bc2883f1a6266a 100644 --- a/src/app/degree-planner/dialogs/remove-course-confirm-dialog/remove-course-confirm-dialog.component.ts +++ b/src/app/degree-planner/dialogs/remove-course-confirm-dialog/remove-course-confirm-dialog.component.ts @@ -19,7 +19,6 @@ export class RemoveCourseConfirmDialogComponent implements OnInit { savedForLater: Boolean; courses: Course[]; type: 'saved' | 'course' | 'search'; - favoriteCourses: SavedForLaterCourse[]; constructor( private dialogRef: MatDialogRef<RemoveCourseConfirmDialogComponent>, diff --git a/src/app/degree-planner/favorites-container/favorites-container.component.html b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.html similarity index 100% rename from src/app/degree-planner/favorites-container/favorites-container.component.html rename to src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.html diff --git a/src/app/degree-planner/favorites-container/favorites-container.component.scss b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.scss similarity index 94% rename from src/app/degree-planner/favorites-container/favorites-container.component.scss rename to src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.scss index 51c3d0a1ed50b831991f1420e516f6d37a0b5464..866d06058fb45b76ff3269f36b8ab23391d69f09 100644 --- a/src/app/degree-planner/favorites-container/favorites-container.component.scss +++ b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.scss @@ -1,4 +1,4 @@ -#favorite-container { +#saved-for-later-container { padding: 20px 0 0px 0; margin-top: 0px; border-top: 1px solid rgba(0, 0, 0, 0.54); diff --git a/src/app/degree-planner/favorites-container/favorites-container.component.spec.ts b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.spec.ts similarity index 92% rename from src/app/degree-planner/favorites-container/favorites-container.component.spec.ts rename to src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.spec.ts index 7ded38ca98dbcae4681a6989bc57f94e9d91d045..2b0b44f521235bde2b246f7670254329e96e13b6 100644 --- a/src/app/degree-planner/favorites-container/favorites-container.component.spec.ts +++ b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.spec.ts @@ -4,7 +4,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SharedModule } from '@app/shared/shared.module'; import { CoreModule } from '@app/core/core.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; -import { SavedForLaterContainerComponent } from './favorites-container.component'; +import { SavedForLaterContainerComponent } from './saved-for-later-container.component'; import { CourseItemComponent } from '../shared/course-item/course-item.component'; describe('SavedForLaterContainerComponent', () => { diff --git a/src/app/degree-planner/favorites-container/favorites-container.component.ts b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.ts similarity index 89% rename from src/app/degree-planner/favorites-container/favorites-container.component.ts rename to src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.ts index 426733087a45073abcfa81b3577336a8d5bf1846..4cc1b12240539b819aefc6e769179a2557d16c86 100644 --- a/src/app/degree-planner/favorites-container/favorites-container.component.ts +++ b/src/app/degree-planner/saved-for-later-container/saved-for-later-container.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { Store, select } from '@ngrx/store'; + import { SavedForLaterCourse } from '@app/core/models/saved-for-later-course'; -import { GlobalState } from '@app/core/state'; import { getSavedForLaterCourses } from '@app/degree-planner/store/selectors'; import { Course } from '@app/core/models/course'; @@ -17,9 +17,9 @@ import { import { getDropZones } from '@app/degree-planner/store/selectors'; @Component({ - selector: 'cse-favorites-container', - templateUrl: './favorites-container.component.html', - styleUrls: ['./favorites-container.component.scss'], + selector: 'cse-saved-for-later-container', + templateUrl: './saved-for-later-container.component.html', + styleUrls: ['./saved-for-later-container.component.scss'], }) export class SavedForLaterContainerComponent implements OnInit { public courses$: Observable<SavedForLaterCourse[]>; diff --git a/src/app/degree-planner/shared/course-item/course-item.component.html b/src/app/degree-planner/shared/course-item/course-item.component.html index 03d492e9ae4badd77c0dd13dcc3a01b28a7a3ca9..4b8f6aa0f51ea1ed9d6e226cf036726bb2504073 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.html +++ b/src/app/degree-planner/shared/course-item/course-item.component.html @@ -27,14 +27,14 @@ <button mat-menu-item (click)="openCourseDetailsDialog(course)">Course Details</button> <button mat-menu-item [matMenuTriggerFor]="academicYearsGroup">Move</button> <mat-menu #academicYearsGroup="matMenu" class="course-item-submenu"> - <button mat-menu-item (click)="moveToFavorites(course)" *ngIf="type != 'saved'" class="favorites-list">Saved for later</button> + <button mat-menu-item (click)="moveToSavedForLater(course)" *ngIf="type != 'saved'" class="saved-for-later-list">Saved for later</button> <button mat-menu-item *ngFor="let term of visibleTerms" (click)="(type == 'saved') ? addToTerm(course, term) : switchTerm(course, term)">{{ term | getTermDescription }}</button> </mat-menu> <button mat-menu-item (click)="openRemoveConfirmationDialog()">Remove</button> </mat-menu> </div> <div fxLayout="row" fxLayoutAlign="end center"> - <p class="course-credits">{{ course.credits ? course.credits : "--" }} Cr</p> + <p class="course-credits">{{ course.credits ? course.credits : course.creditRange }} Cr</p> </div> </div> </div> diff --git a/src/app/degree-planner/shared/course-item/course-item.component.ts b/src/app/degree-planner/shared/course-item/course-item.component.ts index 5e8aa9df2e9634ad4245b6372ad0f614bbdaef45..a9b486aac6bcf5644dace0f7a4bad6334587ce81 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.ts +++ b/src/app/degree-planner/shared/course-item/course-item.component.ts @@ -43,7 +43,7 @@ export class CourseItemComponent implements OnInit { .subscribe(terms => (this.visibleTerms = terms)); } - moveToFavorites(course) { + moveToSavedForLater(course) { this.store.dispatch( new AddSaveForLater({ courseId: course.courseId, diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html index 7c1dca3c3f5f82e6f5ee6a6c9ca50caac4e97c2d..2d7b3514d100ee95a3a0314c2d3f0b2a97660ffa 100644 --- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html +++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html @@ -18,7 +18,7 @@ <h3>Saved for later</h3> </mat-panel-title> </mat-expansion-panel-header> - <cse-favorites-container></cse-favorites-container> + <cse-saved-for-later-container></cse-saved-for-later-container> </mat-expansion-panel> <mat-expansion-panel id="menu-items-container" expanded="true"> diff --git a/src/assets/sass/general.scss b/src/assets/sass/general.scss index bdf434e6b424c90f601743df7bbb1d8038849e36..8bc0f35bc176d52e334644ccce12527548be36ff 100644 --- a/src/assets/sass/general.scss +++ b/src/assets/sass/general.scss @@ -166,7 +166,7 @@ body { width: 200px !important; } -.favorites-list { +.saved-for-later-list { border-bottom: 1px solid #f1f1f1 !important; }