From ee6d2814a504a1808e1824d8e6669ce2409bc909 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Fri, 14 Jan 2022 01:36:04 +0100
Subject: [PATCH] Fix #33, #32

---
 Borepin/Borepin/Borepin.csproj                |  1 +
 Borepin/Borepin/Page/MachineListPage.xaml     | 14 ++-------
 .../Borepin/PageModel/MachineListPageModel.cs | 29 ++++++++++---------
 Borepin/Borepin/Service/BFFH/BFFHService.cs   |  2 ++
 Borepin/Borepin/View/MachineListItemView.xaml |  5 +++-
 .../ViewModel/MachineListItemViewModel.cs     |  7 +++++
 6 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj
index 6e8e1a7..176986f 100644
--- a/Borepin/Borepin/Borepin.csproj
+++ b/Borepin/Borepin/Borepin.csproj
@@ -29,6 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="NaturalSort.Extension" Version="3.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Plugin.Multilingual" Version="1.0.2" />
     <PackageReference Include="Prism.DryIoc.Forms" Version="8.1.97" />
diff --git a/Borepin/Borepin/Page/MachineListPage.xaml b/Borepin/Borepin/Page/MachineListPage.xaml
index cdc8d2d..baa709d 100644
--- a/Borepin/Borepin/Page/MachineListPage.xaml
+++ b/Borepin/Borepin/Page/MachineListPage.xaml
@@ -5,6 +5,9 @@
              x:Class="Borepin.Page.MachineListPage"
              xmlns:converters="clr-namespace:Borepin.Converter"
              Title="Machines">
+    <NavigationPage.TitleView>
+        <Button Text="Refresh" HorizontalOptions="End" BackgroundColor="{StaticResource SecondColor}" TextColor="{StaticResource FirstColor}" Command="{Binding RefreshCommand}"/>
+    </NavigationPage.TitleView>
     <ContentPage.Resources>
         <ResourceDictionary>
             <converters:InvertBoolConverter x:Key="InvertBoolConverter"/>
@@ -25,17 +28,6 @@
                             Android="true"/>
                         </Button.IsVisible>
                     </Button>
-                    <Label Text="Your Machines" IsVisible="{Binding UserAssignedMachineListItemViewModel_List, Converter={StaticResource ListNotEmptyConverter}}"/>
-                    <ListView ItemsSource="{Binding UserAssignedMachineListItemViewModel_List}" IsVisible="{Binding UserAssignedMachineListItemViewModel_List, Converter={StaticResource ListNotEmptyConverter}}" SelectionMode="None">
-                        <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <ViewCell>
-                                    <views:MachineListItemView />
-                                </ViewCell>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                    </ListView>
-                    <Label Text="All Machines"/>
                     <ListView ItemsSource="{Binding MachineListItemViewModel_List}" SelectionMode="None">
                         <ListView.ItemTemplate>
                             <DataTemplate>
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index 56c26ed..13ff559 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -11,6 +11,9 @@ using Prism.Services.Dialogs;
 using Prism.Services;
 using Prism.AppModel;
 using static FabAccessAPI.Schema.Machine;
+using System;
+using NaturalSort.Extension;
+using System.Linq;
 
 namespace Borepin.PageModel
 {
@@ -55,35 +58,34 @@ namespace Borepin.PageModel
 
             IReadOnlyList<Machine> machine_list = await machine_infoInterface.GetMachineList().ConfigureAwait(false);
 
-            List<MachineListItemViewModel> viewmodel_list = new List<MachineListItemViewModel>();
             List<MachineListItemViewModel> viewmodel_list_user_assigned = new List<MachineListItemViewModel>();
+            List<MachineListItemViewModel> viewmodel_list_not_user_assigned = new List<MachineListItemViewModel>();
             foreach (Machine machine in machine_list)
             {
-                if(((InUseInterface_Proxy)machine.Inuse).IsNull)
+                if(!((InUseInterface_Proxy)machine.Inuse).IsNull)
                 {
-                    viewmodel_list.Add(new MachineListItemViewModel(machine));
+                    MachineListItemViewModel new_viewmodel = new MachineListItemViewModel(machine)
+                    {
+                        IsUserAssigned = true
+                    };
+                    viewmodel_list_user_assigned.Add(new_viewmodel);
                 }
                 else
                 {
-                    viewmodel_list_user_assigned.Add(new MachineListItemViewModel(machine));
+                    viewmodel_list_not_user_assigned.Add(new MachineListItemViewModel(machine));
                 }
             }
 
-            MachineListItemViewModel_List = viewmodel_list;
-            UserAssignedMachineListItemViewModel_List = viewmodel_list_user_assigned;
+            List<MachineListItemViewModel> viewmodel_list_sorted = new List<MachineListItemViewModel>();
+            viewmodel_list_sorted.AddRange(viewmodel_list_user_assigned.OrderBy(x => x.Name, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
+            viewmodel_list_sorted.AddRange(viewmodel_list_not_user_assigned.OrderBy(x => x.Name, StringComparison.OrdinalIgnoreCase.WithNaturalSort()));
+            MachineListItemViewModel_List = viewmodel_list_sorted;
 
             IsBusy = false;
         }
         #endregion
 
         #region Fields
-        private IList<MachineListItemViewModel> _UserAssignedMachineListItemViewModel_List;
-        public IList<MachineListItemViewModel> UserAssignedMachineListItemViewModel_List
-        {
-            get => _UserAssignedMachineListItemViewModel_List;
-            set => SetProperty(ref _UserAssignedMachineListItemViewModel_List, value);
-        }
-
         private IList<MachineListItemViewModel> _MachineListItemViewModel_List;
         public IList<MachineListItemViewModel> MachineListItemViewModel_List
         {
@@ -201,6 +203,7 @@ namespace Borepin.PageModel
 
         public override async void OnNavigatedTo(INavigationParameters parameters)
         {
+            IsBusy = true;
             await LoadData().ConfigureAwait(false);
         }
         #endregion
diff --git a/Borepin/Borepin/Service/BFFH/BFFHService.cs b/Borepin/Borepin/Service/BFFH/BFFHService.cs
index 68ae895..5e767cd 100644
--- a/Borepin/Borepin/Service/BFFH/BFFHService.cs
+++ b/Borepin/Borepin/Service/BFFH/BFFHService.cs
@@ -157,6 +157,7 @@ namespace Borepin.Service.BFFH
 
             if (! await _AuthenticatePlainAsync(connection.Username, password).ConfigureAwait(false))
             {
+                await Disconnect().ConfigureAwait(false);
                 throw new AuthenticatingFailedException();
             }
 
@@ -195,6 +196,7 @@ namespace Borepin.Service.BFFH
 
             if (!await _AuthenticatePlainAsync(connection.Username, password).ConfigureAwait(false))
             {
+                await Disconnect().ConfigureAwait(false);
                 throw new AuthenticatingFailedException();
             }
 
diff --git a/Borepin/Borepin/View/MachineListItemView.xaml b/Borepin/Borepin/View/MachineListItemView.xaml
index 893c341..51a78cc 100644
--- a/Borepin/Borepin/View/MachineListItemView.xaml
+++ b/Borepin/Borepin/View/MachineListItemView.xaml
@@ -24,7 +24,10 @@
                 <RowDefinition Height="1"/>
             </Grid.RowDefinitions>
             <Label Grid.Row="0" Grid.Column="1" Text="{Binding Name}" Style="{StaticResource LabelStyle_Primary}"/>
-            <Label Grid.Row="0" Grid.Column="2" Text="{Binding State, Converter={StaticResource MachineStateStringConverter}}" TextColor="{Binding State, Converter={StaticResource MachineStateColorConverter}}" Style="{StaticResource LabelStyle_Second}" HorizontalTextAlignment="End" />
+            <StackLayout Grid.Row="0" Grid.Column="2" Orientation="Horizontal" HorizontalOptions="End">
+                <Label Text="{Binding State, Converter={StaticResource MachineStateStringConverter}}" TextColor="{Binding State, Converter={StaticResource MachineStateColorConverter}}" Style="{StaticResource LabelStyle_Second}"/>
+                <Label Text="by Me" IsVisible="{Binding IsUserAssigned}" Style="{StaticResource LabelStyle_Second}"/>
+            </StackLayout>
             <Button Grid.Row="0" Grid.Column="3" Margin="0, 3, 0, 3" Text="->" Command="{Binding Source={RelativeSource AncestorType={x:Type pagemodel:MachineListPageModel}}, Path=SelectInstanceCommand}" CommandParameter="{Binding .}" Style="{StaticResource Style_Button_Primary}"/>
             <BoxView Grid.Row="1" Grid.ColumnSpan="5" BackgroundColor="{StaticResource FifthColor}"/>
         </Grid>
diff --git a/Borepin/Borepin/ViewModel/MachineListItemViewModel.cs b/Borepin/Borepin/ViewModel/MachineListItemViewModel.cs
index 5c5a1a6..7c46516 100644
--- a/Borepin/Borepin/ViewModel/MachineListItemViewModel.cs
+++ b/Borepin/Borepin/ViewModel/MachineListItemViewModel.cs
@@ -33,5 +33,12 @@ namespace Borepin.ViewModel
             get => _State;
             set => SetProperty(ref _State, value);
         }
+
+        private bool _IsUserAssigned = false;
+        public bool IsUserAssigned
+        {
+            get => _IsUserAssigned;
+            set => SetProperty(ref _IsUserAssigned, value);
+        }
     }
 }