Skip to content

Subject Report Program Years now have better labeling #8860

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
Oct 8, 2025
Merged

Subject Report Program Years now have better labeling #8860

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
ba9148a
added startYear and classOfYear to programYear options to make it eas…
michaelchadwick Oct 6, 2025
69ef5e1
fixed test
michaelchadwick Oct 6, 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
20 changes: 19 additions & 1 deletion packages/frontend/app/components/reports/subject/new/program-year.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,23 @@ import { action } from '@ember/object';
import { hash } from 'rsvp';
import t from 'ember-intl/helpers/t';
import { on } from '@ember/modifier';
import add from 'ember-math-helpers/helpers/add';
import isEmpty from 'ember-truth-helpers/helpers/is-empty';
import eq from 'ember-truth-helpers/helpers/eq';
import LoadingSpinner from 'ilios-common/components/loading-spinner';

export default class ReportsSubjectNewProgramYearComponent extends Component {
@service store;
@service iliosConfig;

crossesBoundaryConfig = new TrackedAsyncData(
this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
);

@cached
get academicYearCrossesCalendarYearBoundaries() {
return this.crossesBoundaryConfig.isResolved ? this.crossesBoundaryConfig.value : false;
}

@cached
get mappedProgramYearsData() {
Expand Down Expand Up @@ -100,7 +111,14 @@ export default class ReportsSubjectNewProgramYearComponent extends Component {
selected={{eq programYear.id this.bestSelectedProgramYear}}
value={{programYear.id}}
>
{{programYear.classOfYear}}
{{#if this.academicYearCrossesCalendarYearBoundaries}}
{{programYear.startYear}}
-
{{add programYear.startYear 1}}
{{else}}
{{programYear.startYear}}
{{/if}}
({{t "general.classOf" year=programYear.classOfYear}})
{{programYear.program.title}}
</option>
{{/each}}
Expand Down
14 changes: 7 additions & 7 deletions packages/frontend/tests/integration/components/reports/subject/new/program-year-test.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ module('Integration | Component | reports/subject/new/program-year', function (h
assert.ok(component.options[0].isSelected);
assert.strictEqual(component.value, '');

assert.strictEqual(component.options[1].text, '2027 program 1');
assert.strictEqual(component.options[1].text, '2020 (Class of 2027) program 1');
assert.notOk(component.options[1].isSelected);
assert.strictEqual(component.options[2].text, '2011 program 0');
assert.strictEqual(component.options[2].text, '2007 (Class of 2011) program 0');
assert.notOk(component.options[2].isSelected);
assert.strictEqual(component.options[3].text, '2010 program 0');
assert.strictEqual(component.options[3].text, '2006 (Class of 2010) program 0');
assert.notOk(component.options[3].isSelected);
assert.strictEqual(component.options[4].text, '2008 program 0');
assert.strictEqual(component.options[4].text, '2004 (Class of 2008) program 0');
assert.notOk(component.options[4].isSelected);

this.set('currentId', '2');
Expand Down Expand Up @@ -107,11 +107,11 @@ module('Integration | Component | reports/subject/new/program-year', function (h
assert.strictEqual(component.options.length, 4);
assert.strictEqual(component.options[0].text, this.intl.t('general.selectPolite'));
assert.ok(component.options[0].isSelected);
assert.strictEqual(component.options[1].text, '2011 program 0');
assert.strictEqual(component.options[1].text, '2007 (Class of 2011) program 0');
assert.notOk(component.options[1].isSelected);
assert.strictEqual(component.options[2].text, '2010 program 0');
assert.strictEqual(component.options[2].text, '2006 (Class of 2010) program 0');
assert.notOk(component.options[2].isSelected);
assert.strictEqual(component.options[3].text, '2008 program 0');
assert.strictEqual(component.options[3].text, '2004 (Class of 2008) program 0');
assert.notOk(component.options[3].isSelected);
});

Expand Down