Merge branch 'master' of https://github.com/magicbug/HRD-Web-Frontend

README

@@ -1,3 +1,7 @@
-HRD Web Frontend
+=HRD Web Frontend (Cloudlog)
 
-Website front end to support Ham Radio Deluxe Logbooks MySQL backend Table to allow logging from any location.
+Website front end to support Ham Radio Deluxe Logbooks MySQL backend Table to allow logging from any location.
+
+==Copyright
+
+Copyright (c) 2011 Peter goodhall. See LICENSE.txt for further details.

application/models/logbook_model.php

@@ -18,6 +18,12 @@ class Logbook_model extends CI_Model {
         } else {
             $prop_mode = "";
         }
+        
+        if($this->session->userdata('user_locator')){
+                $locator = $this->session->userdata('user_locator');
+        } else {
+                $locator = $this->config->item('locator');
+        }
     
     
 		// Create array with QSO Data
@@ -45,6 +51,8 @@ class Logbook_model extends CI_Model {
            'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
            'COL_OPERATOR' => $this->session->userdata('user_callsign'),
            'COL_PROP_MODE' => $prop_mode,
+           'COL_IOTA' => $this->input->post('iota_ref'),
+           'COL_MY_GRIDSQUARE' => $locator,
 		);
 
 		// Add QSO to database
@@ -74,6 +82,7 @@ class Logbook_model extends CI_Model {
            'COL_QSL_RCVD' => $this->input->post('qsl_recv'),
            'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
            'COL_QSL_RCVD_VIA' => $this->input->post('qsl_recv_method'),
+           'COL_IOTA' => $this->input->post('iota_ref'),
 		);
 
 		$this->db->where('COL_PRIMARY_KEY', $this->input->post('id'));

application/models/user_model.php

@@ -204,6 +204,7 @@ class User_Model extends CI_Model {
 			'user_name'		=> $u->row()->user_name,
 			'user_type'		=> $u->row()->user_type,
 			'user_callsign'		=> $u->row()->user_callsign,
+			'user_locator'		=> $u->row()->user_locator,
 			'user_hash'		=> $this->_hash($u->row()->user_id."-".$u->row()->user_type)
 		);
 

application/views/layout/header.php

@@ -127,6 +127,19 @@
 		.ui-widget-content { border: none; }
 		.ui-widget-header { background: none; border: none; border-bottom: 1px solid #DDD; }
 
+		.pager {
+			margin-top: 5px;
+			margin-bottom: 5px;
+			font-size: 12px;
+		}
+		.pager a, strong {
+			border: 1px solid #D7D7D7;
+			padding: 5px;
+		}
+		.pager a:hover {
+			background-color: azure;
+		}
+
 	</style>
 	
 	<script src="http://maps.google.com/maps?file=api&amp;v=3&amp;key=<?php echo $this->config->item('google_maps_api'); ?>&sensor=true"

application/views/qso/edit.php

@@ -73,6 +73,11 @@
 		<td><input type="text" name="sat_mode" value="<?php echo $COL_SAT_MODE; ?>" /></td>
 	</tr>
 	
+	<tr>
+		<td>IOTA</td>
+		<td><input type="text" name="iota_ref" value="<?php echo $COL_IOTA; ?>" /></td>
+	</tr>
+	
 </table>
 
 <h3>QSLing</h3>

application/views/qso/index.php

@@ -189,6 +189,7 @@ function settime () {
 				<li><a href="#tabs-2">Satellite</a></li>
 				<li><a href="#tabs-3">Station</a></li>
 				<li><a href="#tabs-4">QSL</a></li>
+				<li><a href="#tabs-5">Awards</a></li>
 			</ul>
 
 			<div id="tabs-1"><div id="partial_view">Partial Callsign Check</div></div>
@@ -255,6 +256,17 @@ function settime () {
 				</table>
 			</div>
 
+			<div id="tabs-5">
+				
+				<table>
+					<tr>
+						<td>IOTA</td>
+						<td><input type="text" name="iota_ref" value="" /> e.g: EU-005</td>
+					</tr>
+				</table>
+				
+			</div>
+
 		</div>
 <div class="controls"><input type="submit" value="Add QSO" /></div>
 

application/views/view_log/index.php

@@ -65,5 +65,9 @@
 	
 </table>
 
-<?php echo $this->pagination->create_links(); ?>
+	<!-- Page Through the Logbook -->
+	<div class="pager">
+		<?php echo $this->pagination->create_links(); ?>
+	</div>
+
 </div>