Merge pull request #50 from wrk-fmd/develop

RELEASE: 1.1.4
wrk-fmd · Mar 11, 2019 · 3556b8d · 3556b8d
2 parents 48a5c8c + 1643c77
commit 3556b8d
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 16 deletions.
diff --git a/GeoClient/GeoClient.Android/Properties/AndroidManifest.xml b/GeoClient/GeoClient.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="30" android:versionName="1.1.4-RC1" package="at.wrk.fmd.cocemocl" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="35" android:versionName="1.1.4" package="at.wrk.fmd.cocemocl" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

diff --git a/GeoClient/GeoClient/GeoClient.csproj b/GeoClient/GeoClient/GeoClient.csproj
@@ -6,9 +6,9 @@
     <Authors>Daniel Steiner, Robert Wittek</Authors>
     <Copyright>MIT License</Copyright>
     <Description>App to share the position data</Description>
-    <Version>1.1.2</Version>
-    <AssemblyVersion>1.1.4.0</AssemblyVersion>
-    <FileVersion>1.1.4.0</FileVersion>
+    <Version>1.1.4</Version>
+    <AssemblyVersion>1.1.4.1</AssemblyVersion>
+    <FileVersion>1.1.4.1</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/GeoClient/GeoClient/Models/Geobroker/GeobrokerConstants.cs b/GeoClient/GeoClient/Models/Geobroker/GeobrokerConstants.cs
@@ -11,6 +11,7 @@ public static class GeobrokerConstants
         public const string IncidentPriorityProperty = "priority";
         public const string IncidentBlueProperty = "blue";
         public const string IncidentLocationProperty = "location";
+        public const string IncidentDestinationProperty = "destination";
         public const string IncidentAssignedUnitsProperty = "assignedUnits";
 
         public const string UnitIdProperty = "id";

diff --git a/GeoClient/GeoClient/Models/IncidentItem.cs b/GeoClient/GeoClient/Models/IncidentItem.cs
@@ -16,6 +16,7 @@ public class IncidentItem : IComparable<IncidentItem>
         public bool Priority { get; }
         public bool Blue { get; }
         public GeoPoint Location { get; }
+        public GeoPoint Destination { get; }
 
         public List<UnitOfIncident> Units { get; }
 
@@ -36,6 +37,7 @@ public IncidentItem(
             bool priority = false,
             bool blue = false,
             GeoPoint location = null,
+            GeoPoint destination = null,
             List<UnitOfIncident> units = null)
         {
             Id = id;
@@ -44,6 +46,7 @@ public IncidentItem(
             Priority = priority;
             Blue = blue;
             Location = location;
+            Destination = destination;
             Units = units ?? new List<UnitOfIncident>();
         }
 
@@ -55,6 +58,7 @@ protected bool Equals(IncidentItem other)
                    && Priority == other.Priority
                    && Blue == other.Blue
                    && Equals(Location, other.Location)
+                   && Equals(Destination, other.Destination)
                    && ListEquals(Units, other.Units);
         }
 
@@ -85,6 +89,7 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ Priority.GetHashCode();
                 hashCode = (hashCode * 397) ^ Blue.GetHashCode();
                 hashCode = (hashCode * 397) ^ (Location != null ? Location.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (Destination != null ? Destination.GetHashCode() : 0);
                 hashCode = (hashCode * 397) ^ (Units != null ? Units.GetHashCode() : 0);
                 return hashCode;
             }
@@ -93,7 +98,7 @@ public override int GetHashCode()
         public override string ToString()
         {
             return
-                $"{nameof(Id)}: {Id}, {nameof(Type)}: {Type}, {nameof(Info)}: {Info}, {nameof(Priority)}: {Priority}, {nameof(Blue)}: {Blue}, {nameof(Location)}: {Location}, Units.Count: {Units.Count}";
+                $"{nameof(Id)}: {Id}, {nameof(Type)}: {Type}, {nameof(Info)}: {Info}, {nameof(Priority)}: {Priority}, {nameof(Blue)}: {Blue}, {nameof(Location)}: {Location}, {nameof(Destination)}: {Destination}, Units.Count: {Units.Count}";
         }
 
         private string GetDescriptiveType()
@@ -128,12 +133,10 @@ private IncidentTaskState GetOwnTaskState()
             var registrationInfo = _registrationService.GetRegistrationInfo();
             if (registrationInfo?.Id != null)
             {
-                foreach (UnitOfIncident unit in Units)
+                foreach (var unit in Units)
                 {
                     if (unit.Id == registrationInfo.Id)
-                    {
                         return unit.State;
-                    }
                 }
             }
             else

diff --git a/GeoClient/GeoClient/Services/IncidentItemFactory.cs b/GeoClient/GeoClient/Services/IncidentItemFactory.cs
@@ -48,6 +48,7 @@ private static IncidentItem CreateIncidentItem(JObject incident, List<JObject> u
                 incident.Value<bool>(GeobrokerConstants.IncidentPriorityProperty),
                 incident.Value<bool>(GeobrokerConstants.IncidentBlueProperty),
                 CreateGeoPoint(incident[GeobrokerConstants.IncidentLocationProperty]),
+                CreateGeoPoint(incident[GeobrokerConstants.IncidentDestinationProperty]),
                 unitList);
         }
 

diff --git a/GeoClient/GeoClient/ViewModels/ItemDetailViewModel.cs b/GeoClient/GeoClient/ViewModels/ItemDetailViewModel.cs
@@ -13,6 +13,9 @@ public class ItemDetailViewModel : BaseViewModel
         public Color OpenLocationButtonColor => GetOpenLocationButtonColor();
         public string OpenLocationButtonText => GetOpenLocationButtonText();
 
+        public Color OpenDestinationButtonColor => GetOpenDestinationButtonColor();
+        public string OpenDestinationButtonText => GetOpenDestinationButtonText();
+
         public ItemDetailViewModel(IncidentItem incidentItem = null)
         {
             Title = incidentItem?.DescriptiveType;
@@ -26,12 +29,27 @@ private Color GetOpenLocationButtonColor()
 
         private string GetOpenLocationButtonText()
         {
-            return IsLocationAvailable() ? "Berufungsort auf Karte anzeigen" : "Berufungsort ist nicht verortet";
+            return IsLocationAvailable() ? "Berufungsort auf Karte anzeigen" : "Berufungsort nicht verfügbar";
         }
 
         private bool IsLocationAvailable()
         {
             return IncidentItem?.Location != null;
         }
+
+        private Color GetOpenDestinationButtonColor()
+        {
+            return IsDestinationAvailable() ? ActiveButtonColor : DisableButtonColor;
+        }
+
+        private string GetOpenDestinationButtonText()
+        {
+            return IsDestinationAvailable() ? "Zielort auf Karte anzeigen" : "Zielort nicht verfügbar";
+        }
+
+        private bool IsDestinationAvailable()
+        {
+            return IncidentItem?.Destination != null;
+        }
     }
 }
diff --git a/GeoClient/GeoClient/Views/AboutPage.xaml b/GeoClient/GeoClient/Views/AboutPage.xaml
@@ -26,7 +26,7 @@
                                 FontAttributes="Bold"
                                 FontSize="Large" />
                             <Span
-                                Text="1.1.4-RC1"
+                                Text="1.1.4"
                                 FontSize="Large"
                                 ForegroundColor="{StaticResource LightTextColor}" />
                         </FormattedString.Spans>

diff --git a/GeoClient/GeoClient/Views/ItemDetailPage.xaml b/GeoClient/GeoClient/Views/ItemDetailPage.xaml
@@ -60,10 +60,17 @@
                 <Button
                     x:Name="OpenLocationButton"
                     Text="{Binding OpenLocationButtonText}"
-                    Clicked="openLocation_Clicked"
+                    Clicked="OpenLocation_Clicked"
                     BackgroundColor="{Binding OpenLocationButtonColor}"
                     TextColor="White"
                     VerticalOptions="End" />
+                <Button
+                    x:Name="OpenDestinationButton"
+                    Text="{Binding OpenDestinationButtonText}"
+                    Clicked="OpenDestination_Clicked"
+                    BackgroundColor="{Binding OpenDestinationButtonColor}"
+                    TextColor="White"
+                    VerticalOptions="End" />
 
             </StackLayout>
         </ScrollView>

diff --git a/GeoClient/GeoClient/Views/ItemDetailPage.xaml.cs b/GeoClient/GeoClient/Views/ItemDetailPage.xaml.cs
@@ -1,6 +1,7 @@
 using GeoClient.ViewModels;
 using GeoClient.Views.Utils;
 using System;
+using System.Threading.Tasks;
 using GeoClient.Models;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
@@ -78,7 +79,7 @@ private static Label CreateUnitLabel()
             return label;
         }
 
-        private async void openLocation_Clicked(object sender, EventArgs e)
+        private async void OpenLocation_Clicked(object sender, EventArgs e)
         {
             var item = _viewModel.IncidentItem;
 
@@ -90,11 +91,32 @@ private async void openLocation_Clicked(object sender, EventArgs e)
             }
             else
             {
-                await DisplayAlert(
-                    "Adresse nicht verortet",
-                    "Die Adresse konnte leider nicht automatisch verortet werden.",
-                    "OK");
+                await ShowGeoUriNotAvailableError();
             }
         }
+
+        private async void OpenDestination_Clicked(object sender, EventArgs e)
+        {
+            var item = _viewModel.IncidentItem;
+
+            var geoUri = GeoPointUtil.CreateGeoUri(item.Destination, "GeoClient: Zielort");
+
+            if (geoUri != null)
+            {
+                Device.OpenUri(geoUri);
+            }
+            else
+            {
+                await ShowGeoUriNotAvailableError();
+            }
+        }
+
+        private async Task ShowGeoUriNotAvailableError()
+        {
+            await DisplayAlert(
+                "Adresse nicht verortet",
+                "Die Adresse konnte leider nicht automatisch verortet werden.",
+                "OK");
+        }
     }
 }
diff --git a/GeoClientTests/ServiceTests/IncidentItemFactoryTest.cs b/GeoClientTests/ServiceTests/IncidentItemFactoryTest.cs
@@ -36,6 +36,7 @@ private static IncidentItem CreateExpectedItem1()
                 GeoIncidentType.Task,
                 "Info 1",
                 location: new GeoPoint(48, 16),
+                destination: new GeoPoint(19, 21),
                 units: new List<UnitOfIncident>
                 {
                     CreateUnit1(IncidentTaskState.Abo),

diff --git a/GeoClientTests/TestResources/incidents1.json b/GeoClientTests/TestResources/incidents1.json
@@ -9,6 +9,10 @@
             "latitude": 48,
             "longitude": 16
         },
+        "destination": {
+            "latitude": 19,
+            "longitude": 21
+        },
         "assignedUnits": {
             "unit-id-1": "ABO",
             "unit-id-2": "Assigned"