diff --git a/application/controllers/Accumulated.php b/application/controllers/Accumulated.php index e8bcfe48..a3bc64dc 100644 --- a/application/controllers/Accumulated.php +++ b/application/controllers/Accumulated.php @@ -20,6 +20,10 @@ class Accumulated extends CI_Controller { $data['worked_bands'] = $this->Accumulate_model->get_worked_bands(); + $this->load->model('modes'); + + $data['modes'] = $this->modes->active(); + $this->load->view('interface_assets/header', $data); $this->load->view('accumulate/index'); $this->load->view('interface_assets/footer'); @@ -33,9 +37,11 @@ class Accumulated extends CI_Controller { $this->load->model('accumulate_model'); $band = $this->input->post('Band'); $award = $this->input->post('Award'); + $mode = $this->input->post('Mode'); + $period = $this->input->post('Period'); // get data - $data = $this->accumulate_model->get_accumulated_data($band, $award); + $data = $this->accumulate_model->get_accumulated_data($band, $award, $mode, $period); header('Content-Type: application/json'); echo json_encode($data); } diff --git a/application/models/Accumulate_model.php b/application/models/Accumulate_model.php index 709b8da1..72c1b132 100644 --- a/application/models/Accumulate_model.php +++ b/application/models/Accumulate_model.php @@ -9,24 +9,34 @@ class Accumulate_model extends CI_Model parent::__construct(); } - function get_accumulated_data($band, $award) { + function get_accumulated_data($band, $award, $mode, $period) { $CI =& get_instance(); $CI->load->model('Stations'); $station_id = $CI->Stations->find_active(); switch ($award) { - case 'dxcc': $result = $this->get_accumulated_dxcc($band, $station_id); break; - case 'was': $result = $this->get_accumulated_was($band, $station_id); break; - case 'iota': $result = $this->get_accumulated_iota($band, $station_id); break; - case 'waz': $result = $this->get_accumulated_waz($band, $station_id); break; + case 'dxcc': $result = $this->get_accumulated_dxcc($band, $mode, $period, $station_id); break; + case 'was': $result = $this->get_accumulated_was($band, $mode, $period, $station_id); break; + case 'iota': $result = $this->get_accumulated_iota($band, $mode, $period, $station_id); break; + case 'waz': $result = $this->get_accumulated_waz($band, $mode, $period, $station_id); break; } return $result; } - function get_accumulated_dxcc($band, $station_id) { - $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; + function get_accumulated_dxcc($band, $mode, $period, $station_id) { + if ($period == "year") { + $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; + } + else if ($period == "month") { + $sql = "SELECT date_format(col_time_on, '%Y%m') as year, + (select count(distinct b.col_dxcc) from " . + $this->config->item('table_name') . + " as b where date_format(col_time_on, '%Y%m') <= year and b.station_id = ". $station_id; + } if ($band != 'All') { if ($band == 'SAT') { @@ -37,6 +47,10 @@ class Accumulate_model extends CI_Model } } + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + $sql .=") total from " . $this->config->item('table_name') . " as a where a.station_id = ". $station_id; @@ -49,17 +63,37 @@ class Accumulate_model extends CI_Model } } - $sql .= " group by year(a.col_time_on) + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + + if ($period == "year") { + $sql .= " group by year(a.col_time_on) order by year(a.col_time_on)"; + } + else if ($period == "month") { + $sql .= " group by date_format(a.col_time_on, '%Y%m') + order by date_format(a.col_time_on, '%Y%m')"; + } $query = $this->db->query($sql); return $query->result(); } - function get_accumulated_was($band, $station_id) { - $sql = "SELECT year(col_time_on) as year, - (select count(distinct b.col_state) from " . $this->config->item('table_name') . " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + function get_accumulated_was($band, $mode, $period, $station_id) { + if ($period == "year") { + $sql = "SELECT year(col_time_on) as year, + (select count(distinct b.col_state) from " . + $this->config->item('table_name') . + " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + } + else if ($period == "month") { + $sql = "SELECT date_format(col_time_on, '%Y%m') as year, + (select count(distinct b.col_state) from " . + $this->config->item('table_name') . + " as b where date_format(col_time_on, '%Y%m') <= year and b.station_id = ". $station_id; + } if ($band != 'All') { if ($band == 'SAT') { @@ -70,6 +104,10 @@ class Accumulate_model extends CI_Model } } + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + $sql .= " and COL_DXCC in ('291', '6', '110')"; $sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')"; @@ -85,20 +123,40 @@ class Accumulate_model extends CI_Model } } + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + $sql .= " and COL_DXCC in ('291', '6', '110')"; $sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')"; - $sql .= " group by year(a.col_time_on) + if ($period == "year") { + $sql .= " group by year(a.col_time_on) order by year(a.col_time_on)"; + } + else if ($period == "month") { + $sql .= " group by date_format(a.col_time_on, '%Y%m') + order by date_format(a.col_time_on, '%Y%m')"; + } $query = $this->db->query($sql); return $query->result(); } - function get_accumulated_iota($band, $station_id) { - $sql = "SELECT year(col_time_on) as year, - (select count(distinct b.col_iota) from " . $this->config->item('table_name') . " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + function get_accumulated_iota($band, $mode, $period, $station_id) { + if ($period == "year") { + $sql = "SELECT year(col_time_on) as year, + (select count(distinct b.col_iota) from " . + $this->config->item('table_name') . + " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + } + else if ($period == "month") { + $sql = "SELECT date_format(col_time_on, '%Y%m') as year, + (select count(distinct b.col_iota) from " . + $this->config->item('table_name') . + " as b where date_format(col_time_on, '%Y%m') <= year and b.station_id = ". $station_id; + } if ($band != 'All') { if ($band == 'SAT') { @@ -109,6 +167,10 @@ class Accumulate_model extends CI_Model } } + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + $sql .=") total from " . $this->config->item('table_name') . " as a where a.station_id = ". $station_id; @@ -121,17 +183,37 @@ class Accumulate_model extends CI_Model } } - $sql .= " group by year(a.col_time_on) + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + + if ($period == "year") { + $sql .= " group by year(a.col_time_on) order by year(a.col_time_on)"; + } + else if ($period == "month") { + $sql .= " group by date_format(a.col_time_on, '%Y%m') + order by date_format(a.col_time_on, '%Y%m')"; + } $query = $this->db->query($sql); return $query->result(); } - function get_accumulated_waz($band, $station_id) { - $sql = "SELECT year(col_time_on) as year, - (select count(distinct b.col_cqz) from " . $this->config->item('table_name') . " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + function get_accumulated_waz($band, $mode, $period, $station_id) { + if ($period == "year") { + $sql = "SELECT year(col_time_on) as year, + (select count(distinct b.col_cqz) from " . + $this->config->item('table_name') . + " as b where year(col_time_on) <= year and b.station_id = ". $station_id; + } + else if ($period == "month") { + $sql = "SELECT date_format(col_time_on, '%Y%m') as year, + (select count(distinct b.col_cqz) from " . + $this->config->item('table_name') . + " as b where date_format(col_time_on, '%Y%m') <= year and b.station_id = ". $station_id; + } if ($band != 'All') { if ($band == 'SAT') { @@ -142,6 +224,10 @@ class Accumulate_model extends CI_Model } } + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + $sql .=") total from " . $this->config->item('table_name') . " as a where a.station_id = ". $station_id; @@ -154,8 +240,18 @@ class Accumulate_model extends CI_Model } } - $sql .= " group by year(a.col_time_on) + if ($mode != 'All') { + $sql .= " and col_mode ='" . $mode . "'"; + } + + if ($period == "year") { + $sql .= " group by year(a.col_time_on) order by year(a.col_time_on)"; + } + else if ($period == "month") { + $sql .= " group by date_format(a.col_time_on, '%Y%m') + order by date_format(a.col_time_on, '%Y%m')"; + } $query = $this->db->query($sql); diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php index 1a2f7089..dc6ffffd 100644 --- a/application/views/accumulate/index.php +++ b/application/views/accumulate/index.php @@ -6,7 +6,7 @@
-
+
+ + +
+ +
-
-
- - -
-
- - -
-
- - -
-
- - + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 573f9ce6..9776d79e 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1803,10 +1803,12 @@ $(document).ready(function(){ var baseURL= ""; var award = form.awardradio.value; + var mode = form.mode.value; + var period = form.periodradio.value; $.ajax({ url: baseURL+'index.php/accumulated/get_accumulated_data', type: 'post', - data: {'Band': form.band.value, 'Award': award}, + data: {'Band': form.band.value, 'Award': award, 'Mode': mode, 'Period': period}, success: function(data) { // used for switching award text in the table and the chart switch(award) { @@ -1816,7 +1818,11 @@ $(document).ready(function(){ case 'waz': var awardtext = "CQ zones"; break; } - // removing the old chart so that it will not interefere when loading chart again + var periodtext = 'Year'; + if (period == 'month') { + periodtext += ' + month'; + } + // removing the old chart so that it will not interfere when loading chart again $("#accumulateContainer").empty(); $("#accumulateContainer").append("
"); @@ -1824,7 +1830,7 @@ $(document).ready(function(){ $("#accumulateTable").append('' + '' + '' + - '' + + '' + ''+ '' + '' + @@ -1863,7 +1869,7 @@ $(document).ready(function(){ data: { labels: labels, datasets: [{ - label: 'Accumulated number of ' + awardtext + ' worked each year', + label: 'Accumulated number of ' + awardtext + ' worked each ' + period, data: dataDxcc, backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgba(54, 162, 235, 1)',
#Year' + periodtext + 'Accumulated # of ' + awardtext + ' worked