Merge pull request #303 from dbarzin/dev

code quality

Author: dbarzin

app/Calendar.php

@@ -92,13 +92,15 @@ public function __toString()
             foreach ($this->events as $event) {
                 for ($d = 0; $d <= $event[2] - 1; $d++) {
                     if (date('y-m-d', strtotime($this->active_year . '-' . $this->active_month . '-' . $i . ' -' . $d . ' day')) === date('y-m-d', strtotime($event[1]))) {
-                        if ($event[4]!==null)
+                        if ($event[4] !== null) {
                             $html .= '<a href="/bob/show/' . $event[4] . '">';
+                        }
                         $html .= '<div class="event' . $event[3] . '">';
                         $html .= $event[0];
                         $html .= '</div>';
-                        if ($event[4]!==null)
+                        if ($event[4] !== null) {
                             $html .= '</a>';
+                        }
                     }
                 }
             }

app/Http/Controllers/ControlController.php

@@ -722,7 +722,8 @@ public function history()
                 'controls.realisation_date',
                 'controls.plan_date',
                 'controls.periodicity',
-                'measures.clause')
+                'measures.clause'
+            )
             ->leftJoin('control_measure', 'controls.id', '=', 'control_measure.control_id')
             ->join('measures', 'control_measure.measure_id', '=', 'measures.id')
             ->get();
@@ -739,8 +740,8 @@ public function history()
         foreach ($controls as $control) {
             $expandedControls->push($control);
 
-            if (($control->realisation_date==null)&&
-                ($control->periodicity>0)&&($control->periodicity<=12))
+            if (($control->realisation_date === null) &&
+                ($control->periodicity > 0) && ($control->periodicity <= 12)) {
                 for ($i = 1; $i <= 12 / $control->periodicity; $i++) {
                     $repeatedControl = clone $control;
                     $repeatedControl->id = null;
@@ -750,6 +751,7 @@ public function history()
                     $repeatedControl->plan_date = Carbon::parse($control->plan_date)->addMonthsNoOverflow($i * $control->periodicity);
                     $expandedControls->push($repeatedControl);
                 }
+            }
         }
         // Return view with controls
         return view('controls.history')

app/Http/Controllers/HomeController.php

@@ -205,5 +205,4 @@ private function getExpandedControls()
             return $expanded;
         });
     }
-
 }

app/Http/Controllers/MeasureController.php

@@ -197,11 +197,11 @@ public function show(int $id)
 
         // Get associate controls
         $controls = DB::table('controls')
-                ->select('controls.id','controls.name','controls.scope','score','controls.status','realisation_date','plan_date')
-                ->join('control_measure', 'control_measure.control_id', '=', 'controls.id')
-                ->leftjoin('actions', 'actions.control_id', '=', 'controls.id')
-                ->where('control_measure.measure_id', $id)
-                ->get();
+            ->select('controls.id', 'controls.name', 'controls.scope', 'score', 'controls.status', 'realisation_date', 'plan_date')
+            ->join('control_measure', 'control_measure.control_id', '=', 'controls.id')
+            ->leftjoin('actions', 'actions.control_id', '=', 'controls.id')
+            ->where('control_measure.measure_id', $id)
+            ->get();
 
         return view('measures.show')
             ->with('measure', $measure)