Skip to content

refactor(TeacherProjectService): Move setMaxScoreForComponent to GradingEditComponentMaxScore #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hirokiterashima wants to merge 2 commits into from
Closed

refactor(TeacherProjectService): Move setMaxScoreForComponent to GradingEditComponentMaxScore #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80230fa
refactor(TeacherProjectService): Move setMaxScoreForComponent to Grad…
hirokiterashima Aug 16, 2024
b245ed9
Merge branch 'develop' into refactor-teacherProjectService-move-setMa…
hirokiterashima Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions ...nents/grading-edit-component-max-score/grading-edit-component-max-score.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,32 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
import { CopyNodesService } from '../../../services/copyNodesService';
import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ComponentContent } from '../../../common/ComponentContent';

let component: GradingEditComponentMaxScoreComponent;
let fixture: ComponentFixture<GradingEditComponentMaxScoreComponent>;
let saveProjectSpy;
let setMaxScoreForComponentSpy;
let getComponentSpy;
let projectService: TeacherProjectService;

describe('GradingEditComponentMaxScoreComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [GradingEditComponentMaxScoreComponent],
schemas: [NO_ERRORS_SCHEMA],
imports: [StudentTeacherCommonServicesModule],
providers: [CopyNodesService, TeacherProjectService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
});
declarations: [GradingEditComponentMaxScoreComponent],
schemas: [NO_ERRORS_SCHEMA],
imports: [StudentTeacherCommonServicesModule],
providers: [
CopyNodesService,
TeacherProjectService,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting()
]
});
projectService = TestBed.inject(TeacherProjectService);
fixture = TestBed.createComponent(GradingEditComponentMaxScoreComponent);
component = fixture.componentInstance;
saveProjectSpy = spyOn(projectService, 'saveProject').and.callFake(() => new Promise(() => {}));
setMaxScoreForComponentSpy = spyOn(
projectService,
'setMaxScoreForComponent'
).and.callFake(() => {});
getComponentSpy = spyOn(projectService, 'getComponent').and.returnValue({} as ComponentContent);
});
saveMaxScore();
});
Expand All @@ -48,13 +51,13 @@ function saveMaxScore() {

function shouldSave(maxScore: number) {
setMaxScoreAndSave(maxScore);
expect(setMaxScoreForComponentSpy).toHaveBeenCalled();
expect(getComponentSpy).toHaveBeenCalled();
expect(saveProjectSpy).toHaveBeenCalled();
}

function shouldNotSave(maxScore: number) {
setMaxScoreAndSave(maxScore);
expect(setMaxScoreForComponentSpy).not.toHaveBeenCalled();
expect(getComponentSpy).not.toHaveBeenCalled();
expect(saveProjectSpy).not.toHaveBeenCalled();
}

Expand Down
13 changes: 9 additions & 4 deletions ...Components/grading-edit-component-max-score/grading-edit-component-max-score.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ import { TeacherProjectService } from '../../../services/teacherProjectService';

@Component({
selector: 'grading-edit-component-max-score',
styles: [`
/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
.mat-form-field-infix { width: inherit; }`],
styles: [
`
/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */
.mat-form-field-infix {
width: inherit;
}
`
],
templateUrl: 'grading-edit-component-max-score.component.html',
encapsulation: ViewEncapsulation.None
})
Expand Down Expand Up @@ -37,7 +42,7 @@ export class GradingEditComponentMaxScoreComponent {
saveMaxScore(): void {
const maxScore = Number(this.maxScore);
if (maxScore >= 0) {
this.projectService.setMaxScoreForComponent(this.nodeId, this.componentId, maxScore);
this.projectService.getComponent(this.nodeId, this.componentId).maxScore = maxScore;
this.projectService.saveProject();
this.maxScore = this.maxScore || 0;
}
Expand Down
7 changes: 0 additions & 7 deletions src/assets/wise5/services/teacherProjectService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,13 +1738,6 @@ export class TeacherProjectService extends ProjectService {
}
}

setMaxScoreForComponent(nodeId: string, componentId: string, maxScore: number): void {
const component = this.getComponent(nodeId, componentId);
if (component != null) {
component.maxScore = maxScore;
}
}

hasGroupStartId(nodeId) {
const startId = this.getGroupStartId(nodeId);
return startId != null && startId != '';
Expand Down