diff --git a/application/controllers/logbook.php b/application/controllers/logbook.php index 81cc4ef9..434aa041 100644 --- a/application/controllers/logbook.php +++ b/application/controllers/logbook.php @@ -86,12 +86,12 @@ class Logbook extends CI_Controller { } function bearing($qra) { - $my = qra2latlong($this->config->item('locator')); - $stn = qra2latlong($qra); - - $bearing = bearing($my[0], $my[1], $stn[0], $stn[1]); - - echo $bearing; + $my = qra2latlong($this->config->item('locator')); + $stn = qra2latlong($qra); + + $bearing = bearing($my[0], $my[1], $stn[0], $stn[1]); + + echo $bearing; } } @@ -140,9 +140,12 @@ function bearing($lat1, $lon1, $lat2, $lon2) { #if ($rounded % 2 == 1) # $dir = $dirs[round_to_int($rounded/4) % 4] . "-" . $dir; } - +$var_dist = ""; #return $dir; - return round($bearing, 0)."º ".$dir." ".$dist." miles"; + if (isset($dist)) { + $var_dist = $dist." miles"; + } + return round($bearing, 0)."º ".$dir." ".$var_dist; } function qra2latlong($strQRA) diff --git a/application/controllers/qso.php b/application/controllers/qso.php index d9575547..e35c0def 100644 --- a/application/controllers/qso.php +++ b/application/controllers/qso.php @@ -59,6 +59,8 @@ class QSO extends CI_Controller { $this->session->set_userdata('band', $this->input->post('band')); $this->session->set_userdata('freq', $this->input->post('freq')); $this->session->set_userdata('mode', $this->input->post('mode')); + $this->session->set_userdata('sat_name', $this->input->post('sat_name')); + $this->session->set_userdata('sat_mode', $this->input->post('sat_mode')); $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY'); $this->db->order_by("COL_TIME_ON", "desc"); diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index c82a9d19..cd7c7e61 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -93,7 +93,7 @@ class Logbook_model extends CI_Model { function total_ssb() { - $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'ssb\' or COL_MODE = \'lsb\' or COL_MODE = \'usb\''); + $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'SSB\' or COL_MODE = \'LSB\' or COL_MODE = \'USB\''); if ($query->num_rows() > 0) { @@ -105,7 +105,7 @@ class Logbook_model extends CI_Model { } function total_cw() { - $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'cw\''); + $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'CW\''); if ($query->num_rows() > 0) { @@ -117,7 +117,7 @@ class Logbook_model extends CI_Model { } function total_fm() { - $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'fm\''); + $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'FM\''); if ($query->num_rows() > 0) { @@ -129,7 +129,7 @@ class Logbook_model extends CI_Model { } function total_digi() { - $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE = \'psk31\' or COL_MODE = \'rtty\' or COL_MODE = \'psk63\' or COL_MODE = \'psk125\' or COL_MODE = \'JT65\''); + $query = $this->db->query('SELECT COUNT( * ) as count FROM '.$this->config->item('table_name').' WHERE COL_MODE != \'SSB\' or COL_MODE != \'LSB\' or COL_MODE = \'USB\' or COL_MODE = \'CW\' or COL_MODE = \'FM\''); if ($query->num_rows() > 0) { diff --git a/application/views/layout/header.php b/application/views/layout/header.php index 55463df6..b14e243a 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -38,6 +38,7 @@ ul#navlist li { float: left; margin: 2px 2px 0 3px; height:43px; border-bottom: #footer { margin: 0 auto; width: 780px; text-align: center; padding-top: 5px; padding-bottom: 5px; font-size: 12px; } #message { margin: 0 auto; width: 770px; border: 1px solid #fcefa1; background-color: #fbfaf3; padding: 5px; margin-top: 5px; margin-bottom: 5px; font-weight: bold; font-size: 12px; } +#message p { line-height: 1.7; margin: 0px 0; } .clear { clear: both; } h2 { margin: 0 auto; width: 780px; font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; } h3 { font-weight: bold; font-size: 16px; margin: 5px; } @@ -51,15 +52,25 @@ table .titles { font-weight: bold; } #qso_input { border: 1px solid #dddddd; margin: 5px; padding: 2px; } .input_date { width: 70px; } .input_time { width: 54px; } -#locator { width: 47px; text-transform: uppercase; } +#locator { width: 55px; text-transform: uppercase; } #country { border: none; } #locator_info { font-size: 13px; } +#comment { width: 145px; } .dash_left { float: left; width: 430px; } .dash_sidebar { float: right; width: 350px; } .note { padding: 5px; } #notes_add { padding: 5px; } #search_box { padding: 5px; } + +a { text-decoration: none; color: #000; } +a:hover { text-decoration: underline; } + +p { +line-height: 1.7; +margin: 10px 0; +} + + + + + + + +
@@ -43,7 +66,7 @@ function settime () { '; ?> COL_TIME_ON); echo date('d/m/y', $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> - COL_CALL); ?> + COL_PRIMARY_KEY; ?>">COL_CALL); ?> COL_MODE; ?> COL_RST_SENT; ?> COL_RST_RCVD; ?> @@ -138,7 +161,7 @@ function settime () { - + @@ -162,12 +185,12 @@ function settime () { - + - +
Sat Name
Sat Mode
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php index 43fd3106..a3143e02 100644 --- a/application/views/view_log/index.php +++ b/application/views/view_log/index.php @@ -9,7 +9,7 @@ $(document).ready(function() { $(".qsobox").fancybox({ 'width' : '75%', - 'height' : '75%', + 'height' : '50%', 'autoScale' : false, 'transitionIn' : 'none', 'transitionOut' : 'none', diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 93179712..728d065c 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -6,13 +6,35 @@ body { font-family: Arial, "Trebuchet MS", sans-serif; } h1 { font-weight: bold; font-size: 23px; margin-top: 5px; margin-bottom: 10px; } + h2 { font-weight: bold; font-size: 18px; margin-top: 5px; margin-bottom: 10px; } + + .clear { clear: both } #info { float: left; width: 50%; } #stat { float: right; width: 50%; } td { padding: 5px; } + + + - + num_rows() > 0) { foreach ($query->result() as $row) { ?>

QSO Information for COL_CALL; ?>

@@ -35,7 +57,7 @@ COL_BAND; ?> - COL_FREQ != null) { ?> + config->item('display_freq') == true) { ?> Freq: COL_FREQ; ?> @@ -59,7 +81,7 @@ COL_GRIDSQUARE != null) { ?> - Comment + QRA COL_GRIDSQUARE; ?> @@ -94,10 +116,53 @@
- + +
+ +COL_GRIDSQUARE != null) { + $stn_loc = qra2latlong($row->COL_GRIDSQUARE); + + $lat = $stn_loc[0]; + $lng = $stn_loc[1]; + } else { + $query = $this->db->query(' + SELECT * + FROM dxcc + WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) ) + ORDER BY LENGTH( prefix ) DESC + LIMIT 1 + '); + + foreach ($query->result() as $dxcc) { + $lat = $dxcc->lat; + $lng = $dxcc->long; + } + } + +?> + + +
- \ No newline at end of file