Bladeren bron

PRS MOBILE - DataGrid sorting completed, Filtering function in progress

Nick 2 jaren geleden
bovenliggende
commit
c4de1d43c7

+ 18 - 0
prs.mobile/comal.timesheets/DataGridHeaderRow.xaml.cs

@@ -31,6 +31,7 @@ namespace comal.timesheets
 
         private void HeaderBtn_Clicked(object sender, EventArgs e)
         {
+            SortDirection = ChooseDirection(SortDirection);
             OnDataGridHeaderTapped?.Invoke(ColumnNumber, SortDirection);
         }
 
@@ -46,5 +47,22 @@ namespace comal.timesheets
                 filterBtn.IsVisible = false;
             ForceLayout();
         }
+
+        private SearchUtils.SortDirection ChooseDirection(SearchUtils.SortDirection sortdirection)
+        {
+            switch (sortdirection)
+            {
+                case SearchUtils.SortDirection.Default:
+                    sortdirection = SearchUtils.SortDirection.Ascending;
+                    break;
+                case SearchUtils.SortDirection.Ascending:
+                    sortdirection = SearchUtils.SortDirection.Descending;
+                    break;
+                case SearchUtils.SortDirection.Descending:
+                    sortdirection = SearchUtils.SortDirection.Ascending;
+                    break;
+            }
+            return sortdirection;
+        }
     }
 }

+ 1 - 1
prs.mobile/comal.timesheets/MobileDataGrid.xaml

@@ -11,7 +11,7 @@
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
 
-            <Frame Grid.Row="0" Padding="2" Margin="2" BorderColor="LightGray">
+            <Frame Grid.Row="0" Padding="2" Margin="2" BorderColor="DimGray">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto"/>

+ 0 - 9
prs.mobile/comal.timesheets/MobileDataGrid.xaml.cs

@@ -279,10 +279,6 @@ namespace comal.timesheets
 
         private void Header_OnDataGridHeaderTapped(int columnnumber, SearchUtils.SortDirection sortdirection)
         {
-            sortdirection = sortdirection == SearchUtils.SortDirection.Ascending ? SearchUtils.SortDirection.Descending
-                : sortdirection == SearchUtils.SortDirection.Descending ? SearchUtils.SortDirection.Ascending
-                : SearchUtils.SortDirection.Ascending;
-
             var intermediatelist = new List<DataGridViewModelItem>();
             foreach (var property in info)
             {
@@ -297,11 +293,6 @@ namespace comal.timesheets
             }
         }
 
-        private void SortList(List<DataGridViewModelItem> items, int columnnumber)
-        {
-          
-        }
-
         private void Header_OnDataGridHeaderFilterTapped(int columnnumber, string columnname)
         {
 

+ 12 - 0
prs.mobile/comal.timesheets/MultiSelectionPage.xaml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="comal.timesheets.MultiSelectionPage">
+    <ContentPage.Content>
+        <StackLayout>
+            <Label Text="Welcome to Xamarin.Forms!"
+                VerticalOptions="CenterAndExpand" 
+                HorizontalOptions="CenterAndExpand" />
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>

+ 20 - 0
prs.mobile/comal.timesheets/MultiSelectionPage.xaml.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace comal.timesheets
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class MultiSelectionPage : ContentPage
+	{
+		public MultiSelectionPage ()
+		{
+			InitializeComponent ();
+		}
+	}
+}

+ 9 - 0
prs.mobile/comal.timesheets/comal.timesheets.projitems

@@ -226,6 +226,9 @@
       <DependentUpon>MobileDataGrid.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)MultiSelectionPage.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Site\JobDocFilterItem.xaml.cs">
       <DependentUpon>JobDocFilterItem.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -1053,4 +1056,10 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)MultiSelectionPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>