diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 8481ac2a5..d15802260 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -40,7 +40,7 @@ function echo_table_col($row, $name) {
case 'Bearing':echo '| COL_VUCC_GRIDS : $row->COL_GRIDSQUARE).'">' . getBearing(($row->COL_VUCC_GRIDS!="" ? $row->COL_VUCC_GRIDS : $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { echo strtolower($row->COL_BAND ?? ''); } echo ''; break;
case 'Frequency':
- echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { echo $ci->frequency->qrg_conversion($row->COL_FREQ); } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null && $row->COL_FREQ != 0) { echo $ci->frequency->qrg_conversion($row->COL_FREQ); } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
case 'Name': echo '' . ($row->COL_NAME) . ' | '; break;
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 0a8d01b3a..5c38d76a0 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -18,7 +18,7 @@ function echo_table_header_col($ctx, $name) {
case 'Location': echo ''.__("Station Location").' | '; break;
case 'Name': echo ''.__("Name").' | '; break;
case 'Bearing': echo ''.__("Bearing").' | '; break;
- case 'Propagation': echo ''.__("Propagation").' | '; break;
+ case 'Propagation': echo ''.__("Propagation").' | '; break;
}
}
@@ -26,93 +26,93 @@ function echo_table_col($row, $name) {
$ci =& get_instance();
switch($name) {
case 'Mode': echo ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ' | '; break;
- case 'RSTS': echo '' . $row->COL_RST_SENT ?? ''; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ' | '; break;
- case 'RSTR': echo '' . $row->COL_RST_RCVD ?? ''; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ' | '; break;
+ case 'RSTS': echo '' . $row->COL_RST_SENT ?? ''; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo ' | '; break;
+ case 'RSTR': echo '' . $row->COL_RST_RCVD ?? ''; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo ' | '; break;
case 'Country': echo ''; if ($row->adif == 0) { echo $row->name; } else echo ucwords(strtolower(($row->name==null?"- NONE -":$row->name))); if ($row->end != null) echo ' '.__("Deleted DXCC").'' . ' | '; break;
case 'IOTA': echo '' . ($row->COL_IOTA ?? '') . ' | '; break;
case 'SOTA': echo '' . ($row->COL_SOTA_REF ?? '') . ' | '; break;
case 'WWFF': echo '' . ($row->COL_WWFF_REF ?? '') . ' | '; break;
case 'POTA': echo '' . ($row->COL_POTA_REF ?? '') . ' | '; break;
case 'Grid':
- if(!$ci->load->is_loaded('Qra')) {
- $ci->load->library('Qra');
- }
- echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
+ if(!$ci->load->is_loaded('Qra')) {
+ $ci->load->library('Qra');
+ }
+ echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Distance':echo '' . getDistance($row->COL_DISTANCE) . ' | '; break;
case 'Bearing':echo 'COL_VUCC_GRIDS : $row->COL_GRIDSQUARE).'">' . getBearing(($row->COL_VUCC_GRIDS!="" ? $row->COL_VUCC_GRIDS : $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Band':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
case 'Frequency':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null && $row->COL_FREQ != 0) { echo ' '.$ci->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE ?? '') . ' | '; break;
case 'Operator':echo '' . ($row->COL_OPERATOR ?? '') . ' | '; break;
case 'Location':echo '' . ($row->station_profile_name ?? '') . ' | '; break;
case 'Name':echo '' . ($row->COL_NAME ?? '') . ' | '; break;
- case 'Propagation':
- if (isset($row->COL_PROP_MODE)) {
- switch($row->COL_PROP_MODE) {
- case 'AS':
- echo '' . _pgettext("Propagation Mode","Aircraft Scatter") . ' | ';
- break;
- case 'AUR':
- echo '' . _pgettext("Propagation Mode","Aurora") . ' | ';
- break;
- case 'AUE':
- echo '' . _pgettext("Propagation Mode","Aurora-E") . ' | ';
- break;
- case 'BS':
- echo '' . _pgettext("Propagation Mode","Back scatter") . ' | ';
- break;
- case 'ECH':
- echo '' . _pgettext("Propagation Mode","EchoLink") . ' | ';
- break;
- case 'EME':
- echo '' . _pgettext("Propagation Mode","Earth-Moon-Earth") . ' | ';
- break;
- case 'ES':
- echo '' . _pgettext("Propagation Mode","Sporadic E") . ' | ';
- break;
- case 'FAI':
- echo '' . _pgettext("Propagation Mode","Field Aligned Irregularities") . ' | ';
- break;
- case 'F2':
- echo '' . _pgettext("Propagation Mode","F2 Reflection") . ' | ';
- break;
- case 'INTERNET':
- echo '' . _pgettext("Propagation Mode","Internet-assisted") . ' | ';
- break;
- case 'ION':
- echo '' . _pgettext("Propagation Mode","Ionoscatter") . ' | ';
- break;
- case 'IRL':
- echo '' . _pgettext("Propagation Mode","IRLP") . ' | ';
- break;
- case 'MS':
- echo '' . _pgettext("Propagation Mode","Meteor scatter") . ' | ';
- break;
- case 'RPT':
- echo '' . _pgettext("Propagation Mode","Terrestrial or atmospheric repeater or transponder") . ' | ';
- break;
- case 'RS':
- echo '' . _pgettext("Propagation Mode","Rain scatter") . ' | ';
- break;
- case 'SAT':
- echo '' . _pgettext("Propagation Mode","Satellite") . ' | ';
- break;
- case 'TEP':
- echo '' . _pgettext("Propagation Mode","Trans-equatorial") . ' | ';
- break;
- case 'TR':
- echo '' . _pgettext("Propagation Mode","Tropospheric ducting") . ' | ';
- break;
- default:
- echo '' . htmlspecialchars($row->COL_PROP_MODE ?? '') . ' | ';
- break;
- }
- } else {
- echo ' | ';
- }
- break;
+ case 'Propagation':
+ if (isset($row->COL_PROP_MODE)) {
+ switch($row->COL_PROP_MODE) {
+ case 'AS':
+ echo '' . _pgettext("Propagation Mode","Aircraft Scatter") . ' | ';
+ break;
+ case 'AUR':
+ echo '' . _pgettext("Propagation Mode","Aurora") . ' | ';
+ break;
+ case 'AUE':
+ echo '' . _pgettext("Propagation Mode","Aurora-E") . ' | ';
+ break;
+ case 'BS':
+ echo '' . _pgettext("Propagation Mode","Back scatter") . ' | ';
+ break;
+ case 'ECH':
+ echo '' . _pgettext("Propagation Mode","EchoLink") . ' | ';
+ break;
+ case 'EME':
+ echo '' . _pgettext("Propagation Mode","Earth-Moon-Earth") . ' | ';
+ break;
+ case 'ES':
+ echo '' . _pgettext("Propagation Mode","Sporadic E") . ' | ';
+ break;
+ case 'FAI':
+ echo '' . _pgettext("Propagation Mode","Field Aligned Irregularities") . ' | ';
+ break;
+ case 'F2':
+ echo '' . _pgettext("Propagation Mode","F2 Reflection") . ' | ';
+ break;
+ case 'INTERNET':
+ echo '' . _pgettext("Propagation Mode","Internet-assisted") . ' | ';
+ break;
+ case 'ION':
+ echo '' . _pgettext("Propagation Mode","Ionoscatter") . ' | ';
+ break;
+ case 'IRL':
+ echo '' . _pgettext("Propagation Mode","IRLP") . ' | ';
+ break;
+ case 'MS':
+ echo '' . _pgettext("Propagation Mode","Meteor scatter") . ' | ';
+ break;
+ case 'RPT':
+ echo '' . _pgettext("Propagation Mode","Terrestrial or atmospheric repeater or transponder") . ' | ';
+ break;
+ case 'RS':
+ echo '' . _pgettext("Propagation Mode","Rain scatter") . ' | ';
+ break;
+ case 'SAT':
+ echo '' . _pgettext("Propagation Mode","Satellite") . ' | ';
+ break;
+ case 'TEP':
+ echo '' . _pgettext("Propagation Mode","Trans-equatorial") . ' | ';
+ break;
+ case 'TR':
+ echo '' . _pgettext("Propagation Mode","Tropospheric ducting") . ' | ';
+ break;
+ default:
+ echo '' . htmlspecialchars($row->COL_PROP_MODE ?? '') . ' | ';
+ break;
+ }
+ } else {
+ echo ' | ';
+ }
+ break;
}
}