Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
<br />
<edit-component-submit-button [componentContent]="component.content">
</edit-component-submit-button>
<edit-component-max-submit
*ngIf="component.content.showSubmitButton"
[componentContent]="component.content"
>
</edit-component-max-submit>
@if (component.content.showSubmitButton) {
<edit-component-max-submit [componentContent]="component.content" />
}
<edit-component-default-feedback [componentContent]="component.content">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
8 changes: 4 additions & 4 deletions src/app/authoring-tool/edit-component-field.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import { TeacherProjectService } from '../../assets/wise5/services/teacherProjec
@Directive()
export abstract class EditComponentFieldComponent {
@Input() componentContent: any;
inputChanged: Subject<any> = new Subject<any>();
inputChangedSubscription: Subscription;
protected inputChanged: Subject<any> = new Subject<any>();
protected inputChangedSubscription: Subscription;

constructor(private ProjectService: TeacherProjectService) {}

ngOnInit() {
ngOnInit(): void {
this.inputChangedSubscription = this.inputChanged
.pipe(debounceTime(1000), distinctUntilChanged())
.subscribe(() => {
this.ProjectService.componentChanged();
});
}

ngOnDestroy() {
ngOnDestroy(): void {
this.inputChangedSubscription.unsubscribe();
}
}
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EditComponentMaxSubmitComponent } from './edit-component-max-submit.component';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module';
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { MockProvider } from 'ng-mocks';

describe('EditComponentMaxSubmitComponent', () => {
let component: EditComponentMaxSubmitComponent;
let fixture: ComponentFixture<EditComponentMaxSubmitComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [EditComponentMaxSubmitComponent],
schemas: [NO_ERRORS_SCHEMA],
imports: [StudentTeacherCommonServicesModule],
providers: [TeacherProjectService, provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
}).compileComponents();
imports: [EditComponentMaxSubmitComponent],
providers: [MockProvider(TeacherProjectService), provideHttpClient(withInterceptorsFromDi())]
}).compileComponents();
});

beforeEach(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { Component } from '@angular/core';
import { EditComponentFieldComponent } from '../edit-component-field.component';
import { MatFormFieldModule } from '@angular/material/form-field';
import { FormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';

@Component({
selector: 'edit-component-max-submit',
templateUrl: './edit-component-max-submit.component.html',
styleUrls: ['./edit-component-max-submit.component.scss'],
standalone: false
imports: [FormsModule, MatFormFieldModule, MatInputModule],
selector: 'edit-component-max-submit',
styleUrl: './edit-component-max-submit.component.scss',
templateUrl: './edit-component-max-submit.component.html'
})
export class EditComponentMaxSubmitComponent extends EditComponentFieldComponent {}
2 changes: 1 addition & 1 deletion src/app/teacher/component-authoring.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import { EditCRaterIdeaDescriptionsComponent } from '../../assets/wise5/componen
EditComponentExcludeFromTotalScoreComponent,
EditComponentJsonComponent,
EditComponentMaxScoreComponent,
EditComponentMaxSubmitComponent,
EditComponentPeerGroupingTagComponent,
EditComponentRubricComponent,
EditComponentSaveButtonComponent,
Expand Down Expand Up @@ -172,6 +171,7 @@ import { EditCRaterIdeaDescriptionsComponent } from '../../assets/wise5/componen
ComponentAuthoringComponent,
EditComponentAdvancedButtonComponent,
EditComponentConstraintsComponent,
EditComponentMaxSubmitComponent,
EditComponentPrompt,
EditComponentWidthComponent,
EditCRaterIdeaDescriptionsComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
type="text"
/>
</mat-form-field>
<edit-component-max-submit [componentContent]="componentContent"></edit-component-max-submit>
<edit-component-max-submit [componentContent]="componentContent" />
<mat-checkbox
color="primary"
[(ngModel)]="componentContent.isComputerAvatarEnabled"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { provideHttpClientTesting } from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { StudentTeacherCommonServicesModule } from '../../../../../app/student-teacher-common-services.module';
Expand Down Expand Up @@ -31,11 +30,7 @@ describe('DialogGuidanceAuthoringComponent', () => {
DialogGuidanceAuthoringModule,
StudentTeacherCommonServicesModule
],
providers: [
TeacherNodeService,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting()
]
providers: [TeacherNodeService, provideHttpClient(withInterceptorsFromDi())]
});
spyOn(TestBed.inject(TeacherProjectService), 'getLocale').and.returnValue(
new ProjectLocale({ default: 'en-US' })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import { TeacherNodeService } from '../../../services/teacherNodeService';
@NgModule({
declarations: [
DialogGuidanceAuthoringComponent,
EditComponentMaxSubmitComponent,
EditFeedbackRulesComponent,
FeedbackRuleHelpComponent
],
imports: [
CommonModule,
ComponentAuthoringModule,
EditComponentMaxSubmitComponent,
EditComponentPrompt,
DragDropModule,
FormsModule,
Expand All @@ -57,11 +57,6 @@ import { TeacherNodeService } from '../../../services/teacherNodeService';
TeacherNodeService,
TeacherProjectService
],
exports: [
DialogGuidanceAuthoringComponent,
EditComponentPrompt,
EditComponentMaxSubmitComponent,
EditFeedbackRulesComponent
]
exports: [DialogGuidanceAuthoringComponent, EditComponentPrompt, EditFeedbackRulesComponent]
})
export class DialogGuidanceAuthoringModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
<edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
<br />
<edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,9 @@
<edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
<br />
<edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
<edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
<br />
<edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@
<edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
<br />
<edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
<edit-component-save-button [componentContent]="componentContent"> </edit-component-save-button>
<br />
<edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,9 @@
Enable Row Selection
</mat-checkbox>
</div>
<edit-component-max-submit
*ngIf="componentContent.showSubmitButton"
[componentContent]="componentContent"
>
</edit-component-max-submit>
@if (componentContent.showSubmitButton) {
<edit-component-max-submit [componentContent]="componentContent" />
}
<edit-component-default-feedback [componentContent]="componentContent">
</edit-component-default-feedback>
<div fxLayout="column" fxLayoutAlign="start start">
Expand Down
Loading