All users must create their own account. Teachers must create a teacher account and students
must create a student account. Users can create an account by going to the
WISE Home Page and clicking on the
Register link at the upper right of the
screen.
-
Here are instructions on how to create a teacher account.
+
Here are instructions on how to create a teacher account.
Choose the number of students per team. Choosing 1-3 will allow students to work together in a
team.
-
+
Choose the start date. Students will not be able to use the project until this date.
Click "Create Run".
@@ -63,10 +60,10 @@
How do I use a unit with my class?
Students will need to use this access code to work on the run you created.
-
-
Student Management
+
+
Student Management
Should I register my students for WISE or have them do it themselves?
-
+
WISE makes student registration simple and intuitive -- direct your students to the register
page by having them go to the WISE home page and clicking the "Register" link at the upper
right. They should be able to register in 10 minutes or less. However, you can also opt to
@@ -128,14 +125,14 @@
How do I change a student team after they've started a project run?
- Warning 1:
+ Warning 1:
If you move Student A into an established team, student A loses all of their current work
and inherits the current work of the established team.
- Warning 2:
+ Warning 2:
If you move Student A into a newly created (blank) team, student A will lose all of their
work.How do I change the period for a student?
Choose a different period.
Click "Save Changes".
- Warning:
+ Warning:
If you move a student to a different period, they will lose all of their work.
-
+
I do not remember my teacher access code that students need to create their account for my new
students.
@@ -172,8 +169,8 @@
Find the run in your Teacher Home Page.
The Access Code will be displayed below the run title.
-
-
Project Management
+
+
Project Management
When should I set up my project run?
@@ -238,7 +235,7 @@
How do I delete a period after creating a run?
Find the period you want to delete and click the "Delete" button next to it.
Note: You are not allowed to delete a period that has students in it.
-
+
What if I run out of computer lab time but some of my students are not finished with the
project?
@@ -249,8 +246,8 @@
computer, per the teacher's discretion.
-
-
Assessment of Student Work
+
+
Assessment of Student Work
How do I review and grade student work?
Sign into WISE with your teacher account.
@@ -295,7 +292,7 @@
How can I encourage my students to review the graded notes and comments
some sample responses and have the class critique the work.
-
How do I find time to grade all of the student work?
+
How do I find time to grade all of the student work?
We recommend that you go through the project and select a few steps that you think best
@@ -305,8 +302,8 @@
How do I find time to grade all of the st
very time consuming and unpractical.
-
-
Real Time Classroom Monitor
+
+
Real Time Classroom Monitor
What is the Real Time Classroom Monitor?
@@ -318,7 +315,7 @@
What is the Real Time Classroom Monitor?
Does the Real Time Classroom Monitor work on a tablet like the iPad?
-
Yes it does.
+
Yes it does.
Can I use the Real Time Classroom Monitor to pause student screens?
@@ -327,8 +324,8 @@
Can I use the Real Time Classroom Monitor to pause student screens?
-
-
Technical Questions
+
+
Technical Questions
The WISE web site won't load on my web browser. What do I do?
diff --git a/src/app/modules/shared/edit-password/edit-password.component.spec.ts b/src/app/modules/shared/edit-password/edit-password.component.spec.ts
index 1b6c6eececb..e671f168d3d 100644
--- a/src/app/modules/shared/edit-password/edit-password.component.spec.ts
+++ b/src/app/modules/shared/edit-password/edit-password.component.spec.ts
@@ -1,7 +1,7 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { EditPasswordComponent } from './edit-password.component';
import { UserService } from '../../../services/user.service';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, Observable, Subscriber } from 'rxjs';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ReactiveFormsModule } from '@angular/forms';
import { NO_ERRORS_SCHEMA } from '@angular/core';
@@ -10,13 +10,15 @@ import { By } from '@angular/platform-browser';
import { User } from '../../../domain/user';
import { MatDialogModule } from '@angular/material/dialog';
import { PasswordModule } from '../../../password/password.module';
+import { MatIconModule } from '@angular/material/icon';
+import { PasswordErrors } from '../../../domain/password/password-errors';
+import { PasswordRequirementComponent } from '../../../password/password-requirement/password-requirement.component';
const CORRECT_OLD_PASSWORD = 'correctOldPassword123';
const INCORRECT_OLD_PASSWORD = 'incorrectOldPassword123';
-const INVALID_PASSWORD_TOO_SHORT = 'Abcd123';
-const INVALID_PASSWORD_PATTERN = 'abcd1234';
-const NEW_PASSWORD_1 = 'Abcd1111';
-const NEW_PASSWORD_2 = 'Abcd2222';
+const INVALID_PASSWORD = PasswordRequirementComponent.INVALID_PASSWORD_TOO_SHORT;
+const NEW_PASSWORD_1 = PasswordRequirementComponent.VALID_PASSWORD;
+const NEW_PASSWORD_2 = PasswordRequirementComponent.VALID_PASSWORD + '!';
export class MockUserService {
getUser(): BehaviorSubject {
@@ -54,6 +56,7 @@ describe('EditPasswordComponent', () => {
imports: [
BrowserAnimationsModule,
MatDialogModule,
+ MatIconModule,
MatSnackBarModule,
PasswordModule,
ReactiveFormsModule
@@ -70,121 +73,126 @@ describe('EditPasswordComponent', () => {
validForm_enableSubmitButton();
passwordMismatch_disableSubmitButtonAndInvalidateForm();
oldPasswordIncorrect_disableSubmitButtonAndShowError();
- saveChanges_newPasswordTooShort_ShowError();
saveChanges_newPasswordPatternInvalid_ShowError();
formSubmit_disableSubmitButton();
notGoogleUser_showUnlinkOption();
unlinkGoogleButtonClick_showDialog();
- invalidPasswordTooShort_showError();
- invalidPasswordPattern_showError();
+ invalidPassword_showError();
});
function initialState_disableSubmitButton() {
- it('should disable submit button and invalidate form on initial state', () => {
- expect(component.changePasswordFormGroup.valid).toBeFalsy();
- expectSubmitButtonDisabled();
+ describe('the form is first loaded', () => {
+ it('disables the submit button', () => {
+ expect(component.changePasswordFormGroup.valid).toBeFalsy();
+ expectSubmitButtonDisabled();
+ });
});
}
function validForm_enableSubmitButton() {
- it('should enable submit button when form is valid', () => {
- setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
- expectSubmitButtonEnabled();
- expect(component.changePasswordFormGroup.valid).toBeTruthy();
+ describe('the form is valid', () => {
+ it('enables the submit button', () => {
+ setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
+ expectSubmitButtonEnabled();
+ expect(component.changePasswordFormGroup.valid).toBeTruthy();
+ });
});
}
function passwordMismatch_disableSubmitButtonAndInvalidateForm() {
- it(`should disable submit button and invalidate form when new password and confirm new password
- fields do not match`, () => {
- setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_2);
- expectSubmitButtonDisabled();
- expect(component.changePasswordFormGroup.valid).toBeFalsy();
+ describe('new password and confirm new password do not match', () => {
+ it(`disables the submit button`, () => {
+ setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_2);
+ expect(component.changePasswordFormGroup.valid).toBeFalsy();
+ expectSubmitButtonDisabled();
+ });
});
}
function oldPasswordIncorrect_disableSubmitButtonAndShowError() {
- it(`should disable submit button and set incorrectPassword error when old password is
- incorrect`, async () => {
- spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
- generateObservableResponse('incorrectPassword', false)
- );
- setPasswords(INCORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
- submitForm();
- expectSubmitButtonDisabled();
- expect(component.changePasswordFormGroup.get('oldPassword').getError('incorrectPassword')).toBe(
- true
- );
+ describe('server returns response that says old password is incorrect', () => {
+ it('shows the incorrect password error and disables the submit button', async () => {
+ spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
+ generateErrorObservable('incorrectPassword')
+ );
+ setPasswords(INCORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
+ submitForm();
+ expect(
+ component.changePasswordFormGroup.get('oldPassword').getError('incorrectPassword')
+ ).toBe(true);
+ expectSubmitButtonDisabled();
+ });
});
}
-function saveChanges_newPasswordTooShort_ShowError() {
- it(`should set minlength error when changePassword response returns new password is not long
- enough error`, async () => {
- spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
- generateObservableResponse('invalidPasswordLength', false)
- );
- setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD_TOO_SHORT, INVALID_PASSWORD_TOO_SHORT);
- component.saveChanges();
- expect(component.newPasswordFormGroup.get('newPassword').getError('minlength')).toBe(true);
+function saveChanges_newPasswordPatternInvalid_ShowError() {
+ describe('server returns response that says new password is not valid', () => {
+ it('shows the new password error messages and disables the submit button', async () => {
+ const passwordErrors = new PasswordErrors(false, false, true);
+ spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
+ generateErrorObservable(passwordErrors)
+ );
+ setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD, INVALID_PASSWORD);
+ component.saveChanges();
+ expectPasswordErrors(false, false, true);
+ expectSubmitButtonDisabled();
+ });
});
}
-function saveChanges_newPasswordPatternInvalid_ShowError() {
- it(`should set pattern error when changePassword response returns new password is not valid
- pattern error`, async () => {
- spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
- generateObservableResponse('invalidPasswordPattern', false)
- );
- setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD_PATTERN, INVALID_PASSWORD_PATTERN);
- component.saveChanges();
- expect(component.newPasswordFormGroup.get('newPassword').getError('pattern')).toBe(true);
- });
+function expectPasswordErrors(
+ missingLetter: boolean,
+ missingNumber: boolean,
+ tooShort: boolean
+): void {
+ expect(component.newPasswordFormGroup.get('newPassword').getError('missingLetter')).toBe(
+ missingLetter
+ );
+ expect(component.newPasswordFormGroup.get('newPassword').getError('missingNumber')).toBe(
+ missingNumber
+ );
+ expect(component.newPasswordFormGroup.get('newPassword').getError('tooShort')).toBe(tooShort);
}
function formSubmit_disableSubmitButton() {
- it('should disable submit button when form is successfully submitted', async () => {
- spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
- generateObservableResponse('passwordChanged', true)
- );
- setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
- submitForm();
- expectSubmitButtonDisabled();
+ describe('form is successfully submitted', () => {
+ it('disables the submit button', async () => {
+ spyOn(TestBed.inject(UserService), 'changePassword').and.returnValue(
+ generateSuccessObservable('passwordChanged')
+ );
+ setPasswords(CORRECT_OLD_PASSWORD, NEW_PASSWORD_1, NEW_PASSWORD_1);
+ submitForm();
+ expectSubmitButtonDisabled();
+ });
});
}
function notGoogleUser_showUnlinkOption() {
- it('should hide show option to unlink google account if the user is not a google user', () => {
- expect(getUnlinkGoogleAccountButton()).toBeNull();
+ describe('user is not a google user', () => {
+ it('hides the option to unlink google acccount', () => {
+ expect(getUnlinkGoogleAccountButton()).toBeNull();
+ });
});
}
function unlinkGoogleButtonClick_showDialog() {
- it('clicking on unlink google account link should open a dialog', () => {
- const dialogSpy = spyOn(component.dialog, 'open');
- setGoogleUser();
- getUnlinkGoogleAccountButton().click();
- expect(dialogSpy).toHaveBeenCalled();
- });
-}
-
-function invalidPasswordTooShort_showError() {
- it(`should disable submit button and set min length error when new password is too
- short`, async () => {
- setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD_TOO_SHORT, INVALID_PASSWORD_TOO_SHORT);
- expectSubmitButtonDisabled();
- expect(component.newPasswordFormGroup.get('newPassword').getError('minlength')).toBeTruthy();
- expect(component.newPasswordFormGroup.get('newPassword').getError('pattern')).toBeFalsy();
+ describe('user is a google user and clicks unlink google account button', () => {
+ it('opens dialog', () => {
+ const dialogSpy = spyOn(component.dialog, 'open');
+ setGoogleUser();
+ getUnlinkGoogleAccountButton().click();
+ expect(dialogSpy).toHaveBeenCalled();
+ });
});
}
-function invalidPasswordPattern_showError() {
- it(`should disable submit button and set pattern error when new password does not satisfy the
- pattern requirements`, async () => {
- setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD_PATTERN, INVALID_PASSWORD_PATTERN);
- expectSubmitButtonDisabled();
- expect(component.newPasswordFormGroup.get('newPassword').getError('minlength')).toBeFalsy();
- expect(component.newPasswordFormGroup.get('newPassword').getError('pattern')).toBeTruthy();
+function invalidPassword_showError() {
+ describe('new password does not satisfy the requirements', () => {
+ it('shows password errors and disables submit button', async () => {
+ setPasswords(CORRECT_OLD_PASSWORD, INVALID_PASSWORD, INVALID_PASSWORD);
+ expect(component.newPasswordFormGroup.get('newPassword').errors).not.toBeNull();
+ expectSubmitButtonDisabled();
+ });
});
}
@@ -213,16 +221,27 @@ function setPasswords(oldPass: string, newPass: string, newPassConfirm: string)
fixture.detectChanges();
}
-function generateObservableResponse(messageCode: string, isSuccess: boolean): Observable {
- if (isSuccess) {
- return new Observable((observer) => {
- observer.next({ messageCode: messageCode });
- observer.complete();
- });
- } else {
- return new Observable((observer) => {
- observer.error({ error: { messageCode: messageCode } });
- observer.complete();
- });
- }
+function generateSuccessObservable(arg: string | any): Observable {
+ return generateResponseObservable(arg, true);
+}
+
+function generateSuccessResponseValue(arg: string | any): any {
+ return typeof arg === 'string' ? { messageCode: arg } : arg;
+}
+
+function generateErrorObservable(arg: string | any): Observable {
+ return generateResponseObservable(arg, false);
+}
+
+function generateResponseObservable(arg: string | any, isSuccess: boolean): Observable {
+ return new Observable((observer: Subscriber) => {
+ isSuccess
+ ? observer.next(generateSuccessResponseValue(arg))
+ : observer.error(generateErrorResponseValue(arg));
+ observer.complete();
+ });
+}
+
+function generateErrorResponseValue(arg: string | any): any {
+ return typeof arg === 'string' ? { error: { messageCode: arg } } : { error: arg };
}
diff --git a/src/app/modules/shared/edit-password/edit-password.component.ts b/src/app/modules/shared/edit-password/edit-password.component.ts
index 9264c09c292..8bbf0316e1d 100644
--- a/src/app/modules/shared/edit-password/edit-password.component.ts
+++ b/src/app/modules/shared/edit-password/edit-password.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, Component, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { FormControl, FormGroup, Validators, FormBuilder } from '@angular/forms';
import { finalize } from 'rxjs/operators';
import { MatDialog } from '@angular/material/dialog';
@@ -6,13 +6,14 @@ import { MatSnackBar } from '@angular/material/snack-bar';
import { UserService } from '../../../services/user.service';
import { UnlinkGoogleAccountConfirmComponent } from '../unlink-google-account-confirm/unlink-google-account-confirm.component';
import { NewPasswordAndConfirmComponent } from '../../../password/new-password-and-confirm/new-password-and-confirm.component';
+import { changePasswordError } from '../../../common/password-helper';
@Component({
selector: 'app-edit-password',
templateUrl: './edit-password.component.html',
styleUrls: ['./edit-password.component.scss']
})
-export class EditPasswordComponent {
+export class EditPasswordComponent implements OnInit {
@ViewChild('changePasswordForm', { static: false }) changePasswordForm;
isSaving: boolean = false;
isGoogleUser: boolean = false;
@@ -77,29 +78,16 @@ export class EditPasswordComponent {
private changePasswordSuccess(): void {
this.resetForm();
- this.snackBar.open($localize`Password changed.`);
+ this.snackBar.open($localize`Successfully changed password.`);
}
private changePasswordError(error: any): void {
- const formError: any = {};
- switch (error.messageCode) {
- case 'incorrectPassword':
- formError.incorrectPassword = true;
- this.changePasswordFormGroup.get('oldPassword').setErrors(formError);
- break;
- case 'invalidPasswordLength':
- formError.minlength = true;
- this.newPasswordFormGroup
- .get(NewPasswordAndConfirmComponent.NEW_PASSWORD_FORM_CONTROL_NAME)
- .setErrors(formError);
- break;
- case 'invalidPasswordPattern':
- formError.pattern = true;
- this.newPasswordFormGroup
- .get(NewPasswordAndConfirmComponent.NEW_PASSWORD_FORM_CONTROL_NAME)
- .setErrors(formError);
- break;
- }
+ changePasswordError(
+ error,
+ this.changePasswordFormGroup,
+ this.newPasswordFormGroup,
+ 'oldPassword'
+ );
}
unlinkGoogleAccount(): void {
diff --git a/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.spec.ts b/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.spec.ts
index f8fe636454e..23e50a439af 100644
--- a/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.spec.ts
+++ b/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.spec.ts
@@ -9,6 +9,7 @@ import { of } from 'rxjs';
import { PasswordModule } from '../../../password/password.module';
import { UserService } from '../../../services/user.service';
import { UnlinkGoogleAccountPasswordComponent } from './unlink-google-account-password.component';
+import { PasswordRequirementComponent } from '../../../password/password-requirement/password-requirement.component';
class MockUserService {
unlinkGoogleUser(newPassword: string) {
@@ -26,11 +27,11 @@ describe('UnlinkGoogleAccountPasswordComponent', () => {
declarations: [UnlinkGoogleAccountPasswordComponent],
imports: [
BrowserAnimationsModule,
+ MatDialogModule,
MatFormFieldModule,
MatInputModule,
- ReactiveFormsModule,
PasswordModule,
- MatDialogModule
+ ReactiveFormsModule
],
providers: [{ provide: UserService, useValue: userService }],
schemas: [NO_ERRORS_SCHEMA]
@@ -45,7 +46,7 @@ describe('UnlinkGoogleAccountPasswordComponent', () => {
function formSubmit_callUserServiceUnlinkGoogleUserFunction() {
it('should call UserService.UnlinkGoogleUserFunction when form is submitted', () => {
const unlinkFunctionSpy = spyOn(userService, 'unlinkGoogleUser').and.returnValue(of({}));
- const newPassword = 'Abcd1234';
+ const newPassword = PasswordRequirementComponent.VALID_PASSWORD;
component.newPasswordFormGroup.setValue({
newPassword: newPassword,
confirmNewPassword: newPassword
diff --git a/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.ts b/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.ts
index 3bd16b6704c..4e55902151c 100644
--- a/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.ts
+++ b/src/app/modules/shared/unlink-google-account-password/unlink-google-account-password.component.ts
@@ -4,6 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
import { NewPasswordAndConfirmComponent } from '../../../password/new-password-and-confirm/new-password-and-confirm.component';
import { UserService } from '../../../services/user.service';
import { UnlinkGoogleAccountSuccessComponent } from '../unlink-google-account-success/unlink-google-account-success.component';
+import { injectPasswordErrors } from '../../../common/password-helper';
@Component({
styleUrls: ['./unlink-google-account-password.component.scss'],
@@ -51,20 +52,8 @@ export class UnlinkGoogleAccountPasswordComponent {
private error(error: any): void {
this.isSaving = false;
- const formError: any = {};
- switch (error.messageCode) {
- case 'invalidPasswordLength':
- formError.minlength = true;
- this.newPasswordFormGroup
- .get(NewPasswordAndConfirmComponent.NEW_PASSWORD_FORM_CONTROL_NAME)
- .setErrors(formError);
- break;
- case 'invalidPasswordPattern':
- formError.pattern = true;
- this.newPasswordFormGroup
- .get(NewPasswordAndConfirmComponent.NEW_PASSWORD_FORM_CONTROL_NAME)
- .setErrors(formError);
- break;
+ if (error.messageCode === 'invalidPassword') {
+ injectPasswordErrors(this.newPasswordFormGroup, error);
}
}
}
diff --git a/src/app/password/new-password-and-confirm/new-password-and-confirm.component.html b/src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
index 2178d65eee1..0836004faba 100644
--- a/src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
+++ b/src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
@@ -1,25 +1,55 @@
-
-
+
+ {{ passwordLabel }}
-
+
Password required
-
- Password must be at least 8 characters
-
-
- Password must have at least one lowercase, one uppercase, and one number character
-
-
+
+
+
diff --git a/src/assets/wise5/classroomMonitor/dataExport/strategies/PeerChatComponentDataExportStrategy.ts b/src/assets/wise5/classroomMonitor/dataExport/strategies/PeerChatComponentDataExportStrategy.ts
index ded1ac3fc58..98684ae76c4 100644
--- a/src/assets/wise5/classroomMonitor/dataExport/strategies/PeerChatComponentDataExportStrategy.ts
+++ b/src/assets/wise5/classroomMonitor/dataExport/strategies/PeerChatComponentDataExportStrategy.ts
@@ -25,7 +25,6 @@ export class PeerChatComponentDataExportStrategy extends AbstractDataExportStrat
'Component Part Number',
'Step Title',
'Component Type',
- 'Component Prompt',
'Response'
];
@@ -52,55 +51,61 @@ export class PeerChatComponentDataExportStrategy extends AbstractDataExportStrat
private generateComponentHeaderRow(component: any, columnNameToNumber: any): string[] {
const headerRow = this.defaultColumnNames.map((columnName: string) => columnName);
const componentStates = this.teacherDataService.getComponentStatesByComponentId(component.id);
- this.insertPrePromptColumnIfNecessary(headerRow, component);
- this.insertDynamicPromptColumnIfNecessary(headerRow, componentStates);
- this.insertPostPromptColumnIfNecessary(headerRow, component);
- this.insertQuestionColumnsIfNecessary(headerRow, componentStates);
+ this.insertPromptColumns(headerRow, component);
+ this.insertQuestionColumns(headerRow, component, componentStates);
this.populateColumnNameMappings(headerRow, columnNameToNumber);
return headerRow;
}
- private insertPrePromptColumnIfNecessary(headerRow: string[], component: any): void {
+ private insertPromptColumns(headerRow: string[], component: any): void {
+ if (!this.hasDynamicPrompt(component)) {
+ this.insertBeforeResponseColumn(headerRow, 'Prompt');
+ }
if (this.hasPrePrompt(component)) {
- headerRow.splice(headerRow.indexOf('Response'), 0, 'Pre Prompt');
+ this.insertBeforeResponseColumn(headerRow, 'Pre Prompt');
+ }
+ if (this.hasDynamicPrompt(component)) {
+ this.insertBeforeResponseColumn(headerRow, 'Dynamic Prompt');
+ }
+ if (this.hasPostPrompt(component)) {
+ this.insertBeforeResponseColumn(headerRow, 'Post Prompt');
}
}
- private insertDynamicPromptColumnIfNecessary(headerRow: string[], componentStates: any[]): void {
- if (this.hasDynamicPrompt(componentStates)) {
- headerRow.splice(headerRow.indexOf('Response'), 0, 'Dynamic Prompt');
+ private insertQuestionColumns(headerRow: string[], component: any, componentStates: any[]): void {
+ const maxQuestions = this.getMaxQuestionBankCount(componentStates);
+ if (maxQuestions > 0) {
+ for (let q = 0; q < maxQuestions; q++) {
+ this.insertBeforeResponseColumn(headerRow, `Question ${q + 1}`);
+ }
+ }
+ if (this.isClickToUseEnabled(component)) {
+ this.insertBeforeResponseColumn(headerRow, 'Question Used');
}
}
- private insertPostPromptColumnIfNecessary(headerRow: string[], component: any): void {
- if (this.hasPostPrompt(component)) {
- headerRow.splice(headerRow.indexOf('Response'), 0, 'Post Prompt');
- }
+ private insertBeforeResponseColumn(headerRow: string[], columnName: string): void {
+ headerRow.splice(headerRow.indexOf('Response'), 0, columnName);
}
private hasPrePrompt(component: any): boolean {
- const prePrompt = component.dynamicPrompt?.prePrompt;
- return prePrompt != null && prePrompt !== '';
+ return this.hasDynamicPrompt(component) && this.hasValue(component.dynamicPrompt?.prePrompt);
}
- private hasDynamicPrompt(componentStates: any[]): boolean {
- return componentStates.some(
- (componentState: any) => componentState.studentData.dynamicPrompt?.prompt != null
- );
+ private hasDynamicPrompt(component: any): boolean {
+ return component.dynamicPrompt?.enabled;
}
private hasPostPrompt(component: any): boolean {
- const postPrompt = component.dynamicPrompt?.postPrompt;
- return postPrompt != null && postPrompt !== '';
+ return this.hasDynamicPrompt(component) && this.hasValue(component.dynamicPrompt?.postPrompt);
}
- private insertQuestionColumnsIfNecessary(headerRow: string[], componentStates: any[]): void {
- const maxQuestions = this.getMaxQuestionBankCount(componentStates);
- if (maxQuestions > 0) {
- for (let q = 0; q < maxQuestions; q++) {
- headerRow.splice(headerRow.indexOf('Response'), 0, `Question ${q + 1}`);
- }
- }
+ private hasValue(value: any): boolean {
+ return value != null && value !== '';
+ }
+
+ private isClickToUseEnabled(component: any): boolean {
+ return component.questionBank?.clickToUseEnabled;
}
private getMaxQuestionBankCount(componentStates: any[]): number {
@@ -218,7 +223,7 @@ export class PeerChatComponentDataExportStrategy extends AbstractDataExportStrat
this.projectService.getNodePositionAndTitle(nodeId)
);
this.setColumnValue(row, columnNameToNumber, 'Component Type', component.type);
- this.setColumnValue(row, columnNameToNumber, 'Component Prompt', component.prompt);
+ this.setColumnValue(row, columnNameToNumber, 'Prompt', component.prompt);
}
private setStudentWork(
@@ -239,25 +244,53 @@ export class PeerChatComponentDataExportStrategy extends AbstractDataExportStrat
'Client Timestamp',
millisecondsToDateTime(componentState.clientSaveTime)
);
- this.setColumnValue(row, columnNameToNumber, 'Pre Prompt', component.dynamicPrompt?.prePrompt);
- this.setColumnValue(
- row,
- columnNameToNumber,
- 'Dynamic Prompt',
- componentState.studentData.dynamicPrompt?.prompt
- );
- this.setColumnValue(
- row,
- columnNameToNumber,
- 'Post Prompt',
- component.dynamicPrompt?.postPrompt
- );
+ this.setDynamicPrompts(row, columnNameToNumber, component, componentState);
if (componentState.studentData.questionBank != null) {
this.setQuestions(row, columnNameToNumber, componentState);
}
+ if (this.isClickToUseEnabled(component)) {
+ this.setColumnValue(
+ row,
+ columnNameToNumber,
+ 'Question Used',
+ this.getQuestionText(component, componentState.studentData.questionId)
+ );
+ }
this.setColumnValue(row, columnNameToNumber, 'Response', componentState.studentData.response);
}
+ private setDynamicPrompts(
+ row: any,
+ columnNameToNumber: any,
+ component: any,
+ componentState: any
+ ): void {
+ if (this.hasPrePrompt(component)) {
+ this.setColumnValue(
+ row,
+ columnNameToNumber,
+ 'Pre Prompt',
+ component.dynamicPrompt?.prePrompt
+ );
+ }
+ if (this.hasDynamicPrompt(component)) {
+ this.setColumnValue(
+ row,
+ columnNameToNumber,
+ 'Dynamic Prompt',
+ componentState.studentData.dynamicPrompt?.prompt
+ );
+ }
+ if (this.hasPostPrompt(component)) {
+ this.setColumnValue(
+ row,
+ columnNameToNumber,
+ 'Post Prompt',
+ component.dynamicPrompt?.postPrompt
+ );
+ }
+ }
+
private setQuestions(row: any[], columnNameToNumber: any, componentState: any): void {
let questionCounter = 1;
for (const questionBank of componentState.studentData.questionBank) {
@@ -272,6 +305,17 @@ export class PeerChatComponentDataExportStrategy extends AbstractDataExportStrat
}
}
+ private getQuestionText(component: any, questionId: string): string {
+ for (const rule of component.questionBank.rules) {
+ for (const question of rule.questions) {
+ if (question.id === questionId) {
+ return question.text;
+ }
+ }
+ }
+ return null;
+ }
+
private setColumnValue(
row: any[],
columnNameToNumber: any,
diff --git a/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.ts b/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.ts
index 9941423e2f5..76a2775b166 100644
--- a/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.ts
+++ b/src/assets/wise5/classroomMonitor/student-grading/student-grading.component.ts
@@ -70,8 +70,7 @@ export class StudentGradingComponent implements OnInit {
this.maxScore = maxScore ? maxScore : 0;
this.totalScore = this.dataService.getTotalScoreByWorkgroupId(this.workgroupId);
this.projectCompletion = this.classroomStatusService.getStudentProjectCompletion(
- this.workgroupId,
- true
+ this.workgroupId
);
this.nodeIds = this.projectService.getFlattenedProjectAsNodeIds();
this.setNodesById();
@@ -134,7 +133,7 @@ export class StudentGradingComponent implements OnInit {
private subscribeToCurrentWorkgroupChanged(): void {
this.subscriptions.add(
this.dataService.currentWorkgroupChanged$
- .pipe(filter((workgroup) => workgroup != null))
+ .pipe(filter(({ currentWorkgroup }) => currentWorkgroup != null))
.subscribe(({ currentWorkgroup }) => {
const workgroupId = currentWorkgroup.workgroupId;
if (this.workgroupId !== workgroupId) {
diff --git a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
index fd40e0937ad..bbcd180f005 100644
--- a/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
+++ b/src/assets/wise5/classroomMonitor/student-progress/student-progress.component.ts
@@ -53,7 +53,9 @@ export class StudentProgressComponent implements OnInit {
private initializeStudents(): void {
this.teams = [];
- const workgroups = this.configService.getClassmateUserInfos();
+ const workgroups = this.configService
+ .getClassmateUserInfos()
+ .filter((workgroup: any) => workgroup.workgroupId != null);
for (const workgroup of workgroups) {
const workgroupId = workgroup.workgroupId;
const displayNames = this.configService.getDisplayUsernamesByWorkgroupId(workgroupId);
@@ -71,7 +73,7 @@ export class StudentProgressComponent implements OnInit {
private updateTeam(workgroupId: number): void {
const location = this.getCurrentNodeForWorkgroupId(workgroupId);
- const completion = this.getStudentProjectCompletion(workgroupId);
+ const completion = this.classroomStatusService.getStudentProjectCompletion(workgroupId);
const score = this.getStudentTotalScore(workgroupId);
let maxScore = this.classroomStatusService.getMaxScoreForWorkgroupId(workgroupId);
maxScore = maxScore ? maxScore : 0;
@@ -93,15 +95,6 @@ export class StudentProgressComponent implements OnInit {
);
}
- /**
- * Get project completion data for the given workgroup (only include nodes with student work)
- * @param workgroupId the workgroup id
- * @return object with completed, total, and percent completed (integer between 0 and 100)
- */
- private getStudentProjectCompletion(workgroupId: number): any {
- return this.classroomStatusService.getStudentProjectCompletion(workgroupId, true);
- }
-
private getStudentTotalScore(workgroupId: number): number {
return this.dataService.getTotalScoreByWorkgroupId(workgroupId);
}
diff --git a/src/assets/wise5/common/ProjectCompletion.ts b/src/assets/wise5/common/ProjectCompletion.ts
new file mode 100644
index 00000000000..6f17890dd54
--- /dev/null
+++ b/src/assets/wise5/common/ProjectCompletion.ts
@@ -0,0 +1,5 @@
+export class ProjectCompletion {
+ completedItems: number;
+ completionPct: number;
+ totalItems: number;
+}
diff --git a/src/assets/wise5/common/constraint/strategies/AddXNumberOfNotesOnThisStepConstraintStrategy.ts b/src/assets/wise5/common/constraint/strategies/AddXNumberOfNotesOnThisStepConstraintStrategy.ts
index 66bc5e2fb5a..16c30f9344e 100644
--- a/src/assets/wise5/common/constraint/strategies/AddXNumberOfNotesOnThisStepConstraintStrategy.ts
+++ b/src/assets/wise5/common/constraint/strategies/AddXNumberOfNotesOnThisStepConstraintStrategy.ts
@@ -3,7 +3,7 @@ import { AbstractConstraintStrategy } from './AbstractConstraintStrategy';
export class AddXNumberOfNotesOnThisStepConstraintStrategy extends AbstractConstraintStrategy {
evaluate(criteria: any): boolean {
try {
- const notebookItemsByNodeId = this.dataService.getNotebookItemsByNodeId(
+ const notebookItemsByNodeId = this.getNotebookItemsByNodeId(
this.notebookService.getNotebookByWorkgroup(),
criteria.params.nodeId
);
@@ -11,4 +11,8 @@ export class AddXNumberOfNotesOnThisStepConstraintStrategy extends AbstractConst
} catch (e) {}
return false;
}
+
+ private getNotebookItemsByNodeId(notebook: any, nodeId: string): any[] {
+ return notebook.allItems.filter((item) => item.nodeId === nodeId);
+ }
}
diff --git a/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.html b/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.html
index 0bc605789df..0086ecf9a9a 100644
--- a/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.html
+++ b/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.html
@@ -5,8 +5,8 @@
[response]="componentState"
[numReplies]="componentState.replies.length"
[mode]="'grading'"
- (deleteButtonClicked)="deleteButtonClicked($event)"
- (undoDeleteButtonClicked)="undoDeleteButtonClicked($event)"
+ (deleteButtonClicked)="hidePost($event)"
+ (undoDeleteButtonClicked)="showPost($event)"
[isDisabled]="true"
class="post"
>
diff --git a/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts b/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts
index 80fcd6b7cd5..d311c5f3e87 100644
--- a/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts
+++ b/src/assets/wise5/components/discussion/discussion-show-work/discussion-show-work.component.ts
@@ -107,37 +107,8 @@ export class DiscussionShowWorkComponent extends ComponentShowWorkDirective {
* the class from seeing the post.
* @param componentState the student component state the teacher wants to delete.
*/
- deleteButtonClicked(componentState: any): void {
- const toWorkgroupId = componentState.workgroupId;
- const userInfo = this.ConfigService.getUserInfoByWorkgroupId(toWorkgroupId);
- const periodId = userInfo.periodId;
- const teacherUserInfo = this.ConfigService.getMyUserInfo();
- const fromWorkgroupId = teacherUserInfo.workgroupId;
- const runId = this.ConfigService.getRunId();
- const nodeId = this.nodeId;
- const componentId = this.componentId;
- const studentWorkId = componentState.id;
- const data = {
- action: 'Delete'
- };
- const annotation = this.AnnotationService.createInappropriateFlagAnnotation(
- runId,
- periodId,
- nodeId,
- componentId,
- fromWorkgroupId,
- toWorkgroupId,
- studentWorkId,
- data
- );
- this.AnnotationService.saveAnnotation(annotation).then(() => {
- const componentStates = this.TeacherDiscussionService.getPostsAssociatedWithComponentIdsAndWorkgroupId(
- this.getGradingComponentIds(),
- this.workgroupId
- );
- const annotations = this.getInappropriateFlagAnnotationsByComponentStates(componentStates);
- this.setClassResponses(componentStates, annotations);
- });
+ protected hidePost(componentState: any): void {
+ this.flagPost(componentState, 'Delete');
}
/**
@@ -146,7 +117,11 @@ export class DiscussionShowWorkComponent extends ComponentShowWorkDirective {
* This will make the post visible to the students.
* @param componentState the student component state the teacher wants to show again.
*/
- undoDeleteButtonClicked(componentState: any): any {
+ protected showPost(componentState: any): void {
+ this.flagPost(componentState, 'Undo Delete');
+ }
+
+ private flagPost(componentState: any, action: 'Delete' | 'Undo Delete'): void {
const toWorkgroupId = componentState.workgroupId;
const userInfo = this.ConfigService.getUserInfoByWorkgroupId(toWorkgroupId);
const periodId = userInfo.periodId;
@@ -157,7 +132,7 @@ export class DiscussionShowWorkComponent extends ComponentShowWorkDirective {
const componentId = this.componentId;
const studentWorkId = componentState.id;
const data = {
- action: 'Undo Delete'
+ action: action
};
const annotation = this.AnnotationService.createInappropriateFlagAnnotation(
runId,
diff --git a/src/assets/wise5/components/draw/drawService.ts b/src/assets/wise5/components/draw/drawService.ts
index 270221be4d6..534e2222063 100644
--- a/src/assets/wise5/components/draw/drawService.ts
+++ b/src/assets/wise5/components/draw/drawService.ts
@@ -5,7 +5,7 @@ import * as fabric from 'fabric';
window['fabric'] = fabric.fabric;
import * as EventEmitter2 from 'eventemitter2';
window['EventEmitter2'] = EventEmitter2;
-import DrawingTool from 'drawing-tool/dist/drawing-tool';
+import DrawingTool from '@wise-community/drawing-tool/dist/drawing-tool';
import { ComponentService } from '../componentService';
import { StudentAssetService } from '../../services/studentAssetService';
import { Injectable } from '@angular/core';
diff --git a/src/assets/wise5/services/annotationService.ts b/src/assets/wise5/services/annotationService.ts
index d14691f6b0b..06987e54ea7 100644
--- a/src/assets/wise5/services/annotationService.ts
+++ b/src/assets/wise5/services/annotationService.ts
@@ -5,7 +5,6 @@ import { ProjectService } from './projectService';
import { ConfigService } from './configService';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable, Subject } from 'rxjs';
-import { isMatchingPeriods } from '../common/period/period';
import { generateRandomKey } from '../common/string/string';
import { Annotation } from '../common/Annotation';
@@ -28,17 +27,14 @@ export class AnnotationService {
return this.annotations;
}
- /**
- * Get the annotation with the specified id, or null if not found
- * @param annotationId
- */
- getAnnotationById(annotationId) {
- for (let annotation of this.annotations) {
- if (annotation.id === annotationId) {
- return annotation;
- }
- }
- return null;
+ getAnnotationById(annotationId: number): Annotation {
+ return this.annotations.find((annotation) => annotation.id === annotationId) || null;
+ }
+
+ getAnnotationsByNodeIdComponentId(nodeId: string, componentId: string): Annotation[] {
+ return this.annotations.filter(
+ (annotation) => annotation.nodeId === nodeId && annotation.componentId === componentId
+ );
}
/**
@@ -440,28 +436,15 @@ export class AnnotationService {
* @return object containing the component's latest score and comment annotations
*/
getLatestComponentAnnotations(
- nodeId,
- componentId,
- workgroupId,
+ nodeId: string,
+ componentId: string,
+ workgroupId: number,
scoreType: 'score' | 'autoScore' | 'any' = 'any',
- commentType = null
- ) {
- let latestScoreAnnotation = this.getLatestScoreAnnotation(
- nodeId,
- componentId,
- workgroupId,
- scoreType
- );
- let latestCommentAnnotation = this.getLatestCommentAnnotation(
- nodeId,
- componentId,
- workgroupId,
- commentType
- );
-
+ commentType: 'comment' | 'autoComment' | 'any' = 'any'
+ ): any {
return {
- score: latestScoreAnnotation,
- comment: latestCommentAnnotation
+ score: this.getLatestScoreAnnotation(nodeId, componentId, workgroupId, scoreType),
+ comment: this.getLatestCommentAnnotation(nodeId, componentId, workgroupId, commentType)
};
}
@@ -537,13 +520,10 @@ export class AnnotationService {
scoreType: 'score' | 'autoScore' | 'any' = 'any'
): Annotation {
return (
- this.getAnnotations()
+ this.getAnnotationsByNodeIdComponentId(nodeId, componentId)
.filter(
(annotation) =>
- annotation.nodeId == nodeId &&
- annotation.componentId == componentId &&
- annotation.toWorkgroupId == workgroupId &&
- this.matchesScoreType(annotation, scoreType)
+ annotation.toWorkgroupId == workgroupId && this.matchesScoreType(annotation, scoreType)
)
.at(-1) || null
);
@@ -559,74 +539,31 @@ export class AnnotationService {
);
}
- isThereAnyScoreAnnotation(nodeId, componentId, periodId) {
- const annotations = this.getAnnotations();
- for (const annotation of annotations) {
- if (
- annotation.nodeId === nodeId &&
- annotation.componentId === componentId &&
- isMatchingPeriods(annotation.periodId, periodId) &&
- this.isScoreOrAutoScore(annotation)
- ) {
- return true;
- }
- }
- return false;
+ getLatestCommentAnnotation(
+ nodeId: string,
+ componentId: string,
+ workgroupId: number,
+ commentType: 'comment' | 'autoComment' | 'any' = 'any'
+ ): Annotation {
+ return (
+ this.getAnnotationsByNodeIdComponentId(nodeId, componentId)
+ .filter(
+ (annotation) =>
+ annotation.toWorkgroupId == workgroupId &&
+ this.matchesCommentType(annotation, commentType)
+ )
+ .at(-1) || null
+ );
}
- /**
- * Get the latest comment annotation
- * @param nodeId the node id
- * @param componentId the component id
- * @param workgroupId the workgroup id
- * @param commentType (optional) the type of comment
- * e.g.
- * 'autoComment' for auto graded comment
- * 'comment' for teacher graded comment
- * 'any' for auto graded comment or teacher graded comment
- * @returns the latest comment annotation
- */
- getLatestCommentAnnotation(nodeId, componentId, workgroupId, commentType) {
- let annotation = null;
- const annotations = this.getAnnotations();
-
- if (commentType == null) {
- commentType = 'any';
- }
-
- for (let a = annotations.length - 1; a >= 0; a--) {
- const tempAnnotation = annotations[a];
- if (tempAnnotation != null) {
- let acceptAnnotation = false;
- const tempNodeId = tempAnnotation.nodeId;
- const tempComponentId = tempAnnotation.componentId;
- const tempToWorkgroupId = tempAnnotation.toWorkgroupId;
- const tempAnnotationType = tempAnnotation.type;
-
- if (
- nodeId == tempNodeId &&
- componentId == tempComponentId &&
- workgroupId == tempToWorkgroupId
- ) {
- if (
- commentType === 'any' &&
- (tempAnnotationType === 'autoComment' || tempAnnotationType === 'comment')
- ) {
- acceptAnnotation = true;
- } else if (commentType === 'autoComment' && tempAnnotationType === 'autoComment') {
- acceptAnnotation = true;
- } else if (commentType === 'comment' && tempAnnotationType === 'comment') {
- acceptAnnotation = true;
- }
-
- if (acceptAnnotation) {
- annotation = tempAnnotation;
- break;
- }
- }
- }
- }
- return annotation;
+ private matchesCommentType(
+ annotation: Annotation,
+ commentType: 'comment' | 'autoComment' | 'any'
+ ): boolean {
+ return (
+ (commentType === 'any' && ['autoComment', 'comment'].includes(annotation.type)) ||
+ annotation.type === commentType
+ );
}
getScoreValueFromScoreAnnotation(scoreAnnotation: any): number {
@@ -684,21 +621,14 @@ export class AnnotationService {
* @param type the type of annotation
* @return the latest annotation for the given student work and annotation type
*/
- getLatestAnnotationByStudentWorkIdAndType(studentWorkId, type) {
- for (let a = this.annotations.length - 1; a >= 0; a--) {
- const annotation = this.annotations[a];
-
- if (annotation != null) {
- if (studentWorkId == annotation.studentWorkId && type == annotation.type) {
- /*
- * we have found an annotation with the given student work
- * id and annotation type
- */
- return annotation;
- }
- }
- }
- return null;
+ getLatestAnnotationByStudentWorkIdAndType(studentWorkId: number, type: string): Annotation {
+ return (
+ this.annotations
+ .filter(
+ (annotation) => annotation.studentWorkId === studentWorkId && annotation.type === type
+ )
+ .at(-1) || null
+ );
}
/**
@@ -706,71 +636,8 @@ export class AnnotationService {
* @param studentWorkId the student work id
* @return array of annotations for the given student work
*/
- getAnnotationsByStudentWorkId(studentWorkId) {
- let annotations = [];
- for (let annotation of this.annotations) {
- if (annotation && studentWorkId == annotation.studentWorkId) {
- annotations.push(annotation);
- }
- }
- return annotations;
- }
-
- getAverageAutoScore(nodeId, componentId, periodId = -1, type = null) {
- let totalScoreSoFar = 0;
- let annotationsCounted = 0;
- for (let annotation of this.getAllLatestScoreAnnotations(nodeId, componentId, periodId)) {
- if (
- annotation.nodeId === nodeId &&
- annotation.componentId === componentId &&
- (periodId === -1 || annotation.periodId === periodId)
- ) {
- let score = null;
- if (type != null) {
- score = this.getSubScore(annotation, type);
- } else {
- score = this.getScoreFromAnnotation(annotation);
- }
- if (score != null) {
- totalScoreSoFar += score;
- annotationsCounted++;
- }
- }
- }
- return totalScoreSoFar / annotationsCounted;
- }
-
- getAllLatestScoreAnnotations(nodeId, componentId, periodId) {
- const workgroupIdsFound = {};
- const latestScoreAnnotations = [];
- for (let a = this.annotations.length - 1; a >= 0; a--) {
- const annotation = this.annotations[a];
- const workgroupId = annotation.toWorkgroupId;
- if (
- workgroupIdsFound[workgroupId] == null &&
- nodeId === annotation.nodeId &&
- componentId === annotation.componentId &&
- (periodId === -1 || periodId === annotation.periodId) &&
- ('score' === annotation.type || 'autoScore' === annotation.type)
- ) {
- workgroupIdsFound[workgroupId] = annotation;
- latestScoreAnnotations.push(annotation);
- }
- }
- return latestScoreAnnotations;
- }
-
- getScoreFromAnnotation(annotation) {
- return annotation.data.value;
- }
-
- getSubScore(annotation, type) {
- for (let score of annotation.data.scores) {
- if (score.id === type) {
- return score.score;
- }
- }
- return null;
+ getAnnotationsByStudentWorkId(studentWorkId: number): Annotation[] {
+ return this.annotations.filter((annotation) => annotation.studentWorkId === studentWorkId);
}
broadcastAnnotationSavedToServer(annotation: Annotation): void {
diff --git a/src/assets/wise5/services/classroomStatusService.ts b/src/assets/wise5/services/classroomStatusService.ts
index 186462e2544..8d7a6eba37c 100644
--- a/src/assets/wise5/services/classroomStatusService.ts
+++ b/src/assets/wise5/services/classroomStatusService.ts
@@ -4,6 +4,8 @@ import { AnnotationService } from './annotationService';
import { ConfigService } from './configService';
import { ProjectService } from './projectService';
import { Observable, Subject, tap } from 'rxjs';
+import { NodeProgress } from '../common/NodeProgress';
+import { ProjectCompletion } from '../common/ProjectCompletion';
@Injectable()
export class ClassroomStatusService {
@@ -64,16 +66,11 @@ export class ClassroomStatusService {
}
getStudentStatusForWorkgroupId(workgroupId: number): any {
- const studentStatuses = this.getStudentStatuses();
- for (let tempStudentStatus of studentStatuses) {
- if (tempStudentStatus != null) {
- const tempWorkgroupId = tempStudentStatus.workgroupId;
- if (workgroupId === tempWorkgroupId) {
- return tempStudentStatus;
- }
- }
- }
- return null;
+ return (
+ this.getStudentStatuses().find(
+ (studentStatus) => studentStatus.workgroupId === workgroupId
+ ) || null
+ );
}
hasStudentStatus(workgroupId: number): boolean {
@@ -96,79 +93,25 @@ export class ClassroomStatusService {
}
}
- /**
- * Get the student project completion data by workgroup id
- * @param workgroupId the workgroup id
- * @param excludeNonWorkNodes boolean whether to exclude nodes without
- * @returns object with completed, total, and percent completed (integer
- * between 0 and 100)
- */
- getStudentProjectCompletion(workgroupId, excludeNonWorkNodes) {
- let completion = {
- totalItems: 0,
- completedItems: 0,
- completionPct: 0
- };
-
- // get the student status for the workgroup
- let studentStatus = this.getStudentStatusForWorkgroupId(workgroupId);
-
+ getStudentProjectCompletion(workgroupId: number): ProjectCompletion {
+ let completion: ProjectCompletion = new ProjectCompletion();
+ const studentStatus = this.getStudentStatusForWorkgroupId(workgroupId);
if (studentStatus) {
- let projectCompletion = studentStatus.projectCompletion;
-
- if (projectCompletion) {
- if (excludeNonWorkNodes) {
- // we're only looking for completion of nodes with work
- let completionPctWithWork = projectCompletion.completionPctWithWork;
-
- if (completionPctWithWork) {
- completion.totalItems = projectCompletion.totalItemsWithWork;
- completion.completedItems = projectCompletion.completedItemsWithWork;
- completion.completionPct = projectCompletion.completionPctWithWork;
- } else {
- /*
- * we have a legacy projectCompletion object that only includes information for all nodes
- * so we need to calculate manually
- */
- completion = this.getNodeCompletion('group0', -1, workgroupId, true);
- }
- } else {
- completion = projectCompletion;
- }
+ const projectCompletion = studentStatus.projectCompletion;
+ const completionPctWithWork = projectCompletion.completionPctWithWork;
+ if (completionPctWithWork) {
+ completion.totalItems = projectCompletion.totalItemsWithWork;
+ completion.completedItems = projectCompletion.completedItemsWithWork;
+ completion.completionPct = projectCompletion.completionPctWithWork;
+ } else {
+ // we have a legacy projectCompletion object that only includes information for all nodes so
+ // we need to calculate completion manually
+ completion = this.getNodeCompletion('group0', -1, workgroupId, true);
}
}
return completion;
}
- /**
- * Get the workgroups on a node in the given period
- * @param nodeId the node id
- * @param periodId the period id. pass in -1 to select all periods.
- * @returns an array of workgroup ids on a node in a period
- */
- getWorkgroupIdsOnNode(nodeId, periodId) {
- let workgroupIds = [];
- let studentStatuses = this.studentStatuses;
- for (let studentStatus of studentStatuses) {
- if (studentStatus != null) {
- if (periodId === -1 || periodId === studentStatus.periodId) {
- let currentNodeId = studentStatus.currentNodeId;
- if (nodeId === currentNodeId) {
- workgroupIds.push(studentStatus.workgroupId);
- } else if (this.projectService.isGroupNode(nodeId)) {
- let currentNode = this.projectService.getNodeById(currentNodeId);
- let group = this.projectService.getNodeById(nodeId);
-
- if (this.projectService.isNodeDescendentOfGroup(currentNode, group)) {
- workgroupIds.push(studentStatus.workgroupId);
- }
- }
- }
- }
- }
- return workgroupIds;
- }
-
/**
* Get node completion info for the given parameters
* @param nodeId the node id
diff --git a/src/assets/wise5/services/milestoneReportService.ts b/src/assets/wise5/services/milestoneReportService.ts
index 041c129ef53..56ebe394454 100644
--- a/src/assets/wise5/services/milestoneReportService.ts
+++ b/src/assets/wise5/services/milestoneReportService.ts
@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
import { AnnotationService } from './annotationService';
import { ProjectService } from './projectService';
import { MilestoneCriteriaEvaluator } from '../classroomMonitor/milestones/milestoneCriteriaEvaluator';
+import { Annotation } from '../common/Annotation';
+import { isMatchingPeriods } from '../common/period/period';
@Injectable()
export class MilestoneReportService {
@@ -72,11 +74,7 @@ export class MilestoneReportService {
reportSettings: any
) {
const aggregate = {};
- const scoreAnnotations = this.annotationService.getAllLatestScoreAnnotations(
- nodeId,
- componentId,
- periodId
- );
+ const scoreAnnotations = this.getAllLatestScoreAnnotations(nodeId, componentId, periodId);
for (const scoreAnnotation of scoreAnnotations) {
if (scoreAnnotation.type === 'autoScore') {
this.addDataToAggregate(aggregate, scoreAnnotation, reportSettings);
@@ -100,6 +98,29 @@ export class MilestoneReportService {
return aggregate;
}
+ private getAllLatestScoreAnnotations(
+ nodeId: string,
+ componentId: string,
+ periodId: number
+ ): Annotation[] {
+ return this.annotationService
+ .getAnnotationsByNodeIdComponentId(nodeId, componentId)
+ .filter(
+ (annotation) =>
+ isMatchingPeriods(annotation.periodId, periodId) &&
+ ['autoScore', 'score'].includes(annotation.type)
+ )
+ .reduceRight(
+ (latestAnnotations, annotation) =>
+ latestAnnotations.some(
+ (latestAnnotation) => latestAnnotation.toWorkgroupId === annotation.toWorkgroupId
+ )
+ ? latestAnnotations
+ : latestAnnotations.concat(annotation),
+ []
+ );
+ }
+
private mergeAutoScoreAndTeacherScore(
autoScoreAnnotation: any,
teacherScoreAnnotation: any,
diff --git a/src/assets/wise5/services/nodeService.ts b/src/assets/wise5/services/nodeService.ts
index 477521006c7..ab6dacc0a50 100644
--- a/src/assets/wise5/services/nodeService.ts
+++ b/src/assets/wise5/services/nodeService.ts
@@ -88,33 +88,18 @@ export class NodeService {
* Get the previous node in the project sequence
* @param currentId (optional)
*/
- getPrevNodeId(currentId?) {
+ getPrevNodeId(currentId?: string): string {
let prevNodeId = null;
- let currentNodeId = null;
- const mode = this.ConfigService.getMode();
- if (currentId) {
- currentNodeId = currentId;
- } else {
- let currentNode = null;
- currentNode = this.DataService.getCurrentNode();
- if (currentNode) {
- currentNodeId = currentNode.id;
- }
- }
+ const currentNodeId = currentId ?? this.DataService.getCurrentNodeId();
if (currentNodeId) {
- if (['classroomMonitor', 'author'].includes(mode)) {
- let currentNodeOrder = this.ProjectService.getNodeOrderById(currentNodeId);
+ if (['author', 'classroomMonitor'].includes(this.ConfigService.getMode())) {
+ const currentNodeOrder = this.ProjectService.getNodeOrderById(currentNodeId);
if (currentNodeOrder) {
- let prevNodeOrder = currentNodeOrder - 1;
- let prevId = this.ProjectService.getNodeIdByOrder(prevNodeOrder);
+ const prevId = this.ProjectService.getNodeIdByOrder(currentNodeOrder - 1);
if (prevId) {
- if (this.ProjectService.isApplicationNode(prevId)) {
- // node is a step, so set it as the next node
- prevNodeId = prevId;
- } else if (this.ProjectService.isGroupNode(prevId)) {
- // node is an activity, so get next nodeId
- prevNodeId = this.getPrevNodeId(prevId);
- }
+ prevNodeId = this.ProjectService.isApplicationNode(prevId)
+ ? prevId
+ : this.getPrevNodeId(prevId);
}
}
} else {
@@ -312,17 +297,6 @@ export class NodeService {
return availableTransitions;
}
- currentNodeHasTransitionLogic() {
- const currentNode: any = this.DataService.getCurrentNode();
- if (currentNode != null) {
- const transitionLogic = currentNode.transitionLogic;
- if (transitionLogic != null) {
- return true;
- }
- }
- return false;
- }
-
/**
* Evaluate the transition logic for the current node and create branch
* path taken events if necessary.
diff --git a/src/assets/wise5/services/projectService.ts b/src/assets/wise5/services/projectService.ts
index 730e034a63d..9628776a98f 100644
--- a/src/assets/wise5/services/projectService.ts
+++ b/src/assets/wise5/services/projectService.ts
@@ -772,25 +772,31 @@ export class ProjectService {
* Retrieves the project JSON from Config.projectURL and returns it.
* If Config.projectURL is undefined, returns null.
*/
- retrieveProject(parseProject: boolean = true): any {
- let projectURL = this.configService.getConfigParam('projectURL');
- if (projectURL == null) {
- return null;
- }
- const headers = new HttpHeaders().set('cache-control', 'no-cache');
- return this.http.get(projectURL, { headers: headers }).pipe(
+ retrieveProject(): Observable {
+ return this.makeProjectRequest().pipe(
tap((projectJSON: any) => {
- if (parseProject) {
- this.setProject(projectJSON);
- } else {
- this.project = projectJSON;
- this.metadata = projectJSON.metadata;
- }
+ this.setProject(projectJSON);
+ return projectJSON;
+ })
+ );
+ }
+
+ retrieveProjectWithoutParsing(): Observable {
+ return this.makeProjectRequest().pipe(
+ tap((projectJSON: any) => {
+ this.project = projectJSON;
+ this.metadata = projectJSON.metadata;
return projectJSON;
})
);
}
+ private makeProjectRequest(): Observable {
+ const projectURL = this.configService.getConfigParam('projectURL');
+ const headers = new HttpHeaders().set('cache-control', 'no-cache');
+ return this.http.get(projectURL, { headers: headers });
+ }
+
getThemePath(): string {
return this.getDefaultThemePath();
}
diff --git a/src/assets/wise5/services/studentDataService.ts b/src/assets/wise5/services/studentDataService.ts
index bdc6ff0711a..45c73c52230 100644
--- a/src/assets/wise5/services/studentDataService.ts
+++ b/src/assets/wise5/services/studentDataService.ts
@@ -185,16 +185,6 @@ export class StudentDataService extends DataService {
);
}
- getNotebookItemsByNodeId(notebook, nodeId) {
- const notebookItemsByNodeId = [];
- for (const notebookItem of notebook.allItems) {
- if (notebookItem.nodeId === nodeId) {
- notebookItemsByNodeId.push(notebookItem);
- }
- }
- return notebookItemsByNodeId;
- }
-
populateHistories(events) {
this.stackHistory = [];
for (const event of events) {
@@ -551,63 +541,29 @@ export class StudentDataService extends DataService {
return null;
}
- getStudentWorkByStudentWorkId(studentWorkId) {
- for (const componentState of this.studentData.componentStates) {
- if (componentState.id === studentWorkId) {
- return componentState;
- }
- }
- return null;
- }
-
- getComponentStates() {
+ getComponentStates(): any[] {
return this.studentData.componentStates;
}
- getComponentStatesByNodeId(nodeId) {
- const componentStatesByNodeId = [];
- for (const componentState of this.studentData.componentStates) {
- if (componentState.nodeId === nodeId) {
- componentStatesByNodeId.push(componentState);
- }
- }
- return componentStatesByNodeId;
+ getComponentStatesByNodeId(nodeId: string): any[] {
+ return this.studentData.componentStates.filter(
+ (componentState) => componentState.nodeId === nodeId
+ );
}
- getComponentStatesByNodeIdAndComponentId(nodeId, componentId) {
- const componentStatesByNodeIdAndComponentId = [];
- for (const componentState of this.studentData.componentStates) {
- if (componentState.nodeId === nodeId && componentState.componentId === componentId) {
- componentStatesByNodeIdAndComponentId.push(componentState);
- }
- }
- return componentStatesByNodeIdAndComponentId;
+ getComponentStatesByNodeIdAndComponentId(nodeId: string, componentId: string): any[] {
+ return this.studentData.componentStates.filter(
+ (componentState) =>
+ componentState.nodeId === nodeId && componentState.componentId === componentId
+ );
}
- getEvents() {
+ getEvents(): any[] {
return this.studentData.events;
}
- getEventsByNodeId(nodeId) {
- const eventsByNodeId = [];
- const events = this.studentData.events;
- for (const event of events) {
- if (event.nodeId === nodeId) {
- eventsByNodeId.push(event);
- }
- }
- return eventsByNodeId;
- }
-
- getEventsByNodeIdAndComponentId(nodeId, componentId) {
- const eventsByNodeId = [];
- const events = this.studentData.events;
- for (const event of events) {
- if (event.nodeId === nodeId && event.componentId === componentId) {
- eventsByNodeId.push(event);
- }
- }
- return eventsByNodeId;
+ getEventsByNodeId(nodeId: string): any[] {
+ return this.studentData.events.filter((event) => event.nodeId === nodeId);
}
/**
diff --git a/src/assets/wise5/vle/node/node.component.ts b/src/assets/wise5/vle/node/node.component.ts
index 3692d6ee756..34db370d5f0 100644
--- a/src/assets/wise5/vle/node/node.component.ts
+++ b/src/assets/wise5/vle/node/node.component.ts
@@ -151,10 +151,7 @@ export class NodeComponent implements OnInit {
this.dirtySubmitComponentIds = [];
this.updateComponentVisibility();
- if (
- this.nodeService.currentNodeHasTransitionLogic() &&
- this.nodeService.evaluateTransitionLogicOn('enterNode')
- ) {
+ if (this.nodeService.evaluateTransitionLogicOn('enterNode')) {
this.nodeService.evaluateTransitionLogic();
}
@@ -204,10 +201,7 @@ export class NodeComponent implements OnInit {
ngOnDestroy() {
this.stopAutoSaveInterval();
this.nodeUnloaded(this.node.id);
- if (
- this.nodeService.currentNodeHasTransitionLogic() &&
- this.nodeService.evaluateTransitionLogicOn('exitNode')
- ) {
+ if (this.nodeService.evaluateTransitionLogicOn('exitNode')) {
this.nodeService.evaluateTransitionLogic();
}
this.subscriptions.unsubscribe();
@@ -286,23 +280,21 @@ export class NodeComponent implements OnInit {
.saveToServer(componentStates, componentEvents, componentAnnotations)
.then((savedStudentDataResponse) => {
if (savedStudentDataResponse) {
- if (this.nodeService.currentNodeHasTransitionLogic()) {
- if (this.nodeService.evaluateTransitionLogicOn('studentDataChanged')) {
- this.nodeService.evaluateTransitionLogic();
- }
- if (this.nodeService.evaluateTransitionLogicOn('scoreChanged')) {
- if (componentAnnotations != null && componentAnnotations.length > 0) {
- let evaluateTransitionLogic = false;
- for (const componentAnnotation of componentAnnotations) {
- if (componentAnnotation != null) {
- if (componentAnnotation.type === 'autoScore') {
- evaluateTransitionLogic = true;
- }
+ if (this.nodeService.evaluateTransitionLogicOn('studentDataChanged')) {
+ this.nodeService.evaluateTransitionLogic();
+ }
+ if (this.nodeService.evaluateTransitionLogicOn('scoreChanged')) {
+ if (componentAnnotations != null && componentAnnotations.length > 0) {
+ let evaluateTransitionLogic = false;
+ for (const componentAnnotation of componentAnnotations) {
+ if (componentAnnotation != null) {
+ if (componentAnnotation.type === 'autoScore') {
+ evaluateTransitionLogic = true;
}
}
- if (evaluateTransitionLogic) {
- this.nodeService.evaluateTransitionLogic();
- }
+ }
+ if (evaluateTransitionLogic) {
+ this.nodeService.evaluateTransitionLogic();
}
}
}
diff --git a/src/messages.xlf b/src/messages.xlf
index 7e8d97075fa..a7b3e43fbef 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -475,7 +475,7 @@
src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html
- 135
+ 131src/assets/wise5/authoringTool/peer-grouping/create-new-peer-grouping-dialog/create-new-peer-grouping-dialog.component.html
@@ -717,7 +717,7 @@
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 52
+ 51src/assets/wise5/components/animation/animation-authoring/animation-authoring.component.html
@@ -905,7 +905,7 @@
src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 30
+ 18src/assets/wise5/authoringTool/node/advanced/node-advanced-authoring/node-advanced-authoring.component.html
@@ -1147,7 +1147,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 38
+ 39src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html
@@ -1166,7 +1166,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 161
+ 160src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.html
@@ -1454,16 +1454,12 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.8
- src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 74
-
-
- src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 36
+ src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
+ 31src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 39
+ 37
@@ -1476,21 +1472,13 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html
26
-
- src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html
- 28
- src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html85
-
- src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html
- 87
- src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 34
+ 33
@@ -1513,7 +1501,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/addNode/choose-automated-assessment/choose-automated-assessment.component.html
- 40
+ 38src/assets/wise5/authoringTool/addNode/choose-simulation/choose-simulation.component.html
@@ -1861,11 +1849,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/app/forgot/student/forgot-student-password-change/forgot-student-password-change.component.ts
- 100
+ 92src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts
- 157
+ 148src/assets/wise5/authoringTool/peer-grouping/author-peer-grouping-dialog/author-peer-grouping-dialog.component.ts
@@ -3249,7 +3237,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.The verification code has expired. Verification codes are valid for 10 minutes. Please go back to the Teacher Forgot Password page to generate a new one.
src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts
- 138
+ 129src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts
@@ -3260,7 +3248,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.The verification code is invalid. Please try again.
src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts
- 143
+ 134src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts
@@ -3271,7 +3259,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.You have submitted an invalid verification code too many times. For security reasons, we will lock the ability to change your password for 10 minutes. After 10 minutes, please go back to the Teacher Forgot Password page to generate a new verification code.
src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts
- 148
+ 139src/app/forgot/teacher/forgot-teacher-password-verify/forgot-teacher-password-verify.component.ts
@@ -3282,7 +3270,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Passwords do not match, please try again.
src/app/forgot/teacher/forgot-teacher-password-change/forgot-teacher-password-change.component.ts
- 153
+ 144
@@ -3376,346 +3364,331 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
Getting Started
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html3
- src/app/help/help-home/help-home.component.html
- 18
+ src/app/help/faq/student-faq/student-faq.component.html
+ 132
- src/app/help/student-faq/student-faq.component.html
- 130
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 407
- src/app/help/teacher-faq/teacher-faq.component.html
- 410
+ src/app/help/help-home/help-home.component.html
+ 18Creating an Account
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html6 All users must create their own account. Teachers must create a teacher account and students must create a student account. Users can create an account by going to the WISE Home Page and clicking on the Register link at the upper right of the screen.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html7,13Here are instructions on how to create a teacher account.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html14Go to the WISE Home Page.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html16 Click the Register link at the upper right of the screen.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html17,20Click on Teacher.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html21Choose to sign up with your email or with your Google Account.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html22
- src/app/help/student-faq/student-faq.component.html
- 19
+ src/app/help/faq/student-faq/student-faq.component.html
+ 21
- src/app/help/teacher-faq/teacher-faq.component.html
- 36
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 33Fill out the form and submit it.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html23
- src/app/help/student-faq/student-faq.component.html
- 20
+ src/app/help/faq/student-faq/student-faq.component.html
+ 22
- src/app/help/teacher-faq/teacher-faq.component.html
- 37
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 34 If you created an account using your email, you will be given a username that you will need to remember. Your username will be your first name and your last name with no space inbetween. There may be a number added at the end of your username if someone has the same name as you.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html24,28
- src/app/help/student-faq/student-faq.component.html
- 21,25
+ src/app/help/faq/student-faq/student-faq.component.html
+ 23,27
- src/app/help/teacher-faq/teacher-faq.component.html
- 38,42
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 35,39Using a WISE Unit
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html31 To use a WISE unit with your class, you must first choose a unit to use and then set up a "Run" of that unit.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html32,35Here are instructions on how to set up a Run.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html36Sign in to WISE with your teacher account.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html38
- src/app/help/teacher-faq/teacher-faq.component.html
- 46
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 43Click the "Unit Library" tab.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html39
- src/app/help/teacher-faq/teacher-faq.component.html
- 47
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 44
- src/app/help/teacher-faq/teacher-faq.component.html
- 204
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 201Find a project that you would like to use with your class.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html40
- src/app/help/teacher-faq/teacher-faq.component.html
- 48
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 45Click on the project to open the information for the project.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html41
- src/app/help/teacher-faq/teacher-faq.component.html
- 49
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 46Click the "Use With Class" button.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html42
- src/app/help/teacher-faq/teacher-faq.component.html
- 50
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 47Choose the periods you will use the project in.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html43
- src/app/help/teacher-faq/teacher-faq.component.html
- 51
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 48 Choose the number of students per team. Choosing 1-3 will allow students to work together in a team.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html44,47
- src/app/help/teacher-faq/teacher-faq.component.html
- 52,55
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 49,52 Choose the start date. Students will not be able to use the project until this date.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html48,50
- src/app/help/teacher-faq/teacher-faq.component.html
- 56,58
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 53,55Click "Create Run".
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html51
- src/app/help/teacher-faq/teacher-faq.component.html
- 59
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 56The run will be created and added to your Teacher Home.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html52
- src/app/help/teacher-faq/teacher-faq.component.html
- 60
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 57 Copy the "Access Code" for the new run and write it down somewhere like on the white board. Students will need to use this access code to work on the run you created.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html53,56
- src/app/help/teacher-faq/teacher-faq.component.html
- 61,64
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 58,61Teacher FAQ
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html76
- src/app/help/help-home/help-home.component.html
- 29
+ src/app/help/faq/student-faq/student-faq.component.html
+ 143
- src/app/help/student-faq/student-faq.component.html
- 141
+ src/app/help/help-home/help-home.component.html
+ 29Questions from teachers.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html78
- src/app/help/help-home/help-home.component.html
- 31
+ src/app/help/faq/student-faq/student-faq.component.html
+ 145
- src/app/help/student-faq/student-faq.component.html
- 143
+ src/app/help/help-home/help-home.component.html
+ 31Student FAQ
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html87
- src/app/help/help-home/help-home.component.html
- 40
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 418
- src/app/help/teacher-faq/teacher-faq.component.html
- 421
+ src/app/help/help-home/help-home.component.html
+ 40Questions from students.
- src/app/help/getting-started/getting-started.component.html
+ src/app/help/faq/getting-started/getting-started.component.html89
- src/app/help/help-home/help-home.component.html
- 42
-
-
- src/app/help/teacher-faq/teacher-faq.component.html
- 423
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 420
-
-
- Information for new users.src/app/help/help-home/help-home.component.html
- 20
-
-
- src/app/help/student-faq/student-faq.component.html
- 132
-
-
- src/app/help/teacher-faq/teacher-faq.component.html
- 412
+ 42Student Frequently Asked Questions
- src/app/help/student-faq/student-faq.component.html
+ src/app/help/faq/student-faq/student-faq.component.html3Table of Contents
- src/app/help/student-faq/student-faq.component.html
+ src/app/help/faq/student-faq/student-faq.component.html6
- src/app/help/teacher-faq/teacher-faq.component.html
- 7
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 6src/app/privacy/privacy.component.html
@@ -3725,184 +3698,184 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
General Questions
- src/app/help/student-faq/student-faq.component.html
- 8
+ src/app/help/faq/student-faq/student-faq.component.html
+ 9
- src/app/help/student-faq/student-faq.component.html
- 14
+ src/app/help/faq/student-faq/student-faq.component.html
+ 16
- src/app/help/teacher-faq/teacher-faq.component.html
+ src/app/help/faq/teacher-faq/teacher-faq.component.html9
- src/app/help/teacher-faq/teacher-faq.component.html
- 31
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 28Technical Questions
- src/app/help/student-faq/student-faq.component.html
- 11
+ src/app/help/faq/student-faq/student-faq.component.html
+ 12
- src/app/help/student-faq/student-faq.component.html
- 59
+ src/app/help/faq/student-faq/student-faq.component.html
+ 61
- src/app/help/teacher-faq/teacher-faq.component.html
- 28
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 24
- src/app/help/teacher-faq/teacher-faq.component.html
- 331
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 328How do I create an account?
- src/app/help/student-faq/student-faq.component.html
- 15
+ src/app/help/faq/student-faq/student-faq.component.html
+ 17
- src/app/help/teacher-faq/teacher-faq.component.html
- 32
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 29Go to the Register page.
- src/app/help/student-faq/student-faq.component.html
- 17
+ src/app/help/faq/student-faq/student-faq.component.html
+ 19
- src/app/help/teacher-faq/teacher-faq.component.html
- 34
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 31Click on Student.
- src/app/help/student-faq/student-faq.component.html
- 18
+ src/app/help/faq/student-faq/student-faq.component.html
+ 20I forgot my username, how can I find it?
- src/app/help/student-faq/student-faq.component.html
- 27
+ src/app/help/faq/student-faq/student-faq.component.html
+ 29 Go to the forgot username page and follow the instructions to retrieve your username.
- src/app/help/student-faq/student-faq.component.html
- 29,31
+ src/app/help/faq/student-faq/student-faq.component.html
+ 31,33I forgot my password, how can I change it?
- src/app/help/student-faq/student-faq.component.html
- 33
+ src/app/help/faq/student-faq/student-faq.component.html
+ 35Go to the forgot password page and follow the instructions to reset your password.
- src/app/help/student-faq/student-faq.component.html
- 35
+ src/app/help/faq/student-faq/student-faq.component.html
+ 37How do I start working on a project?
- src/app/help/student-faq/student-faq.component.html
- 37
+ src/app/help/faq/student-faq/student-faq.component.html
+ 39 In order to start working on a project you must obtain an Access Code from your teacher. Once you have an Access Code, follow the directions below.
- src/app/help/student-faq/student-faq.component.html
- 38,41
+ src/app/help/faq/student-faq/student-faq.component.html
+ 40,43Log into WISE with your student account.
- src/app/help/student-faq/student-faq.component.html
- 43
+ src/app/help/faq/student-faq/student-faq.component.html
+ 45 Click on the "Add Unit" button at the top right of the Student Home Page.
- src/app/help/student-faq/student-faq.component.html
- 44,47
+ src/app/help/faq/student-faq/student-faq.component.html
+ 46,49Enter the Access Code from your teacher.
- src/app/help/student-faq/student-faq.component.html
- 48
+ src/app/help/faq/student-faq/student-faq.component.html
+ 50Choose your period.
- src/app/help/student-faq/student-faq.component.html
- 49
+ src/app/help/faq/student-faq/student-faq.component.html
+ 51Click "Add".
- src/app/help/student-faq/student-faq.component.html
- 50
+ src/app/help/faq/student-faq/student-faq.component.html
+ 52The run will be added to your list of runs.
- src/app/help/student-faq/student-faq.component.html
- 51
+ src/app/help/faq/student-faq/student-faq.component.html
+ 53Click "Launch" to open the project.
- src/app/help/student-faq/student-faq.component.html
- 52
+ src/app/help/faq/student-faq/student-faq.component.html
+ 54I chose the wrong period, how can I change it?
- src/app/help/student-faq/student-faq.component.html
- 54
+ src/app/help/faq/student-faq/student-faq.component.html
+ 56Only your teacher can change your period. Please ask them for assistance.
- src/app/help/student-faq/student-faq.component.html
- 56
+ src/app/help/faq/student-faq/student-faq.component.html
+ 58The WISE web site won't load on my web browser. What do I do?
- src/app/help/student-faq/student-faq.component.html
- 60
+ src/app/help/faq/student-faq/student-faq.component.html
+ 62
- src/app/help/teacher-faq/teacher-faq.component.html
- 332
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 329
@@ -3910,521 +3883,525 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.clearing your browser cache and then reloading the WISE web site.
- src/app/help/student-faq/student-faq.component.html
- 62,68
+ src/app/help/faq/student-faq/student-faq.component.html
+ 64,70
- src/app/help/teacher-faq/teacher-faq.component.html
- 334,340
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 331,337You can try using a different web browser. We recommend using Chrome or Firefox.
- src/app/help/student-faq/student-faq.component.html
- 69
+ src/app/help/faq/student-faq/student-faq.component.html
+ 71
- src/app/help/teacher-faq/teacher-faq.component.html
- 341
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 338What if I have trouble logging in?
- src/app/help/student-faq/student-faq.component.html
- 71
+ src/app/help/faq/student-faq/student-faq.component.html
+ 73
- src/app/help/teacher-faq/teacher-faq.component.html
- 351
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 348 If you do not remember your username or password click the Lost Username or Password link and follow the instructions.
- src/app/help/student-faq/student-faq.component.html
- 73,76
+ src/app/help/faq/student-faq/student-faq.component.html
+ 75,78
- src/app/help/teacher-faq/teacher-faq.component.html
- 353,356
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 350,353Can I use WISE in another language?
- src/app/help/student-faq/student-faq.component.html
- 78
-
-
- src/app/help/teacher-faq/teacher-faq.component.html
- 358
-
-
-
- Yes!
-
- src/app/help/student-faq/student-faq.component.html
- 79
+ src/app/help/faq/student-faq/student-faq.component.html
+ 80
- src/app/help/teacher-faq/teacher-faq.component.html
- 359
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 355Sign into WISE with your student account.
- src/app/help/student-faq/student-faq.component.html
- 81
+ src/app/help/faq/student-faq/student-faq.component.html
+ 83 Click on your account icon at the top right of the page. This should open a drop down with options.
- src/app/help/student-faq/student-faq.component.html
- 82,85
+ src/app/help/faq/student-faq/student-faq.component.html
+ 84,87
- src/app/help/teacher-faq/teacher-faq.component.html
- 362,365
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 359,362 Click the "Edit Profile" option.
- src/app/help/student-faq/student-faq.component.html
- 86,89
+ src/app/help/faq/student-faq/student-faq.component.html
+ 88,91
- src/app/help/teacher-faq/teacher-faq.component.html
- 366,369
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 363,366Near the bottom there will be a "Language" setting.
- src/app/help/student-faq/student-faq.component.html
- 90
+ src/app/help/faq/student-faq/student-faq.component.html
+ 92
- src/app/help/teacher-faq/teacher-faq.component.html
- 370
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 367Change the language to the language of your choice.
- src/app/help/student-faq/student-faq.component.html
- 91
+ src/app/help/faq/student-faq/student-faq.component.html
+ 93
- src/app/help/teacher-faq/teacher-faq.component.html
- 371
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 368 Note 1: If your language is not listed as an option, or you'd like to help us improve the translation, please contact us and we'll help you get started!
- src/app/help/student-faq/student-faq.component.html
- 92,95
+ src/app/help/faq/student-faq/student-faq.component.html
+ 94,97
- src/app/help/teacher-faq/teacher-faq.component.html
- 372,375
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 369,372 Note 2: Changing the language will change the language of the website but will not change the language of the projects. Projects must be independently translated which means that if you want to use a project in another language, you must translate it yourself or find a version of the project that has been translated by someone else.
- src/app/help/student-faq/student-faq.component.html
- 96,101
+ src/app/help/faq/student-faq/student-faq.component.html
+ 98,103
- src/app/help/teacher-faq/teacher-faq.component.html
- 376,381
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 373,378Who do I contact when I have a problem I can't solve?
- src/app/help/student-faq/student-faq.component.html
- 103
+ src/app/help/faq/student-faq/student-faq.component.html
+ 105
- src/app/help/teacher-faq/teacher-faq.component.html
- 383
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 380 The Contact WISE form will send an email to the WISE technology group. You can find a link to the form at the bottom of the home page. Be sure to include as much information as you can about the problem. We will respond as quickly as we can.
- src/app/help/student-faq/student-faq.component.html
- 105,110
+ src/app/help/faq/student-faq/student-faq.component.html
+ 107,112
+
+
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 382,387
+
+
+
+ Information for new users.
+
+ src/app/help/faq/student-faq/student-faq.component.html
+ 134
+
+
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 409
- src/app/help/teacher-faq/teacher-faq.component.html
- 385,390
+ src/app/help/help-home/help-home.component.html
+ 20Teacher Frequently Asked Questions
- src/app/help/teacher-faq/teacher-faq.component.html
- 4
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 3Student Management
- src/app/help/teacher-faq/teacher-faq.component.html
+ src/app/help/faq/teacher-faq/teacher-faq.component.html12
- src/app/help/teacher-faq/teacher-faq.component.html
- 67
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 64Project Management
- src/app/help/teacher-faq/teacher-faq.component.html
+ src/app/help/faq/teacher-faq/teacher-faq.component.html15
- src/app/help/teacher-faq/teacher-faq.component.html
- 176
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 173Assessment of Student Work
- src/app/help/teacher-faq/teacher-faq.component.html
- 19
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 18
- src/app/help/teacher-faq/teacher-faq.component.html
- 253
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 250Real Time Classroom Monitor
- src/app/help/teacher-faq/teacher-faq.component.html
- 24
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 21
- src/app/help/teacher-faq/teacher-faq.component.html
- 309
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 306Click on "Teacher".
- src/app/help/teacher-faq/teacher-faq.component.html
- 35
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 32How do I use a unit with my class?
- src/app/help/teacher-faq/teacher-faq.component.html
- 44
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 41Should I register my students for WISE or have them do it themselves?
- src/app/help/teacher-faq/teacher-faq.component.html
- 68
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 65 WISE makes student registration simple and intuitive -- direct your students to the register page by having them go to the WISE home page and clicking the "Register" link at the upper right. They should be able to register in 10 minutes or less. However, you can also opt to pre-register all of your students and provide them with a copy of their username/password on their first day in the project run.
- src/app/help/teacher-faq/teacher-faq.component.html
- 69,75
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 66,72 Once a student has created a WISE account they should never need to create another one.
- src/app/help/teacher-faq/teacher-faq.component.html
- 77,79
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 74,76 Some teachers that pre-register prefer to give all students the same initial password, to decrease problems with students signing in. This is ok, but for security purposes, we advise that you have the students change their passwords once they log in.
- src/app/help/teacher-faq/teacher-faq.component.html
- 80,84
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 77,81A student has forgotten his/her username or password. What should I do?
- src/app/help/teacher-faq/teacher-faq.component.html
- 86
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 83 First, we recommend always having students WRITE DOWN their username/password when they first register.
- src/app/help/teacher-faq/teacher-faq.component.html
- 88,91
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 85,88 Second, encourage the students to solve the problem themselves. Tell them to go to the WISE home page, click the Lost username/password link, and click the Student button. If the student can answer their security question (created at registration) they can change their password.
- src/app/help/teacher-faq/teacher-faq.component.html
- 92,96
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 89,93 Third, if the student can't solve the problem directly, you can change their password for them using the instructions below.
- src/app/help/teacher-faq/teacher-faq.component.html
- 97,100
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 94,97How do I change a student's password?
- src/app/help/teacher-faq/teacher-faq.component.html
- 102
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 99Sign into WISE with your teacher account.
- src/app/help/teacher-faq/teacher-faq.component.html
- 104
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 101
- src/app/help/teacher-faq/teacher-faq.component.html
- 117
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 114
- src/app/help/teacher-faq/teacher-faq.component.html
- 147
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 144
- src/app/help/teacher-faq/teacher-faq.component.html
- 171
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 168
- src/app/help/teacher-faq/teacher-faq.component.html
- 203
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 200
- src/app/help/teacher-faq/teacher-faq.component.html
- 225
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 222
- src/app/help/teacher-faq/teacher-faq.component.html
- 234
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 231
- src/app/help/teacher-faq/teacher-faq.component.html
- 256
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 253
- src/app/help/teacher-faq/teacher-faq.component.html
- 361
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 358Find the run in your Teacher Home Page.
- src/app/help/teacher-faq/teacher-faq.component.html
- 105
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 102
- src/app/help/teacher-faq/teacher-faq.component.html
- 118
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 115
- src/app/help/teacher-faq/teacher-faq.component.html
- 148
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 145
- src/app/help/teacher-faq/teacher-faq.component.html
- 172
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 169
- src/app/help/teacher-faq/teacher-faq.component.html
- 226
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 223
- src/app/help/teacher-faq/teacher-faq.component.html
- 235
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 232
- src/app/help/teacher-faq/teacher-faq.component.html
- 257
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 254Click the "Teacher Tools" button on the run.
- src/app/help/teacher-faq/teacher-faq.component.html
- 106
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 103
- src/app/help/teacher-faq/teacher-faq.component.html
- 119
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 116
- src/app/help/teacher-faq/teacher-faq.component.html
- 149
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 146
- src/app/help/teacher-faq/teacher-faq.component.html
- 258
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 255Click on the "Manage Students" icon on the left side bar.
- src/app/help/teacher-faq/teacher-faq.component.html
- 107
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 104
- src/app/help/teacher-faq/teacher-faq.component.html
- 120
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 117
- src/app/help/teacher-faq/teacher-faq.component.html
- 150
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 147Find the period the student is in.
- src/app/help/teacher-faq/teacher-faq.component.html
- 108
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 105
- src/app/help/teacher-faq/teacher-faq.component.html
- 121
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 118
- src/app/help/teacher-faq/teacher-faq.component.html
- 151
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 148Find the student and click "Change Password".
- src/app/help/teacher-faq/teacher-faq.component.html
- 109
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 106 Alternatively, you can change the password for ALL students in the current period (the new password will be applied to all the students in the period).
- src/app/help/teacher-faq/teacher-faq.component.html
- 110,113
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 107,110How do I change a student team after they've started a project run?
- src/app/help/teacher-faq/teacher-faq.component.html
- 115
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 112 Drag-and-drop student names to move them from one team to another. Make sure to save your changes before leaving this window.
- src/app/help/teacher-faq/teacher-faq.component.html
- 122,125
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 119,122 If you want to move students into a brand new team, click New Team, then drag 1 or more students into the new team. Save your changes.
- src/app/help/teacher-faq/teacher-faq.component.html
- 126,129
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 123,126Warning 1
- src/app/help/teacher-faq/teacher-faq.component.html
- 131
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 128If you move Student A into an established team, student A loses all of their current work and inherits the current work of the established team.
- src/app/help/teacher-faq/teacher-faq.component.html
- 133,134
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 130,131Warning 2
- src/app/help/teacher-faq/teacher-faq.component.html
- 138
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 135If you move Student A into a newly created (blank) team, student A will lose all of their work.
- src/app/help/teacher-faq/teacher-faq.component.html
- 140,141
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 137,138How do I change the period for a student?
- src/app/help/teacher-faq/teacher-faq.component.html
- 145
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 142Find the student.
- src/app/help/teacher-faq/teacher-faq.component.html
- 152
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 149Click the "Period" link.
- src/app/help/teacher-faq/teacher-faq.component.html
- 153
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 150 A popup will show up that will allow you to choose a different period for the student.
- src/app/help/teacher-faq/teacher-faq.component.html
- 154,156
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 151,153Choose a different period.
- src/app/help/teacher-faq/teacher-faq.component.html
- 157
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 154Click "Save Changes".
- src/app/help/teacher-faq/teacher-faq.component.html
- 158
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 155Warning
- src/app/help/teacher-faq/teacher-faq.component.html
- 160
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 157src/app/modules/shared/unlink-google-account-confirm/unlink-google-account-confirm.component.html
@@ -4450,359 +4427,366 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
If you move a student to a different period, they will lose all of their work.
- src/app/help/teacher-faq/teacher-faq.component.html
- 162
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 159 I do not remember my teacher access code that students need to create their account for my new students.
- src/app/help/teacher-faq/teacher-faq.component.html
- 166,169
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 163,166The Access Code will be displayed below the run title.
- src/app/help/teacher-faq/teacher-faq.component.html
- 173
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 170When should I set up my project run?
- src/app/help/teacher-faq/teacher-faq.component.html
- 177
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 174 You need to set up your project run anytime before the students can start working on the project. They will need the Access Code for the run in order to start working.
- src/app/help/teacher-faq/teacher-faq.component.html
- 179,182
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 176,179How long does it take to run a project?
- src/app/help/teacher-faq/teacher-faq.component.html
- 184
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 181 Project durations vary from about 3 days to 10 days. Some projects may display an estimation of the number of hours it will take for students to complete the project.
- src/app/help/teacher-faq/teacher-faq.component.html
- 186,189
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 183,186Can I shorten a project run to 1 or 2 days?
- src/app/help/teacher-faq/teacher-faq.component.html
- 191
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 188 It is not recommended to shorten a project. Each project has been carefully designed to lead the student through an inquiry process and cutting it short will result in a less satisfactory educational student experience. Nevertheless, if you are under a time constraint and knowledgeable of the project topic, you could customize the project and shorten it to your specific needs.
- src/app/help/teacher-faq/teacher-faq.component.html
- 193,199
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 190,196Where do I find out about lesson plans and standards for WISE projects?
- src/app/help/teacher-faq/teacher-faq.component.html
- 201
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 198Find a project you would like to learn about.
- src/app/help/teacher-faq/teacher-faq.component.html
- 205
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 202Click on the project.
- src/app/help/teacher-faq/teacher-faq.component.html
- 206
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 203This will display a popup that displays information about the project.
- src/app/help/teacher-faq/teacher-faq.component.html
- 207
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 204 Note: Some projects may not have much information because it is dependent on the author to provide the lesson plan and standards.
- src/app/help/teacher-faq/teacher-faq.component.html
- 208,211
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 205,208How do I fit a WISE project into my curriculum?
- src/app/help/teacher-faq/teacher-faq.component.html
- 213
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 210 In general students will benefit from some pre-teaching of the topic covered in the project. It is really up to the teacher to decide where it best fits to support student learning. Many teachers use a WISE project as a capstone activity while others integrate it into their curriculum at a midpoint. Some teachers elect to use WISE projects an introductory activity for a unit, or as a summation activity for a unit.
- src/app/help/teacher-faq/teacher-faq.component.html
- 215,221
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 212,218How do I add a period after creating a run?
- src/app/help/teacher-faq/teacher-faq.component.html
- 223
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 220On the run, click the three vertical dots to view the run options.
- src/app/help/teacher-faq/teacher-faq.component.html
- 227
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 224
- src/app/help/teacher-faq/teacher-faq.component.html
- 236
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 233Click "Edit Settings".
- src/app/help/teacher-faq/teacher-faq.component.html
- 228
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 225
- src/app/help/teacher-faq/teacher-faq.component.html
- 237
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 234Enter a period name in the "Add New Period" field.
- src/app/help/teacher-faq/teacher-faq.component.html
- 229
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 226Click "Add Period".
- src/app/help/teacher-faq/teacher-faq.component.html
- 230
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 227How do I delete a period after creating a run?
- src/app/help/teacher-faq/teacher-faq.component.html
- 232
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 229Find the period you want to delete and click the "Delete" button next to it.
- src/app/help/teacher-faq/teacher-faq.component.html
- 238
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 235Note: You are not allowed to delete a period that has students in it.
- src/app/help/teacher-faq/teacher-faq.component.html
- 239
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 236 What if I run out of computer lab time but some of my students are not finished with the project?
- src/app/help/teacher-faq/teacher-faq.component.html
- 241,244
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 238,241 WISE is a web-based learning environments, so students can sign in from a computer at school or at home. This means that students can complete the project from any home or community based computer, per the teacher's discretion.
- src/app/help/teacher-faq/teacher-faq.component.html
- 246,250
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 243,247How do I review and grade student work?
- src/app/help/teacher-faq/teacher-faq.component.html
- 254
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 251Here you will be able to look at your students' work.
- src/app/help/teacher-faq/teacher-faq.component.html
- 259
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 256 On the left sidebar you can choose to look at the work by step by clicking "Grade By Step" or you can choose to look at the work by team by clicking "Grade By Team".
- src/app/help/teacher-faq/teacher-faq.component.html
- 260,263
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 257,260Next to each student's work, you will be able to give them a score and comment.
- src/app/help/teacher-faq/teacher-faq.component.html
- 264
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 261How do students see my comments and scores for their work?
- src/app/help/teacher-faq/teacher-faq.component.html
- 266
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 263The student must sign into WISE with their student account.
- src/app/help/teacher-faq/teacher-faq.component.html
- 268
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 265Open the project.
- src/app/help/teacher-faq/teacher-faq.component.html
- 269
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 266Go to the step that the teacher graded.
- src/app/help/teacher-faq/teacher-faq.component.html
- 270
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 267The comment and score will be displayed under the piece of work that was graded.
- src/app/help/teacher-faq/teacher-faq.component.html
- 271
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 268What should I look for in my student's answers?
- src/app/help/teacher-faq/teacher-faq.component.html
- 273
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 270 The following link will give you a sample rubric for grading a step in the Mitosis and Cell Processes project. The rubric is based on our TELS Center research on how students integrate their knowledge of complex science concepts. We hope that it can give you a start in developing your own rubrics for the notes and steps you plan to grade.
- src/app/help/teacher-faq/teacher-faq.component.html
- 275,280
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 272,277Sample rubric for assessing student work
- src/app/help/teacher-faq/teacher-faq.component.html
- 286
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 283How can I encourage my students to review the graded notes and comments I have made?
- src/app/help/teacher-faq/teacher-faq.component.html
- 290
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 287 Many teachers find it advantageous to grade the first step or two at the end of the first day of the project run. At the beginning of class the next day they share with the whole class some sample responses and have the class critique the work.
- src/app/help/teacher-faq/teacher-faq.component.html
- 292,296
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 289,293How do I find time to grade all of the student work?
- src/app/help/teacher-faq/teacher-faq.component.html
- 298
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 295 We recommend that you go through the project and select a few steps that you think best demonstrate the students' understanding of the complex concepts covered in the module and grade those steps. Then tell your students they must complete all questions but should concentrate their efforts on the key steps. We recognize that critically grading each step is very time consuming and unpractical.
- src/app/help/teacher-faq/teacher-faq.component.html
- 300,306
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 297,303What is the Real Time Classroom Monitor?
- src/app/help/teacher-faq/teacher-faq.component.html
- 310
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 307 The Real Time Classroom Monitor allows teachers to view student progress in real time. Teachers will be able to see what step a student is on, how much time the student has spent on that step, and how much of the project the student has completed. All of this information will be updated immediately in real time as students work on the project.
- src/app/help/teacher-faq/teacher-faq.component.html
- 312,317
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 309,314Does the Real Time Classroom Monitor work on a tablet like the iPad?
- src/app/help/teacher-faq/teacher-faq.component.html
- 319
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 316Yes it does.
- src/app/help/teacher-faq/teacher-faq.component.html
- 321
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 318Can I use the Real Time Classroom Monitor to pause student screens?
- src/app/help/teacher-faq/teacher-faq.component.html
- 323
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 320 Yes you can! This can be useful if you need to grab their attention in order to have a class discussion or to make an announcement.
- src/app/help/teacher-faq/teacher-faq.component.html
- 325,328
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 322,325How many computers do I need to run WISE?
- src/app/help/teacher-faq/teacher-faq.component.html
- 343
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 340 We strongly recommend one computer for every two students. Research shows that students benefit from working together as a team of two.
- src/app/help/teacher-faq/teacher-faq.component.html
- 345,348
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 342,345
+
+
+
+ Yes!
+
+ src/app/help/faq/teacher-faq/teacher-faq.component.html
+ 356
@@ -5409,7 +5393,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 41
+ 40src/assets/wise5/authoringTool/project-list/project-list.component.html
@@ -6133,11 +6117,11 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.161
-
- Password changed.
+
+ Successfully changed password.src/app/modules/shared/edit-password/edit-password.component.ts
- 80
+ 81
@@ -6357,6 +6341,10 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/app/notebook/notebook-report/notebook-report.component.html
72,74
+
+ src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
+ 11,13
+ src/assets/wise5/themes/default/notebook/edit-notebook-item-dialog/edit-notebook-item-dialog.component.html80,82
@@ -6377,49 +6365,112 @@ Click "Cancel" to keep the invalid JSON open so you can fix it. Password required
src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
- 12,14
+ 23,25
-
- Password must be at least 8 characters
+
+ Password Strength:src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
- 15,17
+ 33
-
- Password must have at least one lowercase, one uppercase, and one number character
+
+ Very Weaksrc/app/password/new-password-and-confirm/new-password-and-confirm.component.html
- 18,20
+ 35
-
- Confirm Password required
+
+ Weaksrc/app/password/new-password-and-confirm/new-password-and-confirm.component.html
- 33,35
+ 36
+
+
+
+ Good
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
+ 37
+
+
+
+ Strong
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
+ 38
+
+
+
+ Very Strong
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
+ 39
+
+
+
+ Your password needs to:
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
+ 43 Password does not match src/app/password/new-password-and-confirm/new-password-and-confirm.component.html
- 36,38
+ 67,69Confirm New Passwordsrc/app/password/new-password-and-confirm/new-password-and-confirm.component.ts
- 18
+ 26New Passwordsrc/app/password/new-password-and-confirm/new-password-and-confirm.component.ts
- 23
+ 31
+
+
+
+ include a letter
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts
+ 33
+
+
+
+ include a number
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts
+ 34
+
+
+
+ be at least 8 characters long
+
+ src/app/password/new-password-and-confirm/new-password-and-confirm.component.ts
+ 35
+
+
+
+ Requirement failed
+
+ src/app/password/password-requirement/password-requirement.component.html
+ 25
+
+
+
+ Requirement passed
+
+ src/app/password/password-requirement/password-requirement.component.html
+ 28
@@ -7277,21 +7328,21 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Error: First Name and Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dash
src/app/register/register-user-form/register-user-form.component.ts
- 44
+ 34Error: First Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dashsrc/app/register/register-user-form/register-user-form.component.ts
- 46
+ 36Error: Last Name must only contain characters A-Z, a-z, spaces, or dashes and can not start or end with a space or dashsrc/app/register/register-user-form/register-user-form.component.ts
- 48
+ 38
@@ -9400,71 +9451,64 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.25,27
-
- Back to Unit Plan
-
- src/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 7
-
- Show Rubricsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 18
+ 6Download Unitsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 41
+ 29Edit Unit JSONsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 55
+ 43src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 39
+ 49Script Filenamesrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 67
+ 55Choosesrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 74
+ 62Unit URLsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 84
+ 72Copy Unit URL to Clipboardsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 91
+ 79Open Unit URL in New Tabsrc/assets/wise5/authoringTool/advanced/advanced-project-authoring.component.html
- 102
+ 90
@@ -9537,18 +9581,25 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.44
+
+ Advanced Settings
+
+ src/assets/wise5/authoringTool/authoring-tool.component.ts
+ 92
+
+ Unit Listsrc/assets/wise5/authoringTool/authoring-tool.component.ts
- 92
+ 99You have been inactive for a long time. Do you want to stay logged in?src/assets/wise5/authoringTool/authoring-tool.component.ts
- 106
+ 113src/assets/wise5/classroomMonitor/classroom-monitor.component.ts
@@ -9563,7 +9614,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Session Timeout
src/assets/wise5/authoringTool/authoring-tool.component.ts
- 107
+ 114src/assets/wise5/classroomMonitor/classroom-monitor.component.ts
@@ -9578,32 +9629,32 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Saving...
src/assets/wise5/authoringTool/authoring-tool.component.ts
- 131
+ 138Savedsrc/assets/wise5/authoringTool/authoring-tool.component.ts
- 145
+ 152Error Saving Unit. Please refresh the page.src/assets/wise5/authoringTool/authoring-tool.component.ts
- 152
+ 159You do not have permission to edit this unit.src/assets/wise5/authoringTool/authoring-tool.component.ts
- 159
+ 166src/assets/wise5/authoringTool/authoring-tool.component.ts
- 192
+ 199
@@ -9629,7 +9680,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 162
+ 131
@@ -9644,7 +9695,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 229
+ 189
@@ -9659,7 +9710,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 230
+ 190
@@ -9721,11 +9772,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html
- 110
-
-
- src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html
- 112
+ 108
@@ -9769,49 +9816,45 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
25
-
- src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 27
- Help src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 43,45
+ 44,46User Menusrc/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 48
+ 49src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 80
+ 78 Go Home src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 73,75
+ 74,76src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 105,107
+ 103,105 Sign Out src/assets/wise5/authoringTool/components/top-bar/top-bar.component.html
- 77,79
+ 78,80src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 109,111
+ 107,109
@@ -10281,7 +10324,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/importComponent/choose-import-component/choose-import-component.component.html
- 126
+ 122
@@ -11418,109 +11461,105 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 190
-
-
- src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 63
+ 189Back to unitsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 45
+ 44Add a new componentsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 56
+ 55Componentssrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 71
+ 70Move Componentssrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 80
+ 79Copy Componentssrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 90
+ 89Delete Componentssrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 100
+ 99 + Expand All src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 115,117
+ 114,116 - Collapse All src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 124,126
+ 123,125This step does not have any components. Click the + button to add a component.src/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 131
+ 130Toggle component authoringsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 153
+ 152Select componentsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 170
+ 169Click to expand/collapsesrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 181
+ 180Copy Componentsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 212
+ 211Delete Componentsrc/assets/wise5/authoringTool/node/node-authoring/node-authoring.component.html
- 226
+ 225
@@ -12025,69 +12064,94 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Add New Lesson
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 8
+ 7Add New Stepsrc/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 19
+ 18Movesrc/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 30
+ 29
+
+
+
+ Select lesson or step
+
+ src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
+ 80
-
+ Branch point with paths based on
+ getBranchCriteriaDescription(item.key)
+ }}"/>
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 121,123
+ 91,93
-
+ Constraint\n\n
+ getConstraintDescriptions(item.key)
+ }}"/>
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 131,133
+ 101,103
-
+ Constraints\n\n
+ getConstraintDescriptions(item.key)
+ }}"/>
src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
- 141,143
+ 111,113Has Rubric
+
+ src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
+ 120
+
+
+
+ Select lessonsrc/assets/wise5/authoringTool/project-authoring/project-authoring.component.html150
+
+ Select step
+
+ src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
+ 176
+
+
+ src/assets/wise5/authoringTool/project-authoring/project-authoring.component.html
+ 212
+
+ Are you sure you want to delete the selected item?src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts
- 106
+ 93Are you sure you want to delete the selected items?src/assets/wise5/authoringTool/project-authoring/project-authoring.component.ts
- 107
+ 94
@@ -12204,68 +12268,67 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.96
-
- Save
+
+ Recovery Viewsrc/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 3,5
+ 2
-
- Go to Authoring View
+
+ Go to Authoring View src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 6
+ 14,16JSON Validsrc/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 9
+ 19JSON Invalidsrc/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 10
+ 20
-
- Warning: Modifying the JSON may break the project. Please make a backup copy of the JSON before you modify it.
-
+
+ Warning: Modifying the JSON may break the project. Please make a backup copy of the JSON before you modify it. src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 18,21
+ 28,31Potential Problemssrc/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 23
+ 33
-
+ This group references the node ID but the node does not exist: src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 26,29
+ 36,39
-
+ This group references the same node ID multiple times: src/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 30,33
+ 40,43This node has a transition to nullsrc/assets/wise5/authoringTool/recovery-authoring/recovery-authoring.component.html
- 34
+ 44
@@ -12701,28 +12764,28 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.Confirm New Student Password
src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts
- 19
+ 20New Student Passwordsrc/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts
- 22
+ 23Changed password for ().src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts
- 70
+ 71Changed password for Student .src/assets/wise5/classroomMonitor/classroomMonitorComponents/manageStudents/change-student-password-dialog/change-student-password-dialog.component.ts
- 71
+ 72
@@ -13530,7 +13593,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 67
+ 65
@@ -13688,7 +13751,7 @@ Click "Cancel" to keep the invalid JSON open so you can fix it.
src/assets/wise5/classroomMonitor/classroomMonitorComponents/shared/top-bar/top-bar.component.html
- 48
+ 46src/assets/wise5/vle/notifications-dialog/notifications-dialog.component.html
@@ -20821,112 +20884,112 @@ If this problem continues, let your teacher know and move on to the next activit
Complete <b></b>src/assets/wise5/services/projectService.ts
- 1174
+ 1180Visit <b></b>src/assets/wise5/services/projectService.ts
- 1180
+ 1186Correctly answer <b></b>src/assets/wise5/services/projectService.ts
- 1186
+ 1192Obtain a score of <b></b> on <b></b>src/assets/wise5/services/projectService.ts
- 1201
+ 1207You must choose "" on ""src/assets/wise5/services/projectService.ts
- 1209
+ 1215Submit <b></b> time on <b></b>src/assets/wise5/services/projectService.ts
- 1221
+ 1227Submit <b></b> times on <b></b>src/assets/wise5/services/projectService.ts
- 1223
+ 1229Take the branch path from <b></b> to <b></b>src/assets/wise5/services/projectService.ts
- 1230
+ 1236Write <b></b> words on <b></b>src/assets/wise5/services/projectService.ts
- 1236
+ 1242"" is visiblesrc/assets/wise5/services/projectService.ts
- 1242
+ 1248"" is visitablesrc/assets/wise5/services/projectService.ts
- 1248
+ 1254Add <b></b> note on <b></b>src/assets/wise5/services/projectService.ts
- 1255
+ 1261Add <b></b> notes on <b></b>src/assets/wise5/services/projectService.ts
- 1257
+ 1263You must fill in <b></b> row in the <b>Table</b> on <b></b>src/assets/wise5/services/projectService.ts
- 1264
+ 1270You must fill in <b></b> rows in the <b>Table</b> on <b></b>src/assets/wise5/services/projectService.ts
- 1266
+ 1272Wait for your teacher to unlock the itemsrc/assets/wise5/services/projectService.ts
- 1269
+ 1275
@@ -20954,21 +21017,21 @@ If this problem continues, let your teacher know and move on to the next activit
StudentDataService.saveComponentEvent: component, category, event args must not be nullsrc/assets/wise5/services/studentDataService.ts
- 251
+ 241StudentDataService.saveComponentEvent: nodeId, componentId, componentType must not be nullsrc/assets/wise5/services/studentDataService.ts
- 261
+ 251StudentDataService.saveVLEEvent: category and event args must not be nullsrc/assets/wise5/services/studentDataService.ts
- 270
+ 260
diff --git a/src/style/themes/_author.scss b/src/style/themes/_author.scss
index 121086c46a9..60246720698 100644
--- a/src/style/themes/_author.scss
+++ b/src/style/themes/_author.scss
@@ -135,7 +135,7 @@ $author-colors: (
'score': #FFC107,
'secondary-text': mat.get-color-from-palette($foreground, 'secondary-text'),
'selected-bg': mat.get-color-from-palette($author-theme-primary, 50),
- 'success': #00C853,
+ 'success': #008004,
'success-contrast': black,
'text': mat.get-color-from-palette($foreground, 'text'),
'warn': mat.get-color-from-palette($author-theme-warn, 800),
diff --git a/src/style/themes/_default.scss b/src/style/themes/_default.scss
index b05c71f9886..65eafc54c89 100644
--- a/src/style/themes/_default.scss
+++ b/src/style/themes/_default.scss
@@ -136,7 +136,7 @@ $default-colors: (
'score': #FFC107,
'secondary-text': mat.get-color-from-palette($foreground, 'secondary-text'),
'selected-bg': mat.get-color-from-palette($default-theme-primary, 50),
- 'success': #00C853,
+ 'success': #008A05,
'success-contrast': black,
'text': mat.get-color-from-palette($foreground, 'text'),
'warn': mat.get-color-from-palette($default-theme-warn, 800),
diff --git a/src/style/themes/_monitor.scss b/src/style/themes/_monitor.scss
index cd1878c9b19..7cd647e9cb0 100644
--- a/src/style/themes/_monitor.scss
+++ b/src/style/themes/_monitor.scss
@@ -135,8 +135,8 @@ $monitor-colors: (
'score': #FFC107,
'secondary-text': mat.get-color-from-palette($foreground, 'secondary-text'),
'selected-bg': mat.get-color-from-palette($monitor-theme-primary, 50),
- 'success': #00C853,
+ 'success': #008004,
'success-contrast': black,
'text': mat.get-color-from-palette($foreground, 'text'),
- 'warn': mat.get-color-from-palette($monitor-theme-warn, 800),
+ 'warn': 'mat.get-color-from-palette($monitor-theme-warn, 800)',
);