Merge branch 'features/feature-hours-between-two-points' into staging

gestion/lib/Constants/GeoConstant.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace OCA\Gestion\Constants;
+abstract class GeoConstant 
+{
+    const DRIVING_MODE = "drive";
+}

gestion/lib/Db/Bdd.php

@@ -2371,39 +2371,13 @@ class Bdd {
         return $devis;
     }
 
-    public function getDistanceTotalByDevisIdList(array $devisIdList){
+    public function getRouteLinesByDevisIdList(array $devisIdList){
-        $ligneTrajetList = $this->getLigneTrajetsByDevisIdList($devisIdList);
-        $distanceTotal = $this->getLigneTrajetsListDistance($ligneTrajetList);
-        return $distanceTotal;
-    }
-
-    private function getLigneTrajetsListDistance(array $ligneTrajetList){
-        $distanceCumul =  0;
-        $last_point = NULL;
-        for ($i=0; $i < sizeof($ligneTrajetList); $i++) {
-            $currentDistance = 0;
-            if($ligneTrajetList[$i]['lieu_id'] != NULL){
-                $last_point = $ligneTrajetList[$i];
-            } 
-            if($last_point['lieu_id'] != NULL && $ligneTrajetList[$i+1]['lieu_id'] != NULL){
-                $currentDistance = $this->calcul_distance(
-                    floatval(value: $last_point['latitude']), 
-                    floatval($last_point['longitude']), 
-                    floatval($ligneTrajetList[$i+1]['latitude']), 
-                    floatval($ligneTrajetList[$i+1]['longitude'])
-                );
-            } 
-            $distanceCumul += $currentDistance;
-        }
-        return $distanceCumul;
-    }
-
-    private function getLigneTrajetsByDevisIdList(array $devisIdList){
         if(empty($devisIdList)){
             return [];
         }
         $sqlConditionsPlaceholder = implode(',', array_fill(0, count($devisIdList), '?'));
-        $sql = "SELECT ligne_trajet.id, ligne_trajet.rang, ligne_trajet.id_nextcloud, ligne_trajet.date, ligne_trajet.user_id, ligne_trajet.commentaire, ligne_trajet.source,
+        $sql = "SELECT ligne_trajet.id, ligne_trajet.rang, ligne_trajet.id_nextcloud, ligne_trajet.date, 
+            ligne_trajet.user_id, ligne_trajet.commentaire, ligne_trajet.source,
             lieu.id as lieu_id, lieu.nom as lieu, lieu.latitude as latitude, lieu.longitude as longitude
             FROM (".$this->tableprefix."ligne_trajet as ligne_trajet
             LEFT JOIN ".$this->tableprefix."lieu as lieu on ligne_trajet.id_lieu = lieu.id) 

gestion/lib/Helpers/GeoHelpers.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace OCA\Gestion\Helpers;
+
+use DateTime;
+use DateTimeZone;
+use Exception;
+use IntlDateFormatter;
+
+class GeoHelpers
+{
+    public static function getPointsTextFromLatitudeAndLongitude($latitude,$longitude): string
+    {
+        return (string)$latitude.','.(string)$longitude;
+    }
+
+}

gestion/lib/Service/ExportThanatoStatisticService.php

@@ -43,10 +43,14 @@ class ExportThanatoStatisticService {
 	/** @var IRootFolder */
 	private $rootFolder;
 
+	private $geoService;
+
 	public function __construct(
 		Bdd $gestionBdd,
 		LoggerInterface $logger,
-		IRootFolder $rootFolder) {
+		IRootFolder $rootFolder,
+		GeoService $geoService) {
+		$this->geoService = $geoService;
 		$this->rootFolder = $rootFolder;
 		$this->logger = $logger;
 		$this->gestionBdd = $gestionBdd;
@@ -109,6 +113,7 @@ class ExportThanatoStatisticService {
 		'HEURES TOTAL DE SOIN'.';'.
 		'HEURES TOTAL DE CONGE'.';'.
 		'HEURES TOTAL DE TRAVAIL'.';'.
+		'HEURES TOTAL DE PARCOURS ENTRE DEVIS'.';'.
 		"\n";
 		return $fileHeader;
 	}
@@ -138,16 +143,18 @@ class ExportThanatoStatisticService {
 			''.';'.
 			''.';'.
 			''.';'.
+			''.';'.
 			''.';'."\n";
 		return $fileContent;
 	}
 
 	public function populateExportDataIntoFileContent(array $exportData,string $fileContent): string{
 		foreach($exportData as $devisDate => $devisData){
-			$distanceTotal = 0;
 			$totalDevisHours = 0;
 			$totalWorkedHours = 8;
 			$totalLeaveHours = 0;
+			$totalDistance = 0;
+			$totalTravelingHoursBetweenDevisLocation = 0;
 			$hasDevisInTheCurrentDate = $devisData['hasDevis'];
 			if($hasDevisInTheCurrentDate === false){
 				$leaves = $devisData["leaves"];
@@ -161,7 +168,10 @@ class ExportThanatoStatisticService {
 				$totalWorkedHours -= $totalLeaveHours;
 			}
 			else{
-				$distanceTotal = $this->gestionBdd->getDistanceTotalByDevisIdList($devisData["devisId"]);
+				$routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]);
+				$totalDistanceAndTotalTravelingHoursBetweenDevis = $this->geoService->getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines($routeLines);
+				$totalDistance = $totalDistanceAndTotalTravelingHoursBetweenDevis["totalDistance"];
+				$totalTravelingHoursBetweenDevisLocation = $totalDistanceAndTotalTravelingHoursBetweenDevis["totalTravelingHours"];
 				$devisList = $devisData["devis"];
 				$leaves = $devisData["leaves"];
 				if(!empty($devisList)){
@@ -181,16 +191,17 @@ class ExportThanatoStatisticService {
 			}
 			$fileContent = $this->populateLastRecapForTheLine(
 				$fileContent,
-				$distanceTotal,
+				$totalDistance,
 				$totalDevisHours,
 				$totalWorkedHours,
-				$totalLeaveHours
+				$totalLeaveHours,
+				$totalTravelingHoursBetweenDevisLocation
 			);
 		}
 		return $fileContent;
 	}
 
-	private function populateLastRecapForTheLine(string $fileContent,$distance,$totalDevisHours,$totalWorkedHours,$totalLeaveHours){
+	private function populateLastRecapForTheLine(string $fileContent,$distance,$totalDevisHours,$totalWorkedHours,$totalLeaveHours,$totalTravelingHours){
 		$fileContent = $fileContent.
 		''.';'.
 		''.';'.
@@ -207,7 +218,8 @@ class ExportThanatoStatisticService {
 		"$distance".';'.
 		"$totalDevisHours".';'.
 		"$totalLeaveHours".';'.
-		"$totalWorkedHours".';'."\n";
+		"$totalWorkedHours".';'.
+		"$totalTravelingHours"."\n";
 		return $fileContent;
 	}
 
@@ -239,6 +251,7 @@ class ExportThanatoStatisticService {
 					''.';'.
 					''.';'.
 					''.';'.
+					''.';'.
 					''.';'."\n";
 		
 		return $fileContent;

gestion/lib/Service/GeoService.php

@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * Calendar App
+ *
+ * @copyright 2021 Anna Larch <anna.larch@gmx.net>
+ *
+ * @author Anna Larch <anna.larch@gmx.net>
+ * @author Richard Steinmetz <richard@steinmetz.cloud>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Gestion\Service;
+
+use Exception;
+use OCA\Gestion\Constants\GeoConstant;
+use OCA\Gestion\Helpers\GeoHelpers;
+
+class GeoService {
+
+	public function __construct() {
+	}
+
+    /**
+     * Calcul la distance entre les deux points à vol d'oiseau
+     */
+    private function getDistanceInKmBetweenTwoPoints($lat1, $lon1, $lat2, $lon2) {
+        $R = 6371; // Rayon moyen de la Terre en kilomètres
+        $dLat = deg2rad($lat2 - $lat1);
+        $dLon = deg2rad($lon2 - $lon1);
+        $a = sin($dLat/2) * sin($dLat/2) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * sin($dLon/2) * sin($dLon/2);
+        $c = 2 * atan2(sqrt($a), sqrt(1-$a));
+        $d = $R * $c;
+        return round($d, 2);
+    }
+
+    private function getTravelingHourBetweenTwoPoints(array $origin,array $destination,$mode = "driving"){
+        $baseUrl = "https://api.geoapify.com/v1/routing";
+        $originPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($origin["latitude"],$origin["longitude"]);
+        $destinationPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($destination["latitude"],$destination["longitude"]);
+
+        $fullUrl = $baseUrl."?waypoints=$originPoints|$destinationPoints&mode=$mode&apiKey=9e23d93e7f454c988344f9171bf867aa";
+        $curl = curl_init();
+        try {
+            curl_setopt_array($curl, array(
+                CURLOPT_URL => $fullUrl,
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_ENCODING => '',
+                CURLOPT_MAXREDIRS => 10,
+                CURLOPT_TIMEOUT => 0,
+                CURLOPT_FOLLOWLOCATION => true,
+                CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                CURLOPT_CUSTOMREQUEST => 'GET',
+            ));
+    
+            $response = curl_exec($curl);
+    
+            curl_close($curl);
+    
+            if ($response === false) {
+                return 0;
+            } else {
+                $timeInSecondes = json_decode($response)->features[0]->properties->time;
+                $travelTimeHours = $timeInSecondes / 3600;
+                $travelTimeHours = round($travelTimeHours, 2);
+                return $travelTimeHours;
+            }
+        }
+        catch(Exception $e){
+            return 0;
+        }
+    }
+
+    public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines(array $routeLines){
+        $distanceCumul =  0;
+        $totalTravelingHoursBetweenTwoDevisLocation = 0;
+        $lastPoint = NULL;
+        for ($i=0; $i < sizeof($routeLines); $i++) {
+            $currentDistance = 0;
+            if($routeLines[$i]['lieu_id'] != NULL){
+                $lastPoint = $routeLines[$i];
+            } 
+            if($lastPoint['lieu_id'] != NULL && $routeLines[$i+1]['lieu_id'] != NULL){
+                $currentDistance = $this->getDistanceInKmBetweenTwoPoints(
+                    floatval(value: $lastPoint['latitude']), 
+                    floatval($lastPoint['longitude']), 
+                    floatval($routeLines[$i+1]['latitude']), 
+                    floatval($routeLines[$i+1]['longitude'])
+                );
+                $targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i+1]["source"] != "siege";
+                if($targetIsBetweenTwoDevisLocation){
+                    $originPoints = [
+                        "latitude" => $lastPoint["latitude"],
+                        "longitude" => $lastPoint["longitude"]
+                    ];
+                    $destinationPoints = [
+                        "latitude" => $routeLines[$i+1]["latitude"],
+                        "longitude" => $routeLines[$i+1]["longitude"]
+                    ];
+                    $totalTravelingHoursBetweenTwoDevisLocation+= $this->getTravelingHourBetweenTwoPoints(
+                        $originPoints,
+                        $destinationPoints,
+                        GeoConstant::DRIVING_MODE
+                    );
+                }
+            } 
+            $distanceCumul += $currentDistance;
+        }
+        return [
+            "totalDistance" => $distanceCumul,
+            "totalTravelingHours" => $totalTravelingHoursBetweenTwoDevisLocation
+        ];
+    }
+}