From 703fa92d2fb9142599f5952db999e90cdd339949 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
Date: Wed, 3 May 2017 11:26:11 +0200
Subject: [PATCH] include user e-mail

---
 src/components/dialog/edit-user.js | 9 ++++++++-
 src/components/dialog/new-user.js  | 9 ++++++++-
 src/containers/users.js            | 3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/dialog/edit-user.js b/src/components/dialog/edit-user.js
index 9485c29..a779725 100644
--- a/src/components/dialog/edit-user.js
+++ b/src/components/dialog/edit-user.js
@@ -38,6 +38,7 @@ class EditUserDialog extends Component {
 
     this.state = {
       username: '',
+      mail: '',
       role: '',
       _id: ''
     }
@@ -58,6 +59,7 @@ class EditUserDialog extends Component {
   resetState() {
     this.setState({
       username: this.props.user.username,
+      mail: this.props.user.mail,
       role: this.props.user.role,
       _id: this.props.user._id
     });
@@ -88,8 +90,13 @@ class EditUserDialog extends Component {
             <FormControl type="text" placeholder="Enter username" value={this.state.username} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
+          <FormGroup controlId="mail" validationState={this.validateForm('mail')}>
+            <ControlLabel>E-mail</ControlLabel>
+            <FormControl type="text" placeholder="Enter e-mail" value={this.state.mail} onChange={(e) => this.handleChange(e)} />
+            <FormControl.Feedback />
+          </FormGroup>
           <FormGroup controlId="role" validationState={this.validateForm('role')}>
-            <ControlLabel>Simulation</ControlLabel>
+            <ControlLabel>Role</ControlLabel>
             <FormControl componentClass="select" placeholder="Select role" value={this.state.role} onChange={(e) => this.handleChange(e)}>
               <option key='1' value='admin'>Admin</option>
               <option key='2' disabled value='operator'>Operator</option>
diff --git a/src/components/dialog/new-user.js b/src/components/dialog/new-user.js
index 60f845d..690f17d 100644
--- a/src/components/dialog/new-user.js
+++ b/src/components/dialog/new-user.js
@@ -37,6 +37,7 @@ class NewUserDialog extends Component {
 
     this.state = {
       username: '',
+      mail: '',
       role: 'admin',
       password: '1234'
     };
@@ -57,6 +58,7 @@ class NewUserDialog extends Component {
   resetState() {
     this.setState({
       username: '',
+      mail: '',
       role: 'admin',
       password: '1234'
     });
@@ -85,8 +87,13 @@ class NewUserDialog extends Component {
             <FormControl type="text" placeholder="Enter username" value={this.state.name} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
+          <FormGroup controlId="mail" validationState={this.validateForm('mail')}>
+            <ControlLabel>E-mail</ControlLabel>
+            <FormControl type="text" placeholder="Enter e-mail" value={this.state.mail} onChange={(e) => this.handleChange(e)} />
+            <FormControl.Feedback />
+          </FormGroup>
           <FormGroup controlId="role" validationState={this.validateForm('role')}>
-            <ControlLabel>Simulation</ControlLabel>
+            <ControlLabel>Role</ControlLabel>
             <FormControl componentClass="select" placeholder="Select role" value={this.state.role} onChange={(e) => this.handleChange(e)}>
               <option key='1' value='admin'>Admin</option>
               <option key='2' disabled value='operator'>Operator</option>
diff --git a/src/containers/users.js b/src/containers/users.js
index b1f573f..91f720c 100644
--- a/src/containers/users.js
+++ b/src/containers/users.js
@@ -101,7 +101,8 @@ class Users extends Component {
         <h1>Users</h1>
 
         <Table data={this.state.users}>
-          <TableColumn title='Username' dataKey='username' />
+          <TableColumn title='Username' width='150' dataKey='username' />
+          <TableColumn title='E-mail' dataKey='mail'  />
           <TableColumn title='Role' dataKey='role'  />
           <TableColumn width='70' editButton deleteButton onEdit={index => this.setState({ editModal: true, modalData: this.state.users[index] })} onDelete={index => this.setState({ deleteModal: true, modalData: this.state.users[index] })} />
         </Table>