From af60e403152f2ab4074512f48f67b4e2d6e84836 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 18 Apr 2025 11:02:22 +0100
Subject: [PATCH] removed redundant code

---
 application/controllers/Qrz.php      |   1 -
 application/models/Logbook_model.php |   1 -
 application/views/qrz/export.php     | 128 +++++++++++++--------------
 3 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php
index 3114486a..4190f79b 100644
--- a/application/controllers/Qrz.php
+++ b/application/controllers/Qrz.php
@@ -469,7 +469,6 @@ class Qrz extends CI_Controller {
 		$tableheaders .= "<td>Mode</td>";
 		$tableheaders .= "<td>QRZ QSL Received</td>";
 		$tableheaders .= "<td>QRZ Confirmed</td>";
-		$tableheaders .= "<td>Log Status</td>";
 		$tableheaders .= "</tr>";
 
 		$table = "";
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 15dadb8e..49a7d9ce 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -4931,7 +4931,6 @@ class Logbook_model extends CI_Model
       $table .= "<td>" . $record['mode'] . "</td>";
       $table .= "<td>" . $record['qsl_date'] . "</td>";
       $table .= "<td>" . ($record['qsl_rcvd'] == 'Y' ? '<span class="badge text-bg-success">Yes</span>' : '<span class="badge text-bg-danger">No</span>') . "</td>";
-      $table .= "<td>" . $log_status . "</td>";
       $table .= "</tr>";
     }
 
diff --git a/application/views/qrz/export.php b/application/views/qrz/export.php
index 4c65be05..0aa37e95 100644
--- a/application/views/qrz/export.php
+++ b/application/views/qrz/export.php
@@ -1,10 +1,9 @@
-
 <div class="container adif" id="qrz_export">
 
-    <h2><?php echo $page_title; ?></h2>
+	<h2><?php echo $page_title; ?></h2>
 
-    <div class="card">
-        <div class="card-header">
+	<div class="card">
+		<div class="card-header">
 			<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
 				<li class="nav-item">
 					<a class="nav-link active" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="import" aria-selected="true">Upload Logbook</a>
@@ -17,18 +16,18 @@
 				</li>
 			</ul>
 
-        </div>
+		</div>
 
-        <div class="card-body">
+		<div class="card-body">
 			<div class="tab-content">
 				<div class="tab-pane active" id="export" role="tabpanel" aria-labelledby="export-tab">
-            <p>Here you can see and upload all QSOs which have not been previously uploaded to a QRZ logbook.</p>
-            <p>You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.</p>
-            <p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
+					<p>Here you can see and upload all QSOs which have not been previously uploaded to a QRZ logbook.</p>
+					<p>You need to set a QRZ Logbook API key in your station profile. Only station profiles with an API Key set are displayed.</p>
+					<p><span class="badge text-bg-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
 
-<?php
-            if ($station_profile->result()) {
-            echo '
+					<?php
+					if ($station_profile->result()) {
+						echo '
 
             <table class="table table-bordered table-hover table-striped table-condensed text-center">
                 <thead>
@@ -41,66 +40,59 @@
                     <td>Actions</td>
                 </thead>
                 <tbody>';
-                foreach ($station_profile->result() as $station) {      // Fills the table with the data
-                echo '<tr>';
-                    echo '<td>' . $station->station_profile_name . '</td>';
-                    echo '<td>' . $station->station_callsign . '</td>';
-                    echo '<td id ="modcount'.$station->station_id.'">' . $station->modcount . '</td>';
-                    echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
-                    echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
-                    echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right ld-ext-right-'.$station->station_id.'" onclick="ExportQrz('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
-                    echo '</tr>';
-                }
-                echo '</tfoot></table>';
+						foreach ($station_profile->result() as $station) {      // Fills the table with the data
+							echo '<tr>';
+							echo '<td>' . $station->station_profile_name . '</td>';
+							echo '<td>' . $station->station_callsign . '</td>';
+							echo '<td id ="modcount' . $station->station_id . '">' . $station->modcount . '</td>';
+							echo '<td id ="notcount' . $station->station_id . '">' . $station->notcount . '</td>';
+							echo '<td id ="totcount' . $station->station_id . '">' . $station->totcount . '</td>';
+							echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right ld-ext-right-' . $station->station_id . '" onclick="ExportQrz(' . $station->station_id . ')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
+							echo '</tr>';
+						}
+						echo '</tfoot></table>';
+					} else {
+						echo '<div class="alert alert-danger" role="alert">Nothing found!</div>';
+					}
+					?>
 
-        }
-        else {
-        echo '<div class="alert alert-danger" role="alert">Nothing found!</div>';
-        }
-        ?>
+				</div>
+				<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
 
-        </div>
-			<div class="tab-pane fade" id="import" role="tabpanel" aria-labelledby="home-tab">
+					<form class="form" action="<?php echo site_url('qrz/import_qrz'); ?>" method="post" enctype="multipart/form-data">
+						Download QSOs from QRZ Logbook for all Locations<br>
+						<button type="submit" class="btn btn-sm btn-primary" value="Export">Download from QRZ Logbook</button>
+					</form>
+				</div>
 
-				<form class="form" action="<?php echo site_url('qrz/import_qrz'); ?>" method="post" enctype="multipart/form-data">
-					<p><span class="badge text-bg-warning">Warning</span> If no startdate is given then all QSOs after last confirmation will be downloaded/updated!</p>
-					<div class="row">
-						<div class="col-md-2">
-							<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
-							<input name="from" id="from" type="date" class="form-control w-auto">
+				<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
+
+					<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
+						<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
+							<option disabled value="0">Select Station Location</option>
+							<?php foreach ($station_profiles->result() as $station) { ?>
+								<option <?php if ($station->station_active) {
+											echo "selected ";
+										} ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+							<?php } ?>
+						</select>
+						<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
+						<div class="row">
+							<div class="col-md-2">
+								<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
+								<input name="from" id="from" type="date" class="form-control w-auto">
+							</div>
+
+							<div class="col-md-2">
+								<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
+								<input name="to" id="to" type="date" class="form-control w-auto">
+							</div>
 						</div>
-					</div>
-					<br>
-					<button type="submit" class="btn btn-sm btn-primary" value="Export">Download from QRZ  Logbook</button>
-				</form>
-			</div>
-
-		<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
-
-				<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
-					<select name="station_profile" class="form-select mb-4 me-sm-4" style="width: 30%;">
-						<option disabled value="0">Select Station Location</option>
-						<?php foreach ($station_profiles->result() as $station) { ?>
-							<option <?php if ($station->station_active) { echo "selected "; } ?>value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
-						<?php } ?>
-					</select>
-					<p><span class="badge text-bg-warning">Warning</span> If a date range is not selected then all QSOs will be marked!</p>
-					<div class="row">
-						<div class="col-md-2">
-							<label for="from"><?php echo lang('gen_from_date') . ": " ?></label>
-							<input name="from" id="from" type="date" class="form-control w-auto">
-						</div>
-
-						<div class="col-md-2">
-							<label for="to"><?php echo lang('gen_to_date') . ": " ?></label>
-							<input name="to" id="to" type="date" class="form-control w-auto">
-						</div>
-					</div>
-					<br>
-					<button type="submit" class="btn btn-sm btn-primary" value="Export">Mark QSOs as exported to QRZ Logbook</button>
-				</form>
-	</div>
+						<br>
+						<button type="submit" class="btn btn-sm btn-primary" value="Export">Mark QSOs as exported to QRZ Logbook</button>
+					</form>
+				</div>
 			</div>
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file