Skip to content

Subject Reports->Competencies by Session now actually runs #8811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dartajax merged 2 commits into from
Sep 22, 2025
Merged

Subject Reports->Competencies by Session now actually runs #8811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86fef9c
added exception for competencies by session and did the logic backwar…
michaelchadwick Sep 18, 2025
5b83ff9
fixed subject report competency integration test
michaelchadwick Sep 18, 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
29 changes: 29 additions & 0 deletions packages/frontend/app/components/reports/subject/competency.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,39 @@ export default class ReportsSubjectCompetencyComponent extends Component {
if (school) {
filters.push(`schools: [${school.id}]`);
}

if (prepositionalObject && prepositionalObjectTableRowId) {
// competencies associated with session need backwards lookup,
// so...jiggery-pokery
if (subject == 'competency' && prepositionalObject == 'session') {
filters.push(`id: ${prepositionalObjectTableRowId}`);

const session = await this.graphql.find('sessions', filters, 'course { id }');
const courseId = session.data.sessions[0].course.id;

const courseObjectives = (
await this.graphql.find(
'courseObjectives',
[`course: ${courseId}`],
`programYearObjectives { competency { id, title, school { title } }}`,
)
).data.courseObjectives;

const competencies = courseObjectives.map((o) =>
o.programYearObjectives.map((pyo) => pyo.competency),
);

const filteredCompetencies = [
...new Map(competencies.flat().map((c) => [c.id, c])).values(),
];

return filteredCompetencies;
}

const what = pluralize(camelize(prepositionalObject));
filters.push(`${what}: [${prepositionalObjectTableRowId}]`);
}

const attributes = ['id', 'title', 'school { title }'];
const result = await this.graphql.find('competencies', filters, attributes.join(', '));
return result.data.competencies;
Expand Down
7 changes: 3 additions & 4 deletions packages/frontend/tests/integration/components/reports/subject/competency-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,9 @@ module('Integration | Component | reports/subject/competency', function (hooks)
assert.expect(1);
this.server.post('api/graphql', function (schema, { requestBody }) {
const { query } = JSON.parse(requestBody);
assert.strictEqual(
query,
'query { competencies(schools: [24], sessions: [13]) { id, title, school { title } } }',
);
// need to reverse lookup session->course->courseObjectives->programYearObjectives->competencies
// so this graphql query doesn't match the context
assert.strictEqual(query, 'query { sessions(schools: [24], id: 13) { course { id } } }');
return responseData;
});
const { id } = this.server.create('report', {
Expand Down