BurningFlipside / VolunteerSystem

app/Schedules/class.GridSchedule.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
 
 require_once('../../api/v1/class.Processor.php');
 

Doc Comments +17 added lines

@@ -45,6 +45,11 @@ 
         return ($hour - 12).'p';
     }
 
+    /**
+     * @param integer $hourCount
+     * @param integer $rowCount
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheat
+     */
     protected function grayOutUnused($hourCount, $rowCount, $sheat)
     {
         for($i = 0; $i < $hourCount; $i++)
@@ -74,6 +79,9 @@ 
         }
     }
 
+    /**
+     * @param double $hourCount
+     */
     protected function getHoursArrays($hour, $hourCount)
     {
         $simpleHours = array();
@@ -91,12 +99,21 @@ 
         return array($simpleHours, $militaryHours);
     }
 
+    /**
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheat
+     * @param double $col
+     * @param integer $row
+     */
     protected function createShiftCell($sheat, $col, $row, $shift)
     {
         $sheat->mergeCellsByColumnAndRow($col, $row, $col+$shift['length']-1, $row);
         $this->setShiftNameInCell($sheat, $col, $row, $shift);
     }
 
+    /**
+     * @param double $col
+     * @param \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $sheat
+     */
     protected function getRowForShift($roleID, $rows, $col, $sheat)
     {
         $firstRow = array_search($roleID, $rows);

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
         {
             for($j = 0; $j < $rowCount; $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
                  if($cell->isInMergeRange())
                  {
                       continue;
@@ -93,28 +93,28 @@ 
 
     protected function createShiftCell($sheat, $col, $row, $shift)
     {
-        $sheat->mergeCellsByColumnAndRow($col, $row, $col+$shift['length']-1, $row);
+        $sheat->mergeCellsByColumnAndRow($col, $row, $col + $shift['length'] - 1, $row);
         $this->setShiftNameInCell($sheat, $col, $row, $shift);
     }
 
     protected function getRowForShift($roleID, $rows, $col, $sheat)
     {
         $firstRow = array_search($roleID, $rows);
-        $cell = $sheat->getCellByColumnAndRow($col, $firstRow+4);
+        $cell = $sheat->getCellByColumnAndRow($col, $firstRow + 4);
         if($cell->isInMergeRange())
         {
-            while($rows[$firstRow+$i] === $roleID)
+            while($rows[$firstRow + $i] === $roleID)
             {
-                $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4+$i);
+                $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i);
                 if(!$cell->isInMergeRange())
                 {
                     break;
                 }
                 $i++;
             }
-            return $firstRow+4+$i;
+            return $firstRow + 4 + $i;
         }
-        return $firstRow+4;
+        return $firstRow + 4;
     }
 
     protected function createSpreadSheet()
@@ -161,7 +161,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;
         $tmp = $this->getHoursArrays($start['hour'], $hourCount);
         $simpleHours = $tmp[0];
         $militaryHours = $tmp[1];
@@ -232,13 +232,13 @@ 
         {
             $i = 1;
             $timeDiff = $originalStartTime->diff($shift['startTime']);
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
-            $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart+2, $sheat);
-            $this->createShiftCell($sheat, $hoursFromStart+2, $rowForShift, $shift);
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
+            $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart + 2, $sheat);
+            $this->createShiftCell($sheat, $hoursFromStart + 2, $rowForShift, $shift);
             $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);
         $this->grayOutUnused($hourCount, $rowCount, $sheat);