Merge branch 'develop' into grade-by-component

~ Conflicts:
~	src/assets/wise5/directives/summary-display/summary-display.component.ts
~	src/messages.xlf

Author: hirokiterashima

src/app/domain/dummyComponentState.ts

@@ -0,0 +1,3 @@
+import { ComponentState } from './componentState';
+
+export class DummyComponentState extends ComponentState {}

src/app/services/summaryService.spec.ts

@@ -1,12 +1,12 @@
-import { TestBed } from '@angular/core/testing';
-import { SummaryService } from '../../assets/wise5/components/summary/summaryService';
-import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
-import { ConfigService } from '../../assets/wise5/services/configService';
 import { AnnotationService } from '../../assets/wise5/services/annotationService';
+import { ConfigService } from '../../assets/wise5/services/configService';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { ProjectService } from '../../assets/wise5/services/projectService';
-import { TagService } from '../../assets/wise5/services/tagService';
-import { SessionService } from '../../assets/wise5/services/sessionService';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { SessionService } from '../../assets/wise5/services/sessionService';
+import { SummaryService } from '../../assets/wise5/components/summary/summaryService';
+import { TagService } from '../../assets/wise5/services/tagService';
+import { TestBed } from '@angular/core/testing';
 
 const ALL_PERIODS = 'allPeriods';
 const componentId = 'component1';
@@ -37,8 +37,8 @@ const scoreSummaryDisallowedComponentTypes = summaryDisallowedComponentTypes;
 describe('SummaryService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-    imports: [],
-    providers: [
+      imports: [],
+      providers: [
         AnnotationService,
         ConfigService,
         ProjectService,
@@ -47,8 +47,8 @@ describe('SummaryService', () => {
         TagService,
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting()
-    ]
-});
+      ]
+    });
     service = TestBed.get(SummaryService);
     http = TestBed.get(HttpTestingController);
     spyOn(TestBed.inject(ConfigService), 'getRunId').and.returnValue(runId);
@@ -62,6 +62,8 @@ describe('SummaryService', () => {
   getLatestClassmateStudentWorkInClass();
   getLatestClassmateScoresInPeriod();
   getLatestClassmateScoresInClass();
+  cleanLabel();
+  convertToNumber();
 });
 
 function createComponent() {
@@ -188,3 +190,28 @@ function getLatestClassmateScoresInX(source: string, expectedUrl: string) {
     });
   http.expectOne(expectedUrl).flush(expectedScores);
 }
+
+function cleanLabel() {
+  describe('cleanLabel', () => {
+    it('should clean the label', () => {
+      expect(service.cleanLabel('hello world')).toEqual('Hello World');
+    });
+  });
+}
+
+function convertToNumber() {
+  describe('convertToNumber', () => {
+    it('should convert to number when value is an empty string', () => {
+      expect(service.convertToNumber('')).toEqual(0);
+    });
+    it('should convert to number when value is not a number', () => {
+      expect(service.convertToNumber('a')).toEqual(0);
+    });
+    it('should convert to number when value is a number string', () => {
+      expect(service.convertToNumber('1')).toEqual(1);
+    });
+    it('should convert to number when value is a number', () => {
+      expect(service.convertToNumber(1)).toEqual(1);
+    });
+  });
+}

src/assets/wise5/common/DummyAnnotation.ts

@@ -0,0 +1,3 @@
+import { Annotation } from './Annotation';
+
+export class DummyAnnotation extends Annotation {}

src/assets/wise5/common/SeriesData.ts

@@ -0,0 +1,17 @@
+import { SeriesDataPoint } from './SeriesDataPoint';
+
+export class SeriesData {
+  private dataPoints: SeriesDataPoint[];
+
+  constructor(dataPoints?: SeriesDataPoint[]) {
+    this.dataPoints = dataPoints ?? [];
+  }
+
+  getDataPoints(): SeriesDataPoint[] {
+    return this.dataPoints;
+  }
+
+  addDataPoint(dataPoint: SeriesDataPoint): void {
+    this.dataPoints.push(dataPoint);
+  }
+}

src/assets/wise5/common/SeriesDataPoint.ts

@@ -0,0 +1,13 @@
+export class SeriesDataPoint {
+  name: string | number;
+  y: number;
+  color: string;
+
+  constructor(name: string | number, y: number, color?: string) {
+    this.name = name;
+    this.y = y;
+    if (color) {
+      this.color = color;
+    }
+  }
+}

src/assets/wise5/components/component/component-student.module.ts

@@ -7,7 +7,6 @@ import { StudentAssetsDialogModule } from '../../vle/studentAsset/student-assets
 import { AnimationStudentModule } from '../animation/animation-student/animation-student.module';
 import { AudioOscillatorStudentModule } from '../audioOscillator/audio-oscillator-student/audio-oscillator.module';
 import { ConceptMapStudentModule } from '../conceptMap/concept-map-student/concept-map-student.module';
-import { DialogGuidanceStudentModule } from '../dialogGuidance/dialogGuidanceStudentModule';
 import { DiscussionStudentModule } from '../discussion/discussion-student/discussion-student.module';
 import { DrawStudentModule } from '../draw/draw-student/draw-student-module';
 import { EmbeddedStudentModule } from '../embedded/embedded-student/embedded-student.module';
@@ -26,6 +25,7 @@ import { ComponentComponent } from './component.component';
 import { AiChatStudentModule } from '../aiChat/ai-chat-student/ai-chat-student.module';
 import { HelpIconComponent } from '../../themes/default/themeComponents/helpIcon/help-icon.component';
 import { MultipleChoiceStudentComponent } from '../multipleChoice/multiple-choice-student/multiple-choice-student.component';
+import { DialogGuidanceStudentComponent } from '../dialogGuidance/dialog-guidance-student/dialog-guidance-student.component';
 
 @NgModule({
   imports: [
@@ -35,7 +35,7 @@ import { MultipleChoiceStudentComponent } from '../multipleChoice/multiple-choic
     CommonModule,
     ComponentComponent,
     ConceptMapStudentModule,
-    DialogGuidanceStudentModule,
+    DialogGuidanceStudentComponent,
     DiscussionStudentModule,
     DrawStudentModule,
     EmbeddedStudentModule,

src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html

@@ -1,19 +1,21 @@
-<computer-avatar-selector
-  *ngIf="computerAvatarSelectorVisible"
-  [computerAvatarSettings]="componentContent.computerAvatarSettings"
-  (chooseAvatarEvent)="selectComputerAvatar($event)"
-/>
-<mat-card appearance="outlined" *ngIf="!computerAvatarSelectorVisible" class="mat-elevation-z2">
-  <component-header [component]="component"></component-header>
-  <dialog-responses
-    [responses]="responses"
-    [isWaitingForComputerResponse]="isWaitingForComputerResponse"
-    [computerAvatar]="computerAvatar"
-  >
-  </dialog-responses>
-  <chat-input
-    *ngIf="studentCanRespond"
-    [submitDisabled]="isWaitingForComputerResponse"
-    (submitEvent)="submitStudentResponse($event)"
-  ></chat-input>
-</mat-card>
+@if (computerAvatarSelectorVisible) {
+  <computer-avatar-selector
+    [computerAvatarSettings]="componentContent.computerAvatarSettings"
+    (chooseAvatarEvent)="selectComputerAvatar($event)"
+  />
+} @else {
+  <mat-card appearance="outlined" class="mat-elevation-z2">
+    <component-header [component]="component" />
+    <dialog-responses
+      [responses]="responses"
+      [isWaitingForComputerResponse]="isWaitingForComputerResponse"
+      [computerAvatar]="computerAvatar"
+    />
+    @if (studentCanRespond) {
+      <chat-input
+        [submitDisabled]="isWaitingForComputerResponse"
+        (submitEvent)="submitStudentResponse($event)"
+      />
+    }
+  </mat-card>
+}

src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.spec.ts

@@ -1,15 +1,7 @@
-import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-import { MatCardModule } from '@angular/material/card';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
 import { ComputerAvatar } from '../../../common/computer-avatar/ComputerAvatar';
-import { ComponentHeaderComponent } from '../../../directives/component-header/component-header.component';
 import { ComputerAvatarService } from '../../../services/computerAvatarService';
 import { DialogGuidanceFeedbackService } from '../../../services/dialogGuidanceFeedbackService';
 import { ProjectService } from '../../../services/projectService';
@@ -19,57 +11,24 @@ import { ComputerDialogResponseMultipleScores } from '../ComputerDialogResponseM
 import { ComputerDialogResponseSingleScore } from '../ComputerDialogResponseSingleScore';
 import { CRaterResponse } from '../../common/cRater/CRaterResponse';
 import { CRaterScore } from '../../common/cRater/CRaterScore';
-import { DialogResponsesComponent } from '../dialog-responses/dialog-responses.component';
 import { DialogGuidanceService } from '../dialogGuidanceService';
 import { DialogGuidanceStudentComponent } from './dialog-guidance-student.component';
 import { DialogGuidanceComponent } from '../DialogGuidanceComponent';
 import { RawCRaterResponse } from '../../common/cRater/RawCRaterResponse';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ChatInputComponent } from '../../../common/chat-input/chat-input.component';
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 let component: DialogGuidanceStudentComponent;
 let fixture: ComponentFixture<DialogGuidanceStudentComponent>;
 const robotAvatar = new ComputerAvatar('robot', 'Robot', 'robot.png');
-
-function initializeComponent(isComputerAvatarEnabled: boolean): void {
-  fixture = TestBed.createComponent(DialogGuidanceStudentComponent);
-  component = fixture.componentInstance;
-  component.component = createDialogGuidanceComponent(isComputerAvatarEnabled);
-  spyOn(component, 'subscribeToSubscriptions').and.callFake(() => {});
-  spyOn(component, 'isNotebookEnabled').and.returnValue(false);
-  fixture.detectChanges();
-}
-
-function createDialogGuidanceComponent(isComputerAvatarEnabled: boolean): DialogGuidanceComponent {
-  const componentContent = TestBed.inject(DialogGuidanceService).createComponent();
-  componentContent.isComputerAvatarEnabled = isComputerAvatarEnabled;
-  return new DialogGuidanceComponent(componentContent, null);
-}
-
 describe('DialogGuidanceStudentComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [DialogGuidanceStudentComponent],
-      schemas: [NO_ERRORS_SCHEMA],
       imports: [
         BrowserAnimationsModule,
-        ChatInputComponent,
-        ComponentHeaderComponent,
-        DialogResponsesComponent,
-        FormsModule,
-        MatCardModule,
-        MatDialogModule,
-        MatFormFieldModule,
-        MatIconModule,
-        MatInputModule,
+        DialogGuidanceStudentComponent,
         StudentTeacherCommonServicesModule
       ],
-      providers: [
-        DialogGuidanceFeedbackService,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting()
-      ]
+      providers: [DialogGuidanceFeedbackService, provideHttpClient(withInterceptorsFromDi())]
     }).compileComponents();
   });
 
@@ -101,19 +60,19 @@ describe('DialogGuidanceStudentComponent', () => {
     );
     component.setIsSubmitDirty(true);
     const response = createDummyScoringResponse();
-    expect(component.responses.length).toEqual(0);
+    expect(component['responses'].length).toEqual(0);
     component.cRaterSuccessResponse(response);
     expect(broadcastComponentSubmitTriggeredSpy).toHaveBeenCalled();
-    expect(component.responses.length).toEqual(1);
+    expect(component['responses'].length).toEqual(1);
   });
 
   it('should disable submit button after using all submits', () => {
     component.componentContent.maxSubmitCount = 2;
-    expect(component.studentCanRespond).toEqual(true);
+    expect(component['studentCanRespond']).toEqual(true);
     simulateSubmit(component);
-    expect(component.studentCanRespond).toEqual(true);
+    expect(component['studentCanRespond']).toEqual(true);
     simulateSubmit(component);
-    expect(component.studentCanRespond).toEqual(false);
+    expect(component['studentCanRespond']).toEqual(false);
   });
 
   it('should handle crater error response', () => {
@@ -129,7 +88,7 @@ describe('DialogGuidanceStudentComponent', () => {
   it('should initialize computer avatar to default computer avatar', () => {
     initializeComponent(false);
     expectComputerAvatarSelectorNotToBeShown(component);
-    expect(component.computerAvatar).not.toBeNull();
+    expect(component['computerAvatar']).not.toBeNull();
   });
 
   it(`should initialize computer avatar when the student has not previously chosen a computer
@@ -183,7 +142,7 @@ describe('DialogGuidanceStudentComponent', () => {
 
   it('should select computer avatar', () => {
     component.selectComputerAvatar(robotAvatar);
-    expect(component.computerAvatar).toEqual(robotAvatar);
+    expect(component['computerAvatar']).toEqual(robotAvatar);
     expectComputerAvatarSelectorNotToBeShown(component);
   });
 
@@ -196,19 +155,34 @@ describe('DialogGuidanceStudentComponent', () => {
     const defaultComputerAvatar = computerAvatarService.getDefaultAvatar();
     spyOn(computerAvatarService, 'getAvatar').and.returnValue(defaultComputerAvatar);
     component.initializeComputerAvatar();
-    expect(component.computerAvatar).toEqual(defaultComputerAvatar);
+    expect(component['computerAvatar']).toEqual(defaultComputerAvatar);
   });
 
   it('should select computer avatar when there is a computer avatar initial response', () => {
     const text = 'Hi there, who lives in a pineapple under sea?';
     component.componentContent.computerAvatarSettings.initialResponse = text;
-    expect(component.responses.length).toEqual(0);
+    expect(component['responses'].length).toEqual(0);
     component.selectComputerAvatar(robotAvatar);
-    expect(component.responses.length).toEqual(1);
-    expect(component.responses[0].text).toEqual(text);
+    expect(component['responses'].length).toEqual(1);
+    expect(component['responses'][0].text).toEqual(text);
   });
 });
 
+function initializeComponent(isComputerAvatarEnabled: boolean): void {
+  fixture = TestBed.createComponent(DialogGuidanceStudentComponent);
+  component = fixture.componentInstance;
+  component.component = createDialogGuidanceComponent(isComputerAvatarEnabled);
+  spyOn(component, 'subscribeToSubscriptions').and.callFake(() => {});
+  spyOn(component, 'isNotebookEnabled').and.returnValue(false);
+  fixture.detectChanges();
+}
+
+function createDialogGuidanceComponent(isComputerAvatarEnabled: boolean): DialogGuidanceComponent {
+  const componentContent = TestBed.inject(DialogGuidanceService).createComponent();
+  componentContent.isComputerAvatarEnabled = isComputerAvatarEnabled;
+  return new DialogGuidanceComponent(componentContent, null);
+}
+
 function simulateSubmit(component: DialogGuidanceStudentComponent): void {
   const response = createDummyScoringResponse();
   component.setIsSubmitDirty(true);