Completed
Push — FVSv2 ( 1cad04...78f5f9 )
by Patrick
01:35
created
api/v1/class.DepartmentAPI.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
         $start = date_parse($str);
309 309
         $lastShift = $shifts[$count - 1];
310 310
         $interval = $lastShift['endTime']->diff($shifts[0]['startTime']);
311
-        $hourCount = ($interval->d*24) + $interval->h;
311
+        $hourCount = ($interval->d * 24) + $interval->h;
312 312
         $simpleHours = array();
313 313
         $militaryHours = array();
314 314
         $hour = $start['hour'];
@@ -410,37 +410,37 @@  discard block
 block discarded – undo
410 410
         {
411 411
             $i = 1;
412 412
             $timeDiff = $originalStartTime->diff($shift['startTime']);
413
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
413
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
414 414
             $firstRow = array_search($shift['roleID'], $rows);
415
-            $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4);
415
+            $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4);
416 416
             if($cell->isInMergeRange())
417 417
             {
418
-                while($rows[$firstRow+$i] === $shift['roleID'])
418
+                while($rows[$firstRow + $i] === $shift['roleID'])
419 419
                 {
420
-                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4+$i);
420
+                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i);
421 421
                     if(!$cell->isInMergeRange())
422 422
                     {
423 423
                         break;
424 424
                     }
425 425
                     $i++;
426 426
                 }
427
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $hoursFromStart+1+$shift['length'], $firstRow+4+$i);
427
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $hoursFromStart + 1 + $shift['length'], $firstRow + 4 + $i);
428 428
             }
429 429
             else
430 430
             {
431
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4, $hoursFromStart+1+$shift['length'], $firstRow+4);
431
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $hoursFromStart + 1 + $shift['length'], $firstRow + 4);
432 432
             }
433 433
             $shift = array_shift($shifts);
434 434
         }
435 435
         $rowCount = count($rows);
436
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3 + $rowCount);
436
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + $rowCount);
437 437
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
438 438
         $hourCount = count($simpleHours);
439 439
         for($i = 0; $i < $hourCount; $i++)
440 440
         {
441 441
             for($j = 0; $j < $rowCount; $j++)
442 442
             {
443
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
443
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
444 444
                  if($cell->isInMergeRange())
445 445
                  {
446 446
                       continue;
Please login to merge, or discard this patch.
app/VolunteerAutoload.php 1 patch
Braces   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,29 +1,29 @@
 block discarded – undo
1 1
 <?php
2
-function VolunteerAutoload($classname)
3
-{
2
+function VolunteerAutoload($classname)
3
+{
4 4
     $classname = str_replace('/', '\\', $classname);
5 5
     $classname = ltrim($classname, '\\');
6 6
     $filename  = '';
7 7
     $namespace = '';
8
-    if($lastNsPos = strrpos($classname, '\\'))
9
-    {
8
+    if($lastNsPos = strrpos($classname, '\\'))
9
+    {
10 10
         $namespace = substr($classname, 0, $lastNsPos);
11 11
         $classname = substr($classname, $lastNsPos + 1);
12 12
         $filename  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
13 13
     }
14 14
     $filename = __DIR__.DIRECTORY_SEPARATOR.$filename.'class.'.$classname.'.php';
15
-    if(is_readable($filename))
16
-    {
15
+    if(is_readable($filename))
16
+    {
17 17
         require $filename;
18 18
     }
19 19
 }
20 20
 
21
-if(version_compare(PHP_VERSION, '5.3.0', '>='))
22
-{
21
+if(version_compare(PHP_VERSION, '5.3.0', '>='))
22
+{
23 23
     spl_autoload_register('VolunteerAutoload', true, true);
24
-}
25
-else
26
-{
24
+}
25
+else
26
+{
27 27
     spl_autoload_register('VolunteerAutoload');
28 28
 }
29 29
 /* vim: set tabstop=4 shiftwidth=4 expandtab: */
Please login to merge, or discard this patch.
app/Schedules/class.SimplePDF.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             $timeStr = $start->format('g:i A').' till '.$end->format('g:i A');
36 36
             if(strlen($shifts[$i]['name']) > 0)
37 37
             {
38
-                $timeStr .=' - <i>'.$shifts[$i]['name'].'</i>';
38
+                $timeStr .= ' - <i>'.$shifts[$i]['name'].'</i>';
39 39
             }
40 40
             if(!isset($days[$dateStr]))
41 41
             {
@@ -50,22 +50,22 @@  discard block
 block discarded – undo
50 50
         ksort($days);
51 51
         foreach($days as $dateStr=>$day)
52 52
         {
53
-            $html .='<h2>'.$dateStr.'</h2>';
53
+            $html .= '<h2>'.$dateStr.'</h2>';
54 54
             uksort($day, array($this, 'groupSort'));
55 55
             foreach($day as $shiftStr=>$shifts)
56 56
             {
57 57
                 usort($shifts, array($this, 'shiftSort'));
58
-                $html .='<h3>'.$shiftStr.'</h3>';
59
-                $html .='<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
58
+                $html .= '<h3>'.$shiftStr.'</h3>';
59
+                $html .= '<table width="100%"><tr><th style="width: 20%">Role</th><th>Volunteer Name</th><th>Volunteer Camp</th></tr>';
60 60
                 foreach($shifts as $shift)
61 61
                 {
62 62
                     //TODO Volunteer info for shift...
63
-                    $html .='<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
63
+                    $html .= '<tr><td>'.$this->getRoleNameFromID($shift['roleID']).'</td><td></td><td></td></tr>';
64 64
                 }
65
-                $html .='</table>';
65
+                $html .= '</table>';
66 66
             }
67 67
         }
68
-        $html .='</body>';
68
+        $html .= '</body>';
69 69
         $this->setPDFFromHTML($html);
70 70
     }
71 71
 } 
Please login to merge, or discard this patch.