feat(reports): enhance weekly and ledger transaction reports with additional package and user details
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 17m28s
Build and Deploy to Kubernetes / build-and-deploy (push) Successful in 17m28s
- Added 'PackageTitle' to the weekly reports for better clarity on package information. - Updated CSV export for weekly reports to include package details. - Introduced 'UserId' and 'UserFullName' columns in ledger transaction reports for improved user tracking. - Modified CSV export for ledger transactions to reflect new user information. - Bumped Foursat.CMSMicroservice.Protobuf version to 0.0.214 for compatibility with recent changes.
This commit is contained in:
@@ -143,7 +143,7 @@
|
|||||||
<ProjectReference Include="../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj" />
|
<ProjectReference Include="../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="!Exists('../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj')">
|
<ItemGroup Condition="!Exists('../../../CMS/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj')">
|
||||||
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.213" />
|
<PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.214" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- ============================================================ -->
|
<!-- ============================================================ -->
|
||||||
|
|||||||
@@ -65,6 +65,11 @@
|
|||||||
SortMode="SortMode.Multiple">
|
SortMode="SortMode.Multiple">
|
||||||
<Columns>
|
<Columns>
|
||||||
<PropertyColumn Property="x => x.WeekDisplayName" Title="هفته" />
|
<PropertyColumn Property="x => x.WeekDisplayName" Title="هفته" />
|
||||||
|
<PropertyColumn Property="x => x.PackageTitle" Title="پکیج">
|
||||||
|
<CellTemplate>
|
||||||
|
@(string.IsNullOrEmpty(context.Item.PackageTitle) ? "—" : context.Item.PackageTitle)
|
||||||
|
</CellTemplate>
|
||||||
|
</PropertyColumn>
|
||||||
<PropertyColumn Property="x => x.TotalPoolAmount" Title="مبلغ کل استخر" Format="N0">
|
<PropertyColumn Property="x => x.TotalPoolAmount" Title="مبلغ کل استخر" Format="N0">
|
||||||
<CellTemplate>
|
<CellTemplate>
|
||||||
<MudText>@context.Item.TotalPoolAmount.ToString("N0") تومان</MudText>
|
<MudText>@context.Item.TotalPoolAmount.ToString("N0") تومان</MudText>
|
||||||
@@ -203,6 +208,8 @@
|
|||||||
{
|
{
|
||||||
WeekDefinitionId = x.WeekDefinitionId,
|
WeekDefinitionId = x.WeekDefinitionId,
|
||||||
WeekDisplayName = x.WeekDisplayName,
|
WeekDisplayName = x.WeekDisplayName,
|
||||||
|
PackageId = x.PackageId,
|
||||||
|
PackageTitle = x.PackageTitle,
|
||||||
TotalPoolAmount = x.TotalPoolAmount,
|
TotalPoolAmount = x.TotalPoolAmount,
|
||||||
TotalBalances = x.TotalBalances,
|
TotalBalances = x.TotalBalances,
|
||||||
ValuePerBalance = x.ValuePerBalance,
|
ValuePerBalance = x.ValuePerBalance,
|
||||||
@@ -249,6 +256,8 @@
|
|||||||
{
|
{
|
||||||
public long WeekDefinitionId { get; set; }
|
public long WeekDefinitionId { get; set; }
|
||||||
public string WeekDisplayName { get; set; } = "";
|
public string WeekDisplayName { get; set; } = "";
|
||||||
|
public long PackageId { get; set; }
|
||||||
|
public string PackageTitle { get; set; } = "";
|
||||||
public long TotalPoolAmount { get; set; }
|
public long TotalPoolAmount { get; set; }
|
||||||
public int TotalBalances { get; set; }
|
public int TotalBalances { get; set; }
|
||||||
public long ValuePerBalance { get; set; }
|
public long ValuePerBalance { get; set; }
|
||||||
|
|||||||
@@ -18,12 +18,13 @@ public partial class WeeklyReports
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
var sb = new StringBuilder();
|
var sb = new StringBuilder();
|
||||||
sb.AppendLine("هفته,مبلغ کل استخر,مجموع موجودیها,ارزش هر موجودی,وضعیت,تاریخ محاسبه");
|
sb.AppendLine("هفته,پکیج,مبلغ کل استخر,مجموع موجودیها,ارزش هر موجودی,وضعیت,تاریخ محاسبه");
|
||||||
|
|
||||||
foreach (var r in _reports)
|
foreach (var r in _reports)
|
||||||
{
|
{
|
||||||
sb.AppendLine(string.Join(",",
|
sb.AppendLine(string.Join(",",
|
||||||
EscapeCsv(r.WeekDisplayName),
|
EscapeCsv(r.WeekDisplayName),
|
||||||
|
EscapeCsv(r.PackageTitle),
|
||||||
r.TotalPoolAmount,
|
r.TotalPoolAmount,
|
||||||
r.TotalBalances,
|
r.TotalBalances,
|
||||||
r.ValuePerBalance,
|
r.ValuePerBalance,
|
||||||
|
|||||||
@@ -96,6 +96,16 @@
|
|||||||
</ToolBarContent>
|
</ToolBarContent>
|
||||||
<Columns>
|
<Columns>
|
||||||
<PropertyColumn Property="x => x.Id" Title="شناسه" />
|
<PropertyColumn Property="x => x.Id" Title="شناسه" />
|
||||||
|
<TemplateColumn Title="کاربر">
|
||||||
|
<CellTemplate>
|
||||||
|
@(context.Item.UserId != null ? context.Item.UserId.ToString() : "—")
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
|
<TemplateColumn Title="نام کاربر">
|
||||||
|
<CellTemplate>
|
||||||
|
@(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
<TemplateColumn Title="نوع">
|
<TemplateColumn Title="نوع">
|
||||||
<CellTemplate>
|
<CellTemplate>
|
||||||
<MudChip T="string" Size="Size.Small" Variant="Variant.Text">
|
<MudChip T="string" Size="Size.Small" Variant="Variant.Text">
|
||||||
@@ -232,13 +242,13 @@
|
|||||||
Filter = BuildFilter()
|
Filter = BuildFilter()
|
||||||
});
|
});
|
||||||
var sb = new System.Text.StringBuilder();
|
var sb = new System.Text.StringBuilder();
|
||||||
sb.AppendLine("Id,Type,Amount,Description,Status,RefId,PaymentDate,Created");
|
sb.AppendLine("Id,UserId,UserFullName,Type,Amount,Description,Status,RefId,PaymentDate,Created");
|
||||||
foreach (var r in result.Models)
|
foreach (var r in result.Models)
|
||||||
{
|
{
|
||||||
var type = r.HasType ? ReportLabels.GetTransactionTypeLabel(r.Type) : "";
|
var type = r.HasType ? ReportLabels.GetTransactionTypeLabel(r.Type) : "";
|
||||||
var status = r.HasPaymentStatus ? ReportLabels.GetTransactionPaymentStatusLabel(r.PaymentStatus) : "";
|
var status = r.HasPaymentStatus ? ReportLabels.GetTransactionPaymentStatusLabel(r.PaymentStatus) : "";
|
||||||
var paymentDate = r.PaymentDate != null ? r.PaymentDate.ToDateTime().ToString("yyyy-MM-dd HH:mm") : "";
|
var paymentDate = r.PaymentDate != null ? r.PaymentDate.ToDateTime().ToString("yyyy-MM-dd HH:mm") : "";
|
||||||
sb.AppendLine($"{r.Id},{type},{r.Amount},\"{r.Description}\",{status},{r.RefId},{paymentDate},{r.Created.ToDateTime():yyyy-MM-dd HH:mm}");
|
sb.AppendLine($"{r.Id},{r.UserId},\"{r.UserFullName}\",{type},{r.Amount},\"{r.Description}\",{status},{r.RefId},{paymentDate},{r.Created.ToDateTime():yyyy-MM-dd HH:mm}");
|
||||||
}
|
}
|
||||||
await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "ledger-transactions.csv", sb.ToString());
|
await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "ledger-transactions.csv", sb.ToString());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,6 +82,11 @@
|
|||||||
<Columns>
|
<Columns>
|
||||||
<PropertyColumn Property="x => x.Id" Title="شناسه" />
|
<PropertyColumn Property="x => x.Id" Title="شناسه" />
|
||||||
<PropertyColumn Property="x => x.UserId" Title="کاربر" />
|
<PropertyColumn Property="x => x.UserId" Title="کاربر" />
|
||||||
|
<TemplateColumn Title="نام کاربر">
|
||||||
|
<CellTemplate>
|
||||||
|
@(string.IsNullOrWhiteSpace(context.Item.UserFullName) ? "—" : context.Item.UserFullName)
|
||||||
|
</CellTemplate>
|
||||||
|
</TemplateColumn>
|
||||||
<PropertyColumn Property="x => x.Mobile" Title="موبایل" />
|
<PropertyColumn Property="x => x.Mobile" Title="موبایل" />
|
||||||
<PropertyColumn Property="x => x.GatewayProvider" Title="درگاه" />
|
<PropertyColumn Property="x => x.GatewayProvider" Title="درگاه" />
|
||||||
<TemplateColumn Title="مبلغ (تومان)">
|
<TemplateColumn Title="مبلغ (تومان)">
|
||||||
@@ -193,9 +198,9 @@
|
|||||||
Filter = BuildFilter()
|
Filter = BuildFilter()
|
||||||
});
|
});
|
||||||
var sb = new System.Text.StringBuilder();
|
var sb = new System.Text.StringBuilder();
|
||||||
sb.AppendLine("Id,UserId,Mobile,Gateway,Amount,Authority,RefId,Status,OrderId,Created");
|
sb.AppendLine("Id,UserId,UserFullName,Mobile,Gateway,Amount,Authority,RefId,Status,OrderId,Created");
|
||||||
foreach (var r in result.Models)
|
foreach (var r in result.Models)
|
||||||
sb.AppendLine($"{r.Id},{r.UserId},{r.Mobile},{r.GatewayProvider},{r.Amount},{r.Authority},{r.RefId},{r.PaymentStatus},{r.OrderId},{r.CreatedAt.ToDateTime():yyyy-MM-dd HH:mm}");
|
sb.AppendLine($"{r.Id},{r.UserId},\"{r.UserFullName}\",{r.Mobile},{r.GatewayProvider},{r.Amount},{r.Authority},{r.RefId},{r.PaymentStatus},{r.OrderId},{r.CreatedAt.ToDateTime():yyyy-MM-dd HH:mm}");
|
||||||
await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "payment-transactions.csv", sb.ToString());
|
await jsRuntime.InvokeVoidAsync("jsSaveAsFile", "payment-transactions.csv", sb.ToString());
|
||||||
}
|
}
|
||||||
catch (Exception ex) { Snackbar.Add($"خطا در export: {ex.Message}", Severity.Error); }
|
catch (Exception ex) { Snackbar.Add($"خطا در export: {ex.Message}", Severity.Error); }
|
||||||
|
|||||||
Reference in New Issue
Block a user