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

[QSLCard] Removed unused file. Added view qsl inside qso dialog, so that you know which file to delete (else you had to go to view qsl page and delete from there).

浏览代码
这个提交包含在：
Andreas 2020-11-01 21:45:47 +01:00
父节点 4d193fc07f
当前提交 8f37c06971
共有 3 个文件被更改，包括 25 次插入 和 33 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -2277,14 +2277,23 @@ $(document).ready(function(){
"paging": false,
"scrollX": true
});
</script>
<?php } ?>
function viewQsl(picture, callsign) {
<script>
function viewQsl(picture, callsign) {
var baseURL= "<?php echo base_url();?>";
var $textAndPic = $('<div></div>');
$textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+'/assets/qslcard/'+picture+'" />');
var title = '';
if (callsign == null) {
title = 'QSL Card';
} else {
title = 'QSL Card for ' + callsign;
}
BootstrapDialog.show({
title: 'QSL Card for ' + callsign,
title: title,
size: BootstrapDialog.SIZE_WIDE,
message: $textAndPic,
buttons: [{
@ -2295,9 +2304,7 @@ $(document).ready(function(){
}]
});
}
</script>
<?php } ?>
</script>
<script>
function deleteQsl(id) {
BootstrapDialog.confirm({
@ -2352,7 +2359,9 @@ function deleteQsl(id) {
if (data.status.front.status == 'Success') {
if ($('.qsltable').length > 0) {
$('.qsltable tr:last').after('<tr><td style="text-align: center">'+data.status.front.filename+'</td>' +
'<td id="'+data.status.front.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.front.insertid+');" class="btn btn-sm btn-danger">Delete</button></td></tr>');
'<td id="'+data.status.front.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.front.insertid+');" class="btn btn-sm btn-danger">Delete</button></td>' +
'<td style="text-align: center"><button onclick="viewQsl(\'' + data.status.front.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
'</tr>');
var quantity = $(".carousel-indicators li").length;
$(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
$(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
@ -2364,10 +2373,12 @@ function deleteQsl(id) {
'<tr>'+
'<th style="text-align: center">QSL image file</th>'+
'<th style="text-align: center"></th>'+
'<th style="text-align: center"></th>'+
'</tr>'+
'</thead><tbody>'+
'<tr><td style="text-align: center">'+data.status.front.filename+'</td>' +
'<td id="'+data.status.front.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.front.insertid+');" class="btn btn-sm btn-danger">Delete</button></td>' +
'<td style="text-align: center"><button onclick="viewQsl(\'' + data.status.front.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
'</tr>'+
'</tbody></table>');
$('.qslcardtab').removeAttr('hidden');
@ -2387,7 +2398,9 @@ function deleteQsl(id) {
var qsoid = $("#qsoid").text();
if ($('.qsltable').length > 0) {
$('.qsltable tr:last').after('<tr><td style="text-align: center">'+data.status.back.filename+'</td>' +
'<td id="'+data.status.back.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.back.insertid+');" class="btn btn-sm btn-danger">Delete</button></td></tr>');
'<td id="'+data.status.back.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.back.insertid+');" class="btn btn-sm btn-danger">Delete</button></td>' +
'<td style="text-align: center"><button onclick="viewQsl(\'' + data.status.back.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
'</tr>');
var quantity = $(".carousel-indicators li").length;
$(".carousel-indicators").append('<li data-target="#carouselExampleIndicators" data-slide-to="'+quantity+'"></li>');
$(".carousel-inner").append('<div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="d-block w-100" src="'+baseURL+'/assets/qslcard/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div>');
@ -2399,10 +2412,12 @@ function deleteQsl(id) {
'<tr>'+
'<th style="text-align: center">QSL image file</th>'+
'<th style="text-align: center"></th>'+
'<th style="text-align: center"></th>'+
'</tr>'+
'</thead><tbody>'+
'<tr><td style="text-align: center">'+data.status.back.filename+'</td>' +
'<td id="'+data.status.back.insertid+'"style="text-align: center"><button onclick="deleteQsl('+data.status.back.insertid+');" class="btn btn-sm btn-danger">Delete</button></td>' +
'<td><button onclick="viewQsl(\'' + data.status.back.filename + '\')" class="btn btn-sm btn-success">View</button></td>'+
'</tr>'+
'</tbody></table>');
$('.qslcardtab').removeAttr('hidden');

25
application/views/qslcard/upload_done.php
查看文件

@ -1,25 +0,0 @@
<div class="container">
<h2><?php echo $page_title; ?></h2>
<div class="card-body">
<?php if($front != 'Success') { ?>
<div class="alert alert-danger" role="alert">
<?php echo $front; ?>
</div>
<?php } else { ?>
<div class="alert alert-success" role="alert">
Front QSL Card image has been uploaded!
</div>
<?php } ?>
<?php if($back != 'Success') { ?>
<div class="alert alert-danger" role="alert">
<?php echo $back; ?>
</div>
<?php } else { ?>
<div class="alert alert-success" role="alert">
Back QSL Card image has been uploaded!
</div>
<?php } ?>
</div>
</div>

4
application/views/view_log/qso.php
查看文件

@ -304,6 +304,7 @@
<tr>
<th style=\'text-align: center\'>QSL image file</th>
<th style=\'text-align: center\'></th>
<th style=\'text-align: center\'></th>
</tr>
</thead><tbody>';
@ -311,6 +312,7 @@
echo '<tr>';
echo '<td style=\'text-align: center\'>' . $qsl->filename . '</td>';
echo '<td id="'.$qsl->id.'" style=\'text-align: center\'><button onclick="deleteQsl('.$qsl->id.')" class="btn btn-sm btn-danger">Delete</button></td>';
echo '<td style=\'text-align: center\'><button onclick="viewQsl(\''.$qsl->filename.'\')" class="btn btn-sm btn-success">View</button></td>';
echo '</tr>';
}
@ -326,7 +328,7 @@
</div>
<div class="form-group">
<label for="qslcardback">Upload QSL card back image</label>
<label for="qslcardback">Upload QSL Card back image</label>
<input class="form-control-file" type="file" id="qslcardback" name="qslcardback" accept="image/*" capture="environment">
</div>