Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
5398178
index on component-grading: 994bbd92d0 refactor(ViewComponentRevision…
hirokiterashima Dec 4, 2024
654a9f8
Add ComponentGradingComponent
hirokiterashima Dec 4, 2024
d1e4169
feat(NodeGrading): add SelectComponentComponent
hirokiterashima Dec 5, 2024
b8b5c70
feat(NodeGrading): enhance component with teacher summary displays
hirokiterashima Dec 9, 2024
62a975d
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 10, 2024
39fad25
Navigate to node/group routes when current node changes.
hirokiterashima Dec 10, 2024
f9fe066
Switching components now correctly renders the summary for the new co…
hirokiterashima Dec 10, 2024
9ba1137
Update summary display when period selection is changed.
hirokiterashima Dec 10, 2024
675a289
refactor(NodeGradingComponent, SelectComponentComponent): update comp…
hirokiterashima Dec 12, 2024
d1aa2ca
feat(ComponentGradingView): add new component for grading components
hirokiterashima Dec 13, 2024
5a51ed8
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 16, 2024
ecd56b1
feat(NodeGradingComponent): replace methods with properties for node …
hirokiterashima Dec 16, 2024
a82e7b3
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 17, 2024
6a4cdfa
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 17, 2024
51b2874
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 18, 2024
8c80503
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 18, 2024
357087d
Merge branch 'develop' into grade-by-component
hirokiterashima Dec 20, 2024
8ef340c
Merge branch 'develop' into grade-by-component
hirokiterashima Jan 10, 2025
37ecffc
Merge branch 'develop' into grade-by-component
hirokiterashima Jan 22, 2025
9e17164
Merge branch 'develop' into grade-by-component
hirokiterashima Feb 11, 2025
d79b647
Add ClassResponses to show student work on a specific component. Got …
hirokiterashima Feb 15, 2025
d15d7bc
Uncommented out all the component grading modules in ComponentGrading…
hirokiterashima Feb 18, 2025
b554863
Merge branch 'develop' into grade-by-component
hirokiterashima Feb 19, 2025
a6981ca
Fix issue where the ClassResponses was not being rendered for the ver…
hirokiterashima Feb 19, 2025
89242a6
Show component score and max score when ComponentWorkgroupItem is ini…
hirokiterashima Feb 19, 2025
09df026
Calculate score in ClassResponsesComponent and pass down to Component…
hirokiterashima Feb 19, 2025
9002a59
Component completion status display is now working
hirokiterashima Feb 19, 2025
695f3f5
Add "Step" to completion and mean score heading text
hirokiterashima Feb 20, 2025
90f5ae7
Get events when getting student data for node. This is used to calcul…
hirokiterashima Feb 21, 2025
4a5ac9b
Fix maxScore calculation logic
hirokiterashima Feb 21, 2025
fe8f46b
Pass in nodeId correctly.
hirokiterashima Feb 21, 2025
34a8613
Add MilestoneReportButton and show if available
hirokiterashima Feb 21, 2025
f637b0a
Add PeerGroupButton and show if available
hirokiterashima Feb 21, 2025
79f3a61
Removed NodeGradingView and moved everything into MilestoneGradingView.
hirokiterashima Feb 22, 2025
c5daaa8
Rewrite code using some()
hirokiterashima Feb 22, 2025
0ac62dd
Add protected modifiers. Remove unused code. Alpbahetize fields.
hirokiterashima Feb 22, 2025
f58150d
Add sorting on fields. Clean up template using @if
hirokiterashima Feb 24, 2025
f9a18c8
Remove ComponentSelectComponent and ability to hide components using …
hirokiterashima Feb 25, 2025
38e6412
Remove unused variables
hirokiterashima Feb 25, 2025
60defd2
Extract common code to AbstractClassResponsesComponent
hirokiterashima Feb 25, 2025
f5cb4d7
Merge branch 'develop' into grade-by-component
hirokiterashima Feb 25, 2025
a54b0d8
Extract collapseAll, expandAll, isWorkgroupShown and onUpdateExpand t…
hirokiterashima Feb 25, 2025
9602fdb
Add node and component in parent class. Use node.id and component.id …
hirokiterashima Feb 25, 2025
259b6e9
Rewrite sortTeam* using ternary
hirokiterashima Feb 25, 2025
75a44c5
Move getLatestWorkTimeByWorkgroupId() to parent.
hirokiterashima Feb 25, 2025
74bb201
Move getLatestAnnotationTimeByWorkgroupId() to parent
hirokiterashima Feb 25, 2025
9f8e0d5
Move updateWorkgroup() to parent
hirokiterashima Feb 25, 2025
a10e04e
Rename ClassResponses to ComponentClassResponses
hirokiterashima Feb 26, 2025
b923b1d
Rename MilestoneGradingView to MilestoneClassResponses
hirokiterashima Feb 26, 2025
07cd23b
Rename isExpandAll to allWorkgroupsExpanded
hirokiterashima Feb 26, 2025
0fe9af5
Fix issue where subroutes weren't lazily loaded in dev-serve mode
hirokiterashima Feb 26, 2025
a7fe617
Clean up code using forEach adn ternary
hirokiterashima Feb 26, 2025
88f4e8a
Move getCompletionStatusByWorkgroupId() to parent
hirokiterashima Feb 26, 2025
39f2410
Clean up code related to saving events
hirokiterashima Feb 26, 2025
3aafba7
Move getScoreByWorkgroupId() closer to caller and clean up its code
hirokiterashima Feb 26, 2025
a0cc9f4
Break up subscribeToEvents() into sub functions and use pipe(filter()…
hirokiterashima Feb 26, 2025
c824f29
Convert CompletionStatus into class and move StateNumber calculation …
hirokiterashima Feb 26, 2025
35dbc1f
Simplify sorting functions
hirokiterashima Feb 27, 2025
5e8ec04
Clean up sortWorkgroups() using convention. Fix issue where sorting b…
hirokiterashima Feb 27, 2025
d04c815
Refactor getCompletionStatusByWorkgroupId() using ternary
hirokiterashima Feb 27, 2025
c4a9163
Simplify getLatestWorkTimeByWorkgroupId() and getLatestAnnotationTime…
hirokiterashima Feb 27, 2025
0e21b07
Fix issue where collapsing an in-view element caused it to re-expand,…
hirokiterashima Feb 27, 2025
14140bd
Improve code readability using ternary
hirokiterashima Feb 27, 2025
3273fd4
Make sortedWorkgroups and workgroups protected to improve encapsulati…
hirokiterashima Feb 27, 2025
4fbf822
Improve encapsulation and function names
hirokiterashima Feb 27, 2025
59dee4c
Improve readability of sortBy criteria and function. Remove setSort()…
hirokiterashima Feb 27, 2025
f51ecb9
Remove init param from updateWorkgroup. It wasn't necessary. Remove d…
hirokiterashima Feb 27, 2025
d26e5f8
Improve variable naming and encapsulation.
hirokiterashima Feb 27, 2025
1af509a
Hide summary view for MC if there is no work for the current period.
hirokiterashima Feb 28, 2025
50c83b4
Fix NPE when grade-by-component is first initialized and when compone…
hirokiterashima Mar 3, 2025
44ac86c
Merge branch 'develop' into grade-by-component
hirokiterashima Mar 7, 2025
75b9749
Rename file to match class name
hirokiterashima Mar 7, 2025
9aa59fb
Merge branch 'develop' into grade-by-component
hirokiterashima Mar 12, 2025
c76f167
feat(Grade By Component): Show component average score (#2112)
hirokiterashima Mar 12, 2025
a254916
refactor(ComponentWorkgroupItemComponent): Remove unused code and add…
hirokiterashima Mar 14, 2025
9706ce7
test(ComponentWorkgroupItemComponent): add test to ensure that onUpda…
hirokiterashima Mar 14, 2025
22b15be
feat(Grade By Component): Show component completion (#2113)
hirokiterashima Mar 14, 2025
699f290
Merge branch 'develop' into grade-by-component
hirokiterashima Mar 14, 2025
4087593
Fix issue where node completion wasn't being calculated. Refactor cod…
hirokiterashima Mar 17, 2025
328aba6
Clean up ComponentGradingViewComponent. Node is already set when this…
hirokiterashima Mar 17, 2025
0d070f3
Remove import. This is only used in ComponentGradingView and there's …
hirokiterashima Mar 17, 2025
036c471
Remove redundant standalone declaration (defaults to true now) and cl…
hirokiterashima Mar 17, 2025
8aa595c
Remove unused currentNodeChanged listener. We listen to nodeId input …
hirokiterashima Mar 17, 2025
d6ba9f8
Fix dialog response text wrapping
breity Mar 18, 2025
1250e79
Remove redundant function. This is already defined in NodeService.
hirokiterashima Mar 26, 2025
b9cd65c
Fix issue where going to a specific component was always resetting to…
hirokiterashima Mar 26, 2025
222f660
Remove FlexLayout and update styles and layout
breity Apr 1, 2025
b3bc8a6
Show component type labels in component select
breity Apr 3, 2025
ebaa1b8
Merge branch 'develop' into grade-by-component
hirokiterashima May 8, 2025
a9a643f
Remove routing to specific component. Show all components in NodeGrad…
hirokiterashima May 13, 2025
76bb8e2
Add FilterComponentsComponent to let teacher choose only components t…
hirokiterashima May 14, 2025
39439e8
Move summary display to top of page
hirokiterashima May 22, 2025
5cb2826
Merge branch 'develop' into grade-by-component-show-all-components
hirokiterashima May 22, 2025
b45abd9
Add NodeClassResponses to show all the workgroup's work for the node …
hirokiterashima May 24, 2025
f92779d
Add tests for the new components
hirokiterashima May 27, 2025
ef826c5
Updated messages
github-actions[bot] May 27, 2025
5fe9329
Update styles and terminology
breity May 28, 2025
3a8882b
Fix tests
breity May 28, 2025
237a8a5
Updated messages
github-actions[bot] May 28, 2025
3edd3d1
Merge pull request #2189 from WISE-Community/grade-by-component-show-…
hirokiterashima Jun 25, 2025
01b350a
Merge branch 'develop' into grade-by-component
hirokiterashima Jul 29, 2025
3632e58
Merge branch 'develop' into grade-by-component
hirokiterashima Aug 11, 2025
c4ba8f5
Merge branch 'develop' into grade-by-component
hirokiterashima Aug 16, 2025
f521e40
Updated messages
github-actions[bot] Aug 16, 2025
270679f
Merge branch 'develop' into grade-by-component
breity Aug 25, 2025
fab6297
Fix Data Explorer fields in TableShowWork
breity Aug 25, 2025
aefa843
Updated messages
github-actions[bot] Aug 25, 2025
824867f
Add component summaries in tabs
breity Aug 27, 2025
e414120
Added displayIndex to fix issue where component select dropdown's ind…
hirokiterashima Aug 29, 2025
8bb628d
Merge branch 'component-summaries' into grade-by-component
breity Aug 30, 2025
6722b60
Fix component completion display and update styles
breity Aug 30, 2025
706c206
Set selected component tab to 0 on node change
breity Sep 3, 2025
a871641
Merge branch 'develop' into grade-by-component
hirokiterashima Sep 3, 2025
9dff6c5
Fix issue where AT wasn't loading
hirokiterashima Sep 3, 2025
983eeb8
Open preview with current node. Show tooltip text
hirokiterashima Sep 3, 2025
22a8fd8
Reenabled ComponentGradingViewComponent and added tests for when stud…
hirokiterashima Sep 4, 2025
7d4e87b
Fix unit tests
hirokiterashima Sep 5, 2025
b959fe8
Lazy load component grading views
breity Sep 5, 2025
56ac9df
Updated messages
github-actions[bot] Sep 5, 2025
96fa1ae
Remove unnecessary FlexLayoutModule dep
hirokiterashima Sep 5, 2025
f62afdc
Clean up NodeGradingComponent spec. Remove dep on ClassroomMonitorTes…
hirokiterashima Sep 5, 2025
852847e
Clean up GradingStepToolsComponent spec. Remove dep on ClassroomMonit…
hirokiterashima Sep 5, 2025
2f4ab85
Remove no-longer used components: ComponentClassResponsesComponent, C…
hirokiterashima Sep 5, 2025
2bdd04b
Clean up WorkgroupItemComponent spec. Add test for toggle button. Rem…
hirokiterashima Sep 5, 2025
16758e2
Remove FlexLayout from PeerGroupButtonComponent
hirokiterashima Sep 5, 2025
cb023d2
Remove FlexLayout dependency and clean up tests from MilestoneReportB…
hirokiterashima Sep 5, 2025
5bdf670
Clean up FilterComponentsComponent
hirokiterashima Sep 5, 2025
683a8cb
Set summary score graph range to min and max student scores
breity Sep 5, 2025
becd5c0
Updated messages
github-actions[bot] Sep 5, 2025
388fab2
Add Match and Idea summary displays to ComponentGradingView
breity Sep 9, 2025
31e0235
Fix tests and spacing issue
breity Sep 9, 2025
16ba221
Updated messages
github-actions[bot] Sep 9, 2025
ca65da8
Update average score and total score values in node grading and summa…
hirokiterashima Sep 9, 2025
7a914be
Set FilterComponents select width to auto
breity Sep 9, 2025
29c4894
Add component summaries toggle
breity Sep 9, 2025
9fd9a8a
Only show idea summary if component has idea rubric
breity Sep 9, 2025
5554967
Remove ShowNodeInfoDialog
breity Sep 10, 2025
af8e9c8
Updated messages
github-actions[bot] Sep 10, 2025
cff48a9
Remove MatDialog dep. No longer used. Alphabetize imports and class v…
hirokiterashima Sep 10, 2025
de65aa7
Add tests for NodeGrading. Remove redundant call to calculate nodeCom…
hirokiterashima Sep 10, 2025
9d5d259
Rename ComponentGradingView to ComponentSummary
hirokiterashima Sep 10, 2025
70ae75a
Remove dependency on ClassroomMonitorTestingModule in spec
hirokiterashima Sep 10, 2025
96ea2f4
Clean up code
hirokiterashima Sep 10, 2025
6371df4
Remove unnecessary constructor
hirokiterashima Sep 10, 2025
2f828a9
Fix issue where idea summary wasn't updating when period was changed.…
hirokiterashima Sep 10, 2025
ab016e0
Fix issue where match summary was not updating when period changed
hirokiterashima Sep 10, 2025
d8084c4
Clean up MatchSummaryDisplayComponent
hirokiterashima Sep 10, 2025
3477269
Remove NodeInfoComponent. No longer used. We open the preview in new …
hirokiterashima Sep 10, 2025
05b9868
Fix issue where bucket data was being displayed multiple times.
hirokiterashima Sep 10, 2025
ad6a3f5
Fix issue in IdeaSummary where switching to period with no ideas dete…
hirokiterashima Sep 10, 2025
aa0f46a
Clean up ComponentCompletionComponent
hirokiterashima Sep 11, 2025
5d7fbe9
Refactor ComponentSummary. Pass in periodId to ComponentSummary inste…
hirokiterashima Sep 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"baseHref": "/"
},
"development": {
"optimization": false,
"optimization": true,
"outputHashing": "all",
"sourceMap": true,
"namedChunks": true,
Expand Down
2,938 changes: 1,508 additions & 1,430 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class XhrInterceptor implements HttpInterceptor {
}

@NgModule({
imports: [RouterModule.forRoot(routes, {}), FormsModule],
imports: [RouterModule.forRoot(routes, { paramsInheritanceStrategy: 'always' }), FormsModule],
exports: [RouterModule],
providers: [{ provide: HTTP_INTERCEPTORS, useClass: XhrInterceptor, multi: true }]
})
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

66 changes: 4 additions & 62 deletions src/app/services/milestone/milestoneService.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ let teacherDataService: TeacherDataService;
describe('MilestoneService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [MatDialogModule, StudentTeacherCommonServicesModule],
providers: [
imports: [MatDialogModule, StudentTeacherCommonServicesModule],
providers: [
ClassroomStatusService,
CopyNodesService,
MilestoneService,
Expand All @@ -38,8 +38,8 @@ describe('MilestoneService', () => {
TeacherWebSocketService,
provideHttpClient(withInterceptorsFromDi()),
provideHttpClientTesting()
]
});
]
});
service = TestBed.inject(MilestoneService);
achievementService = TestBed.inject(AchievementService);
configService = TestBed.inject(ConfigService);
Expand All @@ -48,7 +48,6 @@ describe('MilestoneService', () => {
teacherDataService = TestBed.inject(TeacherDataService);
});
getProjectMilestones();
getMilestoneReportByNodeId();
getProjectMilestoneStatus();
insertMilestoneItems();
insertMilestoneCompletion();
Expand Down Expand Up @@ -85,63 +84,6 @@ function getProjectMilestones() {
});
}

function getMilestoneReportByNodeId() {
describe('getMilestoneReportByNodeId()', () => {
it('should get project milestone report by node id when there is none', () => {
const achievements = {
isEnabled: true,
items: [
{
id: 'milestone1',
type: 'milestone',
report: {
templates: [
{
satisfyCriteria: [
{
nodeId: 'node1',
componentId: 'component1'
}
]
}
]
}
}
]
};
spyOn(projectService, 'getAchievements').and.returnValue(achievements);
const milestoneReport = service.getMilestoneReportByNodeId('node2');
expect(milestoneReport).toBeNull();
});
it('should get project milestone report by node id when there is one', () => {
const achievements = {
isEnabled: true,
items: [
{
id: 'milestone1',
type: 'milestone',
report: {
templates: [
{
satisfyCriteria: [
{
nodeId: 'node1',
componentId: 'component1'
}
]
}
]
}
}
]
};
spyOn(projectService, 'getAchievements').and.returnValue(achievements);
const milestoneReport = service.getMilestoneReportByNodeId('node1');
expect(milestoneReport).toBeDefined();
});
});
}

function getProjectMilestoneStatus() {
describe('getProjectMilestoneStatus()', () => {
it('should get project milestone status', () => {
Expand Down
7 changes: 5 additions & 2 deletions src/app/services/workgroup.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ import { ConfigService } from '../../assets/wise5/services/configService';

@Injectable()
export class WorkgroupService {
constructor(private ConfigService: ConfigService, private http: HttpClient) {}
constructor(
private ConfigService: ConfigService,
private http: HttpClient
) {}
getWorkgroupsInPeriod(periodId: number): Map<number, any> {
const workgroups = new Map();
for (const workgroup of this.getWorkgroupsSortedById()) {
if (workgroup.periodId === periodId && workgroup.workgroupId != null) {
if (periodId === -1 || (workgroup.periodId === periodId && workgroup.workgroupId != null)) {
workgroup.displayNames = this.ConfigService.getDisplayUsernamesByWorkgroupId(
workgroup.workgroupId
);
Expand Down
Loading
Loading