BurningFlipside / VolunteerSystem

api/v1/class.DepartmentAPI.php

Spacing +16 added lines, -16 removed lines

@@ -277,7 +277,7 @@ 
             $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
             if(strlen($shifts[$i]['name']) > 0)
             {
-                $timeStr .=' - <i>'.$shifts[$i]['name'].'</i>';
+                $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
             }
             if(!isset($days[$dateStr]))
             {
@@ -292,22 +292,22 @@ 
         ksort($days);
         foreach($days as $dateStr=>$day)
         {
-            $html .='<h2>'.$dateStr.'</h2>';
+            $html .= '<h2>'.$dateStr.'</h2>';
             uksort($day, array($this, 'groupSort'));
             foreach($day as $shiftStr=>$shifts)
             {
                 usort($shifts, array($this, 'shiftSort'));
-                $html .='<h3>'.$shiftStr.'</h3>';
-                $html .='<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
+                $html .= '<h3>'.$shiftStr.'</h3>';
+                $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
                 foreach($shifts as $shift)
                 {
                     //TODO Volunteer info for shift...
-                    $html .='<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
+                    $html .= '<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
                 }
-                $html .='</table>';
+                $html .= '</table>';
             }
         }
-        $html .='</body>';
+        $html .= '</body>';
         $pdf->setPDFFromHTML($html);
         $response = $response->withHeader('Content-Type', 'application/pdf');
         $response->getBody()->write($pdf->toPDFBuffer());
@@ -356,7 +356,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'];
@@ -458,35 +458,35 @@ 
         {
             $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);
             }
             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);
             }
             $shift = array_shift($shifts);
         }
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3+count($rows));
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + count($rows));
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
         for($i = 0; $i < count($simpleHours); $i++)
         {
             for($j = 0; $j < count($rows); $j++)
             {
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
                  if($cell->isInMergeRange())
                  {
                       continue;