Skip to content

Commit ee94539

Browse files
Robert MiddletonRobert Middleton
authored andcommitted
Added padding to LTSelectors and specified types in SelectedLTStudentViewTable.tsx.
1 parent 5f1c474 commit ee94539

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

src/Components/StudentOverview/LTStudentViewTable.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function LTStudentViewTable() {
120120
if (!learningTargetSet.has(target.targetName)) {
121121
learningTargetSet.add(target.targetName);
122122
learningTargetGroup.columns.push({
123-
Header: target.targetName,
123+
Header: target.description,
124124
accessor: `row.${target.targetName}`,
125125
});
126126
}
@@ -129,7 +129,12 @@ function LTStudentViewTable() {
129129

130130
return (
131131
<div>
132-
<ToggleButtonGroup value={selectedLT} exclusive onChange={handleLTSelection}>
132+
<ToggleButtonGroup
133+
value={selectedLT}
134+
style={{ paddingLeft: '20px' }}
135+
exclusive
136+
onChange={handleLTSelection}
137+
>
133138
{courseTargets.targets.map((target: Target) => {
134139
return (
135140
<ToggleButton value={target.targetId} style={{ width: '100px' }}>

src/Components/StudentOverview/SelectedLTStudentViewTable.tsx

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import TableComponent from '../TableComponent/TableComponent';
1111
import {
1212
CmStudentFieldsFragment,
13+
CtmObjectiveMasteryFieldsFragment,
14+
CtmStudentObjectiveMasteryFieldsFragment,
1315
Objective,
1416
useClassTargetMasteryQuery,
1517
} from '../../__generated__/types';
@@ -124,20 +126,22 @@ function SelectedLTStudentViewTable(classMissionMastery: any, selectedLTId: stri
124126
colorMap.set('NOT_GRADED', 'rgb(191, 191, 191)');
125127
colorMap.set('NEARLY_MASTERED', 'rgb(230, 230, 0)');
126128
targetMasteryData.classTargetMastery.studentObjectiveMasteryList.map(
127-
(studentObjectiveMastery: any) => {
129+
(studentObjectiveMastery: CtmStudentObjectiveMasteryFieldsFragment) => {
128130
if (studentObjectiveMastery.objectiveMasteryList.length === 0) {
129-
objectiveSet.forEach((value: any) => {
130-
data[index].row[value] = '';
131+
objectiveSet.forEach((objectiveId: any) => {
132+
data[index].row[objectiveId] = '';
131133
});
132134
} else {
133-
studentObjectiveMastery.objectiveMasteryList.map((objectiveMastery: any) => {
134-
data[index].row[objectiveMastery.objectiveId] = {
135-
status: objectiveMastery.mastery,
136-
style: {
137-
backgroundColor: colorMap.get(objectiveMastery.mastery),
138-
},
139-
};
140-
});
135+
studentObjectiveMastery.objectiveMasteryList.map(
136+
(objectiveMastery: CtmObjectiveMasteryFieldsFragment) => {
137+
data[index].row[objectiveMastery.objectiveId] = {
138+
status: objectiveMastery.mastery,
139+
style: {
140+
backgroundColor: colorMap.get(objectiveMastery.mastery),
141+
},
142+
};
143+
}
144+
);
141145
}
142146
index++;
143147
}

src/Screens/TaskView/Rubric/RubricMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function RubricMenu({ requirements }: { requirements: RubricRequirement[] }) {
114114
))}
115115
<NavDropdown.Divider />
116116
<Button className="mx-auto" type="submit">
117-
Submit Task
117+
Submit Grade
118118
</Button>
119119
</Form>
120120
</Drawer>

0 commit comments

Comments
 (0)