diff --git a/src/app/possible-score/possible-score.component.html b/src/app/possible-score/possible-score.component.html index d40d581dc93..1112ec0ad97 100644 --- a/src/app/possible-score/possible-score.component.html +++ b/src/app/possible-score/possible-score.component.html @@ -1,9 +1,7 @@ @if (maxScore > 0 && !hidePossibleScores) { - - @if (maxScore === 1) { - ({{ maxScore }} point) - } @else { - ({{ maxScore }} points) - } - + @if (maxScore === 1) { + {{ maxScore }} point + } @else { + {{ maxScore }} points + } } diff --git a/src/app/services/graphService.spec.ts b/src/app/services/graphService.spec.ts index 943cb4cb16d..010922f45c8 100644 --- a/src/app/services/graphService.spec.ts +++ b/src/app/services/graphService.spec.ts @@ -16,8 +16,8 @@ let service: GraphService; describe('GraphService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [], - providers: [ + imports: [], + providers: [ AnnotationService, ConfigService, GraphService, @@ -27,8 +27,8 @@ describe('GraphService', () => { TagService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting() - ] -}); + ] + }); service = TestBed.inject(GraphService); http = TestBed.inject(HttpTestingController); spyOn(TestBed.inject(ConfigService), 'getRunId').and.returnValue(runId); @@ -111,7 +111,7 @@ function createComponent() { it('should create a graph component', () => { const component = service.createComponent(); expect(component.type).toEqual('Graph'); - expect(component.title).toEqual(''); + expect(component.graphTitle).toEqual(''); expect(component.width).toEqual(800); expect(component.height).toEqual(500); expect(component.enableTrials).toEqual(false); @@ -508,17 +508,14 @@ function getClassmateStudentWork() { .flush([]); }); - it( - 'should get classmate student work from class', - waitForAsync(() => { - service - .getClassmateStudentWork(nodeId2, componentId2, periodId, nodeId1, componentId1, 'class') - .subscribe(); - http - .expectOne( - `/api/classmate/graph/student-work/${runId}/${nodeId2}/${componentId2}/${nodeId1}/${componentId1}/class` - ) - .flush([]); - }) - ); + it('should get classmate student work from class', waitForAsync(() => { + service + .getClassmateStudentWork(nodeId2, componentId2, periodId, nodeId1, componentId1, 'class') + .subscribe(); + http + .expectOne( + `/api/classmate/graph/student-work/${runId}/${nodeId2}/${componentId2}/${nodeId1}/${componentId1}/class` + ) + .flush([]); + })); } diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html index 07e2eee7b0e..11982f4f623 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/nodeGrading/node-grading/node-grading.component.html @@ -1,5 +1,5 @@
-
+

diff --git a/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html b/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html index 575077cb36e..3021b1dea9d 100644 --- a/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html +++ b/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/assets/wise5/common/ComponentContent.ts b/src/assets/wise5/common/ComponentContent.ts index 2ea81b9c048..60bfd281494 100644 --- a/src/assets/wise5/common/ComponentContent.ts +++ b/src/assets/wise5/common/ComponentContent.ts @@ -9,11 +9,11 @@ export interface ComponentContent { }; anonymizeResponses?: boolean; connectedComponents?: any[]; + title?: string; constraints?: any[]; cRaterRubric?: CRaterRubric; dynamicPrompt?: DynamicPrompt; excludeFromTotalScore?: boolean; - title?: string; maxScore?: number; maxSubmitCount?: number; prompt?: string; diff --git a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.html b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.html index 41ca506b8f8..17f54eda004 100644 --- a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.html +++ b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.html @@ -1,23 +1,22 @@ @if (computerAvatarSelectorVisible) { + } @if (!computerAvatarSelectorVisible) { - - -
- -
- +
+ - +
+ } diff --git a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.scss b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.scss index 2ac4c0a8c49..a4a80b89ee5 100644 --- a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.scss +++ b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.scss @@ -1,11 +1,3 @@ -@use 'style/abstracts/functions'; - -.mat-mdc-card { - padding: 12px; - margin-top: 16px; - max-width: functions.breakpoint('sm.min'); -} - .messages { margin-bottom: 12px; max-height: 500px; diff --git a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts index a80a8a12527..f5a93c12dd7 100644 --- a/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts +++ b/src/assets/wise5/components/aiChat/ai-chat-student/ai-chat-student.component.ts @@ -18,7 +18,6 @@ import { ComputerAvatarInitializer } from '../../../common/computer-avatar/compu import { ComputerAvatarService } from '../../../services/computerAvatarService'; import { StudentStatusService } from '../../../services/studentStatusService'; import { ComputerAvatarSelectorComponent } from '../../../vle/computer-avatar-selector/computer-avatar-selector.component'; -import { MatCard } from '@angular/material/card'; import { ComponentHeaderComponent } from '../../../directives/component-header/component-header.component'; import { ChatInputComponent } from '../../../common/chat-input/chat-input.component'; import { AiChatMessagesComponent } from '../ai-chat-messages/ai-chat-messages.component'; @@ -28,8 +27,7 @@ import { AiChatMessagesComponent } from '../ai-chat-messages/ai-chat-messages.co AiChatMessagesComponent, ChatInputComponent, ComponentHeaderComponent, - ComputerAvatarSelectorComponent, - MatCard + ComputerAvatarSelectorComponent ], styleUrl: './ai-chat-student.component.scss', templateUrl: './ai-chat-student.component.html' diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-show-work/dialog-guidance-show-work.component.ts b/src/assets/wise5/components/dialogGuidance/dialog-guidance-show-work/dialog-guidance-show-work.component.ts index 2cf7e9d7fce..2b950376145 100644 --- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-show-work/dialog-guidance-show-work.component.ts +++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-show-work/dialog-guidance-show-work.component.ts @@ -4,28 +4,25 @@ import { ComputerAvatarService } from '../../../services/computerAvatarService'; import { NodeService } from '../../../services/nodeService'; import { ProjectService } from '../../../services/projectService'; import { ComponentShowWorkDirective } from '../../component-show-work.directive'; -import { MatCardModule } from '@angular/material/card'; import { DialogResponsesComponent } from '../dialog-responses/dialog-responses.component'; import { CRaterRubric } from '../../common/cRater/CRaterRubric'; import { CRaterService } from '../../../services/cRaterService'; import { UserService } from '../../../../../app/services/user.service'; @Component({ - imports: [DialogResponsesComponent, MatCardModule], + imports: [DialogResponsesComponent], selector: 'dialog-guidance-show-work', styleUrls: [ '../dialog-guidance-student/dialog-guidance-student.component.scss', './dialog-guidance-show-work.component.scss' ], template: ` - - - + ` }) export class DialogGuidanceShowWorkComponent extends ComponentShowWorkDirective { diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html index f5dd917b23a..cb1d84cbd18 100644 --- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html +++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.html @@ -1,23 +1,20 @@ -
- @if (computerAvatarSelectorVisible) { - + +} @else { + + + @if (studentCanRespond) { + - } @else { - - - - @if (studentCanRespond) { - - } - } -
+} diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.scss b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.scss index da11d2dde22..969fc34a0f7 100644 --- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.scss +++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.scss @@ -1,11 +1,3 @@ -@use 'style/abstracts/functions'; - -.mat-mdc-card { - padding: 12px; - margin-top: 16px; - max-width: functions.breakpoint('sm.min'); -} - dialog-responses { display: block; margin-bottom: 12px; diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.ts b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.ts index 9f2ce0c65a3..b677fdfea46 100644 --- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.ts +++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-student/dialog-guidance-student.component.ts @@ -30,7 +30,6 @@ import { ConstraintService } from '../../../services/constraintService'; import { applyMixins } from '../../../common/apply-mixins'; import { ComputerAvatarInitializer } from '../../../common/computer-avatar/computer-avatar-initializer'; import { ComputerAvatarSelectorComponent } from '../../../vle/computer-avatar-selector/computer-avatar-selector.component'; -import { MatCardModule } from '@angular/material/card'; import { ComponentHeaderComponent } from '../../../directives/component-header/component-header.component'; import { DialogResponsesComponent } from '../dialog-responses/dialog-responses.component'; import { ChatInputComponent } from '../../../common/chat-input/chat-input.component'; @@ -41,8 +40,7 @@ import { CRaterPingService } from '../../../services/cRaterPingService'; ChatInputComponent, ComponentHeaderComponent, ComputerAvatarSelectorComponent, - DialogResponsesComponent, - MatCardModule + DialogResponsesComponent ], providers: [CRaterPingService, DialogGuidanceFeedbackService], selector: 'dialog-guidance-student', diff --git a/src/assets/wise5/components/draw/draw-student/draw-student.component.html b/src/assets/wise5/components/draw/draw-student/draw-student.component.html index a0e45ff31c2..0e5cf0b92b0 100644 --- a/src/assets/wise5/components/draw/draw-student/draw-student.component.html +++ b/src/assets/wise5/components/draw/draw-student/draw-student.component.html @@ -44,9 +44,10 @@ }
-
+
@if (isSaveOrSubmitButtonVisible) { }
-
+
@if (isSaveOrSubmitButtonVisible) {

/> @if (isSaveOrSubmitButtonVisible) { }
-
+