diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index 8c5ae2460..6f4f1b36f 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -29,7 +29,7 @@ class Dashboard extends CI_Controller { // user is not logged in redirect('user/login'); } - + $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); @@ -41,15 +41,21 @@ class Dashboard extends CI_Controller { if ($qra_position) { $data['qra'] = "set"; $data['qra_lat'] = $qra_position[0]; - $data['qra_lng'] = $qra_position[1]; + $data['qra_lng'] = $qra_position[1]; } else { $data['qra'] = "none"; } } else { $data['qra'] = "none"; } - + $this->load->model('stations'); + $this->load->model('setup_model'); + + $data['countryCount'] = $this->setup_model->getCountryCount(); + $data['logbookCount'] = $this->setup_model->getLogbookCount(); + $data['locationCount'] = $this->setup_model->getLocationCount(); + $data['current_active'] = $this->stations->find_active(); $setup_required = false; @@ -62,7 +68,7 @@ class Dashboard extends CI_Controller { $this->load->view('interface_assets/footer'); } else { - // + // $this->load->model('cat'); $this->load->model('vucc'); @@ -120,7 +126,7 @@ class Dashboard extends CI_Controller { } } - + function radio_display_component() { $this->load->model('cat'); @@ -130,7 +136,7 @@ class Dashboard extends CI_Controller { function map() { $this->load->model('logbook_model'); - + $this->load->library('qra'); $qsos = $this->logbook_model->get_last_qsos('18'); @@ -145,7 +151,7 @@ class Dashboard extends CI_Controller { echo ","; } - if($row->COL_SAT_NAME != null) { + if($row->COL_SAT_NAME != null) { echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: "; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; echo "\",\"label\":\"".$row->COL_CALL."\"}"; @@ -162,10 +168,10 @@ class Dashboard extends CI_Controller { if (count($grids) == 2) { $grid1 = $this->qra->qra2latlong(trim($grids[0])); $grid2 = $this->qra->qra2latlong(trim($grids[1])); - + $coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]); - $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); - + $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); + $stn_loc = $this->qra->get_midpoint($coords); } if (count($grids) == 4) { @@ -173,20 +179,20 @@ class Dashboard extends CI_Controller { $grid2 = $this->qra->qra2latlong(trim($grids[1])); $grid3 = $this->qra->qra2latlong(trim($grids[2])); $grid4 = $this->qra->qra2latlong(trim($grids[3])); - + $coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]); - $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); - $coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]); - $coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]); - + $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); + $coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]); + $coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]); + $stn_loc = $this->qra->get_midpoint($coords); } if($count != 1) { echo ","; } - - if($row->COL_SAT_NAME != null) { + + if($row->COL_SAT_NAME != null) { echo "{\"lat\":\"".$stn_loc[0]."\",\"lng\":\"".$stn_loc[1]."\", \"html\":\"Callsign: ".$row->COL_CALL."
Date/Time: ".$row->COL_TIME_ON."
SAT: ".$row->COL_SAT_NAME."
Mode: "; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; echo "\",\"label\":\"".$row->COL_CALL."\"}"; @@ -195,7 +201,7 @@ class Dashboard extends CI_Controller { echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; echo "\",\"label\":\"".$row->COL_CALL."\"}"; } - + $count++; } else { if($count != 1) { @@ -218,5 +224,5 @@ class Dashboard extends CI_Controller { } - + }