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

Fixed issue #444 when resetting previous contacts didn't clear back to the main list now resolved

浏览代码
这个提交包含在：
Peter Goodhall 2020-04-06 22:03:55 +01:00
父节点 a4e89235e3
当前提交 923e03d4a5
共有 2 个文件被更改，包括 35 次插入 和 29 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/views/interface_assets/footer.php
查看文件

@ -375,6 +375,8 @@ $(document).on('keypress',function(e) {
$('#qsl_via').val(""); $('#qsl_via').val("");
$('#callsign_info').text(""); $('#callsign_info').text("");
$('#input_usa_state').val(""); $('#input_usa_state').val("");
$('#qso-last-table').show();
$('#partial_view').hide();
mymap.setView([51.505, -0.09], 13); mymap.setView([51.505, -0.09], 13);
mymap.removeLayer(markers); mymap.removeLayer(markers);
@ -596,7 +598,9 @@ $(document).on('keypress',function(e) {
if($('#iota_ref').val() == "") { if($('#iota_ref').val() == "") {
$('#iota_ref').val(result.callsign_iota); $('#iota_ref').val(result.callsign_iota);
} }
// Hide the last QSO table
$('#qso-last-table').hide();
$('#partial_view').show();
/* display past QSOs */ /* display past QSOs */
$('#partial_view').html(result.partial); $('#partial_view').html(result.partial);
}); });

58
application/views/qso/index.php
查看文件

@ -382,39 +382,41 @@
<div class="card previous-qsos"> <div class="card previous-qsos">
<div class="card-header"><h4 class="card-title">Previous Contacts</h4></div> <div class="card-header"><h4 class="card-title">Previous Contacts</h4></div>
<div id="partial_view"> <div id="partial_view"></div>
<div class="table-responsive"> <div id="qso-last-table">
<table class="table">
<tr class="log_title titles">
<td>Date/Time</td>
<td>Call</td>
<td>Mode</td>
<td>Sent</td>
<td>Recv</td>
<td>Band</td>
</tr>
<?php $i = 0; <div class="table-responsive">
foreach ($query->result() as $row) { ?> <table class="table">
<?php echo '<tr class="tr'.($i & 1).'">'; ?> <tr class="log_title titles">
<td><?php echo date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?></td> <td>Date/Time</td>
<td><a class="qsobox" data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td> <td>Call</td>
<td><?php echo $row->COL_MODE; ?></td> <td>Mode</td>
<td><?php echo $row->COL_RST_SENT; ?></td> <td>Sent</td>
<td><?php echo $row->COL_RST_RCVD; ?></td> <td>Recv</td>
<?php if($row->COL_SAT_NAME != null) { ?> <td>Band</td>
<td><?php echo $row->COL_SAT_NAME; ?></td> </tr>
<?php } else { ?>
<td><?php echo $row->COL_BAND; ?></td> <?php $i = 0;
<?php } ?> foreach ($query->result() as $row) { ?>
</tr> <?php echo '<tr class="tr'.($i & 1).'">'; ?>
<?php $i++; } ?> <td><?php echo date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?></td>
</table> <td><a class="qsobox" data-fancybox data-type="iframe" data-width="750" data-height="520" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
<td><?php echo $row->COL_MODE; ?></td>
<td><?php echo $row->COL_RST_SENT; ?></td>
<td><?php echo $row->COL_RST_RCVD; ?></td>
<?php if($row->COL_SAT_NAME != null) { ?>
<td><?php echo $row->COL_SAT_NAME; ?></td>
<?php } else { ?>
<td><?php echo $row->COL_BAND; ?></td>
<?php } ?>
</tr>
<?php $i++; } ?>
</table>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>