laudeco / bbc-dolibarr-flightlog

query/BillableFlightQueryHandler.php

Spacing +2 added lines, -2 removed lines

@@ -145,7 +145,7 @@ 
 
         //Total damages
         $damages = $this->pilotDamageQueryRepository->query($query->getFiscalYear());
-        foreach($damages as $currentDamage){
+        foreach ($damages as $currentDamage) {
 
             //Pilot doesn't exist
             if (!isset($pilots[$currentDamage->getAuthorId()])) {
@@ -158,7 +158,7 @@ 
             );
 
             // The damage is already invoiced. So not take into account.
-            if($currentDamage->isInvoiced()){
+            if ($currentDamage->isInvoiced()) {
                 $pilots[$currentDamage->getAuthorId()] = $pilots[$currentDamage->getAuthorId()]->addCount(
                     new FlightTypeCount('invoiced_damage', $currentDamage->getAmount(), -1)
                 );

readFlights.php

Spacing +5 added lines, -5 removed lines

@@ -230,7 +230,7 @@ 
     print '<td>' . $pilot->getCountForType('orga_T6')->getCount() . '</td>';
     print '<td>' . $pilot->getCountForType('orga_T6')->getCost()->getValue() . '</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0?'text-muted':'text-bold'). $pilot->getFlightBonus()->getValue() . ' pts</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0 ? 'text-muted' : 'text-bold') . $pilot->getFlightBonus()->getValue() . ' pts</td>';
 
     print '<td>' . $pilot->getCountForType('3')->getCount() . '</td>';
     print '<td>' . price($pilot->getCountForType('3')->getCost()->getValue()) . '€</td>';
@@ -249,8 +249,8 @@ 
     print '<td>' . price($pilot->getCountForType('damage')->getCost()->getValue()) . '€</td>';
     print '<td>' . price($pilot->getCountForType('invoiced_damage')->getCost()->getValue()) . '€</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0?'text-muted':'text-bold'). price($pilot->getFlightsCost()->getValue()) . '€ </td>';
-    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero())?'text-bold':'text-muted'). price($pilot->getTotalBill()->getValue()) . '€</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0 ? 'text-muted' : 'text-bold') . price($pilot->getFlightsCost()->getValue()) . '€ </td>';
+    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero()) ? 'text-bold' : 'text-muted') . price($pilot->getTotalBill()->getValue()) . '€</td>';
     print '</tr>';
 }
 
@@ -275,7 +275,7 @@ 
 print '<td>' . $totalT3 . '</td>';
 print '<td></td>';
 
-print '<td>' . $totalT4. '</td>';
+print '<td>' . $totalT4 . '</td>';
 print '<td></td>';
 
 print '<td>' . $totalT5 . '</td>';
@@ -304,7 +304,7 @@ 
 //table km
 $tauxRemb = isset($conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM) ? $conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM : 0;
 $year = GETPOST("year", 'int');
-if(empty($year)){
+if (empty($year)) {
     $year = date('Y');
 }
 

Infrastructure/Damage/Query/Repository/GetPilotDamagesQueryRepository.php

Spacing +5 added lines, -5 removed lines

@@ -35,16 +35,16 @@
     public function query($year)
     {
         $sql = 'SELECT damage.amount as amount, damage.billed as billed, damage.author_id as author, author.firstname as author_name';
-        $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage';
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'bbc_vols as flight ON flight.rowid = damage.flight_id';
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id';
-        $sql.=' WHERE YEAR(flight.date) = '.$this->db->escape($year);
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'bbc_vols as flight ON flight.rowid = damage.flight_id';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id';
+        $sql .= ' WHERE YEAR(flight.date) = ' . $this->db->escape($year);
 
         $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);
                     $damage = TotalDamage::fromArray($properties);
                     yield $damage;

card_tab_damage.php

Spacing +8 added lines, -8 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'));
@@ -87,12 +87,12 @@ 
         FLIGHTLOG_ACTION_CONFIRM_BILL_DAMAGE => [FlightDamageController::class, 'handleInvoice'],
     ];
 
-    if(isset($routes[$action])){
+    if (isset($routes[$action])) {
         $controllerName = $routes[$action][0];
         $actionName = $routes[$action][1];
 
         call_user_func([new $controllerName($db), $actionName]);
-    }else{
+    } else {
         echo 'Route non trouvée.';
     }
 ?>
@@ -104,13 +104,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>';

Application/Damage/ViewModel/Damage.php

Spacing +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
      *
      * @return Damage
      */
-    public static function fromArray(array $properties){
+    public static function fromArray(array $properties) {
         $author = $properties['author_name'];
         $amount = $properties['amount'];
         $id = $properties['id'];
-        $invoiced = (bool)$properties['invoiced'];
+        $invoiced = (bool) $properties['invoiced'];
 
         return new self($author, $amount, $id, $invoiced);
     }

Application/Damage/Command/InvoiceDamageCommandHandler.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      *
      * @throws \Exception
      */
-    public function __invoke(InvoiceDamageCommand $command){
+    public function __invoke(InvoiceDamageCommand $command) {
         $damage = $this->damageRepository->getById(DamageId::create($command->getDamageId()));
         $damage = $damage->invoice();
         $this->damageRepository->save($damage);

Infrastructure/Common/Repository/AbstractDomainRepository.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
     public function __construct(\DoliDB $db, $tableName)
     {
         $this->db = $db;
-        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX.$tableName;
+        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX . $tableName;
     }
 
     /**
@@ -33,7 +33,7 @@ 
      *
      * @throws \Exception
      */
-    protected function write(array $elements){
+    protected function write(array $elements) {
         $columns = join(',', array_keys($elements));
         $values = join(',', array_map([$this, 'escape'], array_values($elements)));
 
@@ -44,7 +44,7 @@ 
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $id = $this->db->last_insert_id($this->tableName);
@@ -57,16 +57,16 @@ 
      *
      * @return int|string|null
      */
-    private function escape($value){
-        if(is_null($value)){
+    private function escape($value) {
+        if (is_null($value)) {
             return null;
         }
 
-        if(is_bool($value)){
-            return (int)$value;
+        if (is_bool($value)) {
+            return (int) $value;
         }
 
-        return is_string($value) ? $this->db->escape($value) : $value ;
+        return is_string($value) ? $this->db->escape($value) : $value;
     }
 
     /**
@@ -79,18 +79,18 @@ 
     {
         $sqlModifications = [];
 
-        foreach($elements as $field => $value){
+        foreach ($elements as $field => $value) {
             $sqlModifications[] = sprintf('%s=%s', $field, $this->escape($value));
         }
 
         $this->db->begin();
-        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',',$sqlModifications), $id));
+        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',', $sqlModifications), $id));
 
         if (!$resql) {
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $this->db->commit();
@@ -103,8 +103,8 @@ 
      *
      * @return array|null
      */
-    protected function get($id){
-        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id );
+    protected function get($id) {
+        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id);
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -116,7 +116,7 @@ 
             return null;
         }
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             return $this->db->fetch_array($resql);
         }
 

Infrastructure/Damage/Query/Repository/GetDamagesForFlightQueryRepository.php

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@
     public function __invoke($flightId)
     {
         $sql = 'SELECT damage.rowid as id, damage.amount, author.login 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);
                 }

Infrastructure/Damage/Repository/FlightDamageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
             'author_id' => $flightDamage->getAuthor()->getId()
         ];
 
-        if($flightDamage->getId()){
+        if ($flightDamage->getId()) {
             $this->update($flightDamage->getId()->getId(), $fields);
             return;
         }
@@ -50,10 +50,10 @@ 
      *
      * @throws \Exception
      */
-    public function getById(DamageId $id){
+    public function getById(DamageId $id) {
         $damage = $this->get($id->getId());
 
-        if(null === $damage){
+        if (null === $damage) {
             throw new \Exception('Damage not found');
         }