Merge pull request #248 from Manawyrm/master

Display frequency in MHz and enlarged frequency column

application/views/view_log/qso.php

@@ -50,9 +50,14 @@ margin: 10px 0;
 				<?php if($this->config->item('display_freq') == true) { ?>
 				<tr>
 					<td>Freq:</td>
-					<td><?php echo $row->COL_FREQ; ?></td>
+					<td><?php echo frequency_display_string($row->COL_FREQ); ?></td>
 				</tr>
-				<?php } ?>
+				<?php if($row->COL_FREQ_RX != 0) { ?>
+				<tr>
+					<td>Freq (RX):</td>
+					<td><?php echo frequency_display_string($row->COL_FREQ_RX); ?></td>
+				</tr>
+				<?php }} ?>
 				
 				<tr>
 					<td>Mode</td>
@@ -191,3 +196,10 @@ margin: 10px 0;
 <?php } } ?>
 </body>
 </html>
+<?php 
+  // converts a frequency in Hz (e.g. 3650) to 3.650 MHz 
+  function frequency_display_string($frequency)
+  {
+    return number_format (($frequency / 1000 / 1000), 3) . " MHz";
+  }
+?>

sql/tables/log.sql

@@ -57,8 +57,8 @@ CREATE TABLE IF NOT EXISTS `TABLE_HRD_CONTACTS_V01` (
   `COL_EQSL_QSL_SENT` varchar(2) DEFAULT NULL,
   `COL_EQSL_STATUS` varchar(255) DEFAULT NULL,
   `COL_FORCE_INIT` int(11) DEFAULT NULL,
-  `COL_FREQ` int(11) DEFAULT NULL,
-  `COL_FREQ_RX` int(11) DEFAULT NULL,
+  `COL_FREQ` bigint(13) DEFAULT NULL,
+  `COL_FREQ_RX` bigint(13) DEFAULT NULL,
   `COL_GRIDSQUARE` varchar(12) DEFAULT NULL,
   `COL_HEADING` double DEFAULT NULL,
   `COL_IOTA` varchar(10) DEFAULT NULL,