diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index 480b70d..ae4784d 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js @@ -504,6 +504,8 @@ class VerticalNonLinear extends React.Component { } }); + let date = new Date(); + 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); @@ -820,7 +822,7 @@ class VerticalNonLinear extends React.Component { handlePickupChanged = (res, state) => { let origin = { - id: res.id, + id: res.address_uuid ? res.address_uuid : res.id, name: res.name, lat: res.lat, lng: res.lng, diff --git a/src/routes/app/routes/tables/routes/members/components/Datatable.js b/src/routes/app/routes/tables/routes/members/components/Datatable.js index 4d33a40..58b5492 100644 --- a/src/routes/app/routes/tables/routes/members/components/Datatable.js +++ b/src/routes/app/routes/tables/routes/members/components/Datatable.js @@ -40,9 +40,11 @@ const getDTList = function (member) { member.forEach((r, i) => { list.push( - {r.name} + + {r.name}
+ Details | this.example = c} className='display' cellSpacing='0' width='100%'> + Name Action Subscriber ID