Skip to content

Commit c4b8a9e

Browse files
committed
changed emails back to names
1 parent f0a92a7 commit c4b8a9e

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

src/Components/CourseHome/ListView.tsx

Lines changed: 8 additions & 1 deletion
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.email}`,
39+
name: `${studentMissionMastery.student.lastName} ${studentMissionMastery.student.firstName}`,
4040
recent: studentMissionMastery.currentTaskName,
4141
masteryLevel: studentMissionMastery.level,
4242
lastLogOn: 'Jan. 7, 2021',
@@ -46,6 +46,13 @@ 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+
4956
const tableColumns = [
5057
{
5158
Header: 'Overview',

src/Components/CourseHome/SeatingChartView.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ function SeatingChartView(classMissionMasterydata: any) {
4949
<ProgressContent>
5050
<strong>
5151
{/* Abbreviates last name if name is more than 25 chars */}
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)}...`}
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+
}`}
5961
</strong>
6062
<CurrentTask>
6163
<div>

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.email}`,
55+
name: `${studentMissionMastery.student.lastName} ${studentMissionMastery.student.firstName}`,
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)