Generalize band and also use in QSO entry

application/controllers/Qso.php

@@ -38,6 +38,7 @@ class QSO extends CI_Controller {
 		$data['iota'] = $this->logbook_model->fetchIota();
 		$data['modes'] = $this->modes->active();
 		$data['bands'] = $this->bands->get_user_bands_for_qso_entry();
+		$data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band');
 		$data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true);
 
 		$this->load->library('form_validation');

application/language/english/account_lang.php

@@ -96,8 +96,6 @@ $lang['account_login'] = 'Login';
 $lang['account_mastodon'] = 'Mastodonserver';
 $lang['account_user_mastodon'] = 'URL of Mastodonserver';
 
-$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map';
+$lang['account_default_band_settings'] = 'Settings for Default Band and Confirmation';
 $lang['account_gridmap_default_band'] = 'Default Band';
-$lang['account_qsl_settings'] = 'Default QSL-Method shown in views (Gridsquare and Add-QSO)';
+$lang['account_qsl_settings'] = 'Default QSL-Methods';
-
-

application/language/german/account_lang.php

@@ -96,8 +96,6 @@ $lang['account_login'] = 'Anmeldung';
 $lang['account_mastodon'] = 'Mastodonserver';
 $lang['account_user_mastodon'] = 'URL des Mastodonservers';
 
-$lang['account_gridmap_settings'] = 'Einstellung der Planquadratkarte';
+$lang['account_default_band_settings'] = 'Einstellung für Standardband und -bestätigungsmethode';
 $lang['account_gridmap_default_band'] = 'Standardband';
-$lang['account_qsl_settings'] = 'QSL-Methoden, die in der Planquadratkarte und beim anlegen eines QSOs angezeigt werden';
+$lang['account_qsl_settings'] = 'Standard QSL-Methoden';
-
-

application/views/qso/index.php

@@ -107,8 +107,10 @@
                           echo '<optgroup label="' . strtoupper($key) . '">';
                           foreach($bandgroup as $band) {
                             echo '<option value="' . $band . '"';
-                              if ($this->session->userdata('band') == $band) echo ' selected';
+                            if ($this->session->userdata('band') == $band || $user_gridmap_default_band == $band) {
-                              echo '>' . $band . '</option>'."\n";
+                              echo ' selected';
+                            }
+                            echo '>' . $band . '</option>'."\n";
                           }
                           echo '</optgroup>';
                         }

application/views/user/add.php

@@ -546,7 +546,7 @@
             <div class="col-md">
                 <div class="card">
                     <div class="card-header">
-                    <?php echo lang('account_gridmap_settings'); ?>
+                    <?php echo lang('account_default_band_settings'); ?>
                     </div>
                     <div class="card-body">
                             <div class="form-group">
@@ -564,7 +564,7 @@
                                 </select>
                             </div>
                             <div class="form-group">
-                                <label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+                                <label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
                                 <div class="form-check-inline">
                                     <?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"';
                                         if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {

application/views/user/edit.php

@@ -545,7 +545,7 @@
 			<div class="col-md">
 				<div class="card">
 					<div class="card-header">
-						<?php echo lang('account_gridmap_settings'); ?>
+						<?php echo lang('account_default_band_settings'); ?>
 					</div>
 					<div class="card-body">
 						<div class="form-group">
@@ -562,13 +562,8 @@
 							} ?>
 							</select>
 						</div>
-					</div>
-					<div class="card-header">
-						<?php echo lang('account_qsl_settings'); ?>
-					</div>
-					<div class="card-body">
 						<div class="form-group">
-							<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
+							<label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
 							<div class="form-check-inline">
 								<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"';
 								if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {