laudeco / bbc-dolibarr-flightlog

listFact.php

Spacing +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
 $form = new Form($db);
 print '<!-- debut cartouche rapport -->
 	<div class="tabs">
-	    <a  id="'.($viewSelection == 1 ? 'active' : '').'" class="tab" href="listFact.php?view=1">Facturation</a>
-	    <a  id="'.($viewSelection == 2 ? 'active' : '').'" class="tab" href="listFact.php?view=2">AVIABEL</a>
+	    <a  id="'.($viewSelection == 1 ? 'active' : '') . '" class="tab" href="listFact.php?view=1">Facturation</a>
+	    <a  id="'.($viewSelection == 2 ? 'active' : '') . '" class="tab" href="listFact.php?view=2">AVIABEL</a>
 	</div>';
 print '<div class="tabBar">';
 print "<form name='listFact' action=\"listFact.php\" method=\"get\">\n";

class/YearGraphicalData.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $result = [$this->year];
 
         foreach ($this->graphData as $typeId => $data) {
-            if(!in_array($typeId, [1,2,3,6])){
+            if (!in_array($typeId, [1, 2, 3, 6])) {
                 continue;
             }
 

class/GraphicalValueType.php

Spacing +2 added lines, -2 removed lines

@@ -36,14 +36,14 @@
     /**
      * @param GraphicalValue $value
      */
-    public function addValue(GraphicalValue $value){
+    public function addValue(GraphicalValue $value) {
         $this->counter = $this->counter->add($value);
     }
 
     /**
      * @return int
      */
-    public function getValue(){
+    public function getValue() {
         return $this->counter->getValue();
     }
 

class/GraphicalData.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function addValue($year, GraphicalValue $value)
     {
-        if(!isset($this->data[$year])){
+        if (!isset($this->data[$year])) {
             throw new \Exception("Year is not defined");
         }
 
@@ -54,7 +54,7 @@ 
     {
         $result = [];
 
-        foreach($this->data as $year){
+        foreach ($this->data as $year) {
             $result[] = $year->export();
         }
 

class/card/TabCollection.php

Spacing +3 added lines, -3 removed lines

@@ -45,17 +45,17 @@
      *
      * @return TabCollection
      */
-    public function addTab(Tab $tab){
+    public function addTab(Tab $tab) {
         $this->tabs[] = $tab;
     }
 
     /**
      * @return array
      */
-    public function toArray(){
+    public function toArray() {
         $tabAsArray = [];
 
-        foreach ($this->tabs as $tab){
+        foreach ($this->tabs as $tab) {
             $tabAsArray[] = $tab->toArray();
         }
 

lib/flightLog.lib.php

Spacing +28 added lines, -28 removed lines

@@ -337,7 +337,7 @@ 
     $totalQ4 = 0;
 
     $curMonth = date("m", time());
-    $curQuarter = ceil($curMonth/3);
+    $curQuarter = ceil($curMonth / 3);
     $disableColor = 'style="background-color: lightyellow;" title="N/A" data-toggle="tooltip"';
 
     foreach ($kmByQuartil as $id => $rembKm) {
@@ -371,29 +371,29 @@ 
         print '<td>' . $name . '</td>';
         print '<td>' . $firstname . '</td>';
 
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1) . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1 * $unitPriceMission) . '€</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . $sumQ1 . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($sumQ1 * $tauxRemb) . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'><b>' . $amoutQ1 . '€</b></td>';
-
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2) . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . $sumQ2 . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($sumQ2 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'><b>' . $amoutQ2 . '€</b></td>';
-
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3) . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . $sumQ3 . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($sumQ3 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'><b>' . $amoutQ3 . '€</b></td>';
-
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4) . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . $sumQ4 . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($sumQ4 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'><b>' . $amoutQ4 . '€</b></td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1) . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1 * $unitPriceMission) . '€</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . $sumQ1 . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($sumQ1 * $tauxRemb) . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '><b>' . $amoutQ1 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2) . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . $sumQ2 . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($sumQ2 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '><b>' . $amoutQ2 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3) . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . $sumQ3 . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($sumQ3 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '><b>' . $amoutQ3 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4) . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . $sumQ4 . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($sumQ4 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '><b>' . $amoutQ4 . '€</b></td>';
 
         print '<td>' . (($sumFlights * $unitPriceMission) + ($sumKm * $tauxRemb)) . '€</td>';
 
@@ -401,13 +401,13 @@ 
     }
 
     print "<td colspan='6'></td>";
-    print "<td>".price($totalQ1)."€</td>";
+    print "<td>" . price($totalQ1) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ2)."€</td>";
+    print "<td>" . price($totalQ2) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ3)."€</td>";
+    print "<td>" . price($totalQ3) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ4)."€</td>";
+    print "<td>" . price($totalQ4) . "€</td>";
     print "<td></td>";
 
     print '</table>';

bbcvols/tpl/linkedobjectblock.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
     <tr <?php echo $GLOBALS['bc'][$var]; ?> >
         <td><?php echo $langs->trans("Vol"); ?></td>
         <td><?= $flight->getNomUrl()?></td>
-        <td align="center"><?= sprintf("%s à %s ", $flight->lieuD, $flight->lieuA);?></td>
+        <td align="center"><?= sprintf("%s à %s ", $flight->lieuD, $flight->lieuA); ?></td>
         <td align="center"><?= dol_print_date($flight->date, '%d-%m-%Y') ?></td>
-        <td align="right"><?= $flight->cost?:'N/A' ?></td>
+        <td align="right"><?= $flight->cost ?: 'N/A' ?></td>
         <td align="right"><?= $flight->getLibStatut(3)?></td>
         <td align="right"><a
                     href="<?php echo $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&dellinkid=' . $key; ?>"><?php echo img_delete($langs->transnoentitiesnoconv("RemoveLink")); ?></a>

generateExpenseNote.php

Spacing +13 added lines, -13 removed lines

@@ -81,9 +81,9 @@ 
 
         $missions = bbcKilometersByQuartil($year);
 
-        foreach($missions as $currentMissionUserId => $currentMission){
+        foreach ($missions as $currentMissionUserId => $currentMission) {
 
-            if($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0){
+            if ($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0) {
                 continue;
             }
 
@@ -97,18 +97,18 @@ 
             $object->fk_statut = 1;
             $object->fk_user_validator = GETPOST("fk_user_validator", 'int');
             $object->note_public = GETPOST('public_note', 'alpha');
-            $object->note_private = GETPOST('private_note','alpha');
+            $object->note_private = GETPOST('private_note', 'alpha');
 
             $expenseNoteId = $object->create($expenseNoteUser);
-            if($expenseNoteId < 0){
-                dol_htmloutput_errors("Erreur lors de la création de la note de frais" , $object->errors);
+            if ($expenseNoteId < 0) {
+                dol_htmloutput_errors("Erreur lors de la création de la note de frais", $object->errors);
                 continue;
             }
 
 
             $flightsForQuarter = findFlightByPilotAndQuarter($currentMissionUserId, $year, $quarter);
 
-            foreach($flightsForQuarter as $currentFlightForQuarter) {
+            foreach ($flightsForQuarter as $currentFlightForQuarter) {
 
                 // Kilometers
                 $object_ligne = new ExpenseReportLine($db);
@@ -168,7 +168,7 @@ 
 
         if ($result > 0) {
             dol_htmloutput_mesg("Notes de frais créées");
-        }else{
+        } else {
             dol_htmloutput_errors("Note de frais non créée");
         }
     } else {
@@ -187,15 +187,15 @@ 
 $form = new Form($db);
 
 $tabLinks = [];
-foreach($flightYears as $currentFlightYear){
+foreach ($flightYears as $currentFlightYear) {
     $tabLinks[] = [
-        DOL_URL_ROOT."/flightlog/generateExpenseNote.php?year=".$currentFlightYear,
+        DOL_URL_ROOT . "/flightlog/generateExpenseNote.php?year=" . $currentFlightYear,
         $currentFlightYear,
-        "tab_".$currentFlightYear
+        "tab_" . $currentFlightYear
     ];
 }
 
-dol_fiche_head($tabLinks, "tab_".$year);
+dol_fiche_head($tabLinks, "tab_" . $year);
 
 ?>
     <form method="POST">
@@ -211,7 +211,7 @@ 
         <select name="quarter" id="field_quarter">
             <option value="1" <?= ($year == $currentYear && $currentQuarter <= 1) ? 'disabled="disabled"' : "" ?>>1</option>
             <option value="2" <?= ($year == $currentYear && $currentQuarter <= 2) ? 'disabled="disabled"' : "" ?>>2</option>
-            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"': "" ?>>3</option>
+            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"' : "" ?>>3</option>
             <option value="4" <?= ($year == $currentYear && $currentQuarter <= 4) ? 'disabled="disabled"' : "" ?>>4</option>
         </select>
         <br/>
@@ -220,7 +220,7 @@ 
         <label><?= $langs->trans("Validateur de la note de frais")?></label><br/>
         <?php
             $include_users = $object->fetch_users_approver_expensereport();
-            print $form->select_dolusers($user->id,"fk_user_validator",1,"",0,$include_users);
+            print $form->select_dolusers($user->id, "fk_user_validator", 1, "", 0, $include_users);
         ?>
         <br/>
 

class/actions_Flightlog.class.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         $this->results["flightlog"] = [
             'label' => $langs->trans("Search flight"),
             'text'  => $langs->trans("Search flight"),
-            'url'   => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall='.$searchInfo['search_boxvalue']
+            'url'   => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall=' . $searchInfo['search_boxvalue']
         ];
     }
 
@@ -38,8 +38,8 @@ 
      * @param $object
      * @param $action
      */
-    public function showLinkToObjectBlock($parameter, $object, $action){
-        $this->results["flightlog_bbcvols"]= array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM ".MAIN_DB_PREFIX."bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC");
+    public function showLinkToObjectBlock($parameter, $object, $action) {
+        $this->results["flightlog_bbcvols"] = array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM " . MAIN_DB_PREFIX . "bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC");
 
     }
 }
\ No newline at end of file