From 7e70f5108fa45f89fd20ca2d74b9b5ea65bd2fa0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GENO133\\IvanPlex" Date: Mon, 12 Feb 2024 03:27:26 -0700 Subject: [PATCH] changed dictionary to class object so we can enforce field requirement. --- Models/Collision/CollisionRecordInput.cs | 2 +- Models/ExtraField.cs | 9 +++++++++ Models/GasRecord/GasRecord.cs | 2 +- Models/GasRecord/GasRecordInput.cs | 2 +- Models/GenericRecord.cs | 2 +- Models/OdometerRecord/OdometerRecord.cs | 2 +- Models/OdometerRecord/OdometerRecordInput.cs | 2 +- Models/ServiceRecord/ServiceRecordInput.cs | 2 +- Models/Supply/SupplyRecord.cs | 2 +- Models/Supply/SupplyRecordInput.cs | 2 +- Models/TaxRecord/TaxRecord.cs | 2 +- Models/TaxRecord/TaxRecordInput.cs | 2 +- Models/UpgradeRecord/UpgradeReportInput.cs | 2 +- 13 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 Models/ExtraField.cs diff --git a/Models/Collision/CollisionRecordInput.cs b/Models/Collision/CollisionRecordInput.cs index 3d93267..7ceef0f 100644 --- a/Models/Collision/CollisionRecordInput.cs +++ b/Models/Collision/CollisionRecordInput.cs @@ -12,7 +12,7 @@ public List Files { get; set; } = new List(); public List Supplies { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public CollisionRecord ToCollisionRecord() { return new CollisionRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; } } } diff --git a/Models/ExtraField.cs b/Models/ExtraField.cs new file mode 100644 index 0000000..9a4ed8c --- /dev/null +++ b/Models/ExtraField.cs @@ -0,0 +1,9 @@ +namespace CarCareTracker.Models +{ + public class ExtraField + { + public string Name { get; set; } + public string Value { get; set; } + public bool IsRequired { get; set; } + } +} diff --git a/Models/GasRecord/GasRecord.cs b/Models/GasRecord/GasRecord.cs index 051d01d..8bad3cd 100644 --- a/Models/GasRecord/GasRecord.cs +++ b/Models/GasRecord/GasRecord.cs @@ -19,6 +19,6 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); } } diff --git a/Models/GasRecord/GasRecordInput.cs b/Models/GasRecord/GasRecordInput.cs index 22cb440..287de1d 100644 --- a/Models/GasRecord/GasRecordInput.cs +++ b/Models/GasRecord/GasRecordInput.cs @@ -19,7 +19,7 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public GasRecord ToGasRecord() { return new GasRecord { Id = Id, Cost = Cost, diff --git a/Models/GenericRecord.cs b/Models/GenericRecord.cs index b35c68e..37de27e 100644 --- a/Models/GenericRecord.cs +++ b/Models/GenericRecord.cs @@ -11,6 +11,6 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set;} = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); } } diff --git a/Models/OdometerRecord/OdometerRecord.cs b/Models/OdometerRecord/OdometerRecord.cs index 3807a5d..45594c5 100644 --- a/Models/OdometerRecord/OdometerRecord.cs +++ b/Models/OdometerRecord/OdometerRecord.cs @@ -9,6 +9,6 @@ public string Notes { get; set; } public List Tags { get; set; } = new List(); public List Files { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); } } diff --git a/Models/OdometerRecord/OdometerRecordInput.cs b/Models/OdometerRecord/OdometerRecordInput.cs index 145dcdb..f2c445d 100644 --- a/Models/OdometerRecord/OdometerRecordInput.cs +++ b/Models/OdometerRecord/OdometerRecordInput.cs @@ -9,7 +9,7 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public OdometerRecord ToOdometerRecord() { return new OdometerRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Mileage = Mileage, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; } } } diff --git a/Models/ServiceRecord/ServiceRecordInput.cs b/Models/ServiceRecord/ServiceRecordInput.cs index f272773..30f8ccf 100644 --- a/Models/ServiceRecord/ServiceRecordInput.cs +++ b/Models/ServiceRecord/ServiceRecordInput.cs @@ -12,7 +12,7 @@ public List Files { get; set; } = new List(); public List Supplies { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public ServiceRecord ToServiceRecord() { return new ServiceRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; } } } diff --git a/Models/Supply/SupplyRecord.cs b/Models/Supply/SupplyRecord.cs index 24f0dbf..6ecfbe9 100644 --- a/Models/Supply/SupplyRecord.cs +++ b/Models/Supply/SupplyRecord.cs @@ -34,6 +34,6 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); } } diff --git a/Models/Supply/SupplyRecordInput.cs b/Models/Supply/SupplyRecordInput.cs index b241f54..14896d2 100644 --- a/Models/Supply/SupplyRecordInput.cs +++ b/Models/Supply/SupplyRecordInput.cs @@ -13,7 +13,7 @@ public string Notes { get; set; } public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public SupplyRecord ToSupplyRecord() { return new SupplyRecord { Id = Id, VehicleId = VehicleId, diff --git a/Models/TaxRecord/TaxRecord.cs b/Models/TaxRecord/TaxRecord.cs index 45613ae..7df781d 100644 --- a/Models/TaxRecord/TaxRecord.cs +++ b/Models/TaxRecord/TaxRecord.cs @@ -13,6 +13,6 @@ public int CustomMonthInterval { get; set; } = 0; public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); } } diff --git a/Models/TaxRecord/TaxRecordInput.cs b/Models/TaxRecord/TaxRecordInput.cs index 80435c4..723623d 100644 --- a/Models/TaxRecord/TaxRecordInput.cs +++ b/Models/TaxRecord/TaxRecordInput.cs @@ -13,7 +13,7 @@ public int CustomMonthInterval { get; set; } = 0; public List Files { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public TaxRecord ToTaxRecord() { return new TaxRecord { Id = Id, VehicleId = VehicleId, diff --git a/Models/UpgradeRecord/UpgradeReportInput.cs b/Models/UpgradeRecord/UpgradeReportInput.cs index 5edff2f..ddc60ec 100644 --- a/Models/UpgradeRecord/UpgradeReportInput.cs +++ b/Models/UpgradeRecord/UpgradeReportInput.cs @@ -12,7 +12,7 @@ public List Files { get; set; } = new List(); public List Supplies { get; set; } = new List(); public List Tags { get; set; } = new List(); - public Dictionary ExtraFields { get; set; } = new Dictionary(); + public List ExtraFields { get; set; } = new List(); public UpgradeRecord ToUpgradeRecord() { return new UpgradeRecord { Id = Id, VehicleId = VehicleId, Date = DateTime.Parse(Date), Cost = Cost, Mileage = Mileage, Description = Description, Notes = Notes, Files = Files, Tags = Tags, ExtraFields = ExtraFields }; } } }