handle adding contact information

public/css/main-blessed1.css

@@ -2340,19 +2340,19 @@ html.static.boxed {
 
 @font-face {
   font-family: 'Lato';
-  src: url(/fonts/lato/lato-regular-webfont.woff2) format("woff2"), url(/fonts/lato/lato-regular-webfont.woff) format("woff");
+  src: url(/assets/./fonts/646474e48f4c1ea783f43ac5e41fd111.woff2) format("woff2"), url(/assets/./fonts/374df2a818582454b6e6832804e52f86.woff) format("woff");
   font-weight: bold;
   font-style: normal; }
 
 @font-face {
   font-family: 'Lato';
-  src: url(/assets/./fonts/lato/lato-bolditalic-webfont.woff2) format("woff2"), url(/assets/./fonts/lato/lato-bolditalic-webfont.woff) format("woff");
+  src: url(/assets/./fonts/5fa6d7ddc0a0d53311752343d7176d70.woff2) format("woff2"), url(/assets/./fonts/c53136193516ed2d4fac337d1dc6965a.woff) format("woff");
   font-weight: bold;
   font-style: italic; }
 
 @font-face {
   font-family: 'Lato';
-  src: url(/assets/./fonts/lato/lato-italic-webfont.woff2) format("woff2"), url(/assets/./fonts/lato/lato-italic-webfont.woff) format("woff");
+  src: url(/assets/./fonts/9bcf055a732c0b22d2279ba79e20c577.woff2) format("woff2"), url(/assets/./fonts/c8eef482ac448a91ecca9d008634c044.woff) format("woff");
   font-weight: normal;
   font-style: italic; }
 

src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js

@@ -33,10 +33,7 @@ import Instance from '../../../../../../../components/Connection';
 import Checkbox from 'material-ui/Checkbox';
 import Popover from 'material-ui/Popover';
 
-const ADDRESS_TYPE_HOME = "home";
-
 let DateTimeFormat;
-const roundingTime = 1000 * 60 * 5; //5 minutes
 
 
 DateTimeFormat = global.Intl.DateTimeFormat;
@@ -419,18 +416,16 @@ class VerticalNonLinear extends React.Component {
   constructor(props) {
     super(props);
 
-    let dateNow = new Date();
-
     this.state = {
       stepIndex: 0,
       rideTypeValue: 0,
       providerID: 0,
       providerName: '',
       visitDate: new Date(),
-      visitTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime),
+      visitTime: new Date(),
       pickupLocation: null,
-      pickupTime: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime),
-      pickupTimeReturn: new Date(Math.round(dateNow.getTime() / roundingTime) * roundingTime),
+      pickupTime: new Date(),
+      pickupTimeReturn: new Date(),
       pickupTimeReturnDisplayMode: 'none',
       open: false,
       message: 'Booking Ride',
@@ -474,16 +469,6 @@ class VerticalNonLinear extends React.Component {
     if (user.useruuid !== loggedUser.useruuid) {
       Instance.getRawConn().get(`/v1/nemt/users/member/${user.useruuid}`)
         .then(function (res) {
-          let userHomeAddress = null;
-          res.data.addresses.forEach(address => {
-            if (address.address_type === ADDRESS_TYPE_HOME) {
-              userHomeAddress = address;
-            }
-          });
-          if (userHomeAddress != null) {
-            userHomeAddress.name = "Home";
-            state.handlePickupChanged(userHomeAddress, state);
-          }
           state.setState(Object.assign(state.state, { user: res.data, showUserSelection: true, userSelectionText: `${res.data.member} - ${res.data.name}` }));
         })
         .catch(err => {
@@ -504,19 +489,17 @@ class VerticalNonLinear extends React.Component {
         }
       });
 
-      let date = new Date();
+    let visitTime = new Date(new Date().getTime() + (1 * 60 * 60 * 1000));
+    let visitDate = visitTime;
+    let pickupTime = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
+    let pickupTimeReturn = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
 
-      let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
-      let visitDate = date;
-      let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
-      let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
-  
-      this.setState(Object.assign(this.state, {
-        visitDate: visitDate,
-        visitTime: visitTime,
-        pickupTime: pickupTime,
-        pickupTimeReturn: pickupTimeReturn,
-      }));
+    this.setState(Object.assign(this.state, {
+      visitDate: visitDate,
+      visitTime: visitTime,
+      pickupTime: pickupTime,
+      pickupTimeReturn: pickupTimeReturn,
+    }));
   }
   //for snackbar
   handleTouchTap() {
@@ -540,8 +523,7 @@ class VerticalNonLinear extends React.Component {
       if (stepIndex === 3) {
         self.handleTouchTap();
         var requestRide = {
-          user_uuid: state.state.user ? state.state.user.useruuid : '',
-          user_consent: state.state.checked,
+          user_uuid: state.state.user.useruuid,
           ride_type: "lyft",
           origin: state.state.origin,
           destination: state.state.destination,
@@ -618,10 +600,10 @@ class VerticalNonLinear extends React.Component {
 
   handleDate(event, date, state) {
     let self = state
-    let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
+    let visitTime = new Date(date.getTime() + (1 * 60 * 60 * 1000));
     let visitDate = date;
-    let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
-    let pickupTimeReturn = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
+    let pickupTime = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
+    let pickupTimeReturn = new Date(visitTime.getTime() - (0.5 * 60 * 60 * 1000));
 
     self.setState(Object.assign(self.state, {
       visitDate: visitDate,
@@ -822,7 +804,7 @@ class VerticalNonLinear extends React.Component {
 
   handlePickupChanged = (res, state) => {
     let origin = {
-      id: res.address_uuid ? res.address_uuid : res.id,
+      id: res.id,
       name: res.name,
       lat: res.lat,
       lng: res.lng,
@@ -912,17 +894,7 @@ class VerticalNonLinear extends React.Component {
 
     if (this.state.showUserSelection && this.state.users.length > 0) {
       const handleAutocomplete = (u) => {
-        let userHomeAddress = null;
-          u.addresses.forEach(address => {
-            if (address.address_type === ADDRESS_TYPE_HOME) {
-              userHomeAddress = address;
-            }
-          });
-          if (userHomeAddress != null) {
-            userHomeAddress.name = "Home";
-            state.handlePickupChanged(userHomeAddress,state);
-          }
-          state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata }));
+        state.setState(Object.assign(state.state, { user: u, userSelectionText: u.userdata }));
       }
       const datasourceConfig = { text: 'userdata', value: 'useruuid' }
       userSelection = (

src/routes/app/routes/users/components/user.js

@@ -143,7 +143,7 @@ const Address = (props) => {
   )
 };
 
-const Main = ({ user, onAddressAdded, onAddressRemoved, readOnly }) => {
+const Main = ({ user, onAddressAdded, onAddressRemoved, onContactAdded, readOnly }) => {
   return (
     <div className="row">
       <div className="col-xl-12">
@@ -158,7 +158,7 @@ const Main = ({ user, onAddressAdded, onAddressRemoved, readOnly }) => {
         />
       </div>
       <div className="col-xl-6">
-        <ContactInfo user={user} readOnly={readOnly} />
+        <ContactInfo user={user} readOnly={readOnly} onContactAdded={onContactAdded} />
       </div>
     </div>
   );
@@ -685,6 +685,7 @@ const ContactInfo = (props) => {
                     title={"Member Contact"}
                     buttonValue={"Add Contact"}
                     showDescription={false}
+                    onNewContact={props.onContactAdded}
                   />
                 }
               </div>
@@ -823,6 +824,7 @@ class User extends React.Component {
     this.getUser = this.getUser.bind(this);
     this.handleAddressAdded = this.handleAddressAdded.bind(this);
     this.handleAddressRemoved = this.handleAddressRemoved.bind(this);
+    this.handleContactAdded = this.handleContactAdded.bind(this);
   }
 
   componentDidMount() {
@@ -840,6 +842,22 @@ class User extends React.Component {
       .catch(console.error);
   }
 
+  handleContactAdded(contact) {
+    const user_uuid = this.props.params.user_uuid;
+    const self = this;
+
+    var contactObj = {
+      "type": contact.type,
+      "contact": contact.contact,
+    }
+
+    Instance.getRawConn().post(`/v1/nemt/users/portal/${user_uuid}/contact`, contactObj)
+      .then(res => {
+        this.getUser(user_uuid);
+      })
+      .catch(console.error);
+  }
+
   handleAddressAdded(address) {
     const user_uuid = this.props.params.user_uuid;
     const self = this;
@@ -890,6 +908,7 @@ class User extends React.Component {
             user={user}
             onAddressAdded={this.handleAddressAdded}
             onAddressRemoved={this.handleAddressRemoved}
+            onContactAdded={this.handleContactAdded}
             readOnly={readOnly}
           />
         </QueueAnim>

src/routes/signUp/components/SignUp.js

@@ -47,9 +47,7 @@ class SignUp extends React.Component {
       "role": { name: "", key: "SP", desc: "" },
       "profiles": [],
       "types": [],
-      "organizations": [],
-      showValidationErrors : false,
-      validationErrors: []
+      "organizations": []
     }
 
     this.buttonValidated = this.buttonValidated.bind(this);
@@ -228,42 +226,12 @@ class SignUp extends React.Component {
       localStorage.removeItem('loggedUser');
       location.href = '/#/login';
     }).catch(function (err) {
-      if (err.response.status === 422){
-        //Unprocessable Entity (validation failed)
-        state.setState(Object.assign(state.state, {
-          showValidationErrors:true,
-          validationErrors:err.response.data.data
-        }));
-      }else{
-        alert('Error to log in: ' + err.message);
-      }
+      alert('Error to log in: ' + err.message);
       console.error(err);
     });
   }
 
-  handleDismiss(){
-    this.setState(Object.assign(this.state, { showErrorMessage: false }));
-  }
-
   render() {
-    let validationErrors = null;
-    if (this.state.showValidationErrors){
-      validationErrors = (
-        <ul>
-          {this.state.validationErrors.map(errorMessage=>{
-            const oneValidationMessage = (<li>{errorMessage.message}</li>);
-            const oneValidationMessageWithTab = (<span><li style={{marginLeft:2 + "em"}}>{errorMessage.message}</li></span>);
-
-            if (errorMessage.field_name === "password-tab"){
-              return oneValidationMessageWithTab;
-            } else{
-              return oneValidationMessage;
-            }
-          })}
-        </ul>
-      );
-    }
-
     return (
       <div className="body-inner">
 
@@ -366,10 +334,6 @@ class SignUp extends React.Component {
                 <div className="form-group">
                   <p className="text-small">By clicking on sign up, you agree to <a href="javascript:;"><i>terms</i></a> and <a href="javascript:;"><i>privacy policy</i></a></p>
                 </div>
-                <div className="divider" />
-                <div className="form-group">
-                  {validationErrors}
-                </div>
               </fieldset>
             </form>
           </div>