From a65b19f991aa2cf07e33cca556dd2dbfb9f72a3a Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Fri, 18 Sep 2020 12:17:41 +0200
Subject: [PATCH] Fixed display QSO for WAS-details as well. Changed so that
 bootstrapdialog is included on every page. Will start implementation on
 bootstrapdialog on other awards.

---
 application/views/interface_assets/footer.php | 55 +++++++++++++++++--
 application/views/interface_assets/header.php |  4 +-
 .../views/view_log/partial/log_ajax.php       |  2 +-
 application/views/view_log/qso.php            |  6 +-
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index ea08bf9b..f33e36b4 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1410,9 +1410,54 @@ $(document).ready(function(){
         </script>
     <?php } ?>
 
-    <?php if ($this->uri->segment(2) == "was") { ?>
-            <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
+
+    <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
         <script>
+            function displayQso(id) {
+                var baseURL= "<?php echo base_url();?>";
+                $.ajax({
+                    url: baseURL + 'index.php/logbook/view/' + id,
+                    type: 'post',
+                    success: function(html) {
+                        BootstrapDialog.show({
+                            title: 'QSO Data',
+                            cssClass: 'qso-dialog',
+                            size: BootstrapDialog.SIZE_WIDE,
+                            nl2br: false,
+                            message: html,
+                            onshown: function(dialog) {
+                                var qsoid = $("#qsoid").text();
+                                $(".editButton").html('<a class="btn btn-success" id="edit_qso" href="javascript:qso_edit('+qsoid+')"><i class="fas fa-edit"></i> Edit QSO</a>');
+                                var lat = $("#lat").text();
+                                var long = $("#long").text();
+                                var callsign = $("#callsign").text();
+                                var mymap = L.map('map').setView([lat,long], 5);
+
+                                L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
+                                    maxZoom: 18,
+                                    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a>, ' +
+                                        'Generated by <a href="http://www.cloudlog.co.uk/">Cloudlog</a>',
+                                    id: 'mapbox.streets'
+                                }).addTo(mymap);
+
+
+                                var redIcon = L.icon({
+                                    iconUrl: icon_dot_url,
+                                    iconSize:     [18, 18], // size of the icon
+                                });
+
+                                L.marker([lat,long], {icon: redIcon}).addTo(mymap)
+                                    .bindPopup(callsign);
+
+                                mymap.on('click', onMapClick);
+                            },
+                        });
+
+                    }
+                });
+            }
+
+    <?php if ($this->uri->segment(2) == "was") { ?>
         function displayWasContacts(was, band) {
             var baseURL= "<?php echo base_url();?>";
             $.ajax({
@@ -1425,7 +1470,7 @@ $(document).ready(function(){
                     BootstrapDialog.show({
                         title: 'QSO Data',
                         size: BootstrapDialog.SIZE_WIDE,
-                        cssClass: 'qso-dialog',
+                        cssClass: 'qso-was-dialog',
                         nl2br: false,
                         message: html,
                         buttons: [{
@@ -1438,7 +1483,7 @@ $(document).ready(function(){
                 }
             });
         }
-
+    <?php } ?>
         function qsl_rcvd(id, method) {
             var baseURL= "<?php echo base_url();?>";
             $.ajax({
@@ -1525,6 +1570,6 @@ $(document).ready(function(){
             });
         }
         </script>
-    <?php } ?>
+
   </body>
 </html>
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 835bde1a..b022b20b 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -29,9 +29,7 @@
 	<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/css/ldbtn.min.css" />
 	<?php } ?>
 
-      <?php if ($this->uri->segment(2) == "was") { ?>
-          <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/bootstrapdialog/css/bootstrap-dialog.min.css" />
-      <?php } ?>
+    <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/bootstrapdialog/css/bootstrap-dialog.min.css" />
 
  	<?php if ($this->uri->segment(1) == "adif") { ?>
   	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index b1830c77..9208ff17 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -41,7 +41,7 @@
                 <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
             <?php } ?>
             <td>
-                <a id="edit_qso" href="javascript:qso_edit(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a>
+                <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?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; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index f35d47b9..76271e35 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -249,7 +249,7 @@
 			
 			<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
 				<br>
-				<p><a class="btn btn-success" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
+                    <p class="editButton"><a class="btn btn-success" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
 			<?php } ?>
 
 		</div>
@@ -279,6 +279,10 @@ var lat = <?php echo $lat; ?>;
 var long = <?php echo $lng; ?>;
 var callsign = "<?php echo $row->COL_CALL; ?>";
 </script>
+    <div hidden id ='lat'><?php echo $lat; ?></div>
+    <div hidden id ='long'><?php echo $lng; ?></div>
+    <div hidden id ='callsign'><?php echo $row->COL_CALL; ?></div>
+    <div hidden id ='qsoid'><?php echo $row->COL_PRIMARY_KEY; ?></div>
 
 <?php } } ?>
 <?php