laudeco / bbc-dolibarr-flightlog

card_tab_damage.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
 
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $object = new Bbcvols($db);
 
@@ -57,8 +57,8 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -85,13 +85,13 @@ 
         FLIGHTLOG_ACTION_HANDLE_ADD_DAMAGE => [AddFlightDamageController::class, 'view'],
     ];
 
-    if(isset($routes[$action])){
+    if (isset($routes[$action])) {
         $controllerName = $routes[$action][0];
         $actionName = $routes[$action][1];
 
         $response = call_user_func([new $controllerName($db), $actionName]);
 
-        if($response instanceof \FlightLog\Http\Web\Response\Redirect){
+        if ($response instanceof \FlightLog\Http\Web\Response\Redirect) {
             if (headers_sent()) {
                 echo(sprintf("<script>location.href='%s'</script>", $response->getUrl()));
                 exit;
@@ -102,7 +102,7 @@ 
         }
 
         include $response->getTemplate();
-    }else{
+    } else {
         echo 'Route non trouvée.';
     }
 ?>
@@ -114,13 +114,13 @@ 
 // Buttons
 print '<div class="tabsAction">' . "\n";
 
-if($user->rights->flightlog->vol->financial){
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_damage.php?id=' . $object->id.'&action='.FLIGHTLOG_ACTION_ADD_DAMAGE.'">' . $langs->trans("Ajouter") . '</a></div>' . "\n";
+if ($user->rights->flightlog->vol->financial) {
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_damage.php?id=' . $object->id . '&action=' . FLIGHTLOG_ACTION_ADD_DAMAGE . '">' . $langs->trans("Ajouter") . '</a></div>' . "\n";
 }
 
 print '</div>' . "\n";
 
-if($user->rights->flightlog->vol->financial){
+if ($user->rights->flightlog->vol->financial) {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     $form->showLinkedObjectBlock($object);
     print '</div></div>';

Braces +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         }
 
         include $response->getTemplate();
-    }else{
+    } else{
         echo 'Route non trouvée.';
     }
 ?>

index.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 $routesGuards = require './Infrastructure/Common/Routes/guards.conf.php';
 
 $response = null;
-try{
+try {
     $routeName = GETPOST('r');
 
     $routeManager = new \FlightLog\Infrastructure\Common\Routes\RouteManager($db);
@@ -62,7 +62,7 @@ 
 
     $response = $routeManager->__invoke($routeName, $user);
 
-    if($response instanceof \FlightLog\Http\Web\Response\Redirect){
+    if ($response instanceof \FlightLog\Http\Web\Response\Redirect) {
         if (headers_sent()) {
             echo(sprintf("<script>location.href='%s'</script>", $response->getUrl()));
             exit;
@@ -72,7 +72,7 @@ 
         exit;
     }
 
-}catch (\Exception $e){
+} catch (\Exception $e) {
     dol_syslog($e->getMessage(), LOG_ERR);
     $response = new \FlightLog\Http\Web\Response\Response($e->getMessage());
 }

Braces +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         exit;
     }
 
-}catch (\Exception $e){
+} catch (\Exception $e){
     dol_syslog($e->getMessage(), LOG_ERR);
     $response = new \FlightLog\Http\Web\Response\Response($e->getMessage());
 }

Infrastructure/Common/Routes/RouteManager.php

Spacing +9 added lines, -9 removed lines

@@ -38,8 +38,8 @@ 
      *
      * @throws \Exception
      */
-    public function add(Route $route){
-        if(isset($this->routes[$route->getName()])){
+    public function add(Route $route) {
+        if (isset($this->routes[$route->getName()])) {
             throw new \Exception('Route exists');
         }
 
@@ -51,8 +51,8 @@ 
      *
      * @throws \Exception
      */
-    public function load(array $routes){
-        foreach($routes as $currentRoute){
+    public function load(array $routes) {
+        foreach ($routes as $currentRoute) {
             $this->add($currentRoute);
         }
     }
@@ -62,7 +62,7 @@ 
      */
     public function loadGuards($routesGuards)
     {
-        foreach($routesGuards as $guard){
+        foreach ($routesGuards as $guard) {
             $this->guards[$guard->getRouteName()] = $guard;
         }
     }
@@ -73,8 +73,8 @@ 
      * @param $routeName
      * @return bool
      */
-    public function isAuthorized(User $user, $routeName){
-        if(!isset($this->guards[$routeName])){
+    public function isAuthorized(User $user, $routeName) {
+        if (!isset($this->guards[$routeName])) {
             return true;
         }
 
@@ -92,11 +92,11 @@ 
      */
     public function __invoke($name, User $user)
     {
-        if(!isset($this->routes[$name])){
+        if (!isset($this->routes[$name])) {
             throw new \Exception('Route not found');
         }
 
-        if(!$this->isAuthorized($user, $name)){
+        if (!$this->isAuthorized($user, $name)) {
             throw new \Exception('Action not allowed');
         }
 

class/actions_flightlog.class.php

Spacing +4 added lines, -4 removed lines

@@ -58,8 +58,8 @@ 
      *
      * @return int
      */
-    public function showLinkedObjectBlock(array $params = [], $object){
-        if(!isset($object->linkedObjectsIds) || !isset($object->linkedObjectsIds['flightlog_damage'])){
+    public function showLinkedObjectBlock(array $params = [], $object) {
+        if (!isset($object->linkedObjectsIds) || !isset($object->linkedObjectsIds['flightlog_damage'])) {
             return 0;
         }
 
@@ -69,7 +69,7 @@ 
         dol_include_once('/flightlog/flightlog.inc.php');
         $queryRepository = new \FlightLog\Infrastructure\Damage\Query\Repository\GetDamageQueryRepository($db);
 
-        foreach($object->linkedObjectsIds['flightlog_damage'] as $damageId){
+        foreach ($object->linkedObjectsIds['flightlog_damage'] as $damageId) {
             try {
                 $object->linkedObjects['flightlog_damage'][$damageId] = $queryRepository->query($damageId);
             } catch (Exception $e) {
@@ -99,7 +99,7 @@ 
         return $sql;
     }
 
-    public function completeListOfReferent(){
+    public function completeListOfReferent() {
         dol_include_once('/flightlog/class/bbcvols.class.php');
 
         $this->results['flightlog'] = [

damage/tpl/linkedobjectblock.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -45,13 +45,13 @@
     $var = !$var;
     $trclass = ($var ? 'pair' : 'impair');
 
-    if(!$user->rights->flightlog->vol->financial && $user->rowid != $damage->getAuthorId()){
+    if (!$user->rights->flightlog->vol->financial && $user->rowid != $damage->getAuthorId()) {
         continue;
     }
 ?>
     <tr <?php echo $GLOBALS['bc'][$var]; ?> >
         <td><?php echo $langs->trans("Dégâts"); ?></td>
-        <td><a href="<?php echo sprintf(DOL_URL_ROOT.'/flightlog/index.php?id=%s&r=%s', $damage->getId(), 'get_one_damage');?>"><?php echo $damage->getId()?></a></td>
+        <td><a href="<?php echo sprintf(DOL_URL_ROOT . '/flightlog/index.php?id=%s&r=%s', $damage->getId(), 'get_one_damage'); ?>"><?php echo $damage->getId()?></a></td>
         <td align="center"><?php echo $damage->getAuthorName(); ?></td>
         <td align="center"></td>
         <td align="right"><?echo price($damage->getAmount()) ?>€</td>

Infrastructure/Damage/Query/Repository/GetDamagesForFlightQueryRepository.php

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@
     public function __invoke($flightId)
     {
         $sql = 'SELECT damage.author_id as author_id, damage.rowid as id, damage.amount, CONCAT(author.firstname, " " , author.lastname) as author_name, damage.billed as invoiced';
-        $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage';
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id';
-        $sql.=' WHERE damage.flight_id = '.$this->db->escape($flightId);
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id';
+        $sql .= ' WHERE damage.flight_id = ' . $this->db->escape($flightId);
 
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
             if ($num) {
-                for($i = 0; $i < $num ; $i++) {
+                for ($i = 0; $i < $num; $i++) {
                     $properties = $this->db->fetch_array($resql);
                     yield Damage::fromArray($properties);
                 }

Application/Damage/ViewModel/Damage.php

Spacing +2 added lines, -2 removed lines

@@ -66,13 +66,13 @@
      *
      * @return Damage
      */
-    public static function fromArray(array $properties){
+    public static function fromArray(array $properties) {
         $authorId = $properties['author_id'];
         $author = $properties['author_name'];
         $amount = $properties['amount'];
         $id = $properties['id'];
         $flightId = isset($properties['flight_id']) ? $properties['flight_id'] : null;
-        $invoiced = (bool)$properties['invoiced'];
+        $invoiced = (bool) $properties['invoiced'];
 
         return new self($authorId, $author, $amount, $id, $invoiced, $flightId);
     }

Http/Web/Controller/StatisticalGraphController.php

Indentation +13 added lines, -13 removed lines

@@ -83,19 +83,19 @@
              * @var int $month
              * @var Statistic $stat */
             foreach($months as $month => $stat){
-               if(!isset($series[$month-1])){
-                   $series[$month-1] = [substr(\DateTime::createFromFormat('!m', $month)->format('F'),0,1)];
-               };
-               $series[$month-1][$i] = $stat->number();
-
-               if($year === 2020){
-                   continue;
-               }
-
-               if(!isset($average[$month-1])){
-                   $average[$month-1] = 0;
-               }
-               $average[$month-1] += $stat->number();
+                if(!isset($series[$month-1])){
+                    $series[$month-1] = [substr(\DateTime::createFromFormat('!m', $month)->format('F'),0,1)];
+                };
+                $series[$month-1][$i] = $stat->number();
+
+                if($year === 2020){
+                    continue;
+                }
+
+                if(!isset($average[$month-1])){
+                    $average[$month-1] = 0;
+                }
+                $average[$month-1] += $stat->number();
             }
 
             $i++;

Spacing +15 added lines, -15 removed lines

@@ -31,19 +31,19 @@ 
 
         $i = 10;
         foreach ($series[0] as $key => $year) {
-            if($key == 0){
+            if ($key == 0) {
                 continue;
             }
 
             $graphType[] = $key == 5 ? "lines" : 'linesnopoint';
             $color[] = $graph->datacolor[$key];
 
-            $i+=30;
+            $i += 30;
         }
-        $color[count($color)-1] = [255,0,0]; // Average is red
+        $color[count($color) - 1] = [255, 0, 0]; // Average is red
 
-        $color[count($color)-2] = [0,100,255]; //Current year
-        $graphType[count($color)-2] = 'bars';
+        $color[count($color) - 2] = [0, 100, 255]; //Current year
+        $graphType[count($color) - 2] = 'bars';
 
         $graph->SetDataColor($color);
 
@@ -82,27 +82,27 @@ 
             /**
              * @var int $month
              * @var Statistic $stat */
-            foreach($months as $month => $stat){
-               if(!isset($series[$month-1])){
-                   $series[$month-1] = [substr(\DateTime::createFromFormat('!m', $month)->format('F'),0,1)];
+            foreach ($months as $month => $stat) {
+               if (!isset($series[$month - 1])) {
+                   $series[$month - 1] = [substr(\DateTime::createFromFormat('!m', $month)->format('F'), 0, 1)];
                };
-               $series[$month-1][$i] = $stat->number();
+               $series[$month - 1][$i] = $stat->number();
 
-               if($year === 2020){
+               if ($year === 2020) {
                    continue;
                }
 
-               if(!isset($average[$month-1])){
-                   $average[$month-1] = 0;
+               if (!isset($average[$month - 1])) {
+                   $average[$month - 1] = 0;
                }
-               $average[$month-1] += $stat->number();
+               $average[$month - 1] += $stat->number();
             }
 
             $i++;
         }
 
-        foreach($series as $monthIndex => $seriesValue){
-            $series[$monthIndex][] = $average[$monthIndex] / ($numberOfYears-1);
+        foreach ($series as $monthIndex => $seriesValue) {
+            $series[$monthIndex][] = $average[$monthIndex] / ($numberOfYears - 1);
         }
 
         return $series;

Infrastructure/Flight/Query/Repository/GetBillableFlightPerMonthQueryRepository.php

Spacing +2 added lines, -2 removed lines

@@ -64,13 +64,13 @@
 
         $stats = new BillableFlightByYearMonth();
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             $properties = $this->db->fetch_array($resql);
             $stat = Statistic::fromArray($properties);
             $stats->add($stat);
         }
 
-        $stats->add(new Statistic(0,1,(new \DateTime())->format('Y')));
+        $stats->add(new Statistic(0, 1, (new \DateTime())->format('Y')));
 
         return $stats;
     }