Merge pull request #151 from skweeker/master

Misc improvements to eqsl and lotw import

application/controllers/eqsl.php

@@ -28,19 +28,16 @@ class eqsl extends CI_Controller {
 
 		$this->adif_parser->initialize();
 		
-		$records = $this->adif_parser->get_record();
+		$tableheaders = "<table>";
-		
+			$tableheaders .= "<tr class=\"titles\">";
-		if (count($records) > 0)
+				$tableheaders .= "<td>Date</td>";
-		{
+				$tableheaders .= "<td>Call</td>";
-			$table = "<table>";
+				$tableheaders .= "<td>Mode</td>";
-			$table .= "<tr class=\"titles\">";
+				$tableheaders .= "<td>Log Status</td>";
-					$table .= "<td>Date</td>";
+				$tableheaders .= "<td>eQSL Status</td>";
-					$table .= "<td>Call</td>";
+			$tableheaders .= "<tr>";
-					$table .= "<td>Mode</td>";
+		$table = "";		
-					$table .= "<td>Log Status</td>";
+		while ($record = $this->adif_parser->get_record())
-					$table .= "<td>eQSL Status</td>";
-				$table .= "<tr>";
-			while($record = $this->adif_parser->get_record())
 		{
 			$time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));
 	
@@ -78,10 +75,11 @@ class eqsl extends CI_Controller {
 				$table .= "<td>eQSL Record: ".$eqsl_status."</td>";
 			$table .= "<tr>";
 		}
-			
+		if ($table != "")
+		{	
 			$table .= "</table>";
+			$data['eqsl_results_table_headers'] = $tableheaders;
 			$data['eqsl_results_table'] = $table;
-			
 		}
 
 		unlink($filepath);

application/controllers/lotw.php

@@ -28,31 +28,20 @@ class Lotw extends CI_Controller {
 
 		$this->adif_parser->initialize();
 
-		$table = "<table>";
+		$tableheaders = "<table>";
-			$table .= "<tr class=\"titles\">";
+			$tableheaders .= "<tr class=\"titles\">";
-				$table .= "<td>Date</td>";
+				$tableheaders .= "<td>QSO Date</td>";
-				$table .= "<td>Call</td>";
+				$tableheaders .= "<td>Call</td>";
-				$table .= "<td>Mode</td>";
+				$tableheaders .= "<td>Mode</td>";
-				$table .= "<td>Log Status</td>";
+				$tableheaders .= "<td>LoTW QSL Received</td>";
-				$table .= "<td>LoTW Status</td>";
+				$tableheaders .= "<td>Date LoTW Confirmed</td>";
-			$table .= "<tr>";
+				$tableheaders .= "<td>Log Status</td>";
+				$tableheaders .= "<td>LoTW Status</td>";
+			$tableheaders .= "<tr>";
 
+			$table = "";
 			while($record = $this->adif_parser->get_record())
 			{
-			if(count($record) == 0)
-			{
-				break;
-			};
-
-	
-
-			//echo date('Y-m-d', strtotime($record['qso_date']))."<br>";
-			//echo date('H:m', strtotime($record['time_on']))."<br>";
-
-			//$this->logbook_model->import($record);
-
-			//echo $record["call"]."<br>";
-			//print_r($record->);
 	
 				$time_on = date('Y-m-d', strtotime($record['qso_date'])) ." ".date('H:i', strtotime($record['time_on']));
 	
@@ -82,14 +71,17 @@ class Lotw extends CI_Controller {
 					$table .= "<td>QSO Record: ".$status."</td>";
 					$table .= "<td>LoTW Record: ".$lotw_status."</td>";
 				$table .= "<tr>";
-		};
+			}
 			
+			if ($table != "")
+			{
 				$table .= "</table>";
+				$data['lotw_table_headers'] = $tableheaders;
+				$data['lotw_table'] = $table;
+		}
 		
 		unlink($filepath);
 
-		$data['lotw_table'] = $table;
-
 		$data['page_title'] = "LoTW ADIF Information";
 		$this->load->view('layout/header', $data);
 		$this->load->view('lotw/analysis');

application/views/eqsl/analysis.php

@@ -4,9 +4,10 @@
 <?php $this->load->view('layout/messages'); ?>
 
 <?php
-	if (isset($eqsl_results_table))
+	if (isset($eqsl_results_table_headers))
 	{
-    	echo "<p>The following QSOs have been received from eQSL.cc</p>";
+    	echo "<p>The following QSLs have been received from eQSL.cc</p>";
+    	echo $eqsl_results_table_headers;
     	echo $eqsl_results_table;
     }
     else