diff --git a/application/controllers/Accumulated.php b/application/controllers/Accumulated.php
new file mode 100644
index 00000000..a3bc64dc
--- /dev/null
+++ b/application/controllers/Accumulated.php
@@ -0,0 +1,49 @@
+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');
+
+ $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');
+ }
+
+ /*
+ * Used for ajax-call in javascript to fetch the data and insert into table and chart
+ */
+ public function get_accumulated_data(){
+ //load model
+ $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, $mode, $period);
+ header('Content-Type: application/json');
+ echo json_encode($data);
+ }
+
+}
\ No newline at end of file
diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index 2133a304..4abefd1e 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -40,41 +40,6 @@ class Awards extends CI_Controller {
}
- public function dok_details(){
- $a = $this->input->get();
- $q = "";
- foreach ($a as $key => $value) {
- $q .= $key."=".$value.("(and)");
- }
- $q = substr($q, 0, strlen($q)-13);
-
- $arguments["query"] = $q;
- $arguments["fields"] = '';
- $arguments["format"] = "json";
- $arguments["limit"] = '';
- $arguments["order"] = '';
-
- // print_r($arguments);
- // return;
-
- // Load the API and Logbook models
- $this->load->model('api_model');
- $this->load->model('logbook_model');
-
- // Call the parser within the API model to build the query
- $query = $this->api_model->select_parse($arguments);
-
- // Execute the query, and retrieve the results
- $data = $this->logbook_model->api_search_query($query);
-
- // Render Page
- $data['page_title'] = "Log View - DOK";
- $data['filter'] = str_replace("(and)", ", ", $q);//implode(", ", array_keys($a));
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/dok/details');
- $this->load->view('interface_assets/footer');
- }
-
public function dok_details_ajax(){
$a = $this->input->post();
$q = "";
@@ -172,22 +137,6 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
- public function dxcc_details(){
-
- $this->load->model('logbook_model');
-
- $country = str_replace('"', "", $this->input->get("Country"));
- $band = str_replace('"', "", $this->input->get("Band"));
- $data['results'] = $this->logbook_model->dxcc_qso_details($country, $band);
-
- // Render Page
- $data['page_title'] = "Log View - DXCC";
- $data['filter'] = "country ".$country. " and ".$band;
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/dxcc/details');
- $this->load->view('interface_assets/footer');
- }
-
public function dxcc_details_ajax(){
$this->load->model('logbook_model');
@@ -228,21 +177,6 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
- public function vucc_details(){
- $this->load->model('logbook_model');
-
- $gridsquare = str_replace('"', "", $this->input->get("Gridsquare"));
- $band = str_replace('"', "", $this->input->get("Band"));
- $data['results'] = $this->logbook_model->vucc_qso_details($gridsquare, $band);
-
- // Render Page
- $data['page_title'] = "Log View - VUCC";
- $data['filter'] = "vucc " . $gridsquare . " and band ".$band;
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/vucc/details');
- $this->load->view('interface_assets/footer');
- }
-
public function vucc_details_ajax(){
$this->load->model('logbook_model');
@@ -357,21 +291,6 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
- public function cq_details(){
- $this->load->model('logbook_model');
-
- $cqzone = str_replace('"', "", $this->input->get("CQZone"));
- $band = str_replace('"', "", $this->input->get("Band"));
- $data['results'] = $this->logbook_model->cq_qso_details($cqzone, $band);
-
- // Render Page
- $data['page_title'] = "Log View - DXCC";
- $data['filter'] = "CQZone ".$cqzone;
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/cq/details');
- $this->load->view('interface_assets/footer');
- }
-
public function cq_details_ajax(){
$this->load->model('logbook_model');
@@ -430,21 +349,6 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
- public function was_details() {
- $this->load->model('logbook_model');
-
- $state = str_replace('"', "", $this->input->get("State"));
- $band = str_replace('"', "", $this->input->get("Band"));
- $data['results'] = $this->logbook_model->was_qso_details($state, $band);
-
- // Render Page
- $data['page_title'] = "Log View - WAS";
- $data['filter'] = "state ".$state. " and ".$band;
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/was/details');
- $this->load->view('interface_assets/footer');
- }
-
public function was_details_ajax() {
$this->load->model('logbook_model');
@@ -515,21 +419,6 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
- public function iota_details(){
- $this->load->model('logbook_model');
-
- $iota = str_replace('"', "", $this->input->get("Iota"));
- $band = str_replace('"', "", $this->input->get("Band"));
- $data['results'] = $this->logbook_model->iota_qso_details($iota, $band);
-
- // Render Page
- $data['page_title'] = "Log View - IOTA";
- $data['filter'] = "iota ".$iota. " and ".$band;
- $this->load->view('interface_assets/header', $data);
- $this->load->view('awards/iota/details');
- $this->load->view('interface_assets/footer');
- }
-
public function iota_details_ajax(){
$this->load->model('logbook_model');
diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index 6c45dcab..f97865cd 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -68,7 +68,7 @@ class Dashboard extends CI_Controller {
$raw = strtotime('Monday last week');
$mon = date('Y-m-d', $raw);
- $sun = date('Y-m-d', strtotime('Sunday this week'));
+ $sun = date('Y-m-d', strtotime('Monday next week'));
$qsos = $this->logbook_model->map_week_qsos($mon, $sun);
diff --git a/application/controllers/Station.php b/application/controllers/Station.php
index 694b204f..85804481 100644
--- a/application/controllers/Station.php
+++ b/application/controllers/Station.php
@@ -37,6 +37,9 @@ class Station extends CI_Controller {
$this->load->model('dxcc');
$data['dxcc_list'] = $this->dxcc->list();
+ $this->load->model('logbook_model');
+ $data['iota_list'] = $this->logbook_model->fetchIota();
+
$this->load->library('form_validation');
$this->form_validation->set_rules('station_profile_name', 'Station Profile Name', 'required');
@@ -62,6 +65,9 @@ class Station extends CI_Controller {
$this->load->model('stations');
$this->load->model('dxcc');
+ $this->load->model('logbook_model');
+
+ $data['iota_list'] = $this->logbook_model->fetchIota();
$item_id_clean = $this->security->xss_clean($id);
diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index b6ddaf2d..bf8615ef 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -2,9 +2,9 @@
defined('BASEPATH') OR exit('No direct script access allowed');
-$lang['error_no_active_station_profile'] = 'Attention you need to set an active station profile.';
+$lang['error_no_active_station_profile'] = 'Attention: you need to set an active station profile.';
-$lang['notice_turn_the_radio_on'] = 'You have made no QSOs today, time to turn on the radio!';
+$lang['notice_turn_the_radio_on'] = 'You have made no QSOs today; time to turn on the radio!';
$lang['general_word_important'] = 'Important';
@@ -36,4 +36,4 @@ $lang['gen_hamradio_band'] = 'Band';
$lang['dashboard_you_have_had'] = 'You have had';
$lang['dashboard_qsos_today'] = 'QSOs Today!';
$lang['dashboard_qso_breakdown'] = 'QSOs Breakdown';
-$lang['dashboard_countries_breakdown'] = 'Countries Breakdown';
\ No newline at end of file
+$lang['dashboard_countries_breakdown'] = 'Countries Breakdown';
diff --git a/application/models/Accumulate_model.php b/application/models/Accumulate_model.php
new file mode 100644
index 00000000..72c1b132
--- /dev/null
+++ b/application/models/Accumulate_model.php
@@ -0,0 +1,314 @@
+load->model('Stations');
+ $station_id = $CI->Stations->find_active();
+
+ switch ($award) {
+ 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, $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') {
+ $sql .= " and col_prop_mode ='" . $band . "'";
+ } else {
+ $sql .= " and col_prop_mode !='SAT'";
+ $sql .= " and col_band ='" . $band . "'";
+ }
+ }
+
+ if ($mode != 'All') {
+ $sql .= " and col_mode ='" . $mode . "'";
+ }
+
+ $sql .=") total from " . $this->config->item('table_name') . " as a
+ where a.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 . "'";
+ }
+ }
+
+ 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, $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') {
+ $sql .= " and col_prop_mode ='" . $band . "'";
+ } else {
+ $sql .= " and col_prop_mode !='SAT'";
+ $sql .= " and col_band ='" . $band . "'";
+ }
+ }
+
+ 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 .=") total from " . $this->config->item('table_name') . " as a
+ where a.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 . "'";
+ }
+ }
+
+ 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')";
+
+ 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, $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') {
+ $sql .= " and col_prop_mode ='" . $band . "'";
+ } else {
+ $sql .= " and col_prop_mode !='SAT'";
+ $sql .= " and col_band ='" . $band . "'";
+ }
+ }
+
+ if ($mode != 'All') {
+ $sql .= " and col_mode ='" . $mode . "'";
+ }
+
+ $sql .=") total from " . $this->config->item('table_name') . " as a
+ where a.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 . "'";
+ }
+ }
+
+ 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, $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') {
+ $sql .= " and col_prop_mode ='" . $band . "'";
+ } else {
+ $sql .= " and col_prop_mode !='SAT'";
+ $sql .= " and col_band ='" . $band . "'";
+ }
+ }
+
+ if ($mode != 'All') {
+ $sql .= " and col_mode ='" . $mode . "'";
+ }
+
+ $sql .=") total from " . $this->config->item('table_name') . " as a
+ where a.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 . "'";
+ }
+ }
+
+ 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_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/models/Logbook_model.php b/application/models/Logbook_model.php
index ad926511..745fdcbc 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -263,11 +263,13 @@ class Logbook_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
- if ($band == 'SAT') {
- $this->db->where('col_prop_mode', $band);
- } else if ($band != '') {
- $this->db->where('col_prop_mode !=', 'SAT');
- $this->db->where('col_band', $band);
+ if ($band != 'All') {
+ if ($band == 'SAT') {
+ $this->db->where('col_prop_mode', $band);
+ } else if ($band != '') {
+ $this->db->where('col_prop_mode !=', 'SAT');
+ $this->db->where('col_band', $band);
+ }
}
$this->db->where('station_id', $station_id);
diff --git a/application/views/accumulate/index.php b/application/views/accumulate/index.php
new file mode 100644
index 00000000..4b5b4524
--- /dev/null
+++ b/application/views/accumulate/index.php
@@ -0,0 +1,99 @@
+
+
diff --git a/application/views/api/description.php b/application/views/api/description.php
index 7e88f49b..23c49d4f 100644
--- a/application/views/api/description.php
+++ b/application/views/api/description.php
@@ -25,7 +25,7 @@
- Simple name to describle what you use this API for.
+ Simple name to describe what you use this API for.
diff --git a/application/views/awards/cq/details.php b/application/views/awards/cq/details.php
deleted file mode 100644
index 56394d9f..00000000
--- a/application/views/awards/cq/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
- load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/cq/details_ajax.php b/application/views/awards/cq/details_ajax.php
index 97a47ed4..e1c2be62 100644
--- a/application/views/awards/cq/details_ajax.php
+++ b/application/views/awards/cq/details_ajax.php
@@ -1,3 +1,3 @@
-
Filtering on
+
Filtering on
load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php
index 0fc9fc35..7d273505 100644
--- a/application/views/awards/cq/index.php
+++ b/application/views/awards/cq/index.php
@@ -16,54 +16,55 @@
+

" usemap="#CQ" border="0">
@@ -144,7 +145,7 @@
$i = 1;
if ($cq_array) {
echo '
-
+
| # |
diff --git a/application/views/awards/dok/details.php b/application/views/awards/dok/details.php
deleted file mode 100644
index 5dcbcef8..00000000
--- a/application/views/awards/dok/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
- load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/dok/details_ajax.php b/application/views/awards/dok/details_ajax.php
index bdd89954..13783720 100644
--- a/application/views/awards/dok/details_ajax.php
+++ b/application/views/awards/dok/details_ajax.php
@@ -1,3 +1,3 @@
-
Filtering on
+
Filtering on
load->view('view_log/partial/log_ajax') ?>
\ No newline at end of file
diff --git a/application/views/awards/dxcc/details.php b/application/views/awards/dxcc/details.php
deleted file mode 100644
index 5dcbcef8..00000000
--- a/application/views/awards/dxcc/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
- load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/dxcc/details_ajax.php b/application/views/awards/dxcc/details_ajax.php
index 2e33a16d..59ba1c0e 100644
--- a/application/views/awards/dxcc/details_ajax.php
+++ b/application/views/awards/dxcc/details_ajax.php
@@ -1,3 +1,3 @@
-
Filtering on
+
Filtering on
load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/iota/details.php b/application/views/awards/iota/details.php
deleted file mode 100644
index 8e291702..00000000
--- a/application/views/awards/iota/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
-load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/iota/details_ajax.php b/application/views/awards/iota/details_ajax.php
index bdd89954..13783720 100644
--- a/application/views/awards/iota/details_ajax.php
+++ b/application/views/awards/iota/details_ajax.php
@@ -1,3 +1,3 @@
-
Filtering on
+
Filtering on
load->view('view_log/partial/log_ajax') ?>
\ No newline at end of file
diff --git a/application/views/awards/vucc/details.php b/application/views/awards/vucc/details.php
deleted file mode 100644
index 56394d9f..00000000
--- a/application/views/awards/vucc/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
- load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/vucc/details_ajax.php b/application/views/awards/vucc/details_ajax.php
index 97a47ed4..e1c2be62 100644
--- a/application/views/awards/vucc/details_ajax.php
+++ b/application/views/awards/vucc/details_ajax.php
@@ -1,3 +1,3 @@
-
Filtering on
+
Filtering on
load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/awards/was/details.php b/application/views/awards/was/details.php
deleted file mode 100644
index 56394d9f..00000000
--- a/application/views/awards/was/details.php
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
Logbook
-
-
Filtering on
-
- load->view('view_log/partial/log') ?>
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index 6f405103..859d8f7d 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -68,7 +68,7 @@
if ($was_array) {
$i = 1;
echo '
-
+
| # |
diff --git a/application/views/dayswithqso/index.php b/application/views/dayswithqso/index.php
index 7d61c62f..488a5ddf 100644
--- a/application/views/dayswithqso/index.php
+++ b/application/views/dayswithqso/index.php
@@ -96,7 +96,7 @@
?>
If you make a QSO today, you can continue to extend your streak, else your current streak will be broken!
';
+ echo '';
echo '';
echo '| Current Streak (Continues days with QSOs) | ';
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index e1aecffc..d72d89cc 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -31,9 +31,7 @@
-uri->segment(1) == "awards") { ?>
-
uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
@@ -1259,7 +1257,7 @@ $(document).ready(function(){
$.ajax({
url: baseURL+'index.php/distances/get_distances',
type: 'post',
- data: {'locator': 'JP50HP', 'band': form.distplot_bands.value},
+ data: {'band': form.distplot_bands.value},
success: function(tmp) {
if (tmp.ok == 'OK') {
if (!($('#information').length > 0))
@@ -1271,7 +1269,7 @@ $(document).ready(function(){
renderTo: 'graphcontainer'
},
title: {
- text: 'Mode distribution'
+ text: 'Distance distribution'
},
xAxis: {
categories: [],
@@ -1615,6 +1613,16 @@ $(document).ready(function(){
uri->segment(2) == "cq") { ?>
+uri->segment(1) == "accumulated") { ?>
+
+
+