Skip to content

Commit f0a92a7

Browse files
committed
fixed seating chart names
1 parent b3e909b commit f0a92a7

File tree

4 files changed

+13
-22
lines changed

4 files changed

+13
-22
lines changed

src/Components/CourseHome/ListView.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function ListView(classMissionMasterydata: any) {
3636
(studentMissionMastery: CmStudentFieldsFragment) => {
3737
return {
3838
row: {
39-
name: `${studentMissionMastery.student.lastName} ${studentMissionMastery.student.firstName}`,
39+
name: `${studentMissionMastery.student.email}`,
4040
recent: studentMissionMastery.currentTaskName,
4141
masteryLevel: studentMissionMastery.level,
4242
lastLogOn: 'Jan. 7, 2021',
@@ -46,13 +46,6 @@ function ListView(classMissionMasterydata: any) {
4646
}
4747
);
4848

49-
// TODO remove when names are populated
50-
data.forEach((dataEntry: MissionMasteryRow) => {
51-
if (dataEntry.row.name.indexOf('null') !== -1) {
52-
dataEntry.row.name = 'Mary Lee';
53-
}
54-
});
55-
5649
const tableColumns = [
5750
{
5851
Header: 'Overview',

src/Components/CourseHome/SeatingChartView.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,13 @@ function SeatingChartView(classMissionMasterydata: any) {
4949
<ProgressContent>
5050
<strong>
5151
{/* Abbreviates last name if name is more than 25 chars */}
52-
{!studentMissionMastery.student.firstName
53-
? 'Mary Lee'
54-
: `${studentMissionMastery.student.firstName} ${
55-
studentMissionMastery.student.firstName.length +
56-
studentMissionMastery.student.lastName.length <
57-
25
58-
? `${studentMissionMastery.student.lastName}`
59-
: `${studentMissionMastery.student.lastName.charAt(0)}.`
60-
}`}
52+
{/* {studentMissionMastery.student.email.split('@')[0]} */}
53+
54+
{studentMissionMastery.student.email.split('@')[0].length < 10
55+
? `${studentMissionMastery.student.email.split('@')[0]}`
56+
: `${studentMissionMastery.student.email
57+
.split('@')[0]
58+
.substring(0, 10)}...`}
6159
</strong>
6260
<CurrentTask>
6361
<div>

src/Components/SingleStudentMasteryOverview/SingleStudentMasteryOverview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ function SingleStudentMasteryOverview() {
514514
const { data } = useGetTargetProgressQuery({
515515
variables: {
516516
courseId: 'Integrated Science',
517-
username: '74caa373-b13a-4a97-84d3-ba9e27236290',
517+
username: 'Google_113982570160032635204',
518518
},
519519
});
520520

src/Components/StudentOverview/LTStudentViewTable.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function LTStudentViewTable() {
5252
data.push({
5353
row: {
5454
section: '1',
55-
name: `${studentMissionMastery.student.lastName} ${studentMissionMastery.student.firstName}`,
55+
name: `${studentMissionMastery.student.email}`,
5656
team: studentMissionMastery.student.team,
5757
recent: studentMissionMastery.currentTaskName,
5858
average: '',
@@ -63,9 +63,9 @@ function LTStudentViewTable() {
6363

6464
// TODO remove when names are populated
6565
data.forEach((dataEntry) => {
66-
if (dataEntry.row.name.indexOf('null') !== -1) {
67-
dataEntry.row.name = 'Mary Lee';
68-
}
66+
// if (dataEntry.row.name.indexOf('null') !== -1) {
67+
// dataEntry.row.name = 'Mary Lee';
68+
// }
6969
if (dataEntry.row.name.length > 25) {
7070
dataEntry.row.name = dataEntry.row.name.substring(0, 25);
7171
}

0 commit comments

Comments
 (0)