-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(Branch Authoring): UX improvements (#1967)
- Loading branch information
Showing
10 changed files
with
213 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/assets/wise5/authoringTool/create-branch/create-branch.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| create-branch-paths { | ||
| create-branch-paths, select-merge-step { | ||
| margin-bottom: 16px; | ||
| } |
53 changes: 53 additions & 0 deletions
53
...oringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <h2 mat-dialog-title i18n>Branching Criteria Options</h2> | ||
| <mat-dialog-content class="dialog-content-scroll"> | ||
| <h3 i18n>Workgroup ID</h3> | ||
| <p i18n> | ||
| Automatically assigns students a branch path based on their WISE Workgroup ID number. This | ||
| option ensures a relatively even distribution of students per path. | ||
| </p> | ||
| <p i18n> | ||
| *Assigning paths based on Workgroup ID also can ensure that students are branched to the same | ||
| path across multiple branching structures in the unit (assuming each branching structure | ||
| contains the same number of paths). | ||
| </p> | ||
| <p> | ||
| This option uses the | ||
| <a | ||
| href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Remainder" | ||
| target="_blank" | ||
| >remainder function</a | ||
| >. So for 4 branch paths (A, B, C, D), calculations for the following Workgroup IDs would be: | ||
| </p> | ||
| <ul> | ||
| <li>1000 % 4 = 0 (Path A)</li> | ||
| <li>1001 % 4 = 1 (Path B)</li> | ||
| <li>1002 % 4 = 2 (Path C)</li> | ||
| <li>1003 % 4 = 3 (Path D)</li> | ||
| <li>1004 % 4 = 0 (Path A)</li> | ||
| </ul> | ||
| <mat-divider></mat-divider> | ||
| <h3 i18n>Score</h3> | ||
| <p i18n>Assigns students a branch path based on their score from another item in the unit.</p> | ||
| <p> | ||
| After choosing to branch by score, you'll need to identify a reference component. The branching | ||
| logic will use the student's score from that item to determine their path. | ||
| </p> | ||
| <mat-divider></mat-divider> | ||
| <h3 i18n>Choice Chosen</h3> | ||
| <p i18n> | ||
| Assigns students a branch path based on their selection from a multiple choice item in the unit. | ||
| </p> | ||
| <p> | ||
| After choosing to branch by choice, you'll need to identify a reference component. The branching | ||
| logic will use the student's selection from that item to determine their path. | ||
| </p> | ||
| <mat-divider></mat-divider> | ||
| <h3 i18n>Random</h3> | ||
| <p i18n> | ||
| Randomly assigns student teams a branch path. This option ensures a relatively even distribution | ||
| of students per path. | ||
| </p> | ||
| </mat-dialog-content> | ||
| <mat-dialog-actions align="end"> | ||
| <button mat-button mat-dialog-close cdkFocusRegionstart i18n>Close</button> | ||
| </mat-dialog-actions> |
21 changes: 21 additions & 0 deletions
21
...ngTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { BranchCriteriaHelpComponent } from './branch-criteria-help.component'; | ||
|
|
||
| describe('BranchCriteriaHelpComponent', () => { | ||
| let component: BranchCriteriaHelpComponent; | ||
| let fixture: ComponentFixture<BranchCriteriaHelpComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [BranchCriteriaHelpComponent] | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(BranchCriteriaHelpComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
12 changes: 12 additions & 0 deletions
12
...thoringTool/select-branch-criteria/branch-criteria-help/branch-criteria-help.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { Component } from '@angular/core'; | ||
| import { MatButtonModule } from '@angular/material/button'; | ||
| import { MatDialogModule } from '@angular/material/dialog'; | ||
| import { MatDividerModule } from '@angular/material/divider'; | ||
|
|
||
| @Component({ | ||
| selector: 'branch-criteria-help', | ||
| standalone: true, | ||
| imports: [MatButtonModule, MatDialogModule, MatDividerModule], | ||
| templateUrl: './branch-criteria-help.component.html' | ||
| }) | ||
| export class BranchCriteriaHelpComponent {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
src/assets/wise5/authoringTool/select-merge-step/select-merge-step.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| <mat-form-field class="select-merge form-field-no-hint"> | ||
| <mat-form-field class="select-merge"> | ||
| <mat-label i18n>Merge Step</mat-label> | ||
| <mat-select [(ngModel)]="mergeStepId" (ngModelChange)="selectMergeStepEvent.emit($event)"> | ||
| <mat-option *ngIf="nextStepId !== ''" [value]="nextStepId" i18n> | ||
| Use Next Step In Unit ({{ nextStepTitle }}) | ||
| </mat-option> | ||
| <mat-option [value]="''" i18n>Create New Step</mat-option> | ||
| </mat-select> | ||
| <mat-hint i18n>All students will be directed here after completing their branch paths.</mat-hint> | ||
| </mat-form-field> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters