senaduka/old-svijetlastrana-front
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Upstream sync

Browse Source
This commit is contained in:
Senad Uka
2018-05-21 18:55:30 +02:00
parent adf2ba8232
commit 92785d17a1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js
View File

@@ -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 visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
let visitDate = date; let visitDate = date;
let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime); 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) => { handlePickupChanged = (res, state) => {
let origin = { let origin = {
id: res.id, id: res.address_uuid ? res.address_uuid : res.id,
name: res.name, name: res.name,
lat: res.lat, lat: res.lat,
lng: res.lng, lng: res.lng,

5
src/routes/app/routes/tables/routes/members/components/Datatable.js
View File

@@ -40,9 +40,11 @@ const getDTList = function (member) {
member.forEach((r, i) => { member.forEach((r, i) => {
list.push( list.push(
<tr key={r.useruuid}> <tr key={r.useruuid}>
<td><a href={"/#/app/member/" + r.useruuid}>{r.name}</a></td> <td></td>
<td><a>{r.name}</a></td>
<td> <td>
<div> <div>
<a href={"/#/app/member/" + r.useruuid}> Details </a> |
<ContactList data={{ <ContactList data={{
driverMobile: r.mobile, driverMobile: r.mobile,
memberMobile: r.mobile, memberMobile: r.mobile,
@@ -280,6 +282,7 @@ class DatatableComponent extends React.Component {
<Table ref={(c) => this.example = c} className='display' cellSpacing='0' width='100%'> <Table ref={(c) => this.example = c} className='display' cellSpacing='0' width='100%'>
<thead> <thead>
<tr> <tr>
<th> </th>
<th>Name</th> <th>Name</th>
<th>Action</th> <th>Action</th>
<th>Subscriber ID</th> <th>Subscriber ID</th>