From 352fe2ec49d9f98707be4fc528b1898e857470c8 Mon Sep 17 00:00:00 2001
From: Andy <andy@dev.local>
Date: Mon, 8 Feb 2016 16:07:39 +0000
Subject: [PATCH] - When adding a new QSO, there is an ajax call to clublog.org
 to get country. This now uses dxcc info etc - Allow upload .adif files (not
 just .adi) (fldigi uses .adif) - Search QSO, and click callsign for details -
 not opening in modal window as does on main page - Show eQSL upload and
 download status in main log screen

---
 application/views/awards/dxcc/index.php    | 44 +++++++++++
 application/views/view_log/partial/log.php | 91 ++++++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 application/views/awards/dxcc/index.php
 create mode 100644 application/views/view_log/partial/log.php

diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
new file mode 100644
index 00000000..0e080dc1
--- /dev/null
+++ b/application/views/awards/dxcc/index.php
@@ -0,0 +1,44 @@
+
+<div id="container">
+	<h1><?php echo $page_title; ?></h1>
+
+	<!-- Sub Nav for Awards -->
+	
+	<ul class="tabs">
+	  <li class="active"><a href="<?php echo site_url('awards/dxcc'); ?>">DXCC</a></li>
+	  <li><a href="<?php echo site_url('awards/wab'); ?>">WAB</a></li>
+	  <li><a href="<?php echo site_url('awards/sota'); ?>">SOTA</a></li>
+	  <li><a href="<?php echo site_url('awards/wacral'); ?>">WACRAL</a></li>
+	</ul>
+
+	<table width="100%" class="zebra-striped">
+	<tr>
+	<td>Country</td>
+	<td>160m</td>
+	<td>80m</td>
+	<td>40m</td>
+	<td>30m</td>
+	<td>20m</td>
+	<td>17m</td>
+	<td>15m</td>
+	<td>12m</td>
+	<td>10m</td>
+	<td>6m</td>
+	<td>2m</td>
+	</tr>
+    <?php
+
+        foreach($dxcc as $country=>$val){
+            print("<tr><td>$country</td>");
+            foreach($val as $band=>$count){
+                $count = ($count == 0)?"&nbsp;":$count;
+                print("<td>$count</td>");
+            }
+            print("</tr>");
+        }
+
+    ?>
+
+
+	</table>
+</div>
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
new file mode 100644
index 00000000..6ff7f756
--- /dev/null
+++ b/application/views/view_log/partial/log.php
@@ -0,0 +1,91 @@
+	<table width="100%">
+		<tr class="titles">
+			<td>Date</td>
+			<td>Time</td>
+			<td>Call</td>
+			<td>Mode</td>
+			<td>Sent</td>
+			<td>Recv</td>
+			<td>Band</td>
+			<td>Country</td>
+			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
+			<td>QSL</td>
+			<td>eQSL</td>
+			<td></td>
+			<?php } ?>
+		</tr>
+		
+		<?php  $i = 0;  foreach ($results->result() as $row) { ?>
+			<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
+			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
+			<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
+			<td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo strtoupper($row->COL_CALL); ?></a></td>
+			<td><?php echo $row->COL_MODE; ?></td>
+			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
+			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
+			<?php if($row->COL_SAT_NAME != null) { ?>
+			<td><?php echo $row->COL_SAT_NAME; ?></td>
+			<?php } else { ?>
+			<td><?php echo strtolower($row->COL_BAND); ?></td>
+			<?php } ?>
+			<td><?php echo $row->COL_COUNTRY; ?></td>
+			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
+			<td class="qsl">
+				<?php
+					if($row->COL_QSL_RCVD == "Y" && $row->COL_QSL_SENT == "Y") 
+					{
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard.png" alt="QSL Cards Both sent and received" title="QSL Cards Both sent and received" />
+				<?php
+					} elseif($row->COL_QSL_RCVD == "Y") {
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard_in.png" alt="QSL Cards received" title="QSL Cards received" />
+				<?php
+					} elseif($row->COL_QSL_SENT == "Y") {
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard_sent.png" alt="QSL Cards sent" title="QSL Cards sent" />
+				<?php } ?>
+			</td>
+			<td class="eqsl">
+			    <?php if ($row->COL_EQSL_QSL_SENT != ''){ ?>
+			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
+			    <span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
+			    <?php } ?>
+			</td>
+			<td><a class="editbox" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" ><img src="<?php echo base_url(); ?>/images/application_edit.png" width="16" height="16" alt="Edit" />
+			</a></td>
+			<?php if($this->config->item('callsign_tags') == true) { ?>
+				<?php if($row->COL_STATION_CALLSIGN	 != null) { ?>
+				<td><span class="label notice"><?php echo $row->COL_STATION_CALLSIGN; ?></span></td>
+				<?php } elseif($row->COL_OPERATOR != null) { ?>
+				<td><span class="label notice"><?php echo $row->COL_OPERATOR; ?></span></td>
+				<?php } ?>
+			<?php } ?>
+			<?php } ?>
+		</tr>
+		<?php $i++; } ?>
+		
+	</table>
+
+	<div class="pagination">
+		<?php echo $this->pagination->create_links(); ?>
+	</div>
+
+</div>
+
+<style>
+TD.qsl{
+    width: 20px;
+}
+TD.eqsl{
+    width: 33px;
+}
+.eqsl-green{
+    color: #00A000;
+    font-size: 1.1em;
+}
+.eqsl-red{
+    color: #F00;
+    font-size: 1.1em;
+}
+</style>
\ No newline at end of file