diff --git a/src/app/degree-planner/services/api.service.ts b/src/app/degree-planner/services/api.service.ts index e59a1cae4ad35a285775c63fe0f8968eb72944d6..b96bb85cfd65a5ba42352cb6bb684483ab7c918e 100644 --- a/src/app/degree-planner/services/api.service.ts +++ b/src/app/degree-planner/services/api.service.ts @@ -25,8 +25,8 @@ const HTTP_OPTIONS = { // 'Content-Type': 'application/json', // 'X-API-Key': '', // uid: '', -// wisceduisisemplid: '', -// wiscedupvi: '', +// wiscEduISISEmplID: '', +// wiscEduPVI: '', // }), // }; @@ -53,7 +53,7 @@ export class DegreePlannerApiService { } public getUserProfile(): Observable<Profile> { - return this.http.get<Profile>(`/profile`, HTTP_OPTIONS); + return this.http.get<Profile>('/profile', HTTP_OPTIONS); } public getAllDegreePlans(): Observable<DegreePlan[]> { @@ -76,7 +76,7 @@ export class DegreePlannerApiService { public getSubjectShortDescriptions() { const url = `/api/search/v1/subjectsMap/0000`; - return this.http.get<SubjectCodesTo<string>>(url); + return this.http.get<SubjectCodesTo<string>>(url, HTTP_OPTIONS); } public getAllSubjectDescriptions(): Observable<{}> { @@ -93,17 +93,17 @@ export class DegreePlannerApiService { } const url = `/api/search/v1/subjects`; - return this.http.get<Subjects>(url); + return this.http.get<Subjects>(url, HTTP_OPTIONS); } public getActiveTerms(): Observable<Term[]> { - return this.http.get<Term[]>(this.searchEndpoint('terms'), HTTP_OPTIONS); + return this.http.get<Term[]>(this.searchEndpoint('terms')); } public getActiveTermCodes() { const url = `/api/search/v1/terms`; return this.http - .get<Term[]>(url) + .get<Term[]>(url, HTTP_OPTIONS) .pipe(map(terms => terms.map(TermCode.fromTerm))); } 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 5b9e5bbff63020650fe06d10d8e7700189efc702..275908aef08b9306af3e7a3ba6493a923cc63caa 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 @@ -85,54 +85,42 @@ aria-label="Open course menu" [matMenuTriggerFor]="courseMenu" (menuOpened)="onMenuOpen()"> - <mat-icon - aria-label="Course menu" - alt="Course menu" - matTooltip="Course menu" - matTooltipPosition="right"> + <mat-icon aria-label="Course menu" alt="Course menu" matTooltip="Course menu" matTooltipPosition="right"> more_horiz </mat-icon> </button> - <mat-menu - #courseMenu="matMenu" - class="course-item-menu" - isFocusable="true" - isTabbable="true"> - <button - mat-menu-item - (click)="openCourseDetailsDialog()" - aria-label="Open dialog to see course details"> - Course Details - </button> - <button - mat-menu-item - [matMenuTriggerFor]="academicYearsGroup" - aria-label="Select to move this course to a different term"> - Move - </button> - <mat-menu #academicYearsGroup="matMenu" class="course-item-submenu"> + <mat-menu #courseMenu="matMenu" class="course-item-menu" isFocusable="true" isTabbable="true"> + <ng-template matMenuContent> + <button mat-menu-item (click)="openCourseDetailsDialog()" aria-label="Open dialog to see course details"> + Course Details + </button> + <button mat-menu-item [matMenuTriggerFor]="academicYearsGroup" aria-label="Select to move this course to a different term"> + Move + </button> + <mat-menu #academicYearsGroup="matMenu" class="course-item-submenu"> + <ng-template matMenuContent> + <button mat-menu-item *ngFor="let term of (droppableTermCodes$ | async)" + aria-labelledby="Move course to this term" + (click)="onMove(term)"> + {{ term | getTermDescription }} + </button> + </ng-template> + </mat-menu> + <button + mat-menu-item + aria-label="Move this course to Saved for later" + *ngIf="type !== 'saved'" + (click)="onSaveForLater()"> + Save for later + </button> <button mat-menu-item - *ngFor="let term of (droppableTermCodes$ | async)" - aria-labelledby="Move course to this term" - (click)="onMove(term)"> - {{ term | getTermDescription }} + aria-label="Remove this course from my plan" + *ngIf="type !== 'search'" + (click)="onRemove()"> + Remove </button> - </mat-menu> - <button - mat-menu-item - aria-label="Move this course to Saved for later" - *ngIf="type !== 'saved'" - (click)="onSaveForLater()"> - Save for later - </button> - <button - mat-menu-item - aria-label="Remove this course from my plan" - *ngIf="type !== 'search'" - (click)="onRemove()"> - Remove - </button> + </ng-template> </mat-menu> </div> <div *ngIf="disabled" fxLayout="row" fxLayoutAlign="end center"> diff --git a/src/app/degree-planner/shared/course-item/course-item.component.scss b/src/app/degree-planner/shared/course-item/course-item.component.scss index 39f1875e095335395df0c7367483e85774fc9be4..c471b16a9801d8fe795b300a6613d6b62585062f 100644 --- a/src/app/degree-planner/shared/course-item/course-item.component.scss +++ b/src/app/degree-planner/shared/course-item/course-item.component.scss @@ -73,9 +73,9 @@ } .course-item-menu-button { - width: 24px; - height: 24px; - line-height: 20px; + // width: 24px; + // height: 24px; + // line-height: 20px; &:focus { outline: 2px solid #5e9ed6; outline: -webkit-focus-ring-color auto 5px;