diff --git a/gestion/lib/Controller/PageController.php b/gestion/lib/Controller/PageController.php index 3f0e274..c72e6dc 100644 --- a/gestion/lib/Controller/PageController.php +++ b/gestion/lib/Controller/PageController.php @@ -1433,9 +1433,13 @@ class PageController extends Controller { $distance_temp = 0; $last_point = NULL; } else { + $currentDistance = 0; if($trajetdetails[$i]->lid != NULL) $last_point = $trajetdetails[$i]; - if($last_point->lid != NULL && $trajetdetails[$i+1]->lid != NULL) $distance_temp += $this->myDb->calcul_distance(floatval($last_point->latitude), floatval($last_point->longitude), floatval($trajetdetails[$i+1]->latitude), floatval($trajetdetails[$i+1]->longitude)); - $ik_temp = $ik_temp.utf8_decode(html_entity_decode($trajetdetails[$i]->cprenoms.' '.$trajetdetails[$i]->cnom)).';'.utf8_decode($formatter_ds->format($date_temp)).';'.utf8_decode(html_entity_decode($trajetdetails[$i]->lieu))."\n"; + if($last_point->lid != NULL && $trajetdetails[$i+1]->lid != NULL){ + $currentDistance = $this->myDb->calcul_distance(floatval($last_point->latitude), floatval($last_point->longitude), floatval($trajetdetails[$i+1]->latitude), floatval($trajetdetails[$i+1]->longitude)); + $distance_temp += $currentDistance; + } + $ik_temp = $ik_temp.utf8_decode(html_entity_decode($trajetdetails[$i]->cprenoms.' '.$trajetdetails[$i]->cnom)).';'.utf8_decode($formatter_ds->format($date_temp)).';'.utf8_decode(html_entity_decode($trajetdetails[$i]->lieu)).';'.$currentDistance."\n"; } }