From 7cce98680740a44c8c61929d968c82f10d740a53 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Mon, 8 Apr 2019 15:36:23 +0100
Subject: [PATCH] satellite adif export

---
 application/controllers/Adif.php              | 15 +++++++++++++-
 application/models/Adif_data.php              | 20 +++++++++++++++++++
 application/views/adif/data/exportsat.php     |  3 +--
 application/views/dashboard/index.php         | 13 ++++++++----
 application/views/interface_assets/footer.php |  4 +++-
 application/views/radio/index.php             |  2 +-
 6 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php
index 837886b6..2320383b 100644
--- a/application/controllers/Adif.php
+++ b/application/controllers/Adif.php
@@ -45,7 +45,20 @@ class adif extends CI_Controller {
 
 		$this->load->model('adif_data');
 
-		$data['qsos'] = $this->adif_data->export_all();
+		$data['qsos'] = $this->adif_data->satellite();
+
+		$this->load->view('adif/data/exportsat', $data);
+	}
+
+	// Export all QSO Data in ASC Order of Date.
+	public function exportsatlotw()
+	{
+		// Set memory limit to unlimited to allow heavy usage
+		ini_set('memory_limit', '-1');
+
+		$this->load->model('adif_data');
+
+		$data['qsos'] = $this->adif_data->satellte_lotw();
 
 		$this->load->view('adif/data/exportsat', $data);
 	}
diff --git a/application/models/Adif_data.php b/application/models/Adif_data.php
index 8e91e6ad..98b67e07 100644
--- a/application/models/Adif_data.php
+++ b/application/models/Adif_data.php
@@ -15,6 +15,26 @@ class adif_data extends CI_Model {
         
         return $query;
     }
+
+    function satellte() {
+        $this->db->where('COL_PROP_MODE', 'SAT');
+        $this->db->order_by("COL_TIME_ON", "ASC"); 
+        $query = $this->db->get($this->config->item('table_name'));
+        
+        return $query;
+    }
+
+    function satellte_lotw() {
+        $this->db->where('COL_PROP_MODE', 'SAT');
+
+        $where = "COL_LOTW_QSLRDATE != ''";
+        $this->db->where($where);
+
+        $this->db->order_by("COL_TIME_ON", "ASC"); 
+        $query = $this->db->get($this->config->item('table_name'));
+        
+        return $query;
+    }
     
     function export_custom($from, $to) {
         $this->db->where("COL_TIME_ON BETWEEN '".$from."' AND '".$to."'");
diff --git a/application/views/adif/data/exportsat.php b/application/views/adif/data/exportsat.php
index 9d0e7e37..28d01b5d 100644
--- a/application/views/adif/data/exportsat.php
+++ b/application/views/adif/data/exportsat.php
@@ -9,7 +9,6 @@
 <EOH>
 
 <?php foreach ($qsos->result() as $qso) { //print_r($qso);?>
-	<?php if($qso->COL_SAT_NAME) { ?>
 	<call:<?php echo strlen($qso->COL_CALL); ?>><?php echo $qso->COL_CALL; ?><band:<?php echo strlen($qso->COL_BAND); ?>><?php echo $qso->COL_BAND; ?><mode:<?php echo strlen($qso->COL_MODE); ?>><?php echo $qso->COL_MODE; ?><?php if($qso->COL_FREQ != "0") { ?><?php $freq_in_mhz = $qso->COL_FREQ / 1000000; ?><freq:<?php echo strlen($freq_in_mhz); ?>><?php echo $freq_in_mhz; ?><?php } ?><?php $date_on = strtotime($qso->COL_TIME_ON); $new_date = date('Ymd', $date_on); ?><qso_date:<?php echo strlen($new_date); ?>><?php echo $new_date; ?><?php $time_on = strtotime($qso->COL_TIME_ON); $new_on = date('His', $time_on); ?><time_on:<?php echo strlen($new_on); ?>><?php echo $new_on; ?><?php $time_off = strtotime($qso->COL_TIME_OFF); $new_off = date('His', $time_off); ?><time_off:<?php echo strlen($new_off); ?>><?php echo $new_off; ?><rst_rcvd:<?php echo strlen($qso->COL_RST_RCVD); ?>><?php echo $qso->COL_RST_RCVD; ?><rst_sent:<?php echo strlen($qso->COL_RST_SENT); ?>><?php echo $qso->COL_RST_SENT; ?><qsl_rcvd:<?php echo strlen($qso->COL_QSL_RCVD); ?>><?php echo $qso->COL_QSL_RCVD; ?><qsl_sent:<?php echo strlen($qso->COL_QSL_SENT); ?>><?php echo $qso->COL_QSL_SENT; ?><country:<?php echo strlen($qso->COL_COUNTRY); ?>><?php echo $qso->COL_COUNTRY; ?><?php if($qso->COL_VUCC_GRIDS != "") { ?><vucc_grids:<?php echo strlen($qso->COL_VUCC_GRIDS); ?>><?php echo $qso->COL_VUCC_GRIDS; ?><?php } ?><?php if($qso->COL_VUCC_GRIDS == "" && $qso->COL_GRIDSQUARE != "") { ?><gridsquare:<?php echo strlen($qso->COL_GRIDSQUARE); ?>><?php echo $qso->COL_GRIDSQUARE; ?><?php } ?><?php if($qso->COL_SAT_NAME) { ?><sat_mode:<?php echo strlen($qso->COL_SAT_MODE); ?>><?php echo $qso->COL_SAT_MODE; ?><sat_name:<?php echo strlen($qso->COL_SAT_NAME); ?>><?php echo $qso->COL_SAT_NAME; ?><?php } ?><?php if($qso->COL_PROP_MODE) { ?><prop_mode:<?php echo strlen($qso->COL_PROP_MODE); ?>><?php echo $qso->COL_PROP_MODE; ?><?php } ?><?php if($qso->COL_NAME) { ?><name:<?php echo strlen($qso->COL_NAME); ?>><?php echo $qso->COL_NAME; ?><?php } ?><?php if($qso->COL_COMMENT) { ?><comment:<?php echo strlen($qso->COL_COMMENT); ?>><?php echo $qso->COL_COMMENT; ?><?php } ?><eor>
-	<?php } ?>
+	
 <?php } ?>
\ No newline at end of file
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index cafc7401..42c766bc 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container dashboard">
 <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
 
 	<?php if($todays_qsos >= 1) { ?>
@@ -16,8 +16,10 @@
 <div id="map" style="width: 100%; height: 300px"></div>
 
 <!-- Log Data -->
-<div class="row">
-  <div class="col-8" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
+<div class="row logdata">
+  <div class="col-sm-8">
+
+  	<div class="table-responsive">
     	<table class="table table-striped table-hover">
 
     		<thead>
@@ -53,9 +55,11 @@
 				</tr>
 			<?php $i++; } ?>
 		</table>
+	</div>
   </div>
 
-  <div class="col-4">
+  <div class="col-sm-4">
+  	<div class="table-responsive">
     	<table class="table table-striped table-hover">
 			<tr class="titles">
 				<td colspan="2"><i class="fas fa-chart-bar"></i> QSOs</td>
@@ -119,6 +123,7 @@
 				<td><?php echo $total_qsl_requested; ?></td>
 			</tr>
 		</table>
+	</div>
   </div>
 </div>
 
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index c0522538..246eb925 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -27,7 +27,8 @@ $(document).ready(function() {
     });
 });
 </script>
-    
+
+<?php if ($this->uri->segment(1) == "") { ?>
     <script type="text/javascript" src="<?php echo base_url();?>js/leaflet/leafembed.js"></script>
     <script type="text/javascript">
       
@@ -46,6 +47,7 @@ $(document).ready(function() {
             initmap();
       });
     </script>
+<?php } ?>
 
 
 
diff --git a/application/views/radio/index.php b/application/views/radio/index.php
index c3850475..df74e114 100644
--- a/application/views/radio/index.php
+++ b/application/views/radio/index.php
@@ -19,7 +19,7 @@
 
 	    <div class="table-responsive">
 		    <!-- Display Radio Statuses -->	  
-				<table class="table table-striped"></table>
+				<table class="table table-striped status"></table>
 			</div>
 	  </div>
 	</div>