From e80c9b8ef858a783413f908d38d3232bdcf3dcdf Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 4 Oct 2020 21:41:01 +0200 Subject: [PATCH] Added mode, view and controller for accumulated stats. --- application/controllers/Accumulated.php | 56 +++++++++++ application/models/Accumulate_model.php | 93 +++++++++++++++++++ application/views/accumulate/index.php | 59 ++++++++++++ application/views/interface_assets/header.php | 2 + 4 files changed, 210 insertions(+) create mode 100644 application/controllers/Accumulated.php create mode 100644 application/models/Accumulate_model.php create mode 100644 application/views/accumulate/index.php diff --git a/application/controllers/Accumulated.php b/application/controllers/Accumulated.php new file mode 100644 index 00000000..a943c06c --- /dev/null +++ b/application/controllers/Accumulated.php @@ -0,0 +1,56 @@ +load->model('user_model'); + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + public function index() + { + // Render Page + $data['page_title'] = "Accumulated statistics"; + + $this->load->model('Accumulate_model'); + + if ($this->input->post('band') != NULL) { // Band is not set when page first loads. + $band = $this->input->post('band'); + } + else { + $band = 'All'; + } + + $data['accumulated_dxcc_array'] = $this->Accumulate_model->get_accumulated_dxcc($band); + $data['worked_bands'] = $this->Accumulate_model->get_worked_bands(); + $data['bandselect'] = $band; + + $this->load->view('interface_assets/header', $data); + $this->load->view('accumulate/index'); + $this->load->view('interface_assets/footer'); + } + + public function details() { + $this->load->model('logbook_model'); + + $adif = str_replace('"', "", $this->input->post("Adif")); + $country = $this->logbook_model->get_entity($adif); + $band = str_replace('"', "", $this->input->post("Band")); + $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band); + + // Render Page + $data['page_title'] = "Log View - DXCC"; + $data['filter'] = "country ". $country['name']; + + if ($band != "All") { + $data['filter'] .= " and " . $band; + } + + $this->load->view('timeline/details', $data); + } + +} \ No newline at end of file diff --git a/application/models/Accumulate_model.php b/application/models/Accumulate_model.php new file mode 100644 index 00000000..9eaa2416 --- /dev/null +++ b/application/models/Accumulate_model.php @@ -0,0 +1,93 @@ +load->model('Stations'); + $station_id = $CI->Stations->find_active(); + + $sql = "SELECT year(col_time_on) as year, + (select count(distinct b.col_dxcc) from " . $this->config->item('table_name') . " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + + if ($band != 'All') { + if ($band == 'SAT') { + $sql .= " and col_prop_mode ='" . $band . "'"; + } else { + $sql .= " and col_prop_mode !='SAT'"; + $sql .= " and col_band ='" . $band . "'"; + } + } + + $sql .=") total from " . $this->config->item('table_name') . " as a + where a.station_id = ". $station_id; + + $sql .= " group by year(a.col_time_on) + order by year(a.col_time_on)"; + + $query = $this->db->query($sql); + + return $query->result(); + } + + function get_worked_bands() { + $CI =& get_instance(); + $CI->load->model('Stations'); + $station_id = $CI->Stations->find_active(); + + $data = $this->db->query( + "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `" . $this->config->item('table_name') . "` WHERE station_id = " . $station_id . " AND COL_PROP_MODE != \"SAT\"" + ); + $worked_slots = array(); + foreach ($data->result() as $row) { + array_push($worked_slots, $row->COL_BAND); + } + + $SAT_data = $this->db->query( + "SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `" . $this->config->item('table_name') . "` WHERE station_id = " . $station_id . " AND COL_PROP_MODE = \"SAT\"" + ); + + foreach ($SAT_data->result() as $row) { + array_push($worked_slots, strtoupper($row->COL_PROP_MODE)); + } + + // bring worked-slots in order of defined $bandslots + $results = array(); + foreach (array_keys($this->bandslots) as $slot) { + if (in_array($slot, $worked_slots)) { + array_push($results, $slot); + } + } + return $results; + } + + public $bandslots = array("160m" => 0, + "80m" => 0, + "60m" => 0, + "40m" => 0, + "30m" => 0, + "20m" => 0, + "17m" => 0, + "15m" => 0, + "12m" => 0, + "10m" => 0, + "6m" => 0, + "4m" => 0, + "2m" => 0, + "70cm" => 0, + "23cm" => 0, + "13cm" => 0, + "9cm" => 0, + "6cm" => 0, + "3cm" => 0, + "1.25cm" => 0, + "SAT" => 0, + ); +} \ No newline at end of file diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php new file mode 100644 index 00000000..afc96360 --- /dev/null +++ b/application/views/accumulate/index.php @@ -0,0 +1,59 @@ +
+

+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+
+ + + + + # + Year + Accumulated # of DXCC\'s worked + + + '; + + foreach ($accumulated_dxcc_array as $line) { + echo ' + ' . $i++ . ' + ' . $line->year . ' + ' . $line->total . ' + '; + } + echo '
'; + } + else { + echo ''; + } + ?> + + diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index f284f92f..6e3c2653 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -86,6 +86,8 @@ Days with QSOs DXCC Timeline + + Accumulated statistics