diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index e5c805e6..395b743e 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -152,6 +152,23 @@ Gridsquare (Multi): COL_VUCC_GRIDS; ?> + qra->distance($row->station_gridsquare, $row->COL_VUCC_GRIDS, $measurement_base); + + switch ($measurement_base) { + case 'M': + $distance .= " mi"; + break; + case 'K': + $distance .= " km"; + break; + case 'N': + $distance .= " nmi"; + break; + } + echo $distance; + ?> @@ -379,7 +396,7 @@ COL_SAT_NAME != null) { - $twitter_band_sat = $row->COL_SAT_NAME; + $twitter_band_sat = $row->COL_SAT_NAME." \u{1F6F0}\u{FE0F}"; $hashtags = "#hamr #cloudlog #amsat"; } else { $twitter_band_sat = $row->COL_BAND; @@ -408,7 +425,19 @@ if ($row->COL_DXCC != 0) { $twitter_string .= urlencode("in ".ucwords(strtolower(($row->COL_COUNTRY)))." "); } - $twitter_string .= urlencode("(Gridsquare: ".$row->COL_GRIDSQUARE." / distance: ".$distance.") on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags); + $distancestring = ''; + if ($row->COL_VUCC_GRIDS == null) { + $distancestring = "(Gridsquare: ".$row->COL_GRIDSQUARE." / distance: ".$distance.")"; + } else { + if (substr_count($row->COL_VUCC_GRIDS, ',') == 1) { + $distancestring = "(Gridline: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")"; + } else if (substr_count($row->COL_VUCC_GRIDS, ',') == 3) { + $distancestring = "(Gridcorner: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")"; + } else { + $distancestring = "(Grids: ".$row->COL_VUCC_GRIDS.")"; + } + } + $twitter_string .= urlencode($distancestring." on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags); } ?>