Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
MrYossu committed Oct 14, 2024
2 parents 3c6f645 + f8666c9 commit 2338852
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 14 deletions.
12 changes: 6 additions & 6 deletions Pixata.Blazor.Sample/Pixata.Blazor.Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Blazored.FluentValidation" Version="2.1.0" />
<PackageReference Include="LanguageExt.Core" Version="4.4.6" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.12" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.6.0" />
<PackageReference Include="Blazored.FluentValidation" Version="2.2.0" />
<PackageReference Include="LanguageExt.Core" Version="4.4.9" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.10" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Telerik.UI.for.Blazor" Version="6.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Pixata.Blazor.TelerikComponents/Helpers/DateGridColumn.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Telerik.Blazor.Components;

namespace Pixata.Blazor.TelerikComponents.Helpers;

public class DateGridColumn : GridColumn {
public DateGridColumn() =>
FilterOperators = GridFilterOperators.DateOperators;
}
11 changes: 11 additions & 0 deletions Pixata.Blazor.TelerikComponents/Helpers/EnumGridColumn.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Telerik.Blazor.Components;
using Telerik.DataSource;

namespace Pixata.Blazor.TelerikComponents.Helpers;

public class EnumGridColumn : GridColumn {
public EnumGridColumn() {
DefaultFilterOperator = FilterOperator.IsEqualTo;
ShowFilterCellButtons = false;
}
}
25 changes: 25 additions & 0 deletions Pixata.Blazor.TelerikComponents/Helpers/GridFilterOperators.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System.Collections.Generic;
using Telerik.Blazor.Components;
using Telerik.DataSource;

namespace Pixata.Blazor.TelerikComponents.Helpers;

public static class GridFilterOperators {
public static List<FilterListOperator> StringOperators { get; set; } = [
new FilterListOperator { Operator = FilterOperator.Contains, Text = "contains" },
new FilterListOperator { Operator = FilterOperator.StartsWith, Text = "starts with" },
new FilterListOperator { Operator = FilterOperator.EndsWith, Text = "ends with" }
];

public static List<FilterListOperator> NumericOperators { get; set; } = [
new FilterListOperator { Operator = FilterOperator.IsEqualTo, Text = "equals" },
new FilterListOperator { Operator = FilterOperator.IsLessThan, Text = "less than" },
new FilterListOperator { Operator = FilterOperator.IsGreaterThan, Text = "more than" }
];

public static List<FilterListOperator> DateOperators { get; set; } = [
new FilterListOperator { Operator = FilterOperator.IsLessThan, Text = "before" },
new FilterListOperator { Operator = FilterOperator.IsEqualTo, Text = "on" },
new FilterListOperator { Operator = FilterOperator.IsGreaterThanOrEqualTo, Text = "on or after" }
];
}
8 changes: 8 additions & 0 deletions Pixata.Blazor.TelerikComponents/Helpers/NumericGridColumn.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using Telerik.Blazor.Components;

namespace Pixata.Blazor.TelerikComponents.Helpers;

public class NumericGridColumn : GridColumn {
public NumericGridColumn() =>
FilterOperators = GridFilterOperators.NumericOperators;
}
11 changes: 11 additions & 0 deletions Pixata.Blazor.TelerikComponents/Helpers/TextGridColumn.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Telerik.Blazor.Components;
using Telerik.DataSource;

namespace Pixata.Blazor.TelerikComponents.Helpers;

public class TextGridColumn : GridColumn {
public TextGridColumn() {
FilterOperators = GridFilterOperators.StringOperators;
DefaultFilterOperator = FilterOperator.Contains;
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>1.13.0</Version>
<AssemblyVersion>1.13.0</AssemblyVersion>
<FileVersion>1.13.0</FileVersion>
<TargetFramework>net8.0</TargetFramework>
<Version>1.14.0</Version>
<AssemblyVersion>1.14.0</AssemblyVersion>
<FileVersion>1.14.0</FileVersion>
<Company>Pixata Ltd</Company>
<Authors>Avrohom Yisroel Silver</Authors>
<Product>Pixata.Blazor.TelerikComponents</Product>
Expand All @@ -22,11 +22,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.6.0" />
<PackageReference Include="Telerik.UI.for.Blazor" Version="6.2.0" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 2338852

Please sign in to comment.