Upstream sync

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

@@ -664,22 +664,7 @@ class VerticalNonLinear extends React.Component {
         }));
 
         const eligibility = {
-          "provider": {
+          "raw_provider": self.state.destination.raw,
-            "provider_npi": self.state.destination.raw.fivePartKeyGroups[0].providerNum,
-            "provider_name": self.state.destination.raw.providerName
-          },
-          "subscriber": {
-            "patient_type": self.state.user.type,
-            "subscriber_id": self.state.user.member,
-            "name": {
-              "first": self.state.user.first,
-              "last": self.state.user.last
-            },
-            "demographic_info": {
-              "date_of_birth": self.state.user.birthdate,
-              "gender": self.state.user.gender
-            }
-          },
           "user": {
             "name": `${self.state.user.first} ${self.state.user.last}`,
             "first": self.state.user.first,
@@ -699,8 +684,7 @@ class VerticalNonLinear extends React.Component {
         }
 
         Instance.getRawConn().post('/v1/nemt/eligibility', eligibility).then(function (res) {
-          res.data.agreedTerms = true;
+          self.setState(Object.assign(self.state, { stepIndex: stepIndex + 1, message: '', open: false }));
-          self.setState(Object.assign(self.state, { stepIndex: stepIndex + 1, user: res.data, message: '', open: false }));
         }).catch(error => {
 
           self.setState(Object.assign(self.state, {
@@ -727,6 +711,12 @@ class VerticalNonLinear extends React.Component {
         break;
       case 2:
         self.handleTouchTap();
+
+        self.setState(Object.assign(self.state, {
+          message: 'Adding Visit',
+          open: true,
+        }));
+
         const visit = {
           "user": {
             "name": `${self.state.user.first} ${self.state.user.last}`,
@@ -751,24 +741,29 @@ class VerticalNonLinear extends React.Component {
         }
 
         Instance.getRawConn().post('/v1/nemt/visits/', visit).then(function (res) {
+          self.setState(Object.assign(self.state, {
+            message: '',
+            open: false,
+          }));
+
           const returnMessage = [
             {
-              message: `Member: ${res.data.user.name} (${res.data.user.member})`
+              message: `Member: ${visit.user.name} (${visit.user.member})`
             },
             {
-              message: `Gender: ${res.data.user.gender}`
+              message: `Gender: ${visit.user.gender}`
             },
             {
               message: `Birth date: ${visit.user.type}`
             },
             {
-              message: `Member Type: ${res.data.user.birthdate}`
+              message: `Member Type: ${visit.user.birthdate}`
             },
             {
-              message: `Provider: ${res.data.provider.name}`
+              message: `Provider: ${visit.raw_provider.providerName}`
             },
             {
-              message: `Date: ${res.data.visit_datetime}`
+              message: `Date: ${visit.visit_datetime}`
             }]
 
           self.setState(Object.assign(self.state, {

src/routes/app/routes/tables/routes/visits/components/Datatable.js

@@ -108,7 +108,8 @@ class DatatableComponent extends React.Component {
           },
           columnDefs: [
             { targets: [-1, -3], className: 'dt-body-right mdl-data-table__cell--non-numeric' }
-          ]
+          ],
+          order: [[0, 'desc']]
         });
       state.decorateButtons();
       state.decorateSelect();