Migrate:grade task modal #564
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <span class="grade-icon"> | ||
| {{ gradeLetter }} | ||
| </span> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| .grade-icon { | ||
| color: #fff; | ||
| font-size: 1em; | ||
| border-radius: 100%; | ||
| width: 2.25em; | ||
| height: 2.25em; | ||
| font-weight: 100; | ||
| margin: 0 auto; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| background-color: #333333; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; | ||
| import { GradeIconComponent } from './grade-icon.component'; | ||
| import { gradeService } from 'src/app/ajs-upgraded-providers'; | ||
|
|
||
| describe('GradeIconComponent', () => { | ||
| let component: GradeIconComponent; | ||
| let fixture: ComponentFixture<GradeIconComponent>; | ||
| let gradeServiceStub: jasmine.SpyObj<any>; | ||
|
|
||
| beforeEach( | ||
| waitForAsync(() => { | ||
| gradeServiceStub = { | ||
| grades: ['Pass', 'Credit', 'Distinction', 'High Distinction'], | ||
| gradeAcronyms: { | ||
| Fail: 'F', | ||
| Pass: 'P', | ||
| Credit: 'C', | ||
| Distinction: 'D', | ||
| 'High Distinction': 'HD', | ||
| 0: 'P', | ||
| 1: 'C', | ||
| 2: 'D', | ||
| 3: 'HD', | ||
| }, | ||
| }; | ||
|
|
||
| gradeServiceStub.grades[-1] = 'Fail'; | ||
| gradeServiceStub.gradeAcronyms[-1] = 'F'; | ||
|
|
||
| TestBed.configureTestingModule({ | ||
| declarations: [GradeIconComponent], | ||
| providers: [{ provide: gradeService, useValue: gradeServiceStub }], | ||
| }).compileComponents(); | ||
| }) | ||
| ); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(GradeIconComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
|
|
||
| it('should set the index value when undefined', () => { | ||
| component.index = undefined; | ||
| component.ngOnInit(); | ||
|
|
||
| expect(component.index).toEqual(-1); | ||
| }); | ||
|
|
||
| it('should set the grade to Fail when given invalid input', () => { | ||
| component.index = undefined; | ||
| component.grade = 'Tomato'; | ||
| component.ngOnInit(); | ||
|
|
||
| expect(component.index).toEqual(-1); | ||
| expect(component.gradeText).toEqual('Fail'); | ||
| expect(component.gradeLetter).toEqual('F'); | ||
| }); | ||
|
|
||
| it('should appropriate set the grade when passed a grade value', () => { | ||
| gradeServiceStub.grades.forEach((grade: string) => { | ||
| component.grade = grade; | ||
| component.index = undefined; | ||
| component.ngOnInit(); | ||
|
|
||
| expect(component.index).toEqual(gradeServiceStub.grades.indexOf(grade)); | ||
| expect(component.gradeText).toEqual(grade); | ||
| expect(component.gradeLetter).toEqual(gradeServiceStub.gradeAcronyms[grade]); | ||
| }); | ||
| }); | ||
|
|
||
| it('should appropriate set the grade when passed a grade index', () => { | ||
| gradeServiceStub.grades.forEach((_, index: number) => { | ||
| component.index = index - 1; | ||
| component.ngOnInit(); | ||
|
|
||
| expect(component.index).toEqual(index - 1); | ||
| expect(component.gradeText).toEqual(gradeServiceStub.grades[component.index]); | ||
| expect(component.gradeLetter).toEqual(gradeServiceStub.gradeAcronyms[component.gradeText]); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { Component, OnInit, Input, Inject } from '@angular/core'; | ||
| import { gradeService } from 'src/app/ajs-upgraded-providers'; | ||
|
|
||
| @Component({ | ||
| selector: 'grade-icon', | ||
| templateUrl: 'grade-icon.component.html', | ||
| styleUrls: ['grade-icon.component.scss'], | ||
| }) | ||
| export class GradeIconComponent implements OnInit { | ||
| @Input() grade: string = 'F'; | ||
| @Input() index: number; | ||
|
|
||
| gradeText: string; | ||
| gradeLetter: string; | ||
|
|
||
| constructor(@Inject(gradeService) private GradeService: any) {} | ||
|
|
||
| ngOnInit(): void { | ||
| if (this.index == undefined) { | ||
| this.index = this.GradeService.grades.indexOf(this.grade); | ||
| } | ||
| this.gradeText = this.GradeService.grades[this.index]; | ||
| this.gradeLetter = this.GradeService.gradeAcronyms[this.gradeText]; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There should be a new equivalent of this in typescript.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check if you can remove the GradeService from this and use the new code