goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge pull request #429 from phl0/fixAndUpdateAwards

浏览代码 
Fix and update awards
这个提交包含在：
Peter Goodhall 2020-03-05 16:16:57 +00:00 提交者 GitHub
当前提交 beba4b10d6
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改，包括 32 次插入 和 27 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/controllers/Awards.php
查看文件

@ -99,7 +99,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = $this->input->post('worked'); $postdata['worked'] = $this->input->post('worked');
$postdata['confirmed'] = $this->input->post('confirmed'); $postdata['confirmed'] = $this->input->post('confirmed');
$postdata['notworked'] = $this->input->post('notworked'); $postdata['notworked'] = $this->input->post('notworked');
$postdata['deleted'] = $this->input->post('deleted'); $postdata['includedeleted'] = $this->input->post('includedeleted');
$postdata['Africa'] = $this->input->post('Africa'); $postdata['Africa'] = $this->input->post('Africa');
$postdata['Asia'] = $this->input->post('Asia'); $postdata['Asia'] = $this->input->post('Asia');
$postdata['Europe'] = $this->input->post('Europe'); $postdata['Europe'] = $this->input->post('Europe');
@ -115,7 +115,7 @@ class Awards extends CI_Controller {
$postdata['worked'] = 1; $postdata['worked'] = 1;
$postdata['confirmed'] = 1; $postdata['confirmed'] = 1;
$postdata['notworked'] = 1; $postdata['notworked'] = 1;
$postdata['deleted'] = 1; $postdata['includedeleted'] = 1;
$postdata['Africa'] = 1; $postdata['Africa'] = 1;
$postdata['Asia'] = 1; $postdata['Asia'] = 1;
$postdata['Europe'] = 1; $postdata['Europe'] = 1;
@ -259,4 +259,4 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer'); $this->load->view('interface_assets/footer');
} }
} }

15
application/models/Dxcc.php
查看文件

@ -182,7 +182,8 @@ class DXCC extends CI_Model {
foreach ($dxccArray as $dxcc) { foreach ($dxccArray as $dxcc) {
$dxccMatrix[$dxcc->adif]['name'] = $dxcc->name; $dxccMatrix[$dxcc->adif]['name'] = $dxcc->name;
$dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix; $dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix;
$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "<div class='alert-danger'>Y</div>" : ''; if ($postdata['includedeleted'])
$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "<div class='alert-danger'>Y</div>" : '';
$dxccMatrix[$dxcc->adif][$band] = '-'; $dxccMatrix[$dxcc->adif][$band] = '-';
} }
@ -223,7 +224,7 @@ class DXCC extends CI_Model {
} }
} }
if ($dxccMatrix) { if (isset($dxccMatrix)) {
return $dxccMatrix; return $dxccMatrix;
} }
else { else {
@ -250,7 +251,7 @@ class DXCC extends CI_Model {
$sql .= " group by col_dxcc $sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc"; ) x on dxcc_entities.adif = x.col_dxcc";
if ($postdata['deleted'] == NULL) { if ($postdata['includedeleted'] == NULL) {
$sql .= " and dxcc_entities.end is null"; $sql .= " and dxcc_entities.end is null";
} }
@ -278,7 +279,7 @@ class DXCC extends CI_Model {
$sql .= " group by col_dxcc $sql .= " group by col_dxcc
) x on dxcc_entities.adif = x.col_dxcc";; ) x on dxcc_entities.adif = x.col_dxcc";;
if ($postdata['deleted'] == NULL) { if ($postdata['includedeleted'] == NULL) {
$sql .= " and dxcc_entities.end is null"; $sql .= " and dxcc_entities.end is null";
} }
@ -314,7 +315,7 @@ class DXCC extends CI_Model {
$sql .= " where 1 = 1"; $sql .= " where 1 = 1";
if ($postdata['deleted'] == NULL) { if ($postdata['includedeleted'] == NULL) {
$sql .= " and end is null"; $sql .= " and end is null";
} }
@ -362,7 +363,7 @@ class DXCC extends CI_Model {
) ll on dxcc_entities.adif = ll.col_dxcc ) ll on dxcc_entities.adif = ll.col_dxcc
where 1=1"; where 1=1";
if ($postdata['deleted'] == 'false') { if ($postdata['includedeleted'] == 'false') {
$sql .= " and dxcc_entities.end is null"; $sql .= " and dxcc_entities.end is null";
} }
@ -396,7 +397,7 @@ class DXCC extends CI_Model {
) ll on dxcc_entities.adif = ll.col_dxcc ) ll on dxcc_entities.adif = ll.col_dxcc
where 1=1"; where 1=1";
if ($postdata['deleted'] == 'false') { if ($postdata['includedeleted'] == 'false') {
$sql .= " and dxcc_entities.end is null"; $sql .= " and dxcc_entities.end is null";
} }

38
application/views/awards/dxcc/index.php
查看文件

@ -10,10 +10,10 @@
<!-- Multiple Checkboxes (inline) --> <!-- Multiple Checkboxes (inline) -->
<div class="form-group row"> <div class="form-group row">
<div class="col-md-2 control-label" for="checkboxes">Deleted dxcc</div> <div class="col-md-2 control-label" for="checkboxes">Deleted DXCC</div>
<div class="col-md-10"> <div class="col-md-10">
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="includedeleted" id="includedeleted" value="1" checked="1"> <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"'; ?> >
<label class="form-check-label" for="includedeleted">Include Deleted</label> <label class="form-check-label" for="includedeleted">Include Deleted</label>
</div> </div>
</div> </div>
@ -24,15 +24,15 @@
<div class="col-md-2" for="checkboxes">Worked / confirmed</div> <div class="col-md-2" for="checkboxes">Worked / confirmed</div>
<div class="col-md-10"> <div class="col-md-10">
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="worked" id="worked" value="1" <?php if ($this->input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="worked">Show worked</label> <label class="form-check-label" for="worked">Show worked</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="confirmed" id="confirmed" value="1" <?php if ($this->input->post('confirmed') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="confirmed">Show confirmed</label> <label class="form-check-label" for="confirmed">Show confirmed</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="notworked" id="notworked" value="1" <?php if ($this->input->post('notworked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="notworked">Show not worked</label> <label class="form-check-label" for="notworked">Show not worked</label>
</div> </div>
</div> </div>
@ -42,11 +42,11 @@
<div class="col-md-2">QSL / LoTW</div> <div class="col-md-2">QSL / LoTW</div>
<div class="col-md-10"> <div class="col-md-10">
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="qsl" value="1" checked="1" id="qsl"> <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="qsl">QSL</label> <label class="form-check-label" for="qsl">QSL</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="lotw" value="1" checked="1" id="lotw"> <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="lotw">LoTW</label> <label class="form-check-label" for="lotw">LoTW</label>
</div> </div>
</div> </div>
@ -56,31 +56,31 @@
<div class="col-md-2">Continents</div> <div class="col-md-2">Continents</div>
<div class="col-md-10"> <div class="col-md-10">
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="Antarctica" id="Antarctica" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="Antarctica" id="Antarctica" value="1" <?php if ($this->input->post('Antarctica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="Antarctica">Antarctica</label> <label class="form-check-label" for="Antarctica">Antarctica</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="Africa" id="Africa" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="Africa" id="Africa" value="1" <?php if ($this->input->post('Africa') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="Africa">Africa</label> <label class="form-check-label" for="Africa">Africa</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="Asia" id="Asia" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="Asia" id="Asia" value="1" <?php if ($this->input->post('Asia') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="Asia">Asia</label> <label class="form-check-label" for="Asia">Asia</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="Europe" id="Europe" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="Europe" id="Europe" value="1" <?php if ($this->input->post('Europe') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="Europe">Europe</label> <label class="form-check-label" for="Europe">Europe</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="NorthAmerica" id="NorthAmerica" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="NorthAmerica" id="NorthAmerica" value="1" <?php if ($this->input->post('NorthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="NorthAmerica">North America</label> <label class="form-check-label" for="NorthAmerica">North America</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="SouthAmerica" id="SouthAmerica" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="SouthAmerica" id="SouthAmerica" value="1" <?php if ($this->input->post('SouthAmerica') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="SouthAmerica">South America</label> <label class="form-check-label" for="SouthAmerica">South America</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="Oceania" id="Oceania" value="1" checked="1"> <input class="form-check-input" type="checkbox" name="Oceania" id="Oceania" value="1" <?php if ($this->input->post('Oceania') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
<label class="form-check-label" for="Oceania">Oceania</label> <label class="form-check-label" for="Oceania">Oceania</label>
</div> </div>
</div> </div>
@ -91,9 +91,11 @@
<label class="col-md-2 control-label" for="band">Band</label> <label class="col-md-2 control-label" for="band">Band</label>
<div class="col-md-2"> <div class="col-md-2">
<select id="band2" name="band" class="form-control"> <select id="band2" name="band" class="form-control">
<option value="All" selected>Every band</option> <option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
<?php foreach($worked_bands as $band) { <?php foreach($worked_bands as $band) {
echo '<option value="' . $band . '">' . $band . '</option>'; echo '<option value="' . $band . '"';
if ($this->input->post('band') == $band) echo ' selected';
echo '>' . $band . '</option>'."\n";
} ?> } ?>
</select> </select>
</div> </div>
@ -120,7 +122,9 @@
<tr> <tr>
<td>#</td> <td>#</td>
<td>DXCCName</td> <td>DXCCName</td>
<td>Prefix</td> <td>Prefix</td>';
if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
echo '
<td>Deleted</td>'; <td>Deleted</td>';
foreach($bands as $band) { foreach($bands as $band) {
echo '<td>' . $band . '</td>'; echo '<td>' . $band . '</td>';