rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 424-cmb-release

Browse source
This commit is contained in:
Korina Cordero 2020-08-04 07:57:15 +00:00
commit 8f6aa72cc0
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/assets/js/dashboard_map.js
View file

@ -147,7 +147,7 @@ class DashboardMap {
} }
} }
putMarkerWithLabel(id, name, lat, lng, markers, icon, layer_group, popup_url) { putMarkerWithLabel(id, lat, lng, markers, icon, layer_group, popup_url) {
var my = this; var my = this;
// existing marker // existing marker
if (markers.hasOwnProperty(id)) { if (markers.hasOwnProperty(id)) {
@ -233,7 +233,6 @@ class DashboardMap {
putRiderAvailableMarker(id, lat, lng, name) { putRiderAvailableMarker(id, lat, lng, name) {
this.putMarkerWithLabel( this.putMarkerWithLabel(
id, id,
name,
lat, lat,
lng, lng,
this.rider_markers, this.rider_markers,
@ -246,7 +245,6 @@ class DashboardMap {
putRiderActiveJOMarker(id, lat, lng, name) { putRiderActiveJOMarker(id, lat, lng, name) {
this.putMarkerWithLabel( this.putMarkerWithLabel(
id, id,
name,
lat, lat,
lng, lng,
this.rider_markers, this.rider_markers,
@ -302,7 +300,6 @@ class DashboardMap {
$.each(riders, function(id, data) { $.each(riders, function(id, data) {
var lat = data.latitude; var lat = data.latitude;
var lng = data.longitude; var lng = data.longitude;
var name = data.name;
if (data.has_jo) if (data.has_jo)
my.putRiderActiveJOMarker(id, lat, lng, name); my.putRiderActiveJOMarker(id, lat, lng, name);

5
src/Controller/HomeController.php
View file

@ -58,16 +58,11 @@ class HomeController extends Controller
continue; continue;
} }
// get full name of rider
$name = $rider->getFullName();
$riders[$rider_id]['name'] = $name;
$jo = $rider->getActiveJobOrder(); $jo = $rider->getActiveJobOrder();
if ($jo == null) if ($jo == null)
$riders[$rider_id]['has_jo'] = false; $riders[$rider_id]['has_jo'] = false;
else else
$riders[$rider_id]['has_jo'] = true; $riders[$rider_id]['has_jo'] = true;
} }
// get active JOs and check transaction origin for TransactionOrigin::MOBILE_APP // get active JOs and check transaction origin for TransactionOrigin::MOBILE_APP