@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $cell = $sheat->getCellByColumnAndRow($col, $firstRow + 4); |
| 105 | 105 | if($cell->isInMergeRange()) |
| 106 | 106 | { |
| 107 | - while($rows[$firstRow+$i] === $roleID) |
|
| 107 | + while($rows[$firstRow + $i] === $roleID) |
|
| 108 | 108 | { |
| 109 | 109 | $cell = $sheat->getCellByColumnAndRow($col, $firstRow + 4 + $i); |
| 110 | 110 | if(!$cell->isInMergeRange()) |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $start = date_parse($str); |
| 163 | 163 | $lastShift = $shifts[$count - 1]; |
| 164 | 164 | $interval = $lastShift['endTime']->diff($shifts[0]['startTime']); |
| 165 | - $hourCount = ($interval->d*24) + $interval->h; |
|
| 165 | + $hourCount = ($interval->d * 24) + $interval->h; |
|
| 166 | 166 | $tmp = $this->getHoursArrays($start['hour'], $hourCount); |
| 167 | 167 | $simpleHours = $tmp[0]; |
| 168 | 168 | $militaryHours = $tmp[1]; |
@@ -232,13 +232,13 @@ discard block |
||
| 232 | 232 | while($shift) |
| 233 | 233 | { |
| 234 | 234 | $timeDiff = $originalStartTime->diff($shift['startTime']); |
| 235 | - $hoursFromStart = ($timeDiff->d*24)+$timeDiff->h; |
|
| 236 | - $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart+2, $sheat); |
|
| 237 | - $this->createShiftCell($sheat, $hoursFromStart+2, $rowForShift, $shift); |
|
| 235 | + $hoursFromStart = ($timeDiff->d * 24) + $timeDiff->h; |
|
| 236 | + $rowForShift = $this->getRowForShift($shift['roleID'], $rows, $hoursFromStart + 2, $sheat); |
|
| 237 | + $this->createShiftCell($sheat, $hoursFromStart + 2, $rowForShift, $shift); |
|
| 238 | 238 | $shift = array_shift($shifts); |
| 239 | 239 | } |
| 240 | 240 | $rowCount = count($rows); |
| 241 | - $style = $sheat->getStyleByColumnAndRow(2, 4, 1+count($simpleHours), 3 + $rowCount); |
|
| 241 | + $style = $sheat->getStyleByColumnAndRow(2, 4, 1 + count($simpleHours), 3 + $rowCount); |
|
| 242 | 242 | $style->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN); |
| 243 | 243 | $hourCount = count($simpleHours); |
| 244 | 244 | $this->grayOutUnused($hourCount, $rowCount, $sheat); |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 92 | 92 | $filter = $this->getFilterForPrimaryKey($uid); |
| 93 | 93 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
| 94 | - $odata->skip, $odata->orderby); |
|
| 94 | + $odata->skip, $odata->orderby); |
|
| 95 | 95 | if(empty($areas)) |
| 96 | 96 | { |
| 97 | 97 | return $response->withStatus(404); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 163 | 163 | $filter = $this->getFilterForPrimaryKey($uid); |
| 164 | 164 | $areas = $dataTable->read($filter, array('certs'), $odata->top, |
| 165 | - $odata->skip, $odata->orderby); |
|
| 165 | + $odata->skip, $odata->orderby); |
|
| 166 | 166 | if(empty($areas)) |
| 167 | 167 | { |
| 168 | 168 | return $response->withStatus(404); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | $filter = new \Data\Filter("departmentID eq '$deptId'"); |
| 78 | 78 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 79 | 79 | $roles = $dataTable->read($filter, $odata->select, $odata->top, |
| 80 | - $odata->skip, $odata->orderby); |
|
| 80 | + $odata->skip, $odata->orderby); |
|
| 81 | 81 | if($roles === false) |
| 82 | 82 | { |
| 83 | 83 | $roles = array(); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | $shifts = $dataTable->read($filter, $odata->select, $odata->top, |
| 117 | - $odata->skip, $odata->orderby); |
|
| 117 | + $odata->skip, $odata->orderby); |
|
| 118 | 118 | if($shifts === false) |
| 119 | 119 | { |
| 120 | 120 | $shifts = array(); |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | $shifts = $dataTable->read($filter, $odata->select, $odata->top, |
| 90 | - $odata->skip, $odata->orderby); |
|
| 90 | + $odata->skip, $odata->orderby); |
|
| 91 | 91 | if($shifts === false) |
| 92 | 92 | { |
| 93 | 93 | $shifts = array(); |