Upstream sync

src/components/Header/NavRightList.js

@@ -4,6 +4,13 @@ import MenuItem from 'material-ui/MenuItem';
 import IconButton from 'material-ui/IconButton/IconButton';
 import { hashHistory } from 'react-router';
 
+import {
+  loggedUser,
+  planScheduler,
+  providerScheduler,
+  visitReporter,
+} from 'utils/authorization';
+
 const ImgIconButtonStyle = {
   width: '60px',
   height: '60px'
@@ -28,6 +35,7 @@ class NavRightList extends React.Component {
   handleChange = (event, value) => {
     hashHistory.push(value);
   }
+
   componentDidMount() {
     const user = JSON.parse(localStorage.getItem('loggedUser'));
     if (user) {
@@ -40,6 +48,8 @@ class NavRightList extends React.Component {
       <ul className="list-unstyled float-right">
         <li>
 
+
+
           <IconMenu
 
             iconButtonElement={<IconButton style={ImgIconButtonStyle}><img src="assets/images/ic_account_circle_white_48dp_1x.png" alt="" className="rounded-circle img30_30" /></IconButton>}
@@ -48,33 +58,48 @@ class NavRightList extends React.Component {
             targetOrigin={{ horizontal: 'right', vertical: 'top' }}
             menuStyle={{ minWidth: '150px' }}
           >
-            <MenuItem
-              onTouchTap={(e) => this.handleChange(e, `/app/authorizedusers/${this.state.useruuid}`)}
-              primaryText="Profile"
-              style={{ fontSize: '14px', lineHeight: '48px' }}
-              innerDivStyle={listItemStyle}
-              leftIcon={<i className="material-icons">account_circle</i>}
-            />
-            <MenuItem
-              onTouchTap={(e) => this.handleChange(e, `/app/form/steppers/${this.state.useruuid}`)}
-              primaryText="Book Ride"
-              innerDivStyle={listItemStyle}
-              style={{ fontSize: '14px', lineHeight: '48px' }}
-              leftIcon={<i className="material-icons">mode_edit</i>}
-            />
-            <MenuItem
-              onTouchTap={(e) => this.handleChange(e, `/login`)}
-              primaryText="Log Out"
-              innerDivStyle={listItemStyle}
-              style={{ fontSize: '14px', lineHeight: '48px' }}
-              leftIcon={<i className="material-icons">forward</i>}
-            />
+            {!loggedUser.anyOf(visitReporter) &&
+              <MenuItem
+                onTouchTap={(e) => this.handleChange(e, `/app/authorizedusers/${this.state.useruuid}`)}
+                primaryText="Profile"
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                innerDivStyle={listItemStyle}
+                leftIcon={<i className="material-icons">account_circle</i>}
+              />
+            }
+            {loggedUser.anyOf(visitReporter) &&
+              <MenuItem
+                onTouchTap={(e) => this.handleChange(e, `/app/form/visit/${this.state.useruuid}`)}
+                primaryText="Create Visit"
+                innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                leftIcon={<i className="material-icons">mode_edit</i>}
+              />
+            }
+
+            {!loggedUser.anyOf(visitReporter) &&
+              <MenuItem
+                onTouchTap={(e) => this.handleChange(e, `/app/form/steppers/${this.state.useruuid}`)}
+                primaryText="Book Ride"
+                innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                leftIcon={<i className="material-icons">mode_edit</i>}
+              />
+            }
+
+              <MenuItem
+                onTouchTap={(e) => this.handleChange(e, `/login`)}
+                primaryText="Log Out"
+                innerDivStyle={listItemStyle}
+                style={{ fontSize: '14px', lineHeight: '48px' }}
+                leftIcon={<i className="material-icons">forward</i>}
+              />
           </IconMenu>
         </li>
-        <li style={{ marginRight: '10px' }}><h6>{this.state.name}</h6></li>
+          <li style={{ marginRight: '10px' }}><h6>{this.state.name}</h6></li>
       </ul>
-    );
-  }
-}
-
-module.exports = NavRightList;
+        );
+      }
+    }
+    
+    module.exports = NavRightList;

src/components/Shared/ValidationErrorsInfoDialog.js

@@ -8,11 +8,17 @@ export class ValidationErrorsInfoDialog extends React.Component {
     this.props = props;
     this.state = {
       open: this.props.open,
+      title: "Errors",
     }
   }
 
   componentWillReceiveProps(newProps) {
-    this.setState({ open: newProps.open });
+    let title = this.state.title;
+    if (newProps.errorTitle) {
+      title = newProps.errorTitle;
+    }
+
+    this.setState({ open: newProps.open, title: title });
   }
 
   handleOpen = () => {
@@ -38,7 +44,7 @@ export class ValidationErrorsInfoDialog extends React.Component {
     return (
       <div>
         <Dialog
-          title="Errors"
+          title={this.state.title}
           actions={actions}
           modal={this.props.modal ? this.props.modal : false}
           open={this.state.open}

src/components/Sidenav/SidenavContent.js

@@ -102,9 +102,17 @@ class SidebarContent extends React.Component {
     return (
       <ul className="nav" ref={(c) => { this.nav = c; }}>
         {loggedUser.anyOf(visitReporter) &&
-          <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
+          <li>
+            <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
+            <ul>
+              <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Add Visit</span></FlatButton></li>
+            </ul>
+          </li>
         }
+
+
         {!loggedUser.anyOf(visitReporter) &&
+
           <li>
             <FlatButton href="#/app/form"><i className="nav-icon material-icons cyan-text text-lighter-4">directions_car</i><span className="nav-text">Rides</span></FlatButton>
             <ul>
@@ -158,6 +166,8 @@ class SidebarContent extends React.Component {
         }
 
         <li className="nav-divider" />
+        <li><FlatButton className="prepend-icon" href={"#/login"}><span>Log Out</span></FlatButton></li>
+
       </ul>
     );
   }