From 44615569f3626876709ccfa603ffce6a890b982b Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Thu, 10 Oct 2024 11:50:57 +0200
Subject: [PATCH] make dxcc required

---
 install/assets/css/installer.css |  5 +++++
 install/index.php                | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/install/assets/css/installer.css b/install/assets/css/installer.css
index bce66ff5e..95253dc03 100644
--- a/install/assets/css/installer.css
+++ b/install/assets/css/installer.css
@@ -248,6 +248,11 @@ div.alert-danger {
 	border-color: #ffc107;
 }
 
+#dxcc_button.is-invalid {
+	border: 1px solid;
+	border-color: red;
+}
+
 .uppercase {
 	text-transform: uppercase;
 }
diff --git a/install/index.php b/install/index.php
index 5fdf72b60..ec65729c5 100644
--- a/install/index.php
+++ b/install/index.php
@@ -484,7 +484,7 @@ if (!file_exists('.lock')) {
 										<div class="col-md-6 mb-2">
 											<label for="dxcc" class="form-label"><?= __("DXCC"); ?></label>
 											<select class="form-control" id="dxcc_id" name="dxcc" tabindex="7" aria-describedby="stationCallsignInputHelp">
-												<option value="0" selected=""><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
+												<option value="" selected=""><?= __("Please select one"); ?></option>
 												<option value="2">Abu Ail Is - A1 (<?= __("Deleted DXCC"); ?>)</option>
 												<option value="3">Afghanistan - YA</option>
 												<option value="4">Agalega &amp; St Brandon Islands - 3B7</option>
@@ -1607,6 +1607,7 @@ if (!file_exists('.lock')) {
 					'#callsign',
 					'#city',
 					'#user_email',
+					'#dxcc_id',
 					'#userlocator'
 				];
 
@@ -1682,7 +1683,11 @@ if (!file_exists('.lock')) {
 					let check = true;
 					firstUserInputIDs.forEach(function(inputID) {
 						if ($(inputID).val() == '') {
-							input_is_valid($(inputID), 'is-invalid');
+							if (inputID == '#dxcc_id') {
+								input_is_valid($('#dxcc_button'), 'is-invalid');
+							} else {
+								input_is_valid($(inputID), 'is-invalid');
+							}
 							show_userformwarnings('danger', "<?= __("At least one field is empty."); ?>");
 							return check = false;
 						} else {
@@ -1690,6 +1695,9 @@ if (!file_exists('.lock')) {
 								hide_userformwarnings();
 								input_is_valid($(inputID), 'is-valid');
 							}
+							if (inputID == '#dxcc_id') {
+								input_is_valid($('#dxcc_button'), 'is-valid');
+							}
 						}
 					});
 					return check;