From 8f37c069712e7e3c5be9ed230874ce5b6e60b994 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sun, 1 Nov 2020 21:45:47 +0100
Subject: [PATCH] [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).

---
 application/views/interface_assets/footer.php | 29 ++++++++++++++-----
 application/views/qslcard/upload_done.php     | 25 ----------------
 application/views/view_log/qso.php            |  4 ++-
 3 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 application/views/qslcard/upload_done.php

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 4e7764a3..ef16ac41 100644
--- a/application/views/interface_assets/footer.php
+++ b/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');
diff --git a/application/views/qslcard/upload_done.php b/application/views/qslcard/upload_done.php
deleted file mode 100644
index a968394b..00000000
--- a/application/views/qslcard/upload_done.php
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 2440de91..214431e2 100644
--- a/application/views/view_log/qso.php
+++ b/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>