@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $this->addLink('Home', '..'); |
| 50 | 50 | if($this->user === false || $this->user === null) |
| 51 | 51 | { |
| 52 | - $this->content['body'] = ' |
|
| 52 | + $this->content['body'] = ' |
|
| 53 | 53 | <div id="content"> |
| 54 | 54 | <div class="row"> |
| 55 | 55 | <div class="col-lg-12"> |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | else if($this->isAdmin() === false) |
| 63 | 63 | { |
| 64 | - $this->content['body'] = ' |
|
| 64 | + $this->content['body'] = ' |
|
| 65 | 65 | <div id="content"> |
| 66 | 66 | <div class="row"> |
| 67 | 67 | <div class="col-lg-12"> |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | </div> |
| 71 | 71 | </div> |
| 72 | 72 | '; |
| 73 | - $this->content['header'] = array(); |
|
| 74 | - $this->content['cards'] = array(); |
|
| 73 | + $this->content['header'] = array(); |
|
| 74 | + $this->content['cards'] = array(); |
|
| 75 | 75 | } |
| 76 | 76 | return parent::getContent(); |
| 77 | 77 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | { |
| 32 | 32 | return null; |
| 33 | 33 | } |
| 34 | - $data = $this->getArray($array); |
|
| 34 | + $data = $this->getArray($array); |
|
| 35 | 35 | $ssheat = new Spreadsheet(); |
| 36 | 36 | $sheat = $ssheat->getActiveSheet(); |
| 37 | 37 | $keys = array_shift($data); |
@@ -15,12 +15,12 @@ |
||
| 15 | 15 | |
| 16 | 16 | public function open($savePath, $sessionName) |
| 17 | 17 | { |
| 18 | - $this->dataTable = \Flipside\DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName); |
|
| 19 | - if($this->dataTable) |
|
| 20 | - { |
|
| 21 | - return true; |
|
| 22 | - } |
|
| 23 | - return false; |
|
| 18 | + $this->dataTable = \Flipside\DataSetFactory::getDataTableByNames($this->dataSetName, $this->dataTableName); |
|
| 19 | + if($this->dataTable) |
|
| 20 | + { |
|
| 21 | + return true; |
|
| 22 | + } |
|
| 23 | + return false; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public function close() |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $odata = $request->getAttribute('odata', new \Flipside\ODataParams(array())); |
| 109 | 109 | $params = $this->manipulateParameters($request, $odata); |
| 110 | 110 | $areas = $dataTable->read($odata->filter, $odata->select, $odata->top, |
| 111 | - $odata->skip, $odata->orderby, $params); |
|
| 111 | + $odata->skip, $odata->orderby, $params); |
|
| 112 | 112 | if($areas === false) |
| 113 | 113 | { |
| 114 | 114 | $areas = array(); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $odata = $request->getAttribute('odata', new \Flipside\ODataParams(array())); |
| 160 | 160 | $filter = $this->getFilterForPrimaryKey($args['name']); |
| 161 | 161 | $areas = $dataTable->read($filter, $odata->select, $odata->top, |
| 162 | - $odata->skip, $odata->orderby); |
|
| 162 | + $odata->skip, $odata->orderby); |
|
| 163 | 163 | if(empty($areas)) |
| 164 | 164 | { |
| 165 | 165 | return $response->withStatus(404); |