|
|
@@ -25,9 +25,17 @@ namespace PRSDesktop
|
|
|
|
|
|
Longitude = $"{CoreUtils.GetFullPropertyName(property, ".")}.{nameof(Address.Location)}.{nameof(Address.Location.Longitude)}";
|
|
|
grid.HiddenColumns.Add(CoreUtils.GetPropertyExpression<T>(Longitude));
|
|
|
-
|
|
|
- Geofence = $"{CoreUtils.GetFullPropertyName(property, ".")}.{nameof(Address.Geofence)}";
|
|
|
- grid.HiddenColumns.Add(CoreUtils.GetPropertyExpression<T>(Geofence));
|
|
|
+
|
|
|
+ try
|
|
|
+ {
|
|
|
+ Geofence = $"{CoreUtils.GetFullPropertyName(property, ".")}.{nameof(Address.Geofence)}";
|
|
|
+ grid.HiddenColumns.Add(CoreUtils.GetPropertyExpression<T>(Geofence));
|
|
|
+ }
|
|
|
+ catch (Exception e)
|
|
|
+ {
|
|
|
+ Geofence = "";
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
Image = MapImage;
|
|
|
Action = MapClick;
|
|
|
@@ -46,6 +54,16 @@ namespace PRSDesktop
|
|
|
|
|
|
Longitude = CoreUtils.GetFullPropertyName(property, ".") + ".Longitude";
|
|
|
grid.HiddenColumns.Add(CoreUtils.GetPropertyExpression<T>(Longitude));
|
|
|
+ try
|
|
|
+ {
|
|
|
+ Geofence = $"{CoreUtils.GetFullPropertyName(property, ".")}.{nameof(Address.Geofence)}";
|
|
|
+ grid.HiddenColumns.Add(CoreUtils.GetPropertyExpression<T>(Geofence));
|
|
|
+ }
|
|
|
+ catch (Exception e)
|
|
|
+ {
|
|
|
+ Geofence = "";
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
Image = MapImage;
|
|
|
Action = MapClick;
|
|
|
@@ -73,7 +91,11 @@ namespace PRSDesktop
|
|
|
{
|
|
|
if (row is not null && HasLocation(row))
|
|
|
{
|
|
|
- var geofence = Serialization.Deserialize<GeoFenceDefinition>(row.Get<string>(Geofence)) ?? new GeoFenceDefinition();
|
|
|
+
|
|
|
+ var geofence = (!String.IsNullOrWhiteSpace(Geofence)
|
|
|
+ ? Serialization.Deserialize<GeoFenceDefinition>(row.Get<string>(Geofence))
|
|
|
+ : null)
|
|
|
+ ?? new GeoFenceDefinition();
|
|
|
var mapform = new MapForm(row.Get<double>(Latitude), row.Get<double>(Longitude),geofence);
|
|
|
mapform.ShowDialog();
|
|
|
|