Completed
Push — FVSv2 ( ab906d...c17b7d )
by Patrick
01:58
created
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.
app/Schedules/class.GridSchedule.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $start = date_parse($str);
85 85
         $lastShift = $shifts[$count - 1];
86 86
         $interval = $lastShift['endTime']->diff($shifts[0]['startTime']);
87
-        $hourCount = ($interval->d*24) + $interval->h;
87
+        $hourCount = ($interval->d * 24) + $interval->h;
88 88
         $simpleHours = array();
89 89
         $militaryHours = array();
90 90
         $hour = $start['hour'];
@@ -165,45 +165,45 @@  discard block
 block discarded – undo
165 165
         {
166 166
             $i = 1;
167 167
             $timeDiff = $originalStartTime->diff($shift['startTime']);
168
-            $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h;
168
+            $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h;
169 169
             $firstRow = array_search($shift['roleID'], $rows);
170
-            $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4);
170
+            $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4);
171 171
             if($cell->isInMergeRange())
172 172
             {
173
-                while($rows[$firstRow+$i] === $shift['roleID'])
173
+                while($rows[$firstRow + $i] === $shift['roleID'])
174 174
                 {
175
-                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart+2, $firstRow+4+$i);
175
+                    $cell = $sheat->getCellByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i);
176 176
                     if(!$cell->isInMergeRange())
177 177
                     {
178 178
                         break;
179 179
                     }
180 180
                     $i++;
181 181
                 }
182
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $hoursFromStart+1+$shift['length'], $firstRow+4+$i);
182
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $hoursFromStart + 1 + $shift['length'], $firstRow + 4 + $i);
183 183
                 if(isset($shift['participant']))
184 184
                 {
185
-                    $sheat->setCellValueByColumnAndRow($hoursFromStart+2, $firstRow+4+$i, $this->getParticipantDiplayName($shift['participant']));
185
+                    $sheat->setCellValueByColumnAndRow($hoursFromStart + 2, $firstRow + 4 + $i, $this->getParticipantDiplayName($shift['participant']));
186 186
                 }
187 187
             }
188 188
             else
189 189
             {
190
-                $sheat->mergeCellsByColumnAndRow($hoursFromStart+2, $firstRow+4, $hoursFromStart+1+$shift['length'], $firstRow+4);
190
+                $sheat->mergeCellsByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $hoursFromStart + 1 + $shift['length'], $firstRow + 4);
191 191
                 if(isset($shift['participant']))
192 192
                 {
193
-                    $sheat->setCellValueByColumnAndRow($hoursFromStart+2, $firstRow+4, $this->getParticipantDiplayName($shift['participant']));
193
+                    $sheat->setCellValueByColumnAndRow($hoursFromStart + 2, $firstRow + 4, $this->getParticipantDiplayName($shift['participant']));
194 194
                 }
195 195
             }
196 196
             $shift = array_shift($shifts);
197 197
         }
198 198
         $rowCount = count($rows);
199
-        $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3 + $rowCount);
199
+        $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + $rowCount);
200 200
         $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
201 201
         $hourCount = count($simpleHours);
202 202
         for($i = 0; $i < $hourCount; $i++)
203 203
         {
204 204
             for($j = 0; $j < $rowCount; $j++)
205 205
             {
206
-                 $cell = $sheat->getCellByColumnAndRow($i+2, $j+4);
206
+                 $cell = $sheat->getCellByColumnAndRow($i + 2, $j + 4);
207 207
                  if($cell->isInMergeRange())
208 208
                  {
209 209
                       continue;
Please login to merge, or discard this patch.