diff --git a/application/controllers/Update.php b/application/controllers/Update.php index 3eeb84cc6..6ad01315b 100644 --- a/application/controllers/Update.php +++ b/application/controllers/Update.php @@ -397,8 +397,12 @@ class Update extends CI_Controller { public function update_lotw_sats() { $this->load->model('Update_model'); - $result = $this->Update_model->lotw_sats(); - echo $result; + $bodyData['satupdates'] = $this->Update_model->lotw_sats(); + $data['page_title'] = __("LoTW SAT Update"); + $this->load->view('interface_assets/header', $data); + $this->load->view('lotw/satupdate', $bodyData); + $this->load->view('interface_assets/footer'); + //echo $result; } function version_check() { diff --git a/application/models/Update_model.php b/application/models/Update_model.php index c57f74052..eeede8178 100644 --- a/application/models/Update_model.php +++ b/application/models/Update_model.php @@ -393,13 +393,13 @@ class Update_model extends CI_Model { $existingSats[$row->name] = array($row->lotw, $row->displayname); } - print ''; - print ''; + $result = array(); + foreach ($xml->tqslconfig->satellites->satellite as $sat) { - $name = $sat->attributes()->{'name'}; + $name = ($sat->attributes()->{'name'} ?? '')->__toString(); $startDate = $sat->attributes()->{'startDate'}; $endDate = $sat->attributes()->{'endDate'}; - $displayname = $sat; + $displayname = ($sat ?? '')->__toString(); $status = ''; if (array_key_exists("$name", $existingSats)) { @@ -437,10 +437,9 @@ class Update_model extends CI_Model { $status = __('New SAT. Insert failed.'); } } - print(''); + array_push($result, array('name' => $name, 'displayname' => $displayname, 'startDate' => $startDate, 'endDate' => $endDate, 'status' => $status)); } - print '
'.__('Name').''.__('Display Name').''.__('Start Date').''.__('End Date').''.__('Status').'
'.$name.''.$displayname.''.$startDate.''.$endDate.''.$status.'
'; - return; + return $result; } } diff --git a/application/views/lotw/satupdate.php b/application/views/lotw/satupdate.php new file mode 100644 index 000000000..a00560346 --- /dev/null +++ b/application/views/lotw/satupdate.php @@ -0,0 +1,13 @@ +
+

+ +'; +print ''.__('Name').''.__('Display Name').''.__('Start Date').''.__('End Date').''.__('Status').''; +foreach ($satupdates as $sat) { + print(''.$sat['name'].''.$sat['displayname'].''.$sat['startDate'].''.$sat['endDate'].''.$sat['status'].''); +} +print ''; +?> + +
diff --git a/application/views/satellite/index.php b/application/views/satellite/index.php index 2a82f47c0..7c08fbf16 100644 --- a/application/views/satellite/index.php +++ b/application/views/satellite/index.php @@ -13,6 +13,7 @@
+