From ffcea4af76943bb79a11085d3c2d0873edd4c5c0 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 9 Sep 2024 08:26:41 +0200 Subject: [PATCH 1/2] Add link to general GMA page --- application/views/view_log/qso.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index dcf859960..d2eace9cb 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -326,7 +326,16 @@ COL_SIG != null) { ?> - COL_SIG; ?> + COL_SIG) { + case "GMA": + echo "".$row->COL_SIG.""; + break; + default: + echo "".$row->COL_SIG.""; + break; + } + ?> From 133becb5eeb3656e7ce0f54a3b66d302da8fb712 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 9 Sep 2024 08:27:26 +0200 Subject: [PATCH 2/2] Remove stray whitespace --- application/views/view_log/qso.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index d2eace9cb..128a8b76b 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -308,14 +308,14 @@ COL_POTA_REF); $link_output = ''; - + foreach ($pota_refs as $pota_ref) { $pota_ref = trim($pota_ref); if (!empty($pota_ref)) { $link_output .= '' . $pota_ref . ', '; } } - + $link_output = rtrim($link_output, ', '); echo $link_output; ?> @@ -700,7 +700,7 @@ COL_GRIDSQUARE != null && strlen($row->COL_GRIDSQUARE) >= 4) { - $stn_loc = $this->qra->qra2latlong(trim($row->COL_GRIDSQUARE)); + $stn_loc = $this->qra->qra2latlong(trim($row->COL_GRIDSQUARE)); if($stn_loc[0] != 0) { $lat = $stn_loc[0]; $lng = $stn_loc[1]; @@ -712,7 +712,7 @@ $grid2 = $this->qra->qra2latlong(trim($grids[1])); $coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]); - $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); + $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); $midpoint = $this->qra->get_midpoint($coords); $lat = $midpoint[0]; @@ -725,9 +725,9 @@ $grid4 = $this->qra->qra2latlong(trim($grids[3])); $coords[]=array('lat' => $grid1[0],'lng'=> $grid1[1]); - $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); - $coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]); - $coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]); + $coords[]=array('lat' => $grid2[0],'lng'=> $grid2[1]); + $coords[]=array('lat' => $grid3[0],'lng'=> $grid3[1]); + $coords[]=array('lat' => $grid4[0],'lng'=> $grid4[1]); $midpoint = $this->qra->get_midpoint($coords); $lat = $midpoint[0];