@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $filter = new \Data\Filter("departmentID eq '$deptId'"); |
| 100 | 100 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 101 | 101 | $roles = $dataTable->read($filter, $odata->select, $odata->top, |
| 102 | - $odata->skip, $odata->orderby); |
|
| 102 | + $odata->skip, $odata->orderby); |
|
| 103 | 103 | if($roles === false) |
| 104 | 104 | { |
| 105 | 105 | $roles = array(); |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | $filter = new \Data\Filter("departmentID eq '$deptId'"); |
| 124 | 124 | $odata = $request->getAttribute('odata', new \ODataParams(array())); |
| 125 | 125 | $shifts = $dataTable->read($filter, $odata->select, $odata->top, |
| 126 | - $odata->skip, $odata->orderby); |
|
| 126 | + $odata->skip, $odata->orderby); |
|
| 127 | 127 | if($shifts === false) |
| 128 | 128 | { |
| 129 | 129 | $shifts = array(); |
@@ -337,15 +337,15 @@ discard block |
||
| 337 | 337 | $shifts[$i]['length'] = $diff->h; |
| 338 | 338 | if(!isset($roles[$shifts[$i]['roleID']])) |
| 339 | 339 | { |
| 340 | - $roles[$shifts[$i]['roleID']] = $shifts[$i]['length']; |
|
| 341 | - $roles2[$shifts[$i]['roleID']] = array(); |
|
| 340 | + $roles[$shifts[$i]['roleID']] = $shifts[$i]['length']; |
|
| 341 | + $roles2[$shifts[$i]['roleID']] = array(); |
|
| 342 | 342 | } |
| 343 | 343 | else |
| 344 | 344 | { |
| 345 | - if($roles[$shifts[$i]['roleID']] < $shifts[$i]['length']) |
|
| 346 | - { |
|
| 347 | - $roles[$shifts[$i]['roleID']] = $shifts[$i]['length']; |
|
| 348 | - } |
|
| 345 | + if($roles[$shifts[$i]['roleID']] < $shifts[$i]['length']) |
|
| 346 | + { |
|
| 347 | + $roles[$shifts[$i]['roleID']] = $shifts[$i]['length']; |
|
| 348 | + } |
|
| 349 | 349 | } |
| 350 | 350 | array_push($roles2[$shifts[$i]['roleID']], array('start'=>$start, 'end'=>$end)); |
| 351 | 351 | } |
@@ -488,17 +488,17 @@ discard block |
||
| 488 | 488 | { |
| 489 | 489 | for($j = 0; $j < $rowCount; $j++) |
| 490 | 490 | { |
| 491 | - $cell = $sheat->getCellByColumnAndRow($i+2, $j+4); |
|
| 492 | - if($cell->isInMergeRange()) |
|
| 493 | - { |
|
| 494 | - continue; |
|
| 495 | - } |
|
| 496 | - else |
|
| 497 | - { |
|
| 498 | - $style = $cell->getStyle(); |
|
| 499 | - $style->getBorders()->getAllBorders()->setBorderStyle(false); |
|
| 500 | - $style->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_LIGHTGRAY); |
|
| 501 | - } |
|
| 491 | + $cell = $sheat->getCellByColumnAndRow($i+2, $j+4); |
|
| 492 | + if($cell->isInMergeRange()) |
|
| 493 | + { |
|
| 494 | + continue; |
|
| 495 | + } |
|
| 496 | + else |
|
| 497 | + { |
|
| 498 | + $style = $cell->getStyle(); |
|
| 499 | + $style->getBorders()->getAllBorders()->setBorderStyle(false); |
|
| 500 | + $style->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_LIGHTGRAY); |
|
| 501 | + } |
|
| 502 | 502 | } |
| 503 | 503 | } |
| 504 | 504 | $sheat->getColumnDimension('A')->setAutoSize(true); |