@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | if ($_GET['vol']) { |
34 | 34 | $tmp = New Bbcvols($db); |
35 | 35 | $tmp->fetch($_GET['vol']); |
36 | - if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin)) { |
|
36 | + if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin)) { |
|
37 | 37 | if ($tmp->delete($user) > 0) { |
38 | - dol_syslog("FLIGHT_DELETE : ".$tmp->toString().' BY : '.$user->id,LOG_WARNING); |
|
38 | + dol_syslog("FLIGHT_DELETE : " . $tmp->toString() . ' BY : ' . $user->id, LOG_WARNING); |
|
39 | 39 | Header("Location: readFlights.php"); |
40 | 40 | } |
41 | 41 | } |
@@ -79,11 +79,11 @@ discard block |
||
79 | 79 | $vol->justif_kilometers = $_POST['justif_kilometers']; |
80 | 80 | |
81 | 81 | if ($vol->update($user) < 0) { |
82 | - dol_syslog("Error during update a flight ".$vol->error, LOG_ERR); |
|
82 | + dol_syslog("Error during update a flight " . $vol->error, LOG_ERR); |
|
83 | 83 | $msg = '<div class="error">Erreur lors de la MAJ </div>'; |
84 | 84 | $error++; |
85 | 85 | } else { |
86 | - Header("Location: fiche.php?vol=".$_POST['vol']); |
|
86 | + Header("Location: fiche.php?vol=" . $_POST['vol']); |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | llxHeader('', 'Carnet de vol', ''); |
101 | 101 | //delete |
102 | -if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) && $_GET["action"] == 'delete') { |
|
102 | +if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) && $_GET["action"] == 'delete') { |
|
103 | 103 | $html = New Form($db); |
104 | 104 | print $html->formconfirm("fiche.php?vol=" . $_GET['vol'], "Delete vol", "Etes vous sure de vouloir supprimer ce vol?", 'deleteconfirm'); |
105 | 105 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | //Pilote |
156 | 156 | print "<tr>"; |
157 | 157 | print '<td class="fieldrequired"> Pilote</td><td>'; |
158 | - print $html->select_dolusers($vol->fk_pilot,'pilot',0); |
|
158 | + print $html->select_dolusers($vol->fk_pilot, 'pilot', 0); |
|
159 | 159 | print '</td></tr>'; |
160 | 160 | //organisateur |
161 | 161 | print "<tr>"; |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | //Justif KIlometers |
198 | 198 | print "<tr>"; |
199 | 199 | print '<td width="25%" class="fieldrequired">Justificatif des KM</td><td>'; |
200 | - print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers. '</textarea> '; |
|
200 | + print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers . '</textarea> '; |
|
201 | 201 | print '</td></tr>'; |
202 | 202 | //NBR pax |
203 | 203 | print "<tr>"; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | //Flight cost |
208 | 208 | print "<tr>"; |
209 | 209 | print '<td width="25%" class="fieldrequired">Montant perçu</td><td>'; |
210 | - print '<input type="text" name="cost" calss="flat" value="' .$vol->cost . '"/>'; |
|
210 | + print '<input type="text" name="cost" calss="flat" value="' . $vol->cost . '"/>'; |
|
211 | 211 | print "€"; |
212 | 212 | print '</td></tr>'; |
213 | 213 | //Money receiver |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | if (!isset($_GET['action'])) { |
257 | 257 | //delete - if user has right |
258 | - if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) { |
|
258 | + if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) { |
|
259 | 259 | print '<a class="butActionDelete" href="fiche.php?action=delete&vol=' . $vol->getId() . '">' . $langs->trans('Delete') . '</a>'; |
260 | 260 | } else { |
261 | 261 | print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>'; |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | */ |
431 | 431 | private function initPermissions() |
432 | 432 | { |
433 | - $this->rights = array(); // Permission array used by this module |
|
433 | + $this->rights = array(); // Permission array used by this module |
|
434 | 434 | $r = 0; |
435 | 435 | |
436 | 436 | $this->rights[$r][0] = 9993; |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | |
486 | 486 | private function initCronJobs() |
487 | 487 | { |
488 | - $this->cronjobs = array(); // List of cron jobs entries to add |
|
488 | + $this->cronjobs = array(); // List of cron jobs entries to add |
|
489 | 489 | // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true), |
490 | 490 | // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true) |
491 | 491 | // ); |
@@ -152,7 +152,7 @@ |
||
152 | 152 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>'; |
153 | 153 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>'; |
154 | 154 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>'; |
155 | - print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
155 | + print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
156 | 156 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>'; |
157 | 157 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>'; |
158 | 158 | print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>'; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | |
180 | 180 | $parameters = array(); |
181 | 181 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
182 | - $action); // Note that $action and $object may have been modified by some hooks |
|
182 | + $action); // Note that $action and $object may have been modified by some hooks |
|
183 | 183 | if ($reshook < 0) { |
184 | 184 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
185 | 185 | } |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | // Add fields from hooks |
292 | 292 | $parameters = array(); |
293 | 293 | $reshook = $hookmanager->executeHooks('printFieldListSelect', |
294 | - $parameters); // Note that $action and $object may have been modified by hook |
|
294 | + $parameters); // Note that $action and $object may have been modified by hook |
|
295 | 295 | $sql .= $hookmanager->resPrint; |
296 | 296 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; |
297 | 297 | if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | // Add where from hooks |
382 | 382 | $parameters = array(); |
383 | 383 | $reshook = $hookmanager->executeHooks('printFieldListWhere', |
384 | - $parameters); // Note that $action and $object may have been modified by hook |
|
384 | + $parameters); // Note that $action and $object may have been modified by hook |
|
385 | 385 | $sql .= $hookmanager->resPrint; |
386 | 386 | $sql .= $db->order($sortfield, $sortorder); |
387 | 387 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); |
@@ -481,7 +481,7 @@ discard block |
||
481 | 481 | |
482 | 482 | $parameters = array(); |
483 | 483 | $reshook = $hookmanager->executeHooks('printFieldPreListTitle', |
484 | - $parameters); // Note that $action and $object may have been modified by hook |
|
484 | + $parameters); // Note that $action and $object may have been modified by hook |
|
485 | 485 | if (empty($reshook)) { |
486 | 486 | $moreforfilter .= $hookmanager->resPrint; |
487 | 487 | } else { |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | |
497 | 497 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
498 | 498 | $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, |
499 | - $varpage); // This also change content of $arrayfields |
|
499 | + $varpage); // This also change content of $arrayfields |
|
500 | 500 | |
501 | 501 | print '<div class="div-table-responsive">'; |
502 | 502 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; |
@@ -593,7 +593,7 @@ discard block |
||
593 | 593 | // Hook fields |
594 | 594 | $parameters = array('arrayfields' => $arrayfields); |
595 | 595 | $reshook = $hookmanager->executeHooks('printFieldListTitle', |
596 | - $parameters); // Note that $action and $object may have been modified by hook |
|
596 | + $parameters); // Note that $action and $object may have been modified by hook |
|
597 | 597 | print $hookmanager->resPrint; |
598 | 598 | if (!empty($arrayfields['t.datec']['checked'])) { |
599 | 599 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | // Fields from hook |
712 | 712 | $parameters = array('arrayfields' => $arrayfields); |
713 | 713 | $reshook = $hookmanager->executeHooks('printFieldListOption', |
714 | - $parameters); // Note that $action and $object may have been modified by hook |
|
714 | + $parameters); // Note that $action and $object may have been modified by hook |
|
715 | 715 | print $hookmanager->resPrint; |
716 | 716 | if (!empty($arrayfields['t.datec']['checked'])) { |
717 | 717 | // Date creation |
@@ -752,116 +752,116 @@ discard block |
||
752 | 752 | // Show here line of result |
753 | 753 | print '<tr ' . $bc[$var] . '>'; |
754 | 754 | |
755 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) |
|
755 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) |
|
756 | 756 | { |
757 | - print '<td>'.$flight->getNomUrl(0).'</td>'; |
|
757 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; |
|
758 | 758 | |
759 | - if (! $i) $totalarray['nbfield']++; |
|
759 | + if (!$i) $totalarray['nbfield']++; |
|
760 | 760 | } |
761 | - if (! empty($arrayfields['t.date']['checked'])) |
|
761 | + if (!empty($arrayfields['t.date']['checked'])) |
|
762 | 762 | { |
763 | 763 | print '<td>'; |
764 | 764 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
765 | 765 | print '</td>'; |
766 | 766 | |
767 | - if (! $i) $totalarray['nbfield']++; |
|
767 | + if (!$i) $totalarray['nbfield']++; |
|
768 | 768 | } |
769 | - if (! empty($arrayfields['t.lieuD']['checked'])) |
|
769 | + if (!empty($arrayfields['t.lieuD']['checked'])) |
|
770 | 770 | { |
771 | - print '<td>'.$obj->lieuD.'</td>'; |
|
771 | + print '<td>' . $obj->lieuD . '</td>'; |
|
772 | 772 | |
773 | - if (! $i) $totalarray['nbfield']++; |
|
773 | + if (!$i) $totalarray['nbfield']++; |
|
774 | 774 | } |
775 | - if (! empty($arrayfields['t.lieuA']['checked'])) |
|
775 | + if (!empty($arrayfields['t.lieuA']['checked'])) |
|
776 | 776 | { |
777 | - print '<td>'.$obj->lieuA.'</td>'; |
|
777 | + print '<td>' . $obj->lieuA . '</td>'; |
|
778 | 778 | |
779 | - if (! $i) $totalarray['nbfield']++; |
|
779 | + if (!$i) $totalarray['nbfield']++; |
|
780 | 780 | } |
781 | - if (! empty($arrayfields['t.heureD']['checked'])) |
|
781 | + if (!empty($arrayfields['t.heureD']['checked'])) |
|
782 | 782 | { |
783 | - print '<td>'.$obj->heureD.'</td>'; |
|
783 | + print '<td>' . $obj->heureD . '</td>'; |
|
784 | 784 | |
785 | - if (! $i) $totalarray['nbfield']++; |
|
785 | + if (!$i) $totalarray['nbfield']++; |
|
786 | 786 | } |
787 | - if (! empty($arrayfields['t.heureA']['checked'])) |
|
787 | + if (!empty($arrayfields['t.heureA']['checked'])) |
|
788 | 788 | { |
789 | - print '<td>'.$obj->heureA.'</td>'; |
|
789 | + print '<td>' . $obj->heureA . '</td>'; |
|
790 | 790 | |
791 | - if (! $i) $totalarray['nbfield']++; |
|
791 | + if (!$i) $totalarray['nbfield']++; |
|
792 | 792 | } |
793 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
793 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
794 | 794 | { |
795 | - print '<td>'.$obj->bal.'</td>'; |
|
795 | + print '<td>' . $obj->bal . '</td>'; |
|
796 | 796 | |
797 | - if (! $i) $totalarray['nbfield']++; |
|
797 | + if (!$i) $totalarray['nbfield']++; |
|
798 | 798 | } |
799 | - if (! empty($arrayfields['t.nbrPax']['checked'])) |
|
799 | + if (!empty($arrayfields['t.nbrPax']['checked'])) |
|
800 | 800 | { |
801 | - print '<td>'.$obj->nbrPax.'</td>'; |
|
801 | + print '<td>' . $obj->nbrPax . '</td>'; |
|
802 | 802 | |
803 | - if (! $i) $totalarray['nbfield']++; |
|
803 | + if (!$i) $totalarray['nbfield']++; |
|
804 | 804 | } |
805 | - if (! empty($arrayfields['t.remarque']['checked'])) |
|
805 | + if (!empty($arrayfields['t.remarque']['checked'])) |
|
806 | 806 | { |
807 | - print '<td>'.$obj->remarque.'</td>'; |
|
807 | + print '<td>' . $obj->remarque . '</td>'; |
|
808 | 808 | |
809 | - if (! $i) $totalarray['nbfield']++; |
|
809 | + if (!$i) $totalarray['nbfield']++; |
|
810 | 810 | } |
811 | - if (! empty($arrayfields['t.incidents']['checked'])) |
|
811 | + if (!empty($arrayfields['t.incidents']['checked'])) |
|
812 | 812 | { |
813 | - print '<td>'.$obj->incidents.'</td>'; |
|
813 | + print '<td>' . $obj->incidents . '</td>'; |
|
814 | 814 | |
815 | - if (! $i) $totalarray['nbfield']++; |
|
815 | + if (!$i) $totalarray['nbfield']++; |
|
816 | 816 | } |
817 | - if (! empty($arrayfields['t.fk_type']['checked'])) |
|
817 | + if (!empty($arrayfields['t.fk_type']['checked'])) |
|
818 | 818 | { |
819 | - print '<td>'.$obj->flight_type.'</td>'; |
|
819 | + print '<td>' . $obj->flight_type . '</td>'; |
|
820 | 820 | |
821 | - if (! $i) $totalarray['nbfield']++; |
|
821 | + if (!$i) $totalarray['nbfield']++; |
|
822 | 822 | } |
823 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) |
|
823 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) |
|
824 | 824 | { |
825 | - print '<td>'.$obj->pilot.'</td>'; |
|
825 | + print '<td>' . $obj->pilot . '</td>'; |
|
826 | 826 | |
827 | - if (! $i) $totalarray['nbfield']++; |
|
827 | + if (!$i) $totalarray['nbfield']++; |
|
828 | 828 | } |
829 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
|
829 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) |
|
830 | 830 | { |
831 | - print '<td>'.$obj->organisator.'</td>'; |
|
831 | + print '<td>' . $obj->organisator . '</td>'; |
|
832 | 832 | |
833 | - if (! $i) $totalarray['nbfield']++; |
|
833 | + if (!$i) $totalarray['nbfield']++; |
|
834 | 834 | } |
835 | - if (! empty($arrayfields['t.is_facture']['checked'])) |
|
835 | + if (!empty($arrayfields['t.is_facture']['checked'])) |
|
836 | 836 | { |
837 | 837 | $flight->is_facture = $obj->is_facture; |
838 | - print '<td>'.$flight->getLibStatut(3).'</td>'; |
|
838 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; |
|
839 | 839 | |
840 | - if (! $i) $totalarray['nbfield']++; |
|
840 | + if (!$i) $totalarray['nbfield']++; |
|
841 | 841 | } |
842 | - if (! empty($arrayfields['t.kilometers']['checked'])) |
|
842 | + if (!empty($arrayfields['t.kilometers']['checked'])) |
|
843 | 843 | { |
844 | - print '<td>'.$obj->kilometers.'</td>'; |
|
844 | + print '<td>' . $obj->kilometers . '</td>'; |
|
845 | 845 | |
846 | - if (! $i) $totalarray['nbfield']++; |
|
846 | + if (!$i) $totalarray['nbfield']++; |
|
847 | 847 | } |
848 | - if (! empty($arrayfields['t.cost']['checked'])) |
|
848 | + if (!empty($arrayfields['t.cost']['checked'])) |
|
849 | 849 | { |
850 | - print '<td>'.$obj->cost.'</td>'; |
|
850 | + print '<td>' . $obj->cost . '</td>'; |
|
851 | 851 | |
852 | - if (! $i) $totalarray['nbfield']++; |
|
852 | + if (!$i) $totalarray['nbfield']++; |
|
853 | 853 | } |
854 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) |
|
854 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) |
|
855 | 855 | { |
856 | - print '<td>'.$obj->receiver.'</td>'; |
|
856 | + print '<td>' . $obj->receiver . '</td>'; |
|
857 | 857 | |
858 | - if (! $i) $totalarray['nbfield']++; |
|
858 | + if (!$i) $totalarray['nbfield']++; |
|
859 | 859 | } |
860 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
|
860 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) |
|
861 | 861 | { |
862 | - print '<td>'.$obj->justif_kilometers.'</td>'; |
|
862 | + print '<td>' . $obj->justif_kilometers . '</td>'; |
|
863 | 863 | |
864 | - if (! $i) $totalarray['nbfield']++; |
|
864 | + if (!$i) $totalarray['nbfield']++; |
|
865 | 865 | } |
866 | 866 | |
867 | 867 | // Extra fields |
@@ -886,7 +886,7 @@ discard block |
||
886 | 886 | // Fields from hook |
887 | 887 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
888 | 888 | $reshook = $hookmanager->executeHooks('printFieldListValue', |
889 | - $parameters); // Note that $action and $object may have been modified by hook |
|
889 | + $parameters); // Note that $action and $object may have been modified by hook |
|
890 | 890 | print $hookmanager->resPrint; |
891 | 891 | // Date creation |
892 | 892 | if (!empty($arrayfields['t.datec']['checked'])) { |
@@ -963,7 +963,7 @@ discard block |
||
963 | 963 | |
964 | 964 | $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); |
965 | 965 | $reshook = $hookmanager->executeHooks('printFieldListFooter', |
966 | - $parameters); // Note that $action and $object may have been modified by hook |
|
966 | + $parameters); // Note that $action and $object may have been modified by hook |
|
967 | 967 | print $hookmanager->resPrint; |
968 | 968 | |
969 | 969 | print '</table>' . "\n"; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | $bbcTypes = new Bbctypes($db); |
56 | 56 | |
57 | - $bbcTypes->fetchAll('','',0,0, [ |
|
57 | + $bbcTypes->fetchAll('', '', 0, 0, [ |
|
58 | 58 | "active" => $active |
59 | 59 | ]); |
60 | 60 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | print '<select class="flat" name="' . $htmlname . '">'; |
80 | 80 | |
81 | - if($showempty){ |
|
81 | + if ($showempty) { |
|
82 | 82 | print sprintf('<option selected="%s" value=""></option>', (($selected == "" || $selected = 0 || $selected == -1) ? "selected" : "")); |
83 | 83 | } |
84 | 84 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | print ' selected="selected"'; |
89 | 89 | } |
90 | 90 | print '>'; |
91 | - echo "T".$flightType->numero . '-' . $flightType->nom; |
|
91 | + echo "T" . $flightType->numero . '-' . $flightType->nom; |
|
92 | 92 | print "</option>"; |
93 | 93 | } |
94 | 94 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | print '<select class="flat" name="' . $htmlname . '">'; |
111 | 111 | |
112 | 112 | print '<option value=""'; |
113 | - if ($selected == -1 || $selected == ''|| $selected == 0) { |
|
113 | + if ($selected == -1 || $selected == '' || $selected == 0) { |
|
114 | 114 | print ' selected="selected"'; |
115 | 115 | } |
116 | 116 | print '> </option>'; |
@@ -156,17 +156,17 @@ discard block |
||
156 | 156 | * |
157 | 157 | * @return string |
158 | 158 | */ |
159 | -function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true){ |
|
159 | +function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true) { |
|
160 | 160 | |
161 | 161 | global $db; |
162 | 162 | |
163 | 163 | $sql = "SELECT USR.rowid, USR.lastname, USR.firstname, QUARTER(VOL.date) as quartil "; |
164 | 164 | |
165 | - if($groupBy){ |
|
166 | - $sql.= " , SUM(VOL.kilometers) as SUM"; |
|
167 | - $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight"; |
|
168 | - }else{ |
|
169 | - $sql.= " , VOL.*"; |
|
165 | + if ($groupBy) { |
|
166 | + $sql .= " , SUM(VOL.kilometers) as SUM"; |
|
167 | + $sql .= " , COUNT(VOL.idBBC_vols) as nbrFlight"; |
|
168 | + } else { |
|
169 | + $sql .= " , VOL.*"; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | $sql .= " FROM llx_bbc_vols as VOL"; |
@@ -176,15 +176,15 @@ discard block |
||
176 | 176 | $sql .= " AND YEAR(VOL.date) = " . ($year ?: 'YEAR(NOW())'); |
177 | 177 | $sql .= " AND ( VOL.fk_type = 1 OR VOL.fk_type = 2 ) "; |
178 | 178 | |
179 | - if($pilotId !== null){ |
|
180 | - $sql .= " AND USR.rowid = ".$pilotId; |
|
179 | + if ($pilotId !== null) { |
|
180 | + $sql .= " AND USR.rowid = " . $pilotId; |
|
181 | 181 | } |
182 | 182 | |
183 | - if($quarter !== null){ |
|
184 | - $sql .= " AND QUARTER(VOL.date) = ".$quarter; |
|
183 | + if ($quarter !== null) { |
|
184 | + $sql .= " AND QUARTER(VOL.date) = " . $quarter; |
|
185 | 185 | } |
186 | 186 | |
187 | - if($groupBy){ |
|
187 | + if ($groupBy) { |
|
188 | 188 | $sql .= " GROUP BY QUARTER(VOL.date), VOL.fk_pilot"; |
189 | 189 | } |
190 | 190 | $sql .= " ORDER BY QUARTER(VOL.date), VOL.fk_pilot"; |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | * |
200 | 200 | * @return array |
201 | 201 | */ |
202 | -function findFlightByPilotAndQuarter($pilotId, $year, $quarter){ |
|
202 | +function findFlightByPilotAndQuarter($pilotId, $year, $quarter) { |
|
203 | 203 | global $db; |
204 | 204 | |
205 | 205 | $sql = generateQuarterQuery($year, $pilotId, $quarter, false); |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | print '</tr>'; |
324 | 324 | |
325 | 325 | foreach ($kmByQuartil as $id => $rembKm) { |
326 | - if(!$user->rights->flightLog->vol->detail && $id != $user->id){ |
|
326 | + if (!$user->rights->flightLog->vol->detail && $id != $user->id) { |
|
327 | 327 | continue; |
328 | 328 | } |
329 | 329 | |
@@ -477,10 +477,10 @@ discard block |
||
477 | 477 | |
478 | 478 | $graphData = new GraphicalData(); |
479 | 479 | |
480 | - foreach(getFlightYears() as $flightYear){ |
|
480 | + foreach (getFlightYears() as $flightYear) { |
|
481 | 481 | $pieceData = new YearGraphicalData($flightYear); |
482 | 482 | |
483 | - foreach($flightTypes as $flightType){ |
|
483 | + foreach ($flightTypes as $flightType) { |
|
484 | 484 | $pieceData->addType(new GraphicalType($flightType->id, $flightType->nom)); |
485 | 485 | } |
486 | 486 |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $langs->load("other"); |
57 | 57 | |
58 | 58 | // Get parameters |
59 | -$id = GETPOST('id', 'int')?: GETPOST('idBBC_vols', 'int'); |
|
59 | +$id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int'); |
|
60 | 60 | $action = GETPOST('action', 'alpha'); |
61 | 61 | $cancel = GETPOST('cancel'); |
62 | 62 | $backtopage = GETPOST('backtopage'); |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
107 | 107 | |
108 | 108 | // Load object |
109 | -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 |
|
109 | +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 |
|
110 | 110 | |
111 | 111 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
112 | 112 | $hookmanager->initHooks(array('bbcvols')); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | $parameters = array(); |
127 | 127 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
128 | - $action); // Note that $action and $object may have been modified by some hooks |
|
128 | + $action); // Note that $action and $object may have been modified by some hooks |
|
129 | 129 | if ($reshook < 0) { |
130 | 130 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
131 | 131 | } |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | $object->id = $object->idBBC_vols; |
215 | 215 | $object->lieuD = GETPOST('lieuD', 'alpha'); |
216 | 216 | $object->lieuA = GETPOST('lieuA', 'alpha'); |
217 | - $object->heureD = GETPOST('heureD_h', 'int').":".GETPOST('heureD_m', 'int').":00"; |
|
218 | - $object->heureA = GETPOST('heureA_h', 'int').":".GETPOST('heureA_m', 'int').":00"; |
|
217 | + $object->heureD = GETPOST('heureD_h', 'int') . ":" . GETPOST('heureD_m', 'int') . ":00"; |
|
218 | + $object->heureA = GETPOST('heureA_h', 'int') . ":" . GETPOST('heureA_m', 'int') . ":00"; |
|
219 | 219 | $object->BBC_ballons_idBBC_ballons = GETPOST('BBC_ballons_idBBC_ballons', 'int'); |
220 | 220 | $object->nbrPax = GETPOST('nbrPax', 'alpha'); |
221 | 221 | $object->remarque = GETPOST('remarque', 'alpha'); |
@@ -236,12 +236,12 @@ discard block |
||
236 | 236 | null, 'errors'); |
237 | 237 | } |
238 | 238 | |
239 | - if(!dol_validElement($object->lieuD)){ |
|
239 | + if (!dol_validElement($object->lieuD)) { |
|
240 | 240 | $error++; |
241 | 241 | setEventMessage("Erreur le champ : lieu de décollage", 'errors'); |
242 | 242 | } |
243 | 243 | |
244 | - if(!dol_validElement($object->lieuA)){ |
|
244 | + if (!dol_validElement($object->lieuA)) { |
|
245 | 245 | $error++; |
246 | 246 | setEventMessage("Erreur le champ : lieu d'atterissage", 'errors'); |
247 | 247 | } |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | setEventMessage("Erreur avec les heures de vol", 'errors'); |
254 | 254 | } |
255 | 255 | |
256 | - if(!is_numeric($object->nbrPax) || $object->nbrPax < 0 ){ |
|
256 | + if (!is_numeric($object->nbrPax) || $object->nbrPax < 0) { |
|
257 | 257 | $error++; |
258 | 258 | setEventMessage("Erreur le champ : nombre de passagers", 'errors'); |
259 | 259 | } |
260 | 260 | |
261 | - if(!$pilotService->isPilot($object->fk_pilot)){ |
|
261 | + if (!$pilotService->isPilot($object->fk_pilot)) { |
|
262 | 262 | $error++; |
263 | 263 | setEventMessage("Le pilote selectionne n'est pas pilote", 'errors'); |
264 | 264 | } |
@@ -399,18 +399,18 @@ discard block |
||
399 | 399 | select_balloons($object->BBC_ballons_idBBC_ballons, "BBC_ballons_idBBC_ballons"); |
400 | 400 | print "</td></tr>"; |
401 | 401 | print "<tr><td class=\"fieldrequired\">" . $langs->trans("FieldnbrPax") . "</td><td><input class=\"flat\" type=\"number\" name=\"nbrPax\" value=\"" . $object->nbrPax . "\"></td></tr>"; |
402 | - print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">".$object->remarque."</textarea></td></tr>"; |
|
403 | - print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">".$object->incidents."</textarea></td></tr>"; |
|
402 | + print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">" . $object->remarque . "</textarea></td></tr>"; |
|
403 | + print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">" . $object->incidents . "</textarea></td></tr>"; |
|
404 | 404 | print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_type") . "</td><td>"; |
405 | 405 | select_flight_type($object->fk_type, "fk_type"); |
406 | 406 | print "</td></tr>"; |
407 | - 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>"; |
|
408 | - print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>".$form->select_dolusers($object->fk_organisateur, "fk_organisateur")."</td></tr>"; |
|
407 | + 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>"; |
|
408 | + print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>" . $form->select_dolusers($object->fk_organisateur, "fk_organisateur") . "</td></tr>"; |
|
409 | 409 | |
410 | - if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) { |
|
410 | + if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) { |
|
411 | 411 | print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldkilometers") . "</td><td><input class=\"flat\" type=\"number\" name=\"kilometers\" value=\"" . $object->kilometers . "\"></td></tr>"; |
412 | 412 | print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldcost") . "</td><td><input class=\"flat\" type=\"number\" name=\"cost\" value=\"" . $object->cost . "\"></td></tr>"; |
413 | - print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver,"fk_receiver", true ) . "</td></tr>"; |
|
413 | + print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver, "fk_receiver", true) . "</td></tr>"; |
|
414 | 414 | print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldjustif_kilometers") . "</td><td><textarea class=\"flat\" name=\"justif_kilometers\">" . $object->justif_kilometers . "</textarea></td></tr>"; |
415 | 415 | } |
416 | 416 | print '</table>'; |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | |
433 | 433 | print load_fiche_titre($langs->trans($pageTitle)); |
434 | 434 | |
435 | - $linkback = '<a href="'.DOL_URL_ROOT.'/flightLog/list.php">'.$langs->trans("BackToList").'</a>'; |
|
435 | + $linkback = '<a href="' . DOL_URL_ROOT . '/flightLog/list.php">' . $langs->trans("BackToList") . '</a>'; |
|
436 | 436 | print $form->showrefnav($object, "idBBC_vols", $linkback, true, "idBBC_vols"); |
437 | 437 | dol_fiche_head(); |
438 | 438 | |
@@ -459,13 +459,13 @@ discard block |
||
459 | 459 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>'; |
460 | 460 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>'; |
461 | 461 | |
462 | - if($user->rights->flightLog->vol->financial){ |
|
462 | + if ($user->rights->flightLog->vol->financial) { |
|
463 | 463 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->is_facture . '</td></tr>'; |
464 | 464 | } |
465 | 465 | |
466 | - if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) { |
|
466 | + if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) { |
|
467 | 467 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>'; |
468 | - print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost ." ". $langs->getCurrencySymbol($conf->currency).'</td></tr>'; |
|
468 | + print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>'; |
|
469 | 469 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>'; |
470 | 470 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>'; |
471 | 471 | } |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | print '<div class="tabsAction">' . "\n"; |
479 | 479 | $parameters = array(); |
480 | 480 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
481 | - $action); // Note that $action and $object may have been modified by hook |
|
481 | + $action); // Note that $action and $object may have been modified by hook |
|
482 | 482 | if ($reshook < 0) { |
483 | 483 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
484 | 484 | } |