marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HeReport - csv export

Browse Source
This commit is contained in:
Stoyan Zlatev
2023-04-17 14:01:34 +02:00
parent 6e7a655e6e
commit 1ec91aebe3
10 changed files with 242 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LaaProductionWeb/LaaProductionWeb.Data/Interfaces/ISqlClient.cs
+4
View File
@@ -10,8 +10,12 @@
IEnumerable<T> ExecuteReader<T>(string query, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null);
IEnumerable<T> ExecuteReader<T>(string query, Func<ISqlReader, T> reader, Action<string[]> columns, SqlInfoMessageEventHandler errorCallback = null);
IEnumerable<T> ExecuteReader<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null);
IEnumerable<T> ExecuteReader<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> reader, Action<string[]> columns, SqlInfoMessageEventHandler errorCallback = null);
T ExecuteScalar<T>(string query, Action<SqlParameters> parameters, SqlInfoMessageEventHandler errorCallback = null);
T FirstOrDefault<T>(string query, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null);
LaaProductionWeb/LaaProductionWeb.Data/SqlClient.cs
+56 -8
View File
@@ -34,7 +34,7 @@
return rowsAffected;
}
public IEnumerable<T> ExecuteReader<T>(string query, Func<ISqlReader, T> output, SqlInfoMessageEventHandler errorCallback = null)
public IEnumerable<T> ExecuteReader<T>(string query, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null)
{
using (var sqlConnection = new SqlConnection(this.connectionString))
{
@@ -48,14 +48,14 @@
{
while (sqlReader.Read())
{
yield return output(sqlReader);
yield return reader(sqlReader);
}
}
}
}
}
public IEnumerable<T> ExecuteReader<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> output, SqlInfoMessageEventHandler errorCallback = null)
public IEnumerable<T> ExecuteReader<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null)
{
using (var sqlConnection = new SqlConnection(this.connectionString))
{
@@ -71,7 +71,55 @@
{
while (sqlReader.Read())
{
yield return output(sqlReader);
yield return reader(sqlReader);
}
}
}
}
}
public IEnumerable<T> ExecuteReader<T>(string query, Func<ISqlReader, T> reader, Action<string[]> columns, SqlInfoMessageEventHandler errorCallback = null)
{
using (var sqlConnection = new SqlConnection(this.connectionString))
{
sqlConnection.OpenWithErrorHandling(errorCallback);
using (var sqlCommand = sqlConnection.CreateCommand())
{
sqlCommand.CommandText = query;
using (SqlReader sqlReader = sqlCommand.ExecuteReader())
{
columns(sqlReader.GetColumns());
while (sqlReader.Read())
{
yield return reader(sqlReader);
}
}
}
}
}
public IEnumerable<T> ExecuteReader<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> reader, Action<string[]> columns, SqlInfoMessageEventHandler errorCallback = null)
{
using (var sqlConnection = new SqlConnection(this.connectionString))
{
sqlConnection.OpenWithErrorHandling(errorCallback);
using (var sqlCommand = sqlConnection.CreateCommand())
{
parameters(sqlCommand.Parameters);
sqlCommand.CommandText = query;
using (SqlReader sqlReader = sqlCommand.ExecuteReader())
{
columns(sqlReader.GetColumns());
while (sqlReader.Read())
{
yield return reader(sqlReader);
}
}
}
@@ -104,7 +152,7 @@
return scalarResult;
}
public T FirstOrDefault<T>(string query, Func<ISqlReader, T> output, SqlInfoMessageEventHandler errorCallback = null)
public T FirstOrDefault<T>(string query, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null)
{
var firstOrDefaultResult = default(T);
@@ -120,7 +168,7 @@
{
if (sqlReader.Read())
{
firstOrDefaultResult = output(sqlReader);
firstOrDefaultResult = reader(sqlReader);
}
}
}
@@ -129,7 +177,7 @@
return firstOrDefaultResult;
}
public T FirstOrDefault<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> output, SqlInfoMessageEventHandler errorCallback = null)
public T FirstOrDefault<T>(string query, Action<SqlParameters> parameters, Func<ISqlReader, T> reader, SqlInfoMessageEventHandler errorCallback = null)
{
var firstOrDefaultResult = default(T);
@@ -147,7 +195,7 @@
{
if (sqlReader.Read())
{
firstOrDefaultResult = output(sqlReader);
firstOrDefaultResult = reader(sqlReader);
}
}
}
LaaProductionWeb/LaaProductionWeb.Data/SqlReader.cs
+26 -3
View File
@@ -23,7 +23,11 @@
public byte[] GetBytes(int index = -1)
{
var bytes = default(byte[]);
index = Math.Max(index, this.column++);
if (index < 0)
{
index = this.column++;
}
if (!this.sqlDataReader.IsDBNull(index))
{
@@ -33,9 +37,25 @@
return bytes ?? Array.Empty<byte>();
}
internal string[] GetColumns()
{
var columnsCount = this.sqlDataReader.FieldCount;
var columns = new string[columnsCount];
for (int i = 0; i < columnsCount; i++)
{
columns[i] = this.sqlDataReader.GetName(i);
}
return columns;
}
public string GetString(int index = -1)
{
index = Math.Max(index, this.column++);
if (index < 0)
{
index = this.column++;
}
if (!this.sqlDataReader.IsDBNull(index))
{
@@ -47,7 +67,10 @@
public T GetValue<T>(int index = -1)
{
index = Math.Max(index, this.column++);
if (index < 0)
{
index = this.column++;
}
if (!this.sqlDataReader.IsDBNull(index))
{
LaaProductionWeb/LaaProductionWeb.Services/Interfaces/IReportService.cs
+2
View File
@@ -9,5 +9,7 @@
HeliumReportModel LoadHeliumPressureReport(HeliumReportModel model = null);
IEnumerable<HeliumPressurePoint> LoadHeliumPressureResults(int testId);
byte[] LoadHeliumPressureReportAsCSV(HeliumReportModel model);
}
}
LaaProductionWeb/LaaProductionWeb.Services/ReportService.cs
+94 -3
View File
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
public class ReportService : IReportService
{
@@ -87,18 +88,108 @@
TestDate = reader.GetValue<DateTimeOffset>(16),
Text = reader.GetString(17),
Tester = reader.GetString(18)
})
.ToList();
});
return model;
}
public byte[] LoadHeliumPressureReportAsCSV(HeliumReportModel model)
{
if (model is null)
{
model = new HeliumReportModel();
}
var where = model.Filter.Where();
var orderBy = model.Filter.OrderBy();
var csvItems = new List<object[]>();
var headers = Array.Empty<string>();
var items = this.sqlClient.ExecuteReader($@"
SELECT [PT].[CordonelPressureTest_FertigungsAuftragsNr] AS [FertigungNr] -- 0 Filter
, [POS].[AuftragNr] AS [AuftragNr] -- 1 Filter
, [POS].[PositionNr] AS [PositionNr] -- 2 Filter
, [PCB2SN].[MapPcbIdToSerialNumber_SerialNumber] AS [SerialNr] -- 3
, [ID].[IdentNr] AS [IdentNr] -- 4 Filter
, [PT_HE].[CordonelPressureTestHe_Id] AS [HeId] -- 5
, [PT_HE].[CordonelPressureTestHe_TestID] AS [HeTestId] -- 6
, [PT].[CordonelPressureTest_PcbId] AS [PcbId] -- 7 Filter
, [ID].[Nennweite] AS [Nennweite] -- 8 Filter
, [ID].[Baulaenge] AS [Baulaenge] -- 9 Filter
, [ID].[Typ] AS [Typ] -- 10 Filter
, [ID].[Druck] AS [Druck] -- 11 Filter
, [ID].[Temperatur] AS [Temperatur] -- 12 Filter
, [PT_HE].[CordonelPressureTestHe_LeakRate] AS [HeLakeRate] -- 13
, [PT_HE].[CordonelPressureTestHe_TestPressure] AS [HeTestPressure] -- 14
, [PT].[CordonelPressureTest_Valid] AS [IsValid] -- 15 Filter
, [PT].[CordonelPressureTest_Date] AS [TestDate] -- 16 Filter
, [PT].[CordonelPressureTest_Text] AS [Text] -- 17 Filter
, [PT_HE].[CordonelPressureTestHe_TesterName] AS [Tester] -- 18
, [CPT].[CordonelPressureTest_TestPointNr] AS [PointNr] -- 19
, CAST([CPT].[CordonelPressureTest_TestPointResult] AS NUMERIC(9, 8)) AS [PointResult] -- 20
FROM [Cordonel_PressureTest] AS [PT]
JOIN [Cordonel_PressureTest_He] AS [PT_HE] ON [PT_HE].[CordonelPressureTestHe_TestID] = [PT].[CordonelPressureTest_Id]
LEFT JOIN [Druckpruefung] AS [DP] ON [DP].[FabNr] = [PT].[CordonelPressureTest_PcbId]
JOIN [MapPcbIdToSerialNumber] AS [PCB2SN] ON [PCB2SN].[MapPcbIdToSerialNumber_PcbId] = [PT].[CordonelPressureTest_PcbId]
JOIN [AuftragPosition_Gesamt] AS [POS] ON [POS].[FertigungsauftragNr] = [PT].[CordonelPressureTest_FertigungsAuftragsNr]
JOIN [Identnr] AS [ID] ON [ID].[IdentNr] = [POS].[Identnr]
LEFT JOIN [Cordonel_PressureTest_TestPoints] AS [CPT] ON [CPT].[CordonelPressureTest_Id] = [PT].[CordonelPressureTest_Id]
WHERE [CordonelPressureTest_IsDeleted] = 0
AND {where.Query}
ORDER BY {orderBy.Query}",
parameters =>
{
foreach (var kvp in where.Parameters)
{
parameters.Add(kvp.Key, kvp.Value);
}
foreach (var kvp in orderBy.Parameters)
{
parameters.Add(kvp.Key, kvp.Value);
}
},
reader => new object[]
{
reader.GetValue<int>(0),
reader.GetValue<int>(1),
reader.GetValue<short>(2),
reader.GetValue<int>(3),
reader.GetValue<int>(4),
reader.GetValue<int>(5),
reader.GetValue<int>(6),
reader.GetValue<int>(7),
reader.GetValue<int?>(8),
reader.GetValue<int?>(9),
reader.GetString(10).Replace(',', ' '),
reader.GetValue<int?>(11),
reader.GetValue<int?>(12),
reader.GetString(13).Replace(',', ' '),
reader.GetString(14).Replace(',', ' '),
reader.GetValue<bool>(15),
reader.GetValue<DateTimeOffset>(16),
reader.GetString(17).Replace(',', ' '),
reader.GetString(18).Replace(',', ' '),
reader.GetValue<int>(19),
$"{reader.GetValue<decimal>(20):0.000000000}",
},
columns => csvItems.Add(columns))
.ToList();
csvItems.AddRange(items);
var csvLines = csvItems.Select(x => string.Join(",", x));
var csvContent = string.Join(Environment.NewLine, csvLines);
return Encoding.UTF8.GetBytes(csvContent);
}
public IEnumerable<HeliumPressurePoint> LoadHeliumPressureResults(int testId)
=> this.sqlClient.ExecuteReader($@"
SELECT [CordonelPressureTestTestPoints_Id]
, [CordonelPressureTest_TestPointNr]
, CAST([CordonelPressureTest_TestPointResult] AS NUMERIC(9, 8))
FROM [Auftrag].[dbo].[Cordonel_PressureTest_TestPoints]
FROM [Cordonel_PressureTest_TestPoints]
WHERE [CordonelPressureTest_Id] = @{nameof(testId)}",
parameters => parameters.Add(nameof(testId), testId),
reader => new HeliumPressurePoint
LaaProductionWeb/LaaProductionWeb/Controllers/ApprovalsController.cs
+2 -2
View File
@@ -20,7 +20,7 @@
public ActionResult Add()
=> this.View(new ProductionApproval
{
ApproverName = this.User.Identity.Name,
ApproverName = this.User.Name(),
ApprovalDate = DateTime.Now
});
@@ -31,7 +31,7 @@
if (this.ModelState.IsValid)
{
approval.ApprovalDate = DateTime.Now;
approval.ApproverName = this.User.Identity.Name;
approval.ApproverName = this.User.Name();
var addResult = this.approvals.Add(approval);
LaaProductionWeb/LaaProductionWeb/Controllers/ReportController.cs
+13 -1
View File
@@ -3,7 +3,7 @@
using LaaProductionWeb.App_Infrastructure;
using LaaProductionWeb.Services.Interfaces;
using LaaProductionWeb.Services.Models;
using System;
using System.Web.Mvc;
[Authorize]
@@ -31,6 +31,18 @@
return this.View(model);
}
[HttpPost]
[ValidateAntiForgeryToken]
public ActionResult CSV(HeliumReportModel model)
{
var csvReport = this.reportService.LoadHeliumPressureReportAsCSV(model);
var fileName = $"HeReport_{DateTime.Now:yyyyMMddhhmmss}.csv";
this.Response.AddHeader("Content-Disposition", $"attachment;filename={fileName}");
return this.File(csvReport, "application/csv");
}
public ActionResult Results(int testId = 0)
{
var results = this.reportService.LoadHeliumPressureResults(testId);
LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
+1
View File
@@ -189,6 +189,7 @@
<Content Include="Views\Approvals\Add.cshtml" />
<Content Include="Views\Search\Production.cshtml" />
<Content Include="Views\Admin\Index.cshtml" />
<Content Include="Views\Report\HiddenFilter.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="App_Content\font\fonts\bootstrap-icons.woff" />
LaaProductionWeb/LaaProductionWeb/Views/Report/HiddenFilter.cshtml
+8
View File
@@ -0,0 +1,8 @@
@model LaaProductionWeb.Services.Models.HeliumReportFilterProperty
<input type="hidden" name="@this.Model.TypeName" value="@this.Model.Type" />
<input type="hidden" name="@this.Model.IndexName" value="@this.Model.Index" />
<input type="hidden" name="@this.Model.ColumnName" value="@this.Model.Column" />
<input type="hidden" name="@this.Model.PropertyName" value="@this.Model.Property" />
<input type="hidden" name="@this.Model.LikeName" value="@this.Model.Like" />
<input type="hidden" name="@this.Model.OrderByName" value="@this.Model.OrderBy" />
LaaProductionWeb/LaaProductionWeb/Views/Report/Index.cshtml
+36 -25
View File
@@ -42,37 +42,48 @@
<tbody>
@foreach (var item in this.Model.Items)
{
<tr>
<td class="text-nowrap p-2">@item.FertigungNr</td>
<td class="text-nowrap p-2">@item.AuftragNr</td>
<td class="text-nowrap p-2">@item.PositionNr</td>
<td class="text-nowrap p-2">@item.SerialNr</td>
<td class="text-nowrap p-2">@item.IdentNr</td>
<td class="text-nowrap p-2">@item.HeId</td>
<td class="text-nowrap p-2">
<a class="text-decoration-none cursor-pointer" href="#@item.HeTestId">
@item.HeTestId
</a>
</td>
<td class="text-nowrap p-2">@item.PcbId</td>
<td class="text-nowrap p-2">@item.Nennweite</td>
<td class="text-nowrap p-2">@item.Baulaenge</td>
<td class="text-nowrap p-2">@item.Typ</td>
<td class="text-nowrap p-2">@item.Druck</td>
<td class="text-nowrap p-2">@item.Temperatur</td>
<td class="text-nowrap p-2">@item.HeLakeRate</td>
<td class="text-nowrap p-2">@item.HeTestPressure</td>
<td class="text-nowrap p-2"><i class="bi bi-bold @(item.IsValid ? "bi-check text-success" : "bi-x text-danger")"></i></td>
<td class="p-2">@item.Text</td>
<td class="text-nowrap p-2">@($"{item.TestDate:dd.MM.yyyy}")</td>
<td class="text-nowrap p-2">@item.Tester</td>
</tr>
<tr>
<td class="text-nowrap p-2">@item.FertigungNr</td>
<td class="text-nowrap p-2">@item.AuftragNr</td>
<td class="text-nowrap p-2">@item.PositionNr</td>
<td class="text-nowrap p-2">@item.SerialNr</td>
<td class="text-nowrap p-2">@item.IdentNr</td>
<td class="text-nowrap p-2">@item.HeId</td>
<td class="text-nowrap p-2">
<a class="text-decoration-none cursor-pointer" href="#@item.HeTestId">
@item.HeTestId
</a>
</td>
<td class="text-nowrap p-2">@item.PcbId</td>
<td class="text-nowrap p-2">@item.Nennweite</td>
<td class="text-nowrap p-2">@item.Baulaenge</td>
<td class="text-nowrap p-2">@item.Typ</td>
<td class="text-nowrap p-2">@item.Druck</td>
<td class="text-nowrap p-2">@item.Temperatur</td>
<td class="text-nowrap p-2">@item.HeLakeRate</td>
<td class="text-nowrap p-2">@item.HeTestPressure</td>
<td class="text-nowrap p-2"><i class="bi bi-bold @(item.IsValid ? "bi-check text-success" : "bi-x text-danger")"></i></td>
<td class="p-2">@item.Text</td>
<td class="text-nowrap p-2">@($"{item.TestDate:dd.MM.yyyy}")</td>
<td class="text-nowrap p-2">@item.Tester</td>
</tr>
}
</tbody>
</table>
</div>
</form>
<form action="/Report/CSV" method="post" autocomplete="off" class="position-fixed bottom-0 end-0 m-2">
@this.Html.AntiForgeryToken()
@foreach (var filter in this.Model.Filter)
{
this.Html.Partial("HiddenFilter", filter);
}
<button class="btn btn-light border-success" type="submit">
<i class="bi bi-filetype-csv text-success"></i>
</button>
</form>
<button id="modal_btn" class="d-none" data-bs-toggle="modal" data-bs-target="#modal"></button>
<!-- Modal -->