diff --git a/src/app/dars/audit/audit.component.html b/src/app/dars/audit/audit.component.html index 426bbd442a10281c9fe45e6a173968a4b38d00c2..58a1ddf84ee4b320fb84ad0257d3dfa0f2d1e4cb 100644 --- a/src/app/dars/audit/audit.component.html +++ b/src/app/dars/audit/audit.component.html @@ -203,7 +203,10 @@ <ng-container matColumnDef="grade"> <th mat-header-cell *matHeaderCellDef scope="col">Grade</th> - <td mat-cell *matCellDef="let course">{{course.grade}}</td> + <td mat-cell *matCellDef="let course"> + <span *ngIf="!(course.grade | courseGrade)">{{course.grade}}</span> + <cse-audit-symbol *ngIf="(course.grade | courseGrade)" [symbol]="course.grade | courseGrade"></cse-audit-symbol> + </td> </ng-container> <ng-container matColumnDef="title"> diff --git a/src/app/dars/dars.module.ts b/src/app/dars/dars.module.ts index 328732df5ab1c9ca11a6395c4276c1bd20617892..10796a7f731f085c27063040993c608c5aebacbc 100644 --- a/src/app/dars/dars.module.ts +++ b/src/app/dars/dars.module.ts @@ -18,6 +18,7 @@ import { RequirementSymbolsPipe } from './pipes/requirement-symbols.pipe'; import { SchoolOrCollegePipe } from './pipes/school-college.pipe'; import { AuditNamePipe } from './pipes/name-format.pipe'; import { CourseNotePipe } from './pipes/course-note.pipe'; +import { CourseGradePipe } from './pipes/course-grade.pipe'; import { NewDegreeAuditDialogComponent } from './new-degree-audit-dialog/new-degree-audit-dialog.component'; import { NewWhatIfAuditDialogComponent } from './new-what-if-audit-dialog/new-what-if-audit-dialog.component'; import { AuditViewComponent } from './dars-audit-view/dars-audit-view.component'; @@ -41,6 +42,7 @@ import { AuditSymbolComponent } from './audit-symbol/audit-symbol.component'; SchoolOrCollegePipe, AuditNamePipe, CourseNotePipe, + CourseGradePipe, NewDegreeAuditDialogComponent, NewWhatIfAuditDialogComponent, DARSViewComponent, diff --git a/src/app/dars/pipes/course-grade.pipe.ts b/src/app/dars/pipes/course-grade.pipe.ts new file mode 100644 index 0000000000000000000000000000000000000000..874f444126079672984a7f75fbf996f485a3e330 --- /dev/null +++ b/src/app/dars/pipes/course-grade.pipe.ts @@ -0,0 +1,12 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { AuditSymbol } from '../models/audit-symbols'; +import { AuditSymbolsService } from '../services/audit-symbols.service'; + +@Pipe({ name: 'courseGrade', pure: true }) +export class CourseGradePipe implements PipeTransform { + constructor(public symbols: AuditSymbolsService) { } + + public transform(grade: string | null): AuditSymbol | undefined { + return this.symbols.getByTaxonomy('grade').find(s => s.text === grade); + } +}