laudeco / bbc-dolibarr-flightlog

lib/flightLog.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -149,9 +149,9 @@
 }
 
 /**
- * @param null $year
- * @param null $pilotId
- * @param null $quarter
+ * @param integer $year
+ * @param integer $pilotId
+ * @param integer $quarter
  * @param bool $groupBy
  *
  * @return string

Spacing +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
 
     $bbcTypes = new Bbctypes($db);
 
-    $bbcTypes->fetchAll('','',0,0, [
+    $bbcTypes->fetchAll('', '', 0, 0, [
         "active" => $active
     ]);
 
@@ -78,7 +78,7 @@ 
 
     print '<select class="flat" name="' . $htmlname . '">';
 
-    if($showempty){
+    if ($showempty) {
         print sprintf('<option selected="%s" value=""></option>', (($selected == "" || $selected = 0 || $selected == -1) ? "selected" : ""));
     }
 
@@ -88,7 +88,7 @@ 
             print ' selected="selected"';
         }
         print '>';
-        echo "T".$flightType->numero . '-' . $flightType->nom;
+        echo "T" . $flightType->numero . '-' . $flightType->nom;
         print "</option>";
     }
 
@@ -110,7 +110,7 @@ 
     print '<select class="flat" name="' . $htmlname . '">';
 
     print '<option value=""';
-    if ($selected == -1 || $selected == ''|| $selected == 0) {
+    if ($selected == -1 || $selected == '' || $selected == 0) {
         print ' selected="selected"';
     }
     print '>&nbsp;</option>';
@@ -156,17 +156,17 @@ 
  *
  * @return string
  */
-function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true){
+function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true) {
 
     global $db;
 
     $sql = "SELECT USR.rowid, USR.lastname, USR.firstname, QUARTER(VOL.date) as quartil ";
 
-    if($groupBy){
-        $sql.= " , SUM(VOL.kilometers) as SUM";
-        $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight";
-    }else{
-        $sql.= " , VOL.*";
+    if ($groupBy) {
+        $sql .= " , SUM(VOL.kilometers) as SUM";
+        $sql .= " , COUNT(VOL.idBBC_vols) as nbrFlight";
+    } else {
+        $sql .= " , VOL.*";
     }
 
     $sql .= " FROM llx_bbc_vols as VOL";
@@ -176,15 +176,15 @@ 
     $sql .= " AND YEAR(VOL.date) = " . ($year ?: 'YEAR(NOW())');
     $sql .= " AND ( VOL.fk_type = 1 OR VOL.fk_type = 2 ) ";
 
-    if($pilotId !== null){
-        $sql .= " AND USR.rowid = ".$pilotId;
+    if ($pilotId !== null) {
+        $sql .= " AND USR.rowid = " . $pilotId;
     }
 
-    if($quarter !== null){
-        $sql .= " AND QUARTER(VOL.date) = ".$quarter;
+    if ($quarter !== null) {
+        $sql .= " AND QUARTER(VOL.date) = " . $quarter;
     }
 
-    if($groupBy){
+    if ($groupBy) {
         $sql .= " GROUP BY QUARTER(VOL.date), VOL.fk_pilot";
     }
     $sql .= " ORDER BY QUARTER(VOL.date), VOL.fk_pilot";
@@ -199,7 +199,7 @@ 
  *
  * @return array
  */
-function findFlightByPilotAndQuarter($pilotId, $year, $quarter){
+function findFlightByPilotAndQuarter($pilotId, $year, $quarter) {
     global $db;
 
     $sql = generateQuarterQuery($year, $pilotId, $quarter, false);
@@ -323,7 +323,7 @@ 
     print '</tr>';
 
     foreach ($kmByQuartil as $id => $rembKm) {
-        if(!$user->rights->flightLog->vol->detail && $id != $user->id){
+        if (!$user->rights->flightLog->vol->detail && $id != $user->id) {
             continue;
         }
 
@@ -477,10 +477,10 @@ 
 
     $graphData = new GraphicalData();
 
-    foreach(getFlightYears() as $flightYear){
+    foreach (getFlightYears() as $flightYear) {
         $pieceData = new YearGraphicalData($flightYear);
 
-        foreach($flightTypes as $flightType){
+        foreach ($flightTypes as $flightType) {
             $pieceData->addType(new GraphicalType($flightType->id, $flightType->nom));
         }
 

card.php

Spacing +20 added lines, -20 removed lines

@@ -56,7 +56,7 @@ 
 $langs->load("other");
 
 // Get parameters
-$id = GETPOST('id', 'int')?: GETPOST('idBBC_vols', 'int');
+$id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel');
 $backtopage = GETPOST('backtopage');
@@ -106,7 +106,7 @@ 
 $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_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -125,7 +125,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
-    $action);    // Note that $action and $object may have been modified by some hooks
+    $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -214,8 +214,8 @@ 
         $object->id = $object->idBBC_vols;
         $object->lieuD = GETPOST('lieuD', 'alpha');
         $object->lieuA = GETPOST('lieuA', 'alpha');
-        $object->heureD = GETPOST('heureD_h', 'int').":".GETPOST('heureD_m', 'int').":00";
-        $object->heureA = GETPOST('heureA_h', 'int').":".GETPOST('heureA_m', 'int').":00";
+        $object->heureD = GETPOST('heureD_h', 'int') . ":" . GETPOST('heureD_m', 'int') . ":00";
+        $object->heureA = GETPOST('heureA_h', 'int') . ":" . GETPOST('heureA_m', 'int') . ":00";
         $object->BBC_ballons_idBBC_ballons = GETPOST('BBC_ballons_idBBC_ballons', 'int');
         $object->nbrPax = GETPOST('nbrPax', 'alpha');
         $object->remarque = GETPOST('remarque', 'alpha');
@@ -236,12 +236,12 @@ 
                 null, 'errors');
         }
 
-        if(!dol_validElement($object->lieuD)){
+        if (!dol_validElement($object->lieuD)) {
             $error++;
             setEventMessage("Erreur le champ : lieu de décollage", 'errors');
         }
 
-        if(!dol_validElement($object->lieuA)){
+        if (!dol_validElement($object->lieuA)) {
             $error++;
             setEventMessage("Erreur le champ : lieu d'atterissage", 'errors');
         }
@@ -253,12 +253,12 @@ 
             setEventMessage("Erreur avec les heures de vol", 'errors');
         }
 
-        if(!is_numeric($object->nbrPax) || $object->nbrPax < 0 ){
+        if (!is_numeric($object->nbrPax) || $object->nbrPax < 0) {
             $error++;
             setEventMessage("Erreur le champ : nombre de passagers", 'errors');
         }
 
-        if(!$pilotService->isPilot($object->fk_pilot)){
+        if (!$pilotService->isPilot($object->fk_pilot)) {
             $error++;
             setEventMessage("Le pilote selectionne n'est pas pilote", 'errors');
         }
@@ -399,18 +399,18 @@ 
         select_balloons($object->BBC_ballons_idBBC_ballons, "BBC_ballons_idBBC_ballons");
     print "</td></tr>";
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("FieldnbrPax") . "</td><td><input class=\"flat\" type=\"number\" name=\"nbrPax\" value=\"" . $object->nbrPax . "\"></td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">".$object->remarque."</textarea></td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">".$object->incidents."</textarea></td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">" . $object->remarque . "</textarea></td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">" . $object->incidents . "</textarea></td></tr>";
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_type") . "</td><td>";
         select_flight_type($object->fk_type, "fk_type");
     print "</td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>".$form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1)."</td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>".$form->select_dolusers($object->fk_organisateur, "fk_organisateur")."</td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>" . $form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1) . "</td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>" . $form->select_dolusers($object->fk_organisateur, "fk_organisateur") . "</td></tr>";
 
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldkilometers") . "</td><td><input class=\"flat\" type=\"number\" name=\"kilometers\" value=\"" . $object->kilometers . "\"></td></tr>";
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldcost") . "</td><td><input class=\"flat\" type=\"number\" name=\"cost\" value=\"" . $object->cost . "\"></td></tr>";
-        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver,"fk_receiver", true ) . "</td></tr>";
+        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver, "fk_receiver", true) . "</td></tr>";
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldjustif_kilometers") . "</td><td><textarea class=\"flat\" name=\"justif_kilometers\">" . $object->justif_kilometers . "</textarea></td></tr>";
     }
     print '</table>';
@@ -432,7 +432,7 @@ 
 
     print load_fiche_titre($langs->trans($pageTitle));
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/flightLog/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="' . DOL_URL_ROOT . '/flightLog/list.php">' . $langs->trans("BackToList") . '</a>';
     print $form->showrefnav($object, "idBBC_vols", $linkback, true, "idBBC_vols");
     dol_fiche_head();
 
@@ -459,13 +459,13 @@ 
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>';
 
-    if($user->rights->flightLog->vol->financial){
+    if ($user->rights->flightLog->vol->financial) {
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->is_facture . '</td></tr>';
     }
 
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
-        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost ." ". $langs->getCurrencySymbol($conf->currency).'</td></tr>';
+        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
     }
@@ -478,7 +478,7 @@ 
     print '<div class="tabsAction">' . "\n";
     $parameters = array();
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
-        $action);    // Note that $action and $object may have been modified by hook
+        $action); // Note that $action and $object may have been modified by hook
     if ($reshook < 0) {
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
     }