Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add None to DXCCs

Browse Source
This commit is contained in:
int2001
2024-10-09 07:51:49 +00:00
parent 7a5b9504ec
commit f5acf6ecca
10 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Station.php
View File

@@ -31,6 +31,7 @@ class Station extends CI_Controller
$this->load->library('form_validation');
$this->form_validation->set_rules('station_profile_name', 'Station Profile Name', 'required');
$this->form_validation->set_rules('dxcc', 'DXCC', 'required');
if ($this->form_validation->run() == FALSE) {
$data['page_title'] = __("Create Station Location");
@@ -50,6 +51,7 @@ class Station extends CI_Controller
$data = $this->load_station_for_editing($id);
$data['page_title'] = __("Edit Station Location: ") . $data['my_station_profile']->station_profile_name;
$this->form_validation->set_rules('dxcc', 'DXCC', 'required');
if ($this->form_validation->run() == FALSE) {
$this->load->view('interface_assets/header', $data);
$this->load->view('station_profile/edit');

2
application/controllers/Stationsetup.php
View File

@@ -376,7 +376,7 @@ class Stationsetup extends CI_Controller {
}
private function stationcountry2html($station_country, $dxcc_end) {
$returntext = $station_country == '' ? _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)") : $station_country;
$returntext = $station_country == '' ? __("Please select one") : $station_country;
if ($dxcc_end != NULL) {
$returntext .= ' <span class="badge bg-danger">'.__("Deleted DXCC").'</span>';
}

12
application/controllers/Update.php
View File

@@ -77,6 +77,18 @@ class Update extends CI_Controller {
if ($count % 10 == 0)
$this->update_status(__("Preparing DXCC-Entries: ").$count);
}
array_push($a_data, array(
'adif' => 0,
'name' => '- NONE - (e.g. /MM, /AM)',
'prefix' => '',
'ituz' => 0,
'cqz' => 0,
'cont' => '',
'long' => 0,
'lat' => 0,
'start' => null,
'end' => null
));
$this->db->insert_batch('dxcc_entities', $a_data);
$this->update_status();

2
application/models/Logbookadvanced_model.php
View File

@@ -219,7 +219,7 @@ class Logbookadvanced_model extends CI_Model {
$binding[] = $searchCriteria['iota'];
}
if ($searchCriteria['dxcc'] !== '') {
if ($searchCriteria['dxcc'] ?? '' !== '') {
$conditions[] = "COL_DXCC = ?";
$binding[] = $searchCriteria['dxcc'];
}

3
application/views/logbookadvanced/index.php
View File

@@ -162,8 +162,7 @@ $options = json_decode($options);
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="dxcc"><?= __("DXCC"); ?></label>
<select class="form-control form-control-sm" id="dxcc" name="dxcc">
<option value="">-</option>
<option value="0"><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
<option value=""><?= __("Please select one"); ?></option>
<?php
foreach ($dxccarray as $dxcc) {
echo '<option value=' . $dxcc->adif;

2
application/views/qso/edit_ajax.php
View File

@@ -218,7 +218,7 @@
<div class="mb-3 col-sm-6">
<label for="dxcc_id"><?= __("DXCC"); ?></label>
<select class="form-select" id="dxcc_id" name="dxcc_id" required>
<option value="0"><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
<option value=""><?= __("Please select one"); ?></option>
<?php
foreach($dxcc as $d){
echo '<option value=' . $d->adif;

11
application/views/station_profile/create.php
View File

@@ -1,12 +1,5 @@
<script>
var dxccarray = [];
dxccarray.push({
adif: 0,
name: '- None -',
cq: '',
itu: '',
});
<?php
if ($dxcc_list->result() > 0) {
@@ -74,8 +67,8 @@ if ($dxcc_list->result() > 0) {
<div class="mb-3">
<label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
<?php if ($dxcc_list->num_rows() > 0) { ?>
<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
<option value="0" selected><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
<option value="" selected><?= _("Please select one"); ?></option>
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' ('.__("Deleted DXCC").')';?>
</option>

8
application/views/station_profile/edit.php
View File

@@ -1,8 +1,8 @@
<script>
var dxccarray = [];
dxccarray.push({
adif: 0,
name: '- None -',
adif: null,
name: '-',
cq: '',
itu: '',
});
@@ -95,8 +95,8 @@ if ($dxcc_list->result() > 0) {
<div class="mb-3">
<label for="stationDXCCInput"><?= __("Station DXCC"); ?></label>
<?php if ($dxcc_list->num_rows() > 0) { ?>
<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp">
<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>><?= _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)"); ?></option>
<select class="form-control" id="dxcc_id" name="dxcc" aria-describedby="stationCallsignInputHelp" required>
<option value="" <?php if($my_station_profile->station_dxcc ?? '' == "") { ?>selected<?php } ?>><?= __("Please select one"); ?></option>
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
<?php $isDeleted = $dxcc->end !== NULL; ?>
<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>>

2
application/views/stationsetup/stationsetup.php
View File

@@ -147,7 +147,7 @@
<?php echo $row->station_profile_name;?><br>
</td>
<td><?php echo $row->station_callsign;?></td>
<td><?php echo $row->station_country == '' ? _pgettext("DXCC Select - No DXCC", "- NONE - (e.g. /MM, /AM)") : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
<td><?php echo $row->station_country == '' ? __("Please select one") : $row->station_country; if ($row->dxcc_end != NULL) { echo ' <span class="badge bg-danger">'.__("Deleted DXCC").'</span>'; } ?></td>
<td><?php echo $row->station_gridsquare;?></td>
<td>
<?php if($row->station_active != 1) { ?>

6
install/index.php
View File

@@ -483,8 +483,8 @@ if (!file_exists('.lock')) {
</div>
<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>
<select class="form-control" id="dxcc_id" name="dxcc" tabindex="7" aria-describedby="stationCallsignInputHelp" required>
<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>
@@ -1957,4 +1957,4 @@ if (!file_exists('.lock')) {
header("Location: $websiteurl");
} ?>
</html>
</html>