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

Merge pull request #186 from teabreakninja/master

浏览代码 
DXCC 4m & eQSL log view
这个提交包含在：
Peter Goodhall 2016-02-13 18:28:09 +00:00
当前提交 f4f3b37ef0
共有 4 个文件被更改，包括 24 次插入 和 19 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

5
application/models/dxcc.php
查看文件

@ -30,8 +30,9 @@ class DXCC extends CI_Model {
"15m"=>0,
"12m"=>0,
"10m"=>0,
"6m"=>0,
"2m"=>0);
"4m" =>0,
"6m" =>0,
"2m" =>0);
$last_country = $row->COL_COUNTRY;
}

12
application/models/logbook_model.php
查看文件

@ -158,6 +158,12 @@ class Logbook_model extends CI_Model {
'COL_CQZ' => $this->input->post('cqz'),
);
// if eQSL username set, default SENT & RCVD to 'N' else leave as null
if ($this->session->userdata('user_eqsl_name')){
$data['COL_EQSL_QSL_SENT'] = 'N';
$data['COL_EQSL_QSL_RCVD'] = 'N';
}
$this->add_qso($data);
}
@ -924,6 +930,12 @@ class Logbook_model extends CI_Model {
'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD
);
// if eQSL username set, default SENT & RCVD to 'N' else leave as null
if ($this->session->userdata('user_eqsl_name')){
$data['COL_EQSL_QSL_SENT'] = 'N';
$data['COL_EQSL_QSL_RCVD'] = 'N';
}
$this->add_qso($data);
}
}

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

@ -25,24 +25,11 @@
<td>12m</td>
<td>10m</td>
<td>6m</td>
<td>4m</td>
<td>2m</td>
</tr>
</thead>
<tbody>
<tr>
<td>Country</td>
<td>160m</td>
<td>80m</td>
<td>40m</td>
<td>30m</td>
<td>20m</td>
<td>17m</td>
<td>15m</td>
<td>12m</td>
<td>10m</td>
<td>6m</td>
<td>2m</td>
</tr>
<?php
foreach($dxcc as $country=>$val){

11
application/views/view_log/partial/log.php
查看文件

@ -52,12 +52,17 @@
<?php } ?>
</td>
<?php if ($this->session->userdata('user_eqsl_name') != "" && $row->COL_EQSL_QSL_SENT != ''){ ?>
<?php if ($this->session->userdata('user_eqsl_name') != ""){
if ($row->COL_EQSL_QSL_SENT != '') { ?>
<td class="eqsl">
<span class="eqsl-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span class="eqsl-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
</td>
<?php } ?>
<?php }else{ ?>
<td class="eqsl">&nbsp;</td>
<?php }
}
?>
<?php if($this->session->userdata('user_lotw_name') != "") { ?>
<td class="lotw">
@ -116,4 +121,4 @@ TD.lotw{
font-size: 1.1em;
}
</style>
</style>