BurningFlipside / VolunteerSystem

app/Schedules/class.GridSchedule.php

Spacing +11 added lines, -11 removed lines

@@ -84,7 +84,7 @@ 
         $start = date_parse($str);
         $lastShift = $shifts[$count - 1];
         $interval = $lastShift['endTime']->diff($shifts[0]['startTime']);
-        $hourCount = ($interval->d*24) + $interval->h;
+        $hourCount = ($interval->d * 24) + $interval->h;
         $simpleHours = array();
         $militaryHours = array();
         $hour = $start['hour'];
@@ -165,45 +165,45 @@ 
         {
             $i = 1;
             $timeDiff = $originalStartTime->diff($shift['startTime']);
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
             $firstRow = array_search($shift['roleID'], $rows);
-            $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4);
+            $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4);
             if($cell->isInMergeRange())
             {
-                while($rows[$firstRow+$i] === $shift['roleID'])
+                while($rows[$firstRow + $i] === $shift['roleID'])
                 {
-                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4+$i);
+                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i);
                     if(!$cell->isInMergeRange())
                     {
                         break;
                     }
                     $i++;
                 }
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $hoursFromStart+1+$shift['length'], $firstRow+4+$i);
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $hoursFromStart + 1 + $shift['length'], $firstRow + 4 + $i);
                 if(isset($shift['participant']))
                 {
-                    $sheat->setCellValueByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $this->getParticipantDiplayName($shift['participant']));
+                    $sheat->setCellValueByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $this->getParticipantDiplayName($shift['participant']));
                 }
             }
             else
             {
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4, $hoursFromStart+1+$shift['length'], $firstRow+4);
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $hoursFromStart + 1 + $shift['length'], $firstRow + 4);
                 if(isset($shift['participant']))
                 {
-                    $sheat->setCellValueByColumnAndRow($hoursFromStart+2, $firstRow+4, $this->getParticipantDiplayName($shift['participant']));
+                    $sheat->setCellValueByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $this->getParticipantDiplayName($shift['participant']));
                 }
             }
             $shift = array_shift($shifts);
         }
         $rowCount = count($rows);
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3 + $rowCount);
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + $rowCount);
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
         $hourCount = count($simpleHours);
         for($i = 0; $i < $hourCount; $i++)
         {
             for($j = 0; $j < $rowCount; $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
                  if($cell->isInMergeRange())
                  {
                       continue;