Merge pull request #30 from leungkimming/michael3

Michael3

Author: leungkimming

API/Controllers/ReportController.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc;
+using Telerik.Reporting.Services.AspNetCore;
+using Telerik.Reporting.Services;
+
+namespace API {
+    [Route("reports")]
+    [ApiController]
+    [IgnoreAntiforgeryToken]
+    public class ReportsController : ReportsControllerBase {
+        public ReportsController(IReportServiceConfiguration reportServiceConfiguration)
+                 : base(reportServiceConfiguration) {
+        }
+    }
+}

API/Controllers/SystemParameters/SystemParametersController.cs

@@ -27,6 +27,7 @@ public async Task<IActionResult> SearchAll([FromBody]SystemParametersSearchReque
         [HttpPost]
         [Route("addsystemparameter")]
         [AccessCodeAuthorize("SP02")]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> AddSystemParameter([FromBody]AddSystemParameterRequest request) {
             AddDataResponse response;
             request.Refresh(HttpContext.User.Identity.Name,DateTime.Now);
@@ -36,6 +37,7 @@ public async Task<IActionResult> AddSystemParameter([FromBody]AddSystemParameter
         [HttpPost]
         [Route("editsystemparameter")]
         [AccessCodeAuthorize("SP03")]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> EditSystemParameter([FromBody] EditSystemParameterRequest request) {
             EditDataResponse response;
             request.Refresh(HttpContext.User.Identity.Name, DateTime.Now);
@@ -45,6 +47,7 @@ public async Task<IActionResult> EditSystemParameter([FromBody] EditSystemParame
         [HttpGet]
         [Route("deletesystemparameter")]
         [AccessCodeAuthorize("SP04")]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> DeleteSystemParameter([FromQuery] DeleteSystemParameterRequest request) {
             EditDataResponse response;
             response = await _service.DeleteSystemParameterAsync(request);

API/Controllers/UserController.cs

@@ -40,6 +40,7 @@ public async Task<IActionResult> Get([FromBody] GetUserRequest request) {
 
         [HttpPost(Name = "AddNewUser")]
         [AccessCodeAuthorize("AB01")]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> Add([FromBody] AddUserRequest request) {
             AddUserResponse response;
             request.Refresh(HttpContext.User.Identity.Name, DateTime.Now);
@@ -49,6 +50,7 @@ public async Task<IActionResult> Add([FromBody] AddUserRequest request) {
 
         [HttpPost("Addpayslip")]
         [AccessCodeAuthorize("AC01")]
+        [ValidateAntiForgeryToken]
         public async Task<IActionResult> AddPayslip([FromBody] AddPayslipRequest request) {
             AddPayslipResponse _response;
             request.Refresh(HttpContext.User.Identity.Name, DateTime.Now);

API/P1.API.csproj

@@ -39,6 +39,7 @@
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Telerik.Reporting.Services.AspNetCore" Version="16.0.22.225" />
   </ItemGroup>
 
   <ItemGroup>
@@ -51,7 +52,13 @@
   <ItemGroup>
 	<InternalsVisibleTo Include="P6.StoryTest" />
   </ItemGroup>
-
+	
+  <ItemGroup>
+    <None Update="Reports\FrequentUsers.trdp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+	
   <!-- Uncomment ItemGroup to enable NServiceBus -->
    <!--<ItemGroup>
 	  <PackageReference Include="NServiceBus" Version="7.7.0" />

API/Program.cs

@@ -9,6 +9,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Data;
 using Microsoft.AspNetCore.Server.IIS;
+using Telerik.Reporting.Services;
+using Telerik.Reporting.Cache.File;
+
 // Uncomment to enable NServiceBus
 //using NServiceBus;
 //using Messages;
@@ -65,6 +68,10 @@
                 new string[] {}
         }
     });
+    c.ResolveConflictingActions(apiDescriptions => apiDescriptions.First());
+    c.IgnoreObsoleteActions();
+    c.IgnoreObsoleteProperties();
+    c.CustomSchemaIds(type => type.FullName);
 });
 
 // Authentication, authorization, Antiforgery Token
@@ -98,8 +105,13 @@
 });
 
 // for Blazor wasm hosting
-builder.Services.AddRazorPages();
-
+builder.Services.AddRazorPages().AddNewtonsoftJson();
+builder.Services.AddSingleton<IReportServiceConfiguration>(sp => new ReportServiceConfiguration
+{
+    Storage = new FileStorage(),
+    ReportSourceResolver = new UriReportSourceResolver(
+                        System.IO.Path.Combine(Directory.GetCurrentDirectory(), "Reports"))
+});
 // for IIS hosting
 builder.WebHost.UseIIS();
 

API/Reports/FrequentUsers.trdp

@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Telerik.ReportViewer.Blazor" Version="16.0.22.225" />
     <PackageReference Include="Telerik.UI.for.Blazor" Version="3.1.0" />
   </ItemGroup>
 

Client/Client.csproj

@@ -0,0 +1,24 @@
+@page "/Report"
+@using Telerik.ReportViewer.Blazor
+<PageTitle>Report</PageTitle>
+<style>
+    #rv1 {
+        position: relative;
+        width: 1000px;
+        height: 800px;
+    }
+</style>
+
+<ReportViewer ViewerId="rv1"
+              PageMode="@PageMode.SinglePage"
+              ServiceUrl="./reports"
+              ReportSource="@(new ReportSourceOptions()
+                              {
+                                  Report = "FrequentUsers.trdp"
+                              })"
+              Parameters="@(new ParametersOptions { Editors = new EditorsOptions { MultiSelect = EditorType.ListView, SingleSelect = EditorType.ComboBox } })"
+              ScaleMode="@ScaleMode.FitPageWidth"
+              ParametersAreaPosition="@ParametersAreaPosition.Right"/>
+@code {
+
+}

Client/Pages/Report.razor

@@ -16,6 +16,7 @@ public static class DrawerMenu {
                 new DrawerItem{ Text = "Home", Icon = "home", Url="/dotnet6EAA", Group = "home"},
                 new DrawerItem{ Text = "Add User", Icon = "dollar", Url="/dotnet6EAA/adduser", Group = "app", Target="_popup"},
                 new DrawerItem{ Text = "Search User", Icon = "dollar", Url="/dotnet6EAA/searchuser", Group = "app"},
+                new DrawerItem{ Text = "Report", Icon = "dollar", Url="/dotnet6EAA/Report", Group = "app"},
                 new DrawerItem{ Text = "System Parameters", Icon = "tell-a-friend", Url="/dotnet6EAA/systemparameters/searchdatas", Group = "app"},
                 new DrawerItem{ Text = "Swagger UI", Icon="gear", Url="/dotnet6EAA/swagger/index.html",Group="settings",Target= MenuTarget.Blank.Code},
            };

Client/Shared/NavMenu/DrawerMenu.cs

@@ -6,10 +6,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>DotNet6EAA</title>
     <base href="/dotnet6EAA/" />
+    <script src="js/jquery-3.3.1.min.js"></script>
+    <script src="./reports/resources/js/telerikReportViewer"></script>
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/app.css?version=0.1" rel="stylesheet" />
     <link href="Client.styles.css" rel="stylesheet" />
-    <!--<link href="css/main.css" rel="stylesheet" />-->
     <link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-default/all.css" />
     <script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
 </head>
@@ -35,6 +36,7 @@
             return "";
         }
     </script>
+    <script src="_content/telerik.reportviewer.blazor/interop.js" defer></script>
 </body>
 
 </html>