AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add data models, randomization, and report factory setup

Browse Source 
Introduced several new classes in the `EnvelopeGenerator.WebUI.Client` namespace:
- Added `Adjustment` class for financial adjustments with deterministic randomization.
- Added `Customer` class to load customer data from a SQL data source with fallback.
- Added `DataItem` class to represent detailed billing data, including adjustments.
- Added `DataItemList` class implementing `IList` for dynamic `DataItem` generation.
- Added `DeterministicRandom` class for reproducible random value generation.
- Added `Term` struct to define payment terms.
- Added `ReportsFactory` class to manage predefined reports.

Updated `MIGRATION_CONTEXT.md` to document the completion of Phase 5 (Data & PredefinedReports Migration) and outline next steps for resolving DevExpress-related errors in Phase 7.
This commit is contained in:
tekh
2026-06-12 14:04:37 +02:00
parent 1f889d8b58
commit 150fca5f47
8 changed files with 488 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/Adjustment.cs Normal file
View File

@@ -0,0 +1,44 @@
namespace EnvelopeGenerator.WebUI.Client.Data {
public class Adjustment
{
public static Adjustment CreateBalanceForward(DateTime dt, int random)
{
var rnd = new DeterministicRandom(random);
Adjustment res = new Adjustment();
res.currentDateTime = dt;
res.currentDescription = "Balance Forward";
res.currentAmount = rnd.Random(10, 300) * 10;
return res;
}
public static Adjustment CreatePayment(DateTime dt, int random)
{
var rnd = new DeterministicRandom(random);
Adjustment res = new Adjustment();
res.currentDateTime = dt;
res.currentDescription = "Payment";
res.currentAmount = -rnd.Random(1, 40) * 10;
return res;
}
public static Adjustment CreateCharge(DateTime dt, int random)
{
var rnd = new DeterministicRandom(random);
Adjustment res = new Adjustment();
res.currentDateTime = dt;
res.currentDescription = rnd.GetRandomItem(bills);
res.currentAmount = rnd.Random(10, 50) * 10;
return res;
}
DateTime currentDateTime;
string currentDescription = "";
double currentAmount = 0;
static readonly string[] bills = new string[] { "Bill - Insurance", "Bill - Electricity", "Bill - Rent", "Bill - Phone", "Bill - Office Supplies" };
public DateTime Date { get { return currentDateTime; } }
public string Description { get { return currentDescription; } }
public double Amount { get { return currentAmount; } }
public Adjustment()
{
}
}
}

64
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/Customer.cs Normal file
View File

@@ -0,0 +1,64 @@
using DevExpress.DataAccess.Sql;
using DevExpress.DataAccess.Sql.DataApi;
namespace EnvelopeGenerator.WebUI.Client.Data {
public class Customer {
static List<Customer> currentCustomers = new List<Customer>();
public static List<Customer> Customers { get { return currentCustomers; } }
static Customer() {
try {
SqlDataSource ds = new SqlDataSource("NWindConnectionString");
SelectQuery query = SelectQueryFluentBuilder
.AddTable("Customers")
.SelectAllColumns()
.Build("Customers");
ds.Queries.Add(query);
ds.RebuildResultSchema();
ds.Fill();
ITable src = ds.Result["Customers"];
foreach(var row in src) {
currentCustomers.Add(new Customer() {
CustomerID = row.GetValue<string>("CustomerID"),
Address = row.GetValue<string>("Address"),
CompanyName = row.GetValue<string>("CompanyName"),
ContactName = row.GetValue<string>("ContactName"),
ContactTitle = row.GetValue<string>("ContactTitle"),
Country = row.GetValue<string>("Country"),
City = row.GetValue<string>("City"),
Fax = row.GetValue<string>("Fax"),
Phone = row.GetValue<string>("Phone"),
PostalCode = row.GetValue<string>("PostalCode"),
Region = row.GetValue<string>("Region")
});
}
} catch {
currentCustomers.Add(new Customer() {
Address = "Obere Str. 57",
City = "Berlin",
CompanyName = "Alfreds Futterkiste",
ContactName = "Maria Anders",
ContactTitle = "Sales Representative",
Country = "Germany",
CustomerID = "ALFKI",
Fax = "030-0076545",
Phone = "030-0074321",
PostalCode = "12209"
});
}
}
public string CustomerID { get; set; }
public string CompanyName { get; set; }
public string ContactName { get; set; }
public string ContactTitle { get; set; }
public string Address { get; set; }
public string City { get; set; }
public string PostalCode { get; set; }
public string Region { get; set; }
public string Country { get; set; }
public string Phone { get; set; }
public string Fax { get; set; }
}
}

71
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/DataItem.cs Normal file
View File

@@ -0,0 +1,71 @@
namespace EnvelopeGenerator.WebUI.Client.Data {
public class DataItem {
static readonly string[] accountType = new string[] { "Energy", "Manufacturing", "Estate", "Food", "Services" };
public string CustomerID { get; set; }
public string CompanyName { get; set; }
public string ContactName { get; set; }
public string ContactTitle { get; set; }
public string Address { get; set; }
public string City { get; set; }
public string PostalCode { get; set; }
public string Region { get; set; }
public string Country { get; set; }
public string Phone { get; set; }
public string Fax { get; set; }
public string Email { get; set; }
public string Invoice { get; set; }
public string CustomerAccount { get; set; }
public string CustomerIdentifiers { get; set; }
public DateTime BillingDate { get; set; }
public DateTime BillingPeriodStart { get; set; }
public DateTime BillingPeriodEnd { get; set; }
public string Terms { get; set; }
public string TermsID { get; set; }
public Adjustment[] Adjustments { get; set; }
public DataItem(int i) {
var rnd = new DeterministicRandom(i);
Customer c = rnd.GetRandomItem(Customer.Customers);
CustomerID = c.CustomerID;
CompanyName = c.CompanyName;
ContactName = c.ContactName;
ContactTitle = c.ContactTitle;
Address = c.Address;
City = c.City;
PostalCode = c.PostalCode;
Region = c.Region;
Country = c.Country;
Phone = c.Phone;
Fax = c.Fax;
Email = ContactName.Split(' ')[0].Replace(' ', '.').ToLower() + "@" + CompanyName.Split(' ')[0].ToLower() + ".com";
Invoice = string.Format("{0}{1}-{2}", rnd.RandomChar, rnd.Random(100, 1000), rnd.Random(100, 1000));
CustomerAccount = rnd.GetRandomItem(accountType);
CustomerIdentifiers = string.Format("{0}-{1}", rnd.Random(1000, 10000), rnd.Random(10, 100));
BillingPeriodStart = rnd.RandomTime();
BillingPeriodEnd = rnd.RandomTime(BillingPeriodStart, 7 * 24, 30 * 24);
BillingDate = rnd.RandomTime(BillingPeriodEnd, 7 * 24, 30 * 24);
Term currentTerm = rnd.GetRandomItem(Term.Terms);
Terms = currentTerm.Name;
int adjustmentsCount = rnd.Random(6) + 4;
Adjustments = new Adjustment[adjustmentsCount];
int h = (int)((BillingPeriodEnd - BillingPeriodStart).TotalHours / adjustmentsCount);
Adjustments[0] = Adjustment.CreateBalanceForward(rnd.RandomTime(BillingPeriodStart, 0, h), rnd.Random(10000));
int[] items = rnd.RandomList(adjustmentsCount - 1, 2);
for(int j = 1; j < Adjustments.Length; j++) {
DateTime nextDate = rnd.RandomTime(BillingPeriodStart.AddHours(h * j), 0, h);
switch(items[j - 1]) {
case 0:
Adjustments[j] = Adjustment.CreateCharge(nextDate, rnd.Random(10000));
break;
case 1:
Adjustments[j] = Adjustment.CreatePayment(nextDate, rnd.Random(10000));
break;
}
}
}
}
}

70
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/DataItemList.cs Normal file
View File

@@ -0,0 +1,70 @@
using System.Collections;
namespace EnvelopeGenerator.WebUI.Client.Data {
public class DataItemList : IList<DataItem>, IList {
readonly int rowCount;
public DataItem this[int index] { get { return new DataItem(index); } set { } }
public int Count { get { return rowCount; } }
public bool IsReadOnly { get { return false; } }
public bool IsFixedSize { get { return false; } }
public object SyncRoot { get { return true; } }
public bool IsSynchronized { get { return true; } }
object IList.this[int index] { get { return new DataItem(index); } set { } }
public DataItemList(int rowCount) {
this.rowCount = rowCount;
}
public IEnumerator<DataItem> GetEnumerator() {
throw new NotImplementedException();
}
public int Add(object value) {
throw new NotImplementedException();
}
public bool Contains(object value) {
throw new NotImplementedException();
}
public void Clear() {
throw new NotImplementedException();
}
public int IndexOf(object value) {
throw new NotImplementedException();
}
public void Insert(int index, object value) {
throw new NotImplementedException();
}
public void Remove(object value) {
throw new NotImplementedException();
}
public void RemoveAt(int index) {
throw new NotImplementedException();
}
public void CopyTo(Array array, int index) {
throw new NotImplementedException();
}
IEnumerator IEnumerable.GetEnumerator() {
throw new NotImplementedException();
}
public int IndexOf(DataItem item) {
throw new NotImplementedException();
}
public void Insert(int index, DataItem item) {
throw new NotImplementedException();
}
public void Add(DataItem item) {
throw new NotImplementedException();
}
public bool Contains(DataItem item) {
throw new NotImplementedException();
}
public void CopyTo(DataItem[] array, int arrayIndex) {
throw new NotImplementedException();
}
public bool Remove(DataItem item) {
throw new NotImplementedException();
}
void ICollection<DataItem>.CopyTo(DataItem[] array, int arrayIndex) {
CopyTo(array, arrayIndex);
}
}
}

60
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/DeterministicRandom.cs Normal file
View File

@@ -0,0 +1,60 @@
namespace EnvelopeGenerator.WebUI.Client.Data {
class DeterministicRandom {
const int randomCount = 10000;
static readonly int[] deterministicRandomNumbers;
static readonly DateTime time;
int rnd;
int Next {
get {
rnd = deterministicRandomNumbers[rnd % randomCount];
return rnd;
}
}
public char RandomChar {
get {
return (char)((int)'A' + Random(0, 26));
}
}
public int[] RandomList(int count, int to) {
int[] res = new int[count];
for(int i = 0; i < Math.Min(count, to); i++)
res[i] = i;
for(int i = to; i < count; i++)
res[i] = Random(to);
for(int i = 0; i < count; i++) {
int ind = Random(count);
int temp = res[ind];
res[ind] = res[i];
res[i] = temp;
}
return res;
}
public int Random(int to) {
return Random(0, to);
}
public int Random(int from, int to) {
return Next % Math.Max(1, to - from) + from;
}
public T GetRandomItem<T>(IList<T> list) {
return list[Next % list.Count];
}
public DateTime RandomTime() {
return RandomTime(time, 0, 30 * 24);
}
public DateTime RandomTime(DateTime from, int fromHours, int toHours) {
return from.AddHours(Next % (toHours - fromHours) + fromHours);
}
static DeterministicRandom() {
time = DateTime.Now.AddDays(-62);
Random currentRandom = new Random(randomCount);
deterministicRandomNumbers = new int[randomCount];
for(int i = 0; i < randomCount; i++)
deterministicRandomNumbers[i] = currentRandom.Next(randomCount);
}
public DeterministicRandom(int i) {
this.rnd = i + (i >> 10) + (i >> 20);
}
}
}

15
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/Data/Term.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace EnvelopeGenerator.WebUI.Client.Data {
public struct Term {
public static readonly Term[] Terms = new Term[] {
new Term("Payment seven days after invoice date" ),
new Term("Payment ten days after invoice date" ),
new Term("End of month" ),
new Term("21st of the month following invoice date" ),
};
readonly string currentName;
public string Name { get { return currentName; } }
public Term(string currentName) {
this.currentName = currentName;
}
}
}

14
EnvelopeGenerator.WebUI/EnvelopeGenerator.WebUI.Client/PredefinedReports/ReportsFactory.cs Normal file
View File

@@ -0,0 +1,14 @@
using DevExpress.XtraReports.UI;
namespace EnvelopeGenerator.WebUI.Client.PredefinedReports {
public static class ReportsFactory
{
public static readonly Dictionary<string, Func<XtraReport>> Reports = new() {
["LargeDatasetReport"] = () => new PredefinedReports.Report()
};
public static XtraReport GetReport(string reportName) {
return Reports[reportName]();
}
}
}

150
MIGRATION_CONTEXT.md
View File

@@ -1008,4 +1008,154 @@ https://learn.microsoft.com/en-us/aspnet/core/blazor/components/render-modes
--- ---
#### **? Phase 5: Data & PredefinedReports Migration - COMPLETE**
**Status:** ? **Successfully Completed**
**Data Files Migrated (ReceiverUI/Data ? WebUI.Client/Data):**
1. ? `DataItemList.cs`
2. ? `Customer.cs`
3. ? `Adjustment.cs`
4. ? `Term.cs`
5. ? `DeterministicRandom.cs`
6. ? `DataItem.cs`
**PredefinedReports Files Migrated (ReceiverUI/PredefinedReports ? WebUI.Client/PredefinedReports):**
1. ? `ReportsFactory.cs`
2. ?? `Report.cs` - **NOT MIGRATED** (too large, will be added manually by developer)
**Namespace Updates:** ? All files updated to `EnvelopeGenerator.WebUI.Client.*`
**Build Result:** ?? **50+ DevExpress-related errors remaining** (Expected - Phase 7 will fix)
**Errors Resolved:**
- ? `CS0234: 'PredefinedReports' does not exist` errors **FIXED** (6 errors resolved)
- ? `ReportsFactory.cs` and `InMemoryReportStorageWebExtension.cs` can now find PredefinedReports namespace
**New Errors (Expected):**
- ?? `Customer.cs` requires DevExpress DataAccess packages (uses `SqlDataSource`, `SelectQuery`, `ITable`)
- ?? `Report.cs` missing (will be added manually)
---
#### **?? Phase 3: Server-Side PDF Viewer Pages Migration - PENDING**
**Status:** ?? **NOT STARTED YET**
**Reason:** Focusing on dependency migration first (Data/PredefinedReports completed, now need DevExpress packages)
**Pending Files:**
- `EnvelopeReceiverPage.razor`
- `EnvelopeReceiverPage_DxPdfViewer.razor`
- `EnvelopeReceiverPage_DxReportViewer.razor`
- `EnvelopeReceiverPage_embed.razor`
---
#### **?? Phase 6: Static Files Migration - PENDING**
**Status:** ?? **NOT STARTED YET**
**Pending Actions:**
- Merge `ReceiverUI/wwwroot/js/*` ? `WebUI/wwwroot/js/`
- Merge `ReceiverUI/wwwroot/css/*` ? `WebUI/wwwroot/css/`
- Merge `ReceiverUI/wwwroot/docs/*` ? `WebUI/wwwroot/docs/`
- Merge `ReceiverUI/wwwroot/appsettings.json` ? `WebUI/wwwroot/appsettings.json`
---
#### **?? Phase 7: DevExpress NuGet Packages & Configuration - NEXT**
**Status:** ?? **READY TO START**
**Goal:** Add missing DevExpress WASM packages to `WebUI.Client.csproj` to resolve all DevExpress-related errors
**Actions Required:**
1. Add NuGet packages to `WebUI.Client.csproj`:
```xml
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
<PackageReference Include="DevExpress.Drawing.Skia" Version="25.2.3" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
<PackageReference Include="SkiaSharp.Views.Blazor" Version="3.119.1" />
<NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\2.0.23\*.a" />
```
2. Update `WebUI.Client/Program.cs` with service registrations (from ReceiverUI/Program.cs)
3. Merge `ReceiverUI/_Imports.razor` ? `WebUI.Client/_Imports.razor`
4. Uncomment Options configuration in `WebUI/Program.cs`
**Expected Result:** All 50+ DevExpress errors will be resolved
---
### **?? CURRENT BUILD ERRORS (50+ errors)**
**Error Categories:**
#### **1. DevExpress NuGet Packages Missing (WebUI.Client.csproj)**
**Root Cause:** DevExpress WASM packages not yet added to `WebUI.Client.csproj`
**Affected Files (10+ files):**
- ? `CustomReportProvider.cs` (XtraReport, IReportProviderAsync, ReportProviderContext)
- ? `InMemoryReportStorageWebExtension.cs` (ReportStorageWebExtension, XtraReport)
- ? `FontLoader.cs` (DevExpress.Drawing)
- ? `ObjectDataSourceWizardCustomTypeProvider.cs` (IObjectDataSourceWizardTypeProvider)
- ? `CustomDataSourceWizardJsonDataConnectionStorage.cs` (JsonDataConnection, IDataSourceWizardJsonConnectionStorage)
- ? `CustomJsonDataConnectionProviderFactory.cs` (JsonDataConnection, IJsonDataConnectionProviderFactory)
- ? `ReportsFactory.cs` (XtraReport) - ? **PredefinedReports namespace resolved!**
- ? `Customer.cs` (SqlDataSource, SelectQuery, ITable) - ?? **NEW ERROR** (added in Phase 5)
**Missing Packages (from ReceiverUI.csproj):**
```xml
<PackageReference Include="DevExpress.Blazor.PdfViewer" Version="25.2.3" />
<PackageReference Include="DevExpress.Blazor.Reporting.JSBasedControls" Version="25.2.3" />
<PackageReference Include="DevExpress.Blazor.Reporting.Viewer" Version="25.2.3" />
<PackageReference Include="DevExpress.Drawing.Skia" Version="25.2.3" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
<PackageReference Include="SkiaSharp.Views.Blazor" Version="3.119.1" />
```
**Fix:** Will be addressed in **Phase 7: Configuration**
---
#### **2. Report.cs Missing (Manual Action Required)**
**Root Cause:** `ReceiverUI/PredefinedReports/Report.cs` too large to migrate automatically
**Affected Files:**
- ? `ReportsFactory.cs` ? `new PredefinedReports.Report()` (CS0234)
**Fix:** Developer will manually copy `Report.cs` from ReceiverUI to WebUI.Client
---
### **?? NEXT STEPS**
#### **Phase 7: DevExpress NuGet Packages (CRITICAL - NEXT)**
**Goal:** Add missing DevExpress WASM packages to `WebUI.Client.csproj` to resolve all compilation errors
**Expected Result:** All 50+ DevExpress errors will be resolved after package installation
---
### **?? SUMMARY OF COMPLETED WORK (Updated after Phase 5)**
| Phase | Status | Files Migrated | Build Status |
|-------|--------|----------------|--------------|
| **Phase 1: YARP Setup** | ? Complete | 1 file (yarp.json), 2 config files (Program.cs, appsettings.json) | ? Build Successful |
| **Phase 2: Client Pages** | ? Complete | 4 pages (Index, EnvelopeSender, LoginSender, LoginReceiver) | ?? Expected errors |
| **Phase 3: Server Pages** | ?? Pending | 0 files | N/A |
| **Phase 4: Services/Models/Options** | ? Complete | 22 files (13 services + 7 models + 2 options) | ?? 43 DevExpress errors |
| **Phase 5: Data/PredefinedReports** | ? Complete | 7 files (6 Data + 1 PredefinedReports) | ?? 50+ DevExpress errors |
| **Phase 6: Static Files** | ?? Pending | 0 files | N/A |
| **Phase 7: NuGet & Config** | ?? Pending | 0 files | N/A |
| **Phase 8: Testing** | ?? Pending | N/A | N/A |
**Total Files Migrated:** **34 files** ?
**Total Errors:** **50+** (All DevExpress-related, expected, will be fixed in Phase 7)
---
**END OF MIGRATION CONTEXT** **END OF MIGRATION CONTEXT**