Skip to content

Commit

Permalink
fixing letter-ca-scores populating
Browse files Browse the repository at this point in the history
  • Loading branch information
Emily-ejag committed Nov 17, 2024
1 parent 07e9084 commit f7fdd2a
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/components/ListOrgs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<div v-if="activeOrgType === ORG_TYPES.GROUPS" class="mx-2">
<PvToggleButton
v-model="hideSubgroups"
offLabel="Hide Subgroups"
onLabel="Show Subgroups"
off-label="Hide Subgroups"
on-label="Show Subgroups"
class="p-2 rounded"
/>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/components/RoarDataTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,9 @@ function getUniqueOptions(column) {
const primaryTasks = [
'scores.letter.percentCorrect',
'scores.letter.percentile',
'scores.letter-en-ca.percentCorrect',
'scores.letter-en-ca.percentile',
'scores.letter-en-ca.rawScore',
'scores.pa.percentile',
'scores.swr.percentile',
'scores.sre.percentile',
Expand Down
4 changes: 2 additions & 2 deletions src/components/auth/RegisterChildren.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<PvButton
class="bg-primary border-none border-round py-2 text-white hover:surface-300 hover:text-black-alpha-90 text-md"
icon="pi pi-replay ml-2"
iconPos="right"
icon-pos="right"
severity="secondary"
label="Enter another code"
@click="codeNotRight(outerIndex)"
Expand Down Expand Up @@ -327,9 +327,9 @@
<div class="form-section-button2">
<PvButton
class="bg-primary border-none border-round text-white p-3 hover:surface-300 hover:text-black-alpha-90"
@click="addStudent()"
icon="pi pi-plus"
label="Add Student"
@click="addStudent()"
>
</PvButton>
</div>
Expand Down
25 changes: 25 additions & 0 deletions src/components/reports/SubscoreTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,16 @@ const columns = computed(() => {
{ field: 'scores.letter.incorrectPhonemes', header: 'Sounds To Work On', dataType: 'text', sort: false },
);
}
if (props.taskId === 'letter-en-ca') {
tableColumns.push(
{ field: 'scores.letter-en-ca.lowerCaseScore', header: 'Lower Case', dataType: 'text', sort: false },
{ field: 'scores.letter-en-ca.upperCaseScore', header: 'Upper Case', dataType: 'text', sort: false },
{ field: 'scores.letter-en-ca.phonemeScore', header: 'Letter Sounds', dataType: 'text', sort: false },
{ field: 'scores.letter-en-ca.totalScore', header: 'Total', dataType: 'text', sort: false },
{ field: 'scores.letter-en-ca.incorrectLetters', header: 'Letters To Work On', dataType: 'text', sort: false },
{ field: 'scores.letter-en-ca.incorrectPhonemes', header: 'Sounds To Work On', dataType: 'text', sort: false },
);
}
if (props.taskId === 'pa') {
tableColumns.push(
{ field: 'scores.pa.firstSound', header: 'First Sound', dataType: 'text', sort: false },
Expand Down Expand Up @@ -119,6 +129,14 @@ const exportSelected = (selectedRows) => {
_set(tableRow, 'Letters To Work On', _get(scores, 'letter.incorrectLetters'));
_set(tableRow, 'Sounds To Work On', _get(scores, 'letter.incorrectPhonemes'));
}
if (props.taskId === 'letter-en-ca') {
_set(tableRow, 'Lower Case', _get(scores, 'letter-en-ca.lowerCaseScore'));
_set(tableRow, 'Upper Case', _get(scores, 'letter-en-ca.upperCaseScore'));
_set(tableRow, 'Letter Sounds', _get(scores, 'letter-en-ca.phonemeScore'));
_set(tableRow, 'Total', _get(scores, 'letter-en-ca.totalScore'));
_set(tableRow, 'Letters To Work On', _get(scores, 'letter-en-ca.incorrectLetters'));
_set(tableRow, 'Sounds To Work On', _get(scores, 'letter-en-ca.incorrectPhonemes'));
}
if (props.taskId === 'pa') {
_set(tableRow, 'First Sound', _get(scores, 'pa.firstSound'));
_set(tableRow, 'Last Sound', _get(scores, 'pa.lastSound'));
Expand Down Expand Up @@ -147,6 +165,13 @@ const exportAll = async () => {
_set(tableRow, 'Total', _get(scores, 'letter.totalScore'));
_set(tableRow, 'Letters To Work On', _get(scores, 'letter.incorrectLetters'));
_set(tableRow, 'Sounds To Work On', _get(scores, 'letter.incorrectPhonemes'));
} else if (props.taskId === 'letter-en-ca') {
_set(tableRow, 'Lower Case', _get(scores, 'letter-en-ca.lowerCaseScore'));
_set(tableRow, 'Upper Case', _get(scores, 'letter-en-ca.upperCaseScore'));
_set(tableRow, 'Letter Sounds', _get(scores, 'letter-en-ca.phonemeScore'));
_set(tableRow, 'Total', _get(scores, 'letter-en-ca.totalScore'));
_set(tableRow, 'Letters To Work On', _get(scores, 'letter-en-ca.incorrectLetters'));
_set(tableRow, 'Sounds To Work On', _get(scores, 'letter-en-ca.incorrectPhonemes'));
} else if (props.taskId === 'pa') {
_set(tableRow, 'First Sound', _get(scores, 'pa.firstSound'));
_set(tableRow, 'Last Sound', _get(scores, 'pa.lastSound'));
Expand Down
11 changes: 11 additions & 0 deletions src/helpers/reports.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ export const taskDisplayNames = {
extendedName: 'Letter Names and Sounds',
order: 2,
},
'letter-en-ca': {
name: 'Letter',
publicName: 'ROAR - Letter',
studentFacingName: 'Letter',
extendedTitle: 'ROAR - Letter',
extendedName: 'Letter Names and Sounds',
order: 27,
},
pa: {
name: 'Phoneme',
publicName: 'ROAR - Phoneme',
Expand Down Expand Up @@ -257,6 +265,8 @@ export const extendedDescriptions = {
cva: 'This test measures your students’ knowledge of words that are often used in the books they read at school',
letter:
'This test measures how well your student knows the names of letters and which letters are used to spell each sound',
'letter-en-ca':
'This test measures how well your student knows the names of letters and which letters are used to spell each sound',
'letter-es.':
'This test measures how well your student knows the names of letters and which letters are used to spell each sound.',
comp: 'Temporary description for comp',
Expand Down Expand Up @@ -339,6 +349,7 @@ export const rawOnlyTasks = ['letter', 'cva', 'morphology', 'vocab', 'fluency',
export const tasksToDisplayPercentCorrect = [
'letter',
'letter-es',
'letter-en-ca',
'cva',
'swr-es',
'pa-es',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ScoreReport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ const scoreReportColumns = computed(() => {
}
});

const priorityTasks = ['swr', 'sre', 'pa', 'letter'];
const priorityTasks = ['swr', 'sre', 'pa', 'letter', 'letter-en-ca'];
const spanishTasks = ['letter-es', 'pa-es', 'swr-es', 'sre-es'];
const spanishMathTasks = ['fluency-arf-es', 'fluency-calf-es'];
const supplementaryTasks = ['morphology', 'cva', 'vocab', 'trog', 'phonics', 'roar-inference'];
Expand Down

0 comments on commit f7fdd2a

Please sign in to comment.