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

Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev

浏览代码
这个提交包含在：
Peter Goodhall 2023-08-14 14:48:27 +01:00
当前提交 259ff03d79
共有 6 个文件被更改，包括 107 次插入 和 64 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

7
application/controllers/Dashboard.php
查看文件

@ -87,12 +87,19 @@ class Dashboard extends CI_Controller {
$data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent']; $data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent'];
$data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received']; $data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received'];
$data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested']; $data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested'];
$data['qsl_sent_today'] = $QSLStatsBreakdownArray['QSL_Sent_today'];
$data['qsl_rcvd_today'] = $QSLStatsBreakdownArray['QSL_Received_today'];
$data['qsl_requested_today'] = $QSLStatsBreakdownArray['QSL_Requested_today'];
$data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent']; $data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent'];
$data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received']; $data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received'];
$data['eqsl_sent_today'] = $QSLStatsBreakdownArray['eQSL_Sent_today'];
$data['eqsl_rcvd_today'] = $QSLStatsBreakdownArray['eQSL_Received_today'];
$data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent']; $data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent'];
$data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received']; $data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received'];
$data['lotw_sent_today'] = $QSLStatsBreakdownArray['LoTW_Sent_today'];
$data['lotw_rcvd_today'] = $QSLStatsBreakdownArray['LoTW_Received_today'];
$data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array); $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array);

1
application/language/english/general_words_lang.php
查看文件

@ -140,3 +140,4 @@ $lang['oceania'] = 'Oceania';
$lang['southamerica'] = 'South America'; $lang['southamerica'] = 'South America';
$lang['gen_band_selection'] = 'Band selection'; $lang['gen_band_selection'] = 'Band selection';
$lang['general_word_today'] = 'Today';

1
application/language/german/general_words_lang.php
查看文件

@ -142,3 +142,4 @@ $lang['oceania'] = 'Ozeanien';
$lang['southamerica'] = 'Südamerika'; $lang['southamerica'] = 'Südamerika';
$lang['gen_band_selection'] = 'Bandauswahl'; $lang['gen_band_selection'] = 'Bandauswahl';
$lang['general_word_today'] = 'Heute';

130
application/models/Logbook_model.php
查看文件

@ -2241,64 +2241,88 @@ class Logbook_model extends CI_Model {
function get_QSLStats($StationLocationsArray = null) { function get_QSLStats($StationLocationsArray = null) {
if($StationLocationsArray == null) { if($StationLocationsArray == null) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('logbooks_model'); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
} else { } else {
$logbooks_locations_array = $StationLocationsArray; $logbooks_locations_array = $StationLocationsArray;
} }
if(!empty($logbooks_locations_array)) { if(!empty($logbooks_locations_array)) {
$this->db->select(' $this->db->select('
COUNT(IF(COL_QSL_SENT="Y",COL_QSL_SENT,null)) as QSL_Sent, COUNT(IF(COL_QSL_SENT="Y",COL_QSL_SENT,null)) as QSL_Sent,
COUNT(IF(COL_QSL_RCVD="Y",COL_QSL_RCVD,null)) as QSL_Received, COUNT(IF(COL_QSL_RCVD="Y",COL_QSL_RCVD,null)) as QSL_Received,
COUNT(IF(COL_QSL_SENT IN("Q", "R") ,COL_QSL_SENT,null)) as QSL_Requested, COUNT(IF(COL_QSL_SENT IN("Q", "R") ,COL_QSL_SENT,null)) as QSL_Requested,
COUNT(IF(COL_EQSL_QSL_SENT="Y",COL_EQSL_QSL_SENT,null)) as eQSL_Sent, COUNT(IF(COL_EQSL_QSL_SENT="Y",COL_EQSL_QSL_SENT,null)) as eQSL_Sent,
COUNT(IF(COL_EQSL_QSL_RCVD="Y",COL_EQSL_QSL_RCVD,null)) as eQSL_Received, COUNT(IF(COL_EQSL_QSL_RCVD="Y",COL_EQSL_QSL_RCVD,null)) as eQSL_Received,
COUNT(IF(COL_LOTW_QSL_SENT="Y",COL_LOTW_QSL_SENT,null)) as LoTW_Sent, COUNT(IF(COL_LOTW_QSL_SENT="Y",COL_LOTW_QSL_SENT,null)) as LoTW_Sent,
COUNT(IF(COL_LOTW_QSL_RCVD="Y",COL_LOTW_QSL_RCVD,null)) as LoTW_Received COUNT(IF(COL_LOTW_QSL_RCVD="Y",COL_LOTW_QSL_RCVD,null)) as LoTW_Received,
'); COUNT(IF(COL_QSL_SENT="Y" and DATE(COL_QSLSDATE)=DATE(SYSDATE()),COL_QSL_SENT,null)) as QSL_Sent_today,
$this->db->where_in('station_id', $logbooks_locations_array); COUNT(IF(COL_QSL_RCVD="Y" and DATE(COL_QSLRDATE)=DATE(SYSDATE()),COL_QSL_RCVD,null)) as QSL_Received_today,
COUNT(IF(COL_QSL_SENT IN("Q", "R") and DATE(COL_QSLSDATE)=DATE(SYSDATE()) ,COL_QSL_SENT,null)) as QSL_Requested_today,
COUNT(IF(COL_EQSL_QSL_SENT="Y" and DATE(COL_EQSL_QSLSDATE)=DATE(SYSDATE()),COL_EQSL_QSL_SENT,null)) as eQSL_Sent_today,
COUNT(IF(COL_EQSL_QSL_RCVD="Y" and DATE(COL_EQSL_QSLRDATE)=DATE(SYSDATE()),COL_EQSL_QSL_RCVD,null)) as eQSL_Received_today,
COUNT(IF(COL_LOTW_QSL_SENT="Y" and DATE(COL_LOTW_QSLSDATE)=DATE(SYSDATE()),COL_LOTW_QSL_SENT,null)) as LoTW_Sent_today,
COUNT(IF(COL_LOTW_QSL_RCVD="Y" and DATE(COL_LOTW_QSLRDATE)=DATE(SYSDATE()),COL_LOTW_QSL_RCVD,null)) as LoTW_Received_today
');
$this->db->where_in('station_id', $logbooks_locations_array);
if ($query = $this->db->get($this->config->item('table_name'))) if ($query = $this->db->get($this->config->item('table_name'))) {
{ $this->db->last_query();
$this->db->last_query(); foreach ($query->result() as $row) {
foreach ($query->result() as $row) $QSLBreakdown['QSL_Sent'] = $row->QSL_Sent;
{ $QSLBreakdown['QSL_Received'] = $row->QSL_Received;
$QSLBreakdown['QSL_Sent'] = $row->QSL_Sent; $QSLBreakdown['QSL_Requested'] = $row->QSL_Requested;
$QSLBreakdown['QSL_Received'] = $row->QSL_Received; $QSLBreakdown['eQSL_Sent'] = $row->eQSL_Sent;
$QSLBreakdown['QSL_Requested'] = $row->QSL_Requested; $QSLBreakdown['eQSL_Received'] = $row->eQSL_Received;
$QSLBreakdown['eQSL_Sent'] = $row->eQSL_Sent; $QSLBreakdown['LoTW_Sent'] = $row->LoTW_Sent;
$QSLBreakdown['eQSL_Received'] = $row->eQSL_Received; $QSLBreakdown['LoTW_Received'] = $row->LoTW_Received;
$QSLBreakdown['LoTW_Sent'] = $row->LoTW_Sent; $QSLBreakdown['QSL_Sent_today'] = $row->QSL_Sent_today;
$QSLBreakdown['LoTW_Received'] = $row->LoTW_Received; $QSLBreakdown['QSL_Received_today'] = $row->QSL_Received_today;
} $QSLBreakdown['QSL_Requested_today'] = $row->QSL_Requested_today;
$QSLBreakdown['eQSL_Sent_today'] = $row->eQSL_Sent_today;
$QSLBreakdown['eQSL_Received_today'] = $row->eQSL_Received_today;
$QSLBreakdown['LoTW_Sent_today'] = $row->LoTW_Sent_today;
$QSLBreakdown['LoTW_Received_today'] = $row->LoTW_Received_today;
}
return $QSLBreakdown; return $QSLBreakdown;
} } else {
else $QSLBreakdown['QSL_Sent'] = 0;
{ $QSLBreakdown['QSL_Received'] = 0;
$QSLBreakdown['QSL_Sent'] = 0; $QSLBreakdown['QSL_Requested'] = 0;
$QSLBreakdown['QSL_Received'] = 0; $QSLBreakdown['eQSL_Sent'] = 0;
$QSLBreakdown['QSL_Requested'] = 0; $QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['eQSL_Sent'] = 0; $QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['eQSL_Received'] = 0; $QSLBreakdown['LoTW_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0; $QSLBreakdown['QSL_Sent_today'] = 0;
$QSLBreakdown['LoTW_Received'] = 0; $QSLBreakdown['QSL_Received_today'] = 0;
$QSLBreakdown['QSL_Requested_today'] = 0;
$QSLBreakdown['eQSL_Sent_today'] = 0;
$QSLBreakdown['eQSL_Received_today'] = 0;
$QSLBreakdown['LoTW_Sent_today'] = 0;
$QSLBreakdown['LoTW_Received_today'] = 0;
return $QSLBreakdown; return $QSLBreakdown;
} }
} else { } else {
$QSLBreakdown['QSL_Sent'] = 0; $QSLBreakdown['QSL_Sent'] = 0;
$QSLBreakdown['QSL_Received'] = 0; $QSLBreakdown['QSL_Received'] = 0;
$QSLBreakdown['QSL_Requested'] = 0; $QSLBreakdown['QSL_Requested'] = 0;
$QSLBreakdown['eQSL_Sent'] = 0; $QSLBreakdown['eQSL_Sent'] = 0;
$QSLBreakdown['eQSL_Received'] = 0; $QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0; $QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['LoTW_Received'] = 0; $QSLBreakdown['LoTW_Received'] = 0;
$QSLBreakdown['QSL_Sent_today'] = 0;
$QSLBreakdown['QSL_Received_today'] = 0;
$QSLBreakdown['QSL_Requested_today'] = 0;
$QSLBreakdown['eQSL_Sent_today'] = 0;
$QSLBreakdown['eQSL_Received_today'] = 0;
$QSLBreakdown['LoTW_Sent_today'] = 0;
$QSLBreakdown['LoTW_Received_today'] = 0;
return $QSLBreakdown; return $QSLBreakdown;
} }
} }

8
application/models/Logbookadvanced_model.php
查看文件

@ -86,19 +86,19 @@ class Logbookadvanced_model extends CI_Model {
} }
if ($searchCriteria['eqslSent'] !== '') { if ($searchCriteria['eqslSent'] !== '') {
$condition = "COL_EQSL_SENT = ?"; $condition = "COL_EQSL_QSL_SENT = ?";
if ($searchCriteria['eqslSent'] == 'N') { if ($searchCriteria['eqslSent'] == 'N') {
$condition = '('.$condition; $condition = '('.$condition;
$condition .= " OR COL_EQSL_SENT IS NULL OR COL_EQSL_SENT = '')"; $condition .= " OR COL_EQSL_QSL_SENT IS NULL OR COL_EQSL_QSL_SENT = '')";
} }
$conditions[] = $condition; $conditions[] = $condition;
$binding[] = $searchCriteria['eqslSent']; $binding[] = $searchCriteria['eqslSent'];
} }
if ($searchCriteria['eqslReceived'] !== '') { if ($searchCriteria['eqslReceived'] !== '') {
$condition = "COL_EQSL_RCVD = ?"; $condition = "COL_EQSL_QSL_RCVD = ?";
if ($searchCriteria['eqslReceived'] == 'N') { if ($searchCriteria['eqslReceived'] == 'N') {
$condition = '('.$condition; $condition = '('.$condition;
$condition .= " OR COL_EQSL_RCVD IS NULL OR COL_EQSL_RCVD = '')"; $condition .= " OR COL_EQSL_QSL_RCVD IS NULL OR COL_EQSL_QSL_RCVD = '')";
} }
$conditions[] = $condition; $conditions[] = $condition;
$binding[] = $searchCriteria['eqslReceived']; $binding[] = $searchCriteria['eqslReceived'];

24
application/views/dashboard/index.php
查看文件

@ -216,21 +216,25 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<table class="table table-striped"> <table class="table table-striped">
<tr class="titles"> <tr class="titles">
<td colspan="2"><i class="fas fa-envelope"></i> <?php echo lang('general_word_qslcards'); ?></td> <td colspan="2"><i class="fas fa-envelope"></i> <?php echo lang('general_word_qslcards'); ?></td>
<td colspan="1"><?php echo lang('general_word_today'); ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_sent'); ?></td> <td width="50%"><?php echo lang('general_word_sent'); ?></td>
<td width="50%"><?php echo $total_qsl_sent; ?></td> <td width="25%"><?php echo $total_qsl_sent; ?></td>
<td width="25%"><?php echo $qsl_sent_today; ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_received'); ?></td> <td width="50%"><?php echo lang('general_word_received'); ?></td>
<td width="50%"><?php echo $total_qsl_rcvd; ?></td> <td width="25%"><?php echo $total_qsl_rcvd; ?></td>
<td width="25%"><?php echo $qsl_rcvd_today; ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_requested'); ?></td> <td width="50%"><?php echo lang('general_word_requested'); ?></td>
<td width="50%"><?php echo $total_qsl_requested; ?></td> <td width="25%"><?php echo $total_qsl_requested; ?></td>
<td width="25%"><?php echo $qsl_requested_today; ?></td>
</tr> </tr>
</table> </table>
<?php } ?> <?php } ?>
@ -239,16 +243,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<table class="table table-striped"> <table class="table table-striped">
<tr class="titles"> <tr class="titles">
<td colspan="2"><i class="fas fa-address-card"></i> <?php echo lang('general_word_eqslcards'); ?></td> <td colspan="2"><i class="fas fa-address-card"></i> <?php echo lang('general_word_eqslcards'); ?></td>
<td colspan="1"><?php echo lang('general_word_today'); ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_sent'); ?></td> <td width="50%"><?php echo lang('general_word_sent'); ?></td>
<td width="50%"><?php echo $total_eqsl_sent; ?></td> <td width="25%"><?php echo $total_eqsl_sent; ?></td>
<td width="25%"><?php echo $eqsl_sent_today; ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_received'); ?></td> <td width="50%"><?php echo lang('general_word_received'); ?></td>
<td width="50%"><?php echo $total_eqsl_rcvd; ?></td> <td width="25%"><?php echo $total_eqsl_rcvd; ?></td>
<td width="25%"><?php echo $eqsl_rcvd_today; ?></td>
</tr> </tr>
</table> </table>
<?php } ?> <?php } ?>
@ -257,16 +264,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<table class="table table-striped"> <table class="table table-striped">
<tr class="titles"> <tr class="titles">
<td colspan="2"><i class="fas fa-list"></i> <?php echo lang('general_word_lotw'); ?></td> <td colspan="2"><i class="fas fa-list"></i> <?php echo lang('general_word_lotw'); ?></td>
<td colspan="1"><?php echo lang('general_word_today'); ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_sent'); ?></td> <td width="50%"><?php echo lang('general_word_sent'); ?></td>
<td width="50%"><?php echo $total_lotw_sent; ?></td> <td width="25%"><?php echo $total_lotw_sent; ?></td>
<td width="25%"><?php echo $lotw_sent_today; ?></td>
</tr> </tr>
<tr> <tr>
<td width="50%"><?php echo lang('general_word_received'); ?></td> <td width="50%"><?php echo lang('general_word_received'); ?></td>
<td width="50%"><?php echo $total_lotw_rcvd; ?></td> <td width="25%"><?php echo $total_lotw_rcvd; ?></td>
<td width="25%"><?php echo $lotw_rcvd_today; ?></td>
</tr> </tr>
</table> </table>
<?php } ?> <?php } ?>