diff --git a/app/Models/Location/LocationModel.php b/app/Models/Location/LocationModel.php index 6539a74..6f7f729 100644 --- a/app/Models/Location/LocationModel.php +++ b/app/Models/Location/LocationModel.php @@ -25,11 +25,12 @@ class LocationModel extends BaseModel { public function getLocation($LocationID) { //'Street1', 'Street2', 'City', 'Province', 'PostCode', 'GeoLocationSystem', 'GeoLocationData', $rows = $this->select("location.*, la.Street1, la.Street2, la.PostCode, la.GeoLocationSystem, la.GeoLocationData, - v.*, prop.AreaGeoID as ProvinceID, prop.AreaName as Province, city.AreaGeoID as CityID, city.AreaName as City") + v.VDesc as LocTypeText, prop.AreaGeoID as ProvinceID, prop.AreaName as Province, city.AreaGeoID as CityID, city.AreaName as City, site.SiteID, site.SiteName") ->join("locationaddress la", "location.LocationID=la.LocationID", "left") ->join("valueset v", "v.VID=location.loctype", "left") ->join("areageo prop", "la.Province=prop.AreaGeoID", "left") ->join("areageo city", "la.City=city.AreaGeoID", "left") + ->join("site", "site.SiteID=location.SiteID", "left") ->where('location.LocationID', (int) $LocationID)->findAll(); return $rows; }