From a52827fdc0499243991d7f6c7fd07afb8e6fcb0b Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 11 Feb 2022 23:52:41 +0100
Subject: [PATCH 1/2] Added text (deleted dxcc) to the dropdown so it's easier
 to choose correct dxcc.

---
 application/views/dxatlas/index.php          | 6 +++++-
 application/views/kml/index.php              | 6 +++++-
 application/views/lookup/index.php           | 6 +++++-
 application/views/qso/edit_ajax.php          | 6 +++++-
 application/views/qso/index.php              | 6 +++++-
 application/views/station_profile/create.php | 3 ++-
 application/views/station_profile/edit.php   | 3 ++-
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index 7d7cad24..e013ecf9 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -60,7 +60,11 @@
 						<option value="All">All</option>
 						<?php
 						foreach($dxcc as $d){
-							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+							if ($d->Enddate != null) {
+								echo ' (deleted dxcc)';
+							}
+							echo '</option>';
 						}
 						?>
 
diff --git a/application/views/kml/index.php b/application/views/kml/index.php
index bef91511..eff5ebf2 100644
--- a/application/views/kml/index.php
+++ b/application/views/kml/index.php
@@ -33,7 +33,11 @@
                         <option value="All">All</option>
                         <?php
                         foreach($dxcc as $d){
-                            echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+                            echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+                            if ($d->Enddate != null) {
+                                echo ' (deleted dxcc)';
+                            }
+                            echo '</option>';
                         }
                         ?>
 
diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php
index 995ef6c6..d77358d1 100644
--- a/application/views/lookup/index.php
+++ b/application/views/lookup/index.php
@@ -14,7 +14,11 @@
 
 			<?php
 			foreach($dxcc as $d){
-				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+				if ($d->Enddate != null) {
+					echo ' (deleted dxcc)';
+				}
+				echo '</option>';
 			}
 			?>
 
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 5e377816..184c7215 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -266,7 +266,11 @@
                                                 if ($qso->COL_DXCC == $d->adif) {
                                                     echo " selected=\"selected\"";
                                                 }
-                                                echo '>' . $d->prefix . ' - ' . $d->name . '</option>';
+                                                echo '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name));
+                                                if ($d->Enddate != null) {
+                                                    echo ' (deleted dxcc)';
+                                                }
+                                                echo '</option>';
                                             }
                                             ?>
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 47d63432..4cffb987 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -258,7 +258,11 @@
                       <option value="0">None</option>
                       <?php
                       foreach($dxcc as $d){
-                          echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+                        echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
+                        if ($d->Enddate != null) {
+                          echo ' (deleted dxcc)';
+                        }
+                        echo '</option>';
                       }
                       ?>
 
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index bb900dcf..ec0ddf9b 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -46,7 +46,8 @@
 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected>NONE</option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-				<option value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
+				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)); if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
+				</option>
 				<?php } ?>
 				</select>
 				<?php } ?>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index dc9c5f07..aabc0c6e 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -57,7 +57,8 @@
 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
+							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)); if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
+							</option>
 							<?php } ?>
 							</select>
 							<?php } ?>

From 2418f63b2eaf7062084a6b92586866aff1c420cf Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 12 Feb 2022 12:07:36 +0100
Subject: [PATCH 2/2] Added prefix to dxcc dropdown in station location.

---
 application/views/station_profile/create.php | 2 +-
 application/views/station_profile/edit.php   | 2 +-
 application/views/timeplotter/index.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index ec0ddf9b..2c83e6f2 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -46,7 +46,7 @@
 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 				<option value="0" selected>NONE</option>
 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)); if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
+				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
 				</option>
 				<?php } ?>
 				</select>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index aabc0c6e..bd1a01ab 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -57,7 +57,7 @@
 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
-							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)); if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
+							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
 							</option>
 							<?php } ?>
 							</select>
diff --git a/application/views/timeplotter/index.php b/application/views/timeplotter/index.php
index 7fb28766..f5bcc5be 100644
--- a/application/views/timeplotter/index.php
+++ b/application/views/timeplotter/index.php
@@ -21,7 +21,7 @@
                         <?php
                         if ($dxcc_list->num_rows() > 0) {
                                 foreach ($dxcc_list->result() as $dxcc) {
-                                    echo '<option value=' . $dxcc->adif . '> ' . $dxcc->name . ' - ' . $dxcc->prefix;
+                                    echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
                                     if ($dxcc->end != null) {
                                         echo ' (deleted)';
                                     }