diff --git a/src/app/teacher/classroom-monitor.module.ts b/src/app/teacher/classroom-monitor.module.ts index 918d00af561..a9807b690b9 100644 --- a/src/app/teacher/classroom-monitor.module.ts +++ b/src/app/teacher/classroom-monitor.module.ts @@ -7,7 +7,6 @@ import { ComponentSelectComponent } from '../classroom-monitor/component-select/ import { StepInfoComponent } from '../classroom-monitor/step-info/step-info.component'; import { PeerGroupGradingModule } from './peer-group-grading.module'; import { SelectPeriodModule } from './select-period.module'; -import { ComponentGradingModule } from './component-grading.module'; import { TeacherSummaryDisplay } from '../../assets/wise5/directives/teacher-summary-display/teacher-summary-display.component'; import { HighchartsChartModule } from 'highcharts-angular'; import { StudentTeacherCommonModule } from '../student-teacher-common.module'; @@ -37,6 +36,7 @@ import { RouterModule } from '@angular/router'; import { SaveIndicatorComponent } from '../../assets/wise5/common/save-indicator/save-indicator.component'; import { PreviewComponentComponent } from '../../assets/wise5/authoringTool/components/preview-component/preview-component.component'; import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-tools.component'; +import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; @NgModule({ declarations: [ @@ -61,7 +61,7 @@ import { StepToolsComponent } from '../../assets/wise5/common/stepTools/step-too ViewComponentRevisionsComponent ], imports: [ - ComponentGradingModule, + ComponentGradingComponent, ComponentNewWorkBadgeComponent, ComponentSelectComponent, ComponentStudentModule, diff --git a/src/app/teacher/component-grading.module.ts b/src/app/teacher/component-grading.module.ts deleted file mode 100644 index 9d4998da637..00000000000 --- a/src/app/teacher/component-grading.module.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { NgModule } from '@angular/core'; -import { AnimationGradingModule } from '../../assets/wise5/components/animation/animation-grading/animation-grading.module'; -import { AudioOscillatorGradingModule } from '../../assets/wise5/components/audioOscillator/audio-oscillator-grading/audio-oscillator-grading.module'; -import { ConceptMapGradingModule } from '../../assets/wise5/components/conceptMap/concept-map-grading/concept-map-grading.module'; -import { DialogGuidanceGradingModule } from '../../assets/wise5/components/dialogGuidance/dialog-guidance-grading/dialog-guidance-grading.module'; -import { DiscussionGradingModule } from '../../assets/wise5/components/discussion/discussion-grading/discussion-grading.module'; -import { DrawGradingModule } from '../../assets/wise5/components/draw/draw-grading/draw-grading.module'; -import { EmbeddedGradingModule } from '../../assets/wise5/components/embedded/embedded-grading/embedded-grading.module'; -import { GraphGradingModule } from '../../assets/wise5/components/graph/graph-grading/graph-grading.module'; -import { LabelGradingModule } from '../../assets/wise5/components/label/label-grading/label-grading.module'; -import { MatchGradingModule } from '../../assets/wise5/components/match/match-grading/match-grading.module'; -import { OpenResponseGradingModule } from '../../assets/wise5/components/openResponse/open-response-grading/open-response-grading.module'; -import { PeerChatGradingModule } from '../../assets/wise5/components/peerChat/peer-chat-grading/peer-chat-grading.module'; -import { ShowGroupWorkGradingModule } from '../../assets/wise5/components/showGroupWork/show-group-work-grading/show-group-work-grading.module'; -import { TableGradingModule } from '../../assets/wise5/components/table/table-grading/table-grading.module'; -import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; -import { ShowMyWorkGradingModule } from '../../assets/wise5/components/showMyWork/show-my-work-grading/show-my-work-grading.module'; -import { AiChatGradingModule } from '../../assets/wise5/components/aiChat/ai-chat-grading/ai-chat-grading.module'; -import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component'; -import { MultipleChoiceGradingComponent } from '../../assets/wise5/components/multipleChoice/multiple-choice-grading/multiple-choice-grading.component'; - -@NgModule({ - declarations: [ComponentGradingComponent], - imports: [ - AiChatGradingModule, - AnimationGradingModule, - AudioOscillatorGradingModule, - ComponentStateInfoComponent, - ConceptMapGradingModule, - DialogGuidanceGradingModule, - DiscussionGradingModule, - DrawGradingModule, - EmbeddedGradingModule, - GraphGradingModule, - LabelGradingModule, - MatchGradingModule, - MultipleChoiceGradingComponent, - OpenResponseGradingModule, - PeerChatGradingModule, - ShowGroupWorkGradingModule, - ShowMyWorkGradingModule, - TableGradingModule - ], - exports: [ - AiChatGradingModule, - AnimationGradingModule, - AudioOscillatorGradingModule, - ComponentGradingComponent, - ComponentStateInfoComponent, - ConceptMapGradingModule, - DialogGuidanceGradingModule, - DiscussionGradingModule, - DrawGradingModule, - EmbeddedGradingModule, - GraphGradingModule, - LabelGradingModule, - MatchGradingModule, - MultipleChoiceGradingComponent, - OpenResponseGradingModule, - PeerChatGradingModule, - ShowGroupWorkGradingModule, - ShowMyWorkGradingModule, - TableGradingModule - ] -}) -export class ComponentGradingModule {} diff --git a/src/app/teacher/grading-common.module.ts b/src/app/teacher/grading-common.module.ts index fb572f88fb6..50faf9155f1 100644 --- a/src/app/teacher/grading-common.module.ts +++ b/src/app/teacher/grading-common.module.ts @@ -8,13 +8,15 @@ import { WorkgroupComponentGradingComponent } from '../../assets/wise5/classroom import { WorkgroupNodeStatusComponent } from '../classroom-monitor/workgroup-node-status/workgroup-node-status.component'; import { WorkgroupSelectAutocompleteComponent } from '../classroom-monitor/workgroup-select/workgroup-select-autocomplete/workgroup-select-autocomplete.component'; import { StudentTeacherCommonModule } from '../student-teacher-common.module'; -import { ComponentGradingModule } from './component-grading.module'; import { StatusIconComponent } from '../classroom-monitor/status-icon/status-icon.component'; import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress/nav-item-progress.component'; +import { ComponentGradingComponent } from '../../assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component'; +import { ComponentStateInfoComponent } from '../../assets/wise5/common/component-state-info/component-state-info.component'; @NgModule({ imports: [ - ComponentGradingModule, + ComponentGradingComponent, + ComponentStateInfoComponent, EditComponentAnnotationsComponent, IntersectionObserverModule, NavItemProgressComponent, @@ -30,7 +32,8 @@ import { NavItemProgressComponent } from '../classroom-monitor/nav-item-progress WorkgroupSelectAutocompleteComponent ], exports: [ - ComponentGradingModule, + ComponentGradingComponent, + ComponentStateInfoComponent, EditComponentAnnotationsComponent, IntersectionObserverModule, NavItemProgressComponent, diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts index 8838ac332ec..2718bad6ee2 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/component-grading.component.ts @@ -10,9 +10,46 @@ import { } from '@angular/core'; import { components } from '../../components/Components'; import { TeacherProjectService } from '../../services/teacherProjectService'; +import { AiChatGradingModule } from '../../components/aiChat/ai-chat-grading/ai-chat-grading.module'; +import { AnimationGradingModule } from '../../components/animation/animation-grading/animation-grading.module'; +import { AudioOscillatorGradingModule } from '../../components/audioOscillator/audio-oscillator-grading/audio-oscillator-grading.module'; +import { ConceptMapGradingModule } from '../../components/conceptMap/concept-map-grading/concept-map-grading.module'; +import { DialogGuidanceGradingModule } from '../../components/dialogGuidance/dialog-guidance-grading/dialog-guidance-grading.module'; +import { DiscussionGradingModule } from '../../components/discussion/discussion-grading/discussion-grading.module'; +import { DrawGradingModule } from '../../components/draw/draw-grading/draw-grading.module'; +import { EmbeddedGradingModule } from '../../components/embedded/embedded-grading/embedded-grading.module'; +import { GraphGradingModule } from '../../components/graph/graph-grading/graph-grading.module'; +import { LabelGradingModule } from '../../components/label/label-grading/label-grading.module'; +import { MatchGradingModule } from '../../components/match/match-grading/match-grading.module'; +import { OpenResponseGradingModule } from '../../components/openResponse/open-response-grading/open-response-grading.module'; +import { PeerChatGradingModule } from '../../components/peerChat/peer-chat-grading/peer-chat-grading.module'; +import { ShowGroupWorkGradingModule } from '../../components/showGroupWork/show-group-work-grading/show-group-work-grading.module'; +import { TableGradingModule } from '../../components/table/table-grading/table-grading.module'; +import { ShowMyWorkGradingModule } from '../../components/showMyWork/show-my-work-grading/show-my-work-grading.module'; +import { MultipleChoiceGradingComponent } from '../../components/multipleChoice/multiple-choice-grading/multiple-choice-grading.component'; @Component({ + imports: [ + AiChatGradingModule, + AnimationGradingModule, + AudioOscillatorGradingModule, + ConceptMapGradingModule, + DialogGuidanceGradingModule, + DiscussionGradingModule, + DrawGradingModule, + EmbeddedGradingModule, + GraphGradingModule, + LabelGradingModule, + MatchGradingModule, + MultipleChoiceGradingComponent, + OpenResponseGradingModule, + PeerChatGradingModule, + ShowGroupWorkGradingModule, + ShowMyWorkGradingModule, + TableGradingModule + ], selector: 'component-grading-component', + standalone: true, template: '
' }) export class ComponentGradingComponent { diff --git a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html index 857b6e999d0..e27d86962ab 100644 --- a/src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html +++ b/src/assets/wise5/classroomMonitor/classroomMonitorComponents/view-component-revisions/view-component-revisions.component.html @@ -18,7 +18,7 @@