Merge pull request #1287 from Werzi2001/version_2_exclude_deleted

exclud deleted DXCC and IOTA by default
This commit is contained in:
Peter Goodhall
2021-11-14 13:11:50 +00:00
committed by GitHub
3 changed files with 6 additions and 6 deletions

View File

@@ -120,7 +120,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = 1;
$postdata['confirmed'] = 1;
$postdata['notworked'] = 1;
$postdata['includedeleted'] = 1;
$postdata['includedeleted'] = 0;
$postdata['Africa'] = 1;
$postdata['Asia'] = 1;
$postdata['Europe'] = 1;
@@ -379,7 +379,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = 1;
$postdata['confirmed'] = 1;
$postdata['notworked'] = 1;
$postdata['includedeleted'] = 1;
$postdata['includedeleted'] = 0;
$postdata['Africa'] = 1;
$postdata['Asia'] = 1;
$postdata['Europe'] = 1;

View File

@@ -9,7 +9,7 @@
<div class="col-md-2 control-label" for="checkboxes">Deleted DXCC</div>
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted')) echo ' checked="checked"'; ?> >
<label class="form-check-label" for="includedeleted">Include deleted</label>
</div>
</div>
@@ -138,7 +138,7 @@
<td>#</td>
<td>DXCC Name</td>
<td>Prefix</td>';
if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
if ($this->input->post('includedeleted'))
echo '
<td>Deleted</td>';
foreach($bands as $band) {

View File

@@ -9,7 +9,7 @@
<div class="col-md-2 control-label" for="checkboxes">Deleted IOTA</div>
<div class="col-md-10">
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" <?php if ($this->input->post('includedeleted')) echo ' checked="checked"'; ?> >
<label class="form-check-label" for="includedeleted">Include deleted</label>
</div>
</div>
@@ -125,7 +125,7 @@
<td>IOTA</td>
<td>Prefix</td>
<td>Name</td>';
if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
if ($this->input->post('includedeleted'))
echo ' <td>Deleted</td>';
foreach($bands as $band) {