File tree Expand file tree Collapse file tree 3 files changed +21
-12
lines changed Expand file tree Collapse file tree 3 files changed +21
-12
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ function ListView(classMissionMasterydata: any) {
36
36
( studentMissionMastery : CmStudentFieldsFragment ) => {
37
37
return {
38
38
row : {
39
- name : `${ studentMissionMastery . student . email } ` ,
39
+ name : `${ studentMissionMastery . student . lastName } ${ studentMissionMastery . student . firstName } ` ,
40
40
recent : studentMissionMastery . currentTaskName ,
41
41
masteryLevel : studentMissionMastery . level ,
42
42
lastLogOn : 'Jan. 7, 2021' ,
@@ -46,6 +46,13 @@ function ListView(classMissionMasterydata: any) {
46
46
}
47
47
) ;
48
48
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
+
49
56
const tableColumns = [
50
57
{
51
58
Header : 'Overview' ,
Original file line number Diff line number Diff line change @@ -49,13 +49,15 @@ function SeatingChartView(classMissionMasterydata: any) {
49
49
< ProgressContent >
50
50
< strong >
51
51
{ /* 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
+ } `}
59
61
</ strong >
60
62
< CurrentTask >
61
63
< div >
Original file line number Diff line number Diff line change @@ -52,7 +52,7 @@ function LTStudentViewTable() {
52
52
data . push ( {
53
53
row : {
54
54
section : '1' ,
55
- name : `${ studentMissionMastery . student . email } ` ,
55
+ name : `${ studentMissionMastery . student . lastName } ${ studentMissionMastery . student . firstName } ` ,
56
56
team : studentMissionMastery . student . team ,
57
57
recent : studentMissionMastery . currentTaskName ,
58
58
average : '' ,
@@ -63,9 +63,9 @@ function LTStudentViewTable() {
63
63
64
64
// TODO remove when names are populated
65
65
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
+ }
69
69
if ( dataEntry . row . name . length > 25 ) {
70
70
dataEntry . row . name = dataEntry . row . name . substring ( 0 , 25 ) ;
71
71
}
You can’t perform that action at this time.
0 commit comments