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";

readFlightsBalloon.php

Spacing +10 added lines, -10 removed lines

@@ -45,8 +45,8 @@ 
     //il est titulaire d'un ballon
     $query = 'SELECT * FROM llx_bbc_ballons';
     if (!$user->rights->flightLog->vol->detail) {
-        $query.= ' WHERE `fk_responsable` = ' . $user->id;
-        $query.= ' OR `fk_co_responsable` = ' . $user->id;
+        $query .= ' WHERE `fk_responsable` = ' . $user->id;
+        $query .= ' OR `fk_co_responsable` = ' . $user->id;
     }
     $resql = $db->query($query);
     if ($resql) {
@@ -85,15 +85,15 @@ 
     $titulaire->fetch($ballon->fk_responsable);
     //flight with balloon ID
     $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-    $query.= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
+    $query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
     if ($datep) {
-        $query.= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
+        $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
     }
     if ($datef) {
-        $query.= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
+        $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
     }
 
-    $query.= ' ORDER BY date';
+    $query .= ' ORDER BY date';
 
     $resql = $db->query($query);
 }
@@ -126,8 +126,8 @@ 
         select_balloons($idBallon);
     } else {
         $query2 = 'SELECT * FROM llx_bbc_ballons';
-        $query2.= ' WHERE `fk_responsable` = ' . $user->id;
-        $query2.= ' OR `fk_co_responsable` = ' . $user->id;
+        $query2 .= ' WHERE `fk_responsable` = ' . $user->id;
+        $query2 .= ' OR `fk_co_responsable` = ' . $user->id;
         $resql2 = $db->query($query2);
         if ($resql2) {
             $num = $db->num_rows($resql2);
@@ -217,7 +217,7 @@ 
                 print '<td>' . $obj->fk_type . '</td>';
                 print '<td>' . $obj->date . '</td>';
                 print '<td>' . $ballon->immat . '</td>';
-                print '<td>' . $pilot->getNomUrl(). '</td>';
+                print '<td>' . $pilot->getNomUrl() . '</td>';
                 print '<td>' . $obj->lieuD . '</td>';
                 print '<td>' . $obj->lieuA . '</td>';
                 print '<td>' . $obj->heureD . '</td>';
@@ -231,7 +231,7 @@ 
                 if ($user->rights->flightLog->vol->status) {
                     $vol = new Bbcvols($db);
                     $vol->fetch($obj->idBBC_vols);
-                    print '<td>' . $vol->getStatus().'</td>';
+                    print '<td>' . $vol->getStatus() . '</td>';
                 }
             }
             print'</tr>';

readFlightsPilot.php

Spacing +2 added lines, -2 removed lines

@@ -60,10 +60,10 @@
 $query = 'SELECT *,TIMEDIFF(heureA,heureD) AS time  FROM llx_bbc_vols WHERE 1=1';
 
 if ($datep) {
-    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc'). '\'';
+    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
 }
 if ($datef) {
-    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc'). '\'';
+    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
 }
 
 $query .= ' AND `fk_pilot` = ' . $bbcUser->id;

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/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/bbcvols.class.php

Spacing +1 added lines, -1 removed lines

@@ -701,7 +701,7 @@
 
         $label = '<u>' . $langs->trans("MyModule") . '</u>';
         $label .= '<div width="100%">';
-        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref.'<br>';
+        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref . '<br>';
         $label .= '<b>' . $langs->trans('Date') . ':</b> ' . $this->date;
         $label .= '</div>';
 

readBalloonInc.php

Spacing +47 added lines, -47 removed lines

@@ -23,7 +23,7 @@ 
 $langs->load("mymodule@mymodule");
 
 // Get parameters
-$myparam = isset($_GET["myparam"])?$_GET["myparam"]:'';
+$myparam = isset($_GET["myparam"]) ? $_GET["myparam"] : '';
 
 // Protection if the user can't acces to the module
 if (!$user->rights->flightLog->vol->access)
@@ -42,53 +42,53 @@ 
 //l'utilisateur a le droit de selectionner le ballon qu'il veut
 if (($user->rights->flightLog->vol->detail))
 {
-	if(isset($_GET["ballon"])){
+	if (isset($_GET["ballon"])) {
 		$idBallon = $_GET['ballon'];
-	}else{
-		$idBallon =1;
+	} else {
+		$idBallon = 1;
 	}
 	
-}else{
+} else {
 	
 	//l'utilisateur n'a pas le choix du ballon
 	//il est titulaire d'un ballon
 	$query = 'SELECT * FROM llx_bbc_ballons';
-	$query.= ' WHERE `fk_responsable` = '.$user->id;
+	$query .= ' WHERE `fk_responsable` = ' . $user->id;
 	$resql = $db->query($query);
-	if($resql){
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
-		if($num){
+		if ($num) {
 			print'</tr>';
-			while($i <$num){
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql); //vol
-				if($obj){
+				if ($obj) {
 					$idBallon = ($obj->rowid);
 				}
 			}
-		}else{
+		} else {
 			//il n'est pas titulaire d'un ballon
 			accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
 		}
 	}
 }
-if($idBallon != -1){
+if ($idBallon != -1) {
 	
 	//balloon with ID
 	$ballon = New Bbc_ballons($db);
         
-	if($ballon->fetch($idBallon)==-1){
-		print "ERROR".$idBallon."<br/>";
+	if ($ballon->fetch($idBallon) == -1) {
+		print "ERROR" . $idBallon . "<br/>";
 	}
 	//titulaire with ballon ID
         $titulaire = new User($db);
         $titulaire->fetch($ballon->fk_responsable);
         //flight with balloon ID
 	$query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-	$query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
-	$query.= ' AND `incidents` NOT LIKE \'RAS\'';
-	$query.= ' AND `incidents` NOT LIKE \'\'';
-	$query.= ' ORDER BY date';
+	$query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
+	$query .= ' AND `incidents` NOT LIKE \'RAS\'';
+	$query .= ' AND `incidents` NOT LIKE \'\'';
+	$query .= ' ORDER BY date';
 	$resql = $db->query($query);
 }
 
@@ -100,25 +100,25 @@ 
 * Put here all code to build page
 ****************************************************/
 
-llxHeader('','Carnet de vol','');
-if($msg && $idBallon != -1){
+llxHeader('', 'Carnet de vol', '');
+if ($msg && $idBallon != -1) {
 	print $msg;
-}else{
-	$form=new Form($db);
+} else {
+	$form = new Form($db);
 	
 	print '<!-- debut cartouche rapport -->
 	<div class="tabs">
-	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon.'">Carnet de vol</a>
-	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon.'">Incidents</a>
+	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon . '">Carnet de vol</a>
+	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon . '">Incidents</a>
 	</div>';
 	print '<div class="tabBar">';
 	print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
 	print '<input type="hidden" name="mode" value="SELECT">';
 	print '<table width="100%" class="border">';
 	print '<tr><td>Ballon</td><td colspan="3">';
-	if($user->rights->flightLog->vol->detail){
+	if ($user->rights->flightLog->vol->detail) {
 		select_balloons($idBallon);
-	}else{
+	} else {
 		print $ballon->immat;
 	}
 	
@@ -126,15 +126,15 @@ 
         //titulaire
         print '<tr>';
         print '<td>Titulaire</td>';
-        print '<td>'.$titulaire->getLoginUrl(1).'</td>';
+        print '<td>' . $titulaire->getLoginUrl(1) . '</td>';
         print '</tr>';
         //Vol initial
         print '<tr>';
         print '<td>Bapteme</td>';
-        print '<td>'.dol_print_date($ballon->date, 'dayrfc').'</td>';
+        print '<td>' . dol_print_date($ballon->date, 'dayrfc') . '</td>';
         print '</tr>';
         $num = 0;
-	if($resql){
+	if ($resql) {
 		//fetch pilot
 		
 		$num = $db->num_rows($resql);
@@ -150,7 +150,7 @@ 
 
                 print '<table class="border" width="100%">';
 		$i = 0;
-		if($num){
+		if ($num) {
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"> identifiant </td>';
 			print '<td class="liste_titre"> Date </td>';
@@ -164,32 +164,32 @@ 
 			print '<td class="liste_titre"> Nbr Pax </td>';
 			print '<td class="liste_titre"> Rem </td>';
 			print '<td class="liste_titre"> Incidents </td>';
-			if($user->rights->flightLog->vol->status){
+			if ($user->rights->flightLog->vol->status) {
 				print '<td class="liste_titre"> Statut </td>';
 			}
 			print'</tr>';
-			while($i <$num){
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql); //vol
 				print '<tr>';
-				if($obj){
+				if ($obj) {
 					$pilot = New User($db); //pilot
 					$pilot->fetch($obj->fk_pilot);
-					print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
-					print '<td>'.$obj->date.'</td>';
-					print '<td>'.$ballon->immat.'</td>';
-					print '<td>'.$pilot->getNomUrl().'</a></td>';
-					print '<td>'.$obj->lieuD.'</td>';
-					print '<td>'.$obj->lieuA.'</td>';
-					print '<td>'.$obj->heureD.'</td>';
-					print '<td>'.$obj->heureA.'</td>';
-					print '<td>'.$obj->time.'</td>';
-					print '<td>'.$obj->nbrPax.'</td>';
-					print '<td>'.$obj->remarque.'</td>';
-					print '<td>'.$obj->incidents.'</td>';
-					if($user->rights->flightLog->vol->status){
+					print '<td><a href="fiche.php?vol=' . $obj->idBBC_vols . '">' . $obj->idBBC_vols . '</a></td>';
+					print '<td>' . $obj->date . '</td>';
+					print '<td>' . $ballon->immat . '</td>';
+					print '<td>' . $pilot->getNomUrl() . '</a></td>';
+					print '<td>' . $obj->lieuD . '</td>';
+					print '<td>' . $obj->lieuA . '</td>';
+					print '<td>' . $obj->heureD . '</td>';
+					print '<td>' . $obj->heureA . '</td>';
+					print '<td>' . $obj->time . '</td>';
+					print '<td>' . $obj->nbrPax . '</td>';
+					print '<td>' . $obj->remarque . '</td>';
+					print '<td>' . $obj->incidents . '</td>';
+					if ($user->rights->flightLog->vol->status) {
 						$vol = new Bbcvols($db);
 						$vol->fetch($obj->idBBC_vols);
-                        print '<td>' . $vol->getStatus().'</td>';
+                        print '<td>' . $vol->getStatus() . '</td>';
 					}
 				}
 				print'</tr>';