Skip to content

Commit 2dbc267

Browse files
Update Team dash board for SoftwareSystemLab
1 parent e6dd558 commit 2dbc267

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

src/views/Team.jsx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const useStyles = (theme) => ({
6565
// const allTeams = process.env.NODE_ENV === 'development' ? [
6666
const allTeams = process.env.REACT_APP_ENV === 'development' ? [
6767
{
68-
name: 'James',
68+
name: 'Team0',
6969
members: ['zoezou9']
7070
},
7171
{
@@ -89,29 +89,21 @@ const allTeams = process.env.REACT_APP_ENV === 'development' ? [
8989
name: 'CapstoneRobotTest2',
9090
members: ['tan109598112']
9191
},
92-
{
93-
name: 'CrossFunctionalFrontEnd',
94-
members: ['bonnie37']
95-
},
96-
{
97-
name: 'CrossFunctionalServer',
98-
members: ['wyc1995']
99-
},
10092
{
10193
name: 'dcTrack',
102-
members: ['julia166', 'shawn82tw', 'Aaron123', 'larry870322', 'yenwen', 'xie57813', 'bear888660', '110598109', 't107590020', 'selinafu']
94+
members: ['xie57813', 'bear888660', '110598109', 't107590020', 'sam981431', 'yenwen']
10395
},
10496
{
10597
name: 'ezKanban',
106-
members: ['nightlord851108', 'c20m76z', 'yi10235512', 'Ag101022', 'mandy723', 'kevin871207', 'a98976537', 'fiveman0830']
98+
members: ['nightlord851108', 'mandy723', 'kevin871207', 'a98976537', 'fiveman0830']
10799
},
108100
{
109101
name: 'OIS',
110-
members: ['mashu6211', 'RuiChen' ]
102+
members: ['RuiChen' ]
111103
},
112104
{
113105
name: 'IoT-Dev',
114-
members: ['benny870704', 'jn2657', 'ycycchre', 'Zachary672']
106+
members: ['benny870704', 'ycycchre', 'Zachary672', 'jn2657']
115107
},
116108
]
117109

@@ -209,15 +201,19 @@ class Team extends Component {
209201
)
210202

211203
logs.push(
212-
this.props.teamDashBoardData.member.map((member, idx) => {
213-
return team.members.includes(member.username) ?
214-
<div key={`dashboard-${idx}`} className="team-member-board board-title board-text">
204+
team.members.map((username) => {
205+
let member = this.props.teamDashBoardData.member.find(m => m.username === username)
206+
if (!!! member) {
207+
return null
208+
}
209+
210+
return (
211+
<div key={`dashboard-${username}`} className="team-member-board board-title board-text">
215212
<h2>{member.displayName}'s Dashboard</h2>
216213
<h3>{`spent time: ${member.totalTime}`}</h3>
217214
<DashBoard isPersonal={false} pieData={member.pieData} tableData={member.tableData} chartArea={"25vh"} />
218215
</div>
219-
:
220-
null
216+
)
221217
})
222218
)
223219
})

0 commit comments

Comments
 (0)