Skip to content

Commit b9768b5

Browse files
korzhkorzh
authored
Merge pull request #46 from easyquery/beta
Version 7.4.0
2 parents e36a998 + b1acefa commit b9768b5

File tree

138 files changed

+710
-3284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+710
-3284
lines changed

‎.gitignore‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,10 @@ App_Data/dm-*__default/
2323
/EqAspNetCoreDemo/Properties/serviceDependencies.eqdemo-net5 - Web Deploy.json
2424
/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/wwwroot/js/adhoc-reporting.js.map
2525
/AspNetCore/Razor-Mvc/RazorTypeScript.AdHocReporting/wwwroot/js/adhoc-reporting.js
26-
/AspNet4/Mvc/AdvancedSearch/App_Data/dm-nwind/queries
2726
/Samples.AspNetCore.Mvc.sln
2827
**/eqdemo-sqlite.*
29-
/AspNet4/Mvc/AdhocReporting/EasyQuery.lck
30-
/AspNetCore/Razor-Mvc/Razor.AdvancedSearch/EasyQuery.lck
31-
/AspNet4/Mvc/AdvancedSearch/EasyQuery.lck
32-
/AspNet4/Mvc/AdhocReporting/EasyQuery.lck
33-
/AspNetCore/Razor-Mvc/Razor.AdHocReporting/EasyQuery.lck
28+
3429

3530
*.lck
3631
.idea
3732
/AspNetCore/Angular/AdHocReporting/AdHocReporting.Сlient/.angular/
38-

‎AspNet4/Mvc/AdhocReporting/App_Start/WebApiConfig.cs‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
using EasyData.Export;
99

10+
using Korzh.EasyQuery.AspNet;
11+
1012
namespace EqDemo
1113
{
1214
public static class WebApiConfig
@@ -16,7 +18,7 @@ public static void Register(HttpConfiguration config)
1618
// Web API configuration and services
1719

1820
// Web API routes
19-
config.MapHttpAttributeRoutes(new WebApiCustomDirectRouteProvider());
21+
config.MapHttpAttributeRoutesWithEasyQuery();
2022

2123
config.Routes.MapHttpRoute(
2224
name: "DefaultApi",
@@ -33,18 +35,6 @@ public static void Register(HttpConfiguration config)
3335

3436
// Uncomment this line to enable model loading from DbConnection
3537
// EasyQueryManagerSql.RegisterDbGate<Korzh.EasyQuery.DbGates.SqlClientGate>();
36-
37-
}
38-
}
39-
40-
41-
public class WebApiCustomDirectRouteProvider : DefaultDirectRouteProvider
42-
{
43-
protected override IReadOnlyList<IDirectRouteFactory>
44-
GetActionRouteFactories(HttpActionDescriptor actionDescriptor)
45-
{
46-
// inherit route attributes decorated on base class controller's actions
47-
return actionDescriptor.GetCustomAttributes<IDirectRouteFactory>(inherit: true);
4838
}
4939
}
5040
}

‎AspNet4/Mvc/AdhocReporting/Controllers/EasyQuery/EasyReportController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
using EqDemo.Models;
1111
using EqDemo.Services;
12+
using System.Linq;
1213

1314
namespace EqDemo.Controllers
1415
{
@@ -17,7 +18,6 @@ namespace EqDemo.Controllers
1718
[Authorize]
1819
public class EasyReportController : EasyQueryApiController
1920
{
20-
2121
protected override void ConfigureEasyQueryOptions(EasyQueryOptions options)
2222
{
2323
//use EasyQuery manager that generates SQL queries

‎AspNet4/Mvc/AdhocReporting/EqDemo.AspNet4x.AdhocReporting.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AppDesignerFolder>Properties</AppDesignerFolder>
1515
<RootNamespace>EqDemo</RootNamespace>
1616
<AssemblyName>EqDemo.AspNet4x.AdhocReporting</AssemblyName>
17-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1818
<MvcBuildViews>false</MvcBuildViews>
1919
<UseIISExpress>true</UseIISExpress>
2020
<Use64BitIISExpress />
@@ -71,7 +71,7 @@
7171
</ItemGroup>
7272
<ItemGroup>
7373
<PackageReference Include="Korzh.EasyQuery.SqlServerGate">
74-
<Version>7.3.3</Version>
74+
<Version>7.4.0-rc04</Version>
7575
</PackageReference>
7676
<PackageReference Include="Microsoft.Data.SqlClient">
7777
<Version>2.1.7</Version>
@@ -148,15 +148,15 @@
148148
<PackageReference Include="X.PagedList.Mvc">
149149
<Version>7.6.0</Version>
150150
</PackageReference>
151-
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.3.3" />
152-
<PackageReference Include="Korzh.EasyQuery.Linq" Version="7.3.3" />
153-
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.3.3" />
154-
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.3.3" />
155-
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.3.3" />
151+
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.4.0" />
152+
<PackageReference Include="Korzh.EasyQuery.Linq" Version="7.4.0" />
153+
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0-rc04" />
154+
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.4.0-rc04" />
155+
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.4.0-rc04" />
156156
<PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" />
157157
<PackageReference Include="Korzh.DbUtils.SqlServer" Version="1.4.1" />
158-
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.4.21" />
159-
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.4.21" />
158+
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" />
159+
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.5.9" />
160160
</ItemGroup>
161161
<ItemGroup>
162162
<Compile Include="App_Start\BundleConfig.cs" />

‎AspNet4/Mvc/AdhocReporting/Views/Home/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To test that functionlity - please log out first and create a new user.
1313
@section Styles {
1414

1515
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
16-
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.3.1/eq.core.min.css">
16+
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.4.0/eq.core.min.css">
1717
<link rel="stylesheet" href="~/Content/adhoc-reporting.css" />
1818

1919

@@ -130,7 +130,7 @@ To test that functionlity - please log out first and create a new user.
130130
@section Scripts {
131131

132132
<!-- EasyQuery script -->
133-
<script src="https://cdn.korzh.com/eq/7.3.1/eq.enterprise.min.js"></script>
133+
<script src="https://cdn.korzh.com/eq/7.4.0/eq.enterprise.min.js"></script>
134134

135135
<script>
136136
$(function () {

‎AspNet4/Mvc/AdhocReportingMetaData/App_Start/WebApiConfig.cs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Korzh.EasyQuery.Services;
77

88
using EasyData.Export;
9+
using Korzh.EasyQuery.AspNet;
910

1011
namespace EqDemo
1112
{
@@ -16,7 +17,7 @@ public static void Register(HttpConfiguration config)
1617
// Web API configuration and services
1718

1819
// Web API routes
19-
config.MapHttpAttributeRoutes(new WebApiCustomDirectRouteProvider());
20+
config.MapHttpAttributeRoutesWithEasyQuery();
2021

2122
config.Routes.MapHttpRoute(
2223
name: "DefaultApi",
@@ -35,15 +36,4 @@ public static void Register(HttpConfiguration config)
3536
EasyQueryManagerSql.RegisterDbGate<Korzh.EasyQuery.DbGates.SqlClientGate>();
3637
}
3738
}
38-
39-
40-
public class WebApiCustomDirectRouteProvider : DefaultDirectRouteProvider
41-
{
42-
protected override IReadOnlyList<IDirectRouteFactory>
43-
GetActionRouteFactories(HttpActionDescriptor actionDescriptor)
44-
{
45-
// inherit route attributes decorated on base class controller's actions
46-
return actionDescriptor.GetCustomAttributes<IDirectRouteFactory>(inherit: true);
47-
}
48-
}
4939
}

‎AspNet4/Mvc/AdhocReportingMetaData/EqDemo.AspNet4x.AdhocReporting.Metadata.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
</Reference>
7171
</ItemGroup>
7272
<ItemGroup>
73-
<PackageReference Include="Korzh.EasyQuery.MsSqlGate">
74-
<Version>7.3.3</Version>
73+
<PackageReference Include="Korzh.EasyQuery.MsSqlGate" Version="7.4.0">
74+
<Version>7.4.0-rc04</Version>
7575
</PackageReference>
7676
<PackageReference Include="System.Data.SqlClient">
7777
<Version>4.8.6</Version>
@@ -139,15 +139,15 @@
139139
<PackageReference Include="X.PagedList.Mvc">
140140
<Version>7.6.0</Version>
141141
</PackageReference>
142-
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.3.3" />
143-
<PackageReference Include="Korzh.EasyQuery.Linq" Version="7.3.3" />
144-
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.3.3" />
145-
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.3.3" />
146-
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.3.3" />
142+
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.4.0-rc04" />
143+
<PackageReference Include="Korzh.EasyQuery.Linq" Version="7.4.0-rc04" />
144+
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0-rc04" />
145+
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.4.0-rc04" />
146+
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.4.0-rc04" />
147147
<PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" />
148148
<PackageReference Include="Korzh.DbUtils.SqlServer" Version="1.4.1" />
149-
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.4.21" />
150-
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.4.21" />
149+
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" />
150+
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.5.9" />
151151
</ItemGroup>
152152
<ItemGroup>
153153
<Compile Include="App_Start\BundleConfig.cs" />

‎AspNet4/Mvc/AdhocReportingMetaData/Views/Home/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To test that functionlity - please log out first and create a new user.
1212

1313
@section Styles {
1414
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
15-
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.3.1/eq.core.min.css">
15+
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.4.0/eq.core.min.css">
1616
<link rel="stylesheet" href="~/Content/adhoc-reporting.css" />
1717

1818

@@ -138,7 +138,7 @@ To test that functionlity - please log out first and create a new user.
138138
@section Scripts {
139139

140140
<!-- EasyQuery script -->
141-
<script src="https://cdn.korzh.com/eq/7.3.1/eq.enterprise.min.js"></script>
141+
<script src="https://cdn.korzh.com/eq/7.4.0/eq.enterprise.min.js"></script>
142142

143143
<script>
144144
$(function () {

‎AspNet4/Mvc/AdvancedSearch-Multilayered/FrontApp/Views/Home/Index.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
}
66

77
@section Styles {
8-
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.3.1/eq.core.min.css">
9-
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.3.1/eq.view.min.css">
8+
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.4.0/eq.core.min.css">
9+
<link rel="stylesheet" href="https://cdn.korzh.com/eq/7.4.0/eq.view.min.css">
1010
}
1111

1212
<div class="eqjs-process-bar" id="ProcessBar"></div>
@@ -113,7 +113,7 @@
113113
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.1/Chart.bundle.min.js" type="text/javascript"></script>
114114

115115
<!-- EasyQuery script -->
116-
<script src="https://cdn.korzh.com/eq/7.3.1/eq.enterprise.js"></script>
116+
<script src="https://cdn.korzh.com/eq/7.4.0/eq.enterprise.js"></script>
117117

118118
<!-- EasyQuery Advanced Search view initialization -->
119119
<script>

‎AspNet4/Mvc/AdvancedSearch-Multilayered/ServiceApp/EqDemo.AspNet4x.MultiLayered.ServiceApp.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</ItemGroup>
7070
<ItemGroup>
7171
<PackageReference Include="Korzh.EasyQuery.MsSqlGate">
72-
<Version>7.3.3</Version>
72+
<Version>7.4.0-rc04</Version>
7373
</PackageReference>
7474
<PackageReference Include="System.Data.SqlClient">
7575
<Version>4.8.6</Version>
@@ -112,14 +112,14 @@
112112
</PackageReference>
113113
</ItemGroup>
114114
<ItemGroup>
115-
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.3.3" />
116-
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.3.3" />
117-
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.3.3" />
118-
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.3.3" />
115+
<PackageReference Include="Korzh.EasyQuery.Db" Version="7.4.0" />
116+
<PackageReference Include="Korzh.EasyQuery.AspNet4" Version="7.4.0" />
117+
<PackageReference Include="Korzh.EasyQuery.DataExport" Version="7.4.0" />
118+
<PackageReference Include="Korzh.EasyQuery.EntityFramework6" Version="7.4.0" />
119119
</ItemGroup>
120120
<ItemGroup>
121-
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.4.21" />
122-
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.4.21" />
121+
<PackageReference Include="EasyData.Exporters.ClosedXML" Version="1.5.9" />
122+
<PackageReference Include="EasyData.Exporters.PdfSharp" Version="1.5.9" />
123123
</ItemGroup>
124124
<ItemGroup>
125125
<PackageReference Include="Korzh.DbUtils.Import" Version="1.4.1" />

0 commit comments

Comments
 (0)