Skip to content

Commit cd8d99f

Browse files
hargatahargata
authored
Merge pull request #983 from hargata/Hargata/code.cleanup.3
Code Cleanup - Views
2 parents 56c4d04 + 98e8dfe commit cd8d99f

39 files changed

Lines changed: 55 additions & 55 deletions

‎Controllers/Vehicle/GasController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public IActionResult GetGasRecordsByVehicleId(int vehicleId)
3030
UseHours = vehicleUseHours,
3131
GasRecords = computedResults
3232
};
33-
return PartialView("_Gas", viewModel);
33+
return PartialView("Gas/_Gas", viewModel);
3434
}
3535
[HttpPost]
3636
public IActionResult SaveGasRecordToVehicleId(GasRecordInput gasRecord)
@@ -65,7 +65,7 @@ public IActionResult GetAddGasRecordPartialView(int vehicleId)
6565
var vehicleData = _dataAccess.GetVehicleById(vehicleId);
6666
var vehicleIsElectric = vehicleData.IsElectric;
6767
var vehicleUseHours = vehicleData.UseHours;
68-
return PartialView("_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields } });
68+
return PartialView("Gas/_GasModal", new GasRecordInputContainer() { UseKwh = vehicleIsElectric, UseHours = vehicleUseHours, GasRecord = new GasRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields } });
6969
}
7070
[HttpGet]
7171
public IActionResult GetGasRecordForEditById(int gasRecordId)
@@ -100,7 +100,7 @@ public IActionResult GetGasRecordForEditById(int gasRecordId)
100100
UseHours = vehicleUseHours,
101101
GasRecord = convertedResult
102102
};
103-
return PartialView("_GasModal", viewModel);
103+
return PartialView("Gas/_GasModal", viewModel);
104104
}
105105
private bool DeleteGasRecordWithChecks(int gasRecordId)
106106
{
@@ -136,7 +136,7 @@ public IActionResult SaveUserGasTabPreferences(string gasUnit, string fuelMileag
136136
public IActionResult GetGasRecordsEditModal(List<int> recordIds)
137137
{
138138
var extraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.GasRecord).ExtraFields;
139-
return PartialView("_GasRecordsModal", new GasRecordEditModel { RecordIds = recordIds, EditRecord = new GasRecord { ExtraFields = extraFields } });
139+
return PartialView("Gas/_GasRecordsModal", new GasRecordEditModel { RecordIds = recordIds, EditRecord = new GasRecord { ExtraFields = extraFields } });
140140
}
141141
[HttpPost]
142142
public IActionResult SaveMultipleGasRecords(GasRecordEditModel editModel)

‎Controllers/Vehicle/NoteController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public IActionResult GetNotesByVehicleId(int vehicleId)
1313
{
1414
var result = _noteDataAccess.GetNotesByVehicleId(vehicleId);
1515
result = result.OrderByDescending(x => x.Pinned).ThenBy(x => x.Description).ToList();
16-
return PartialView("_Notes", result);
16+
return PartialView("Note/_Notes", result);
1717
}
1818
[TypeFilter(typeof(CollaboratorFilter))]
1919
[HttpGet]
@@ -44,7 +44,7 @@ public IActionResult SaveNoteToVehicleId(Note note)
4444
public IActionResult GetAddNotePartialView()
4545
{
4646
var extraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.NoteRecord).ExtraFields;
47-
return PartialView("_NoteModal", new Note() { ExtraFields = extraFields });
47+
return PartialView("Note/_NoteModal", new Note() { ExtraFields = extraFields });
4848
}
4949
[HttpGet]
5050
public IActionResult GetNoteForEditById(int noteId)
@@ -56,7 +56,7 @@ public IActionResult GetNoteForEditById(int noteId)
5656
{
5757
return Redirect("/Error/Unauthorized");
5858
}
59-
return PartialView("_NoteModal", result);
59+
return PartialView("Note/_NoteModal", result);
6060
}
6161
private bool DeleteNoteWithChecks(int noteId)
6262
{

‎Controllers/Vehicle/OdometerController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public IActionResult GetOdometerRecordsByVehicleId(int vehicleId)
3434
{
3535
result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
3636
}
37-
return PartialView("_OdometerRecords", result);
37+
return PartialView("Odometer/_OdometerRecords", result);
3838
}
3939
[HttpPost]
4040
public IActionResult SaveOdometerRecordToVehicleId(OdometerRecordInput odometerRecord)
@@ -57,13 +57,13 @@ public IActionResult SaveOdometerRecordToVehicleId(OdometerRecordInput odometerR
5757
[HttpGet]
5858
public IActionResult GetAddOdometerRecordPartialView(int vehicleId)
5959
{
60-
return PartialView("_OdometerRecordModal", new OdometerRecordInput() { InitialMileage = _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List<OdometerRecord>()), ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields });
60+
return PartialView("Odometer/_OdometerRecordModal", new OdometerRecordInput() { InitialMileage = _odometerLogic.GetLastOdometerRecordMileage(vehicleId, new List<OdometerRecord>()), ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields });
6161
}
6262
[HttpPost]
6363
public IActionResult GetOdometerRecordsEditModal(List<int> recordIds)
6464
{
6565
var extraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields;
66-
return PartialView("_OdometerRecordsModal", new OdometerRecordEditModel { RecordIds = recordIds, EditRecord = new OdometerRecord { ExtraFields = extraFields } });
66+
return PartialView("Odometer/_OdometerRecordsModal", new OdometerRecordEditModel { RecordIds = recordIds, EditRecord = new OdometerRecord { ExtraFields = extraFields } });
6767
}
6868
[HttpPost]
6969
public IActionResult SaveMultipleOdometerRecords(OdometerRecordEditModel editModel)
@@ -149,7 +149,7 @@ public IActionResult GetOdometerRecordForEditById(int odometerRecordId)
149149
Tags = result.Tags,
150150
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.OdometerRecord).ExtraFields)
151151
};
152-
return PartialView("_OdometerRecordModal", convertedResult);
152+
return PartialView("Odometer/_OdometerRecordModal", convertedResult);
153153
}
154154
private bool DeleteOdometerRecordWithChecks(int odometerRecordId)
155155
{

‎Controllers/Vehicle/PlanController.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public partial class VehicleController
1212
public IActionResult GetPlanRecordsByVehicleId(int vehicleId)
1313
{
1414
var result = _planRecordDataAccess.GetPlanRecordsByVehicleId(vehicleId);
15-
return PartialView("_PlanRecords", result);
15+
return PartialView("Plan/_PlanRecords", result);
1616
}
1717
[HttpPost]
1818
public IActionResult SavePlanRecordToVehicleId(PlanRecordInput planRecord)
@@ -72,7 +72,7 @@ public IActionResult SavePlanRecordTemplateToVehicleId(PlanRecordInput planRecor
7272
public IActionResult GetPlanRecordTemplatesForVehicleId(int vehicleId)
7373
{
7474
var result = _planRecordTemplateDataAccess.GetPlanRecordTemplatesByVehicleId(vehicleId);
75-
return PartialView("_PlanRecordTemplateModal", result);
75+
return PartialView("Plan/_PlanRecordTemplateModal", result);
7676
}
7777
[HttpPost]
7878
public IActionResult DeletePlanRecordTemplateById(int planRecordTemplateId)
@@ -106,7 +106,7 @@ public IActionResult OrderPlanSupplies(int planRecordTemplateId)
106106
if (existingRecord.Supplies.Any())
107107
{
108108
var suppliesToOrder = CheckSupplyRecordsAvailability(existingRecord.Supplies);
109-
return PartialView("_PlanOrderSupplies", suppliesToOrder);
109+
return PartialView("Plan/_PlanOrderSupplies", suppliesToOrder);
110110
}
111111
else
112112
{
@@ -166,17 +166,17 @@ public IActionResult ConvertPlanRecordTemplateToPlanRecord(int planRecordTemplat
166166
[HttpGet]
167167
public IActionResult GetAddPlanRecordPartialView()
168168
{
169-
return PartialView("_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
169+
return PartialView("Plan/_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
170170
}
171171
[HttpPost]
172172
public IActionResult GetAddPlanRecordPartialView(PlanRecordInput? planModel)
173173
{
174174
if (planModel is not null)
175175
{
176176
planModel.ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields;
177-
return PartialView("_PlanRecordModal", planModel);
177+
return PartialView("Plan/_PlanRecordModal", planModel);
178178
}
179-
return PartialView("_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
179+
return PartialView("Plan/_PlanRecordModal", new PlanRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields });
180180
}
181181
[HttpPost]
182182
public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress planProgress, int odometer = 0)
@@ -268,7 +268,7 @@ public IActionResult UpdatePlanRecordProgress(int planRecordId, PlanProgress pla
268268
public IActionResult GetPlanRecordTemplateForEditById(int planRecordTemplateId)
269269
{
270270
var result = _planRecordTemplateDataAccess.GetPlanRecordTemplateById(planRecordTemplateId);
271-
return PartialView("_PlanRecordTemplateEditModal", result);
271+
return PartialView("Plan/_PlanRecordTemplateEditModal", result);
272272
}
273273
[HttpGet]
274274
public IActionResult GetPlanRecordForEditById(int planRecordId)
@@ -297,7 +297,7 @@ public IActionResult GetPlanRecordForEditById(int planRecordId)
297297
ReminderRecordId = result.ReminderRecordId,
298298
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.PlanRecord).ExtraFields)
299299
};
300-
return PartialView("_PlanRecordModal", convertedResult);
300+
return PartialView("Plan/_PlanRecordModal", convertedResult);
301301
}
302302
[HttpPost]
303303
public IActionResult DeletePlanRecordById(int planRecordId)

‎Controllers/Vehicle/ReminderController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public IActionResult GetReminderRecordsByVehicleId(int vehicleId)
5858
{
5959
var result = GetRemindersAndUrgency(vehicleId, DateTime.Now);
6060
result = result.OrderByDescending(x => x.Urgency).ToList();
61-
return PartialView("_ReminderRecords", result);
61+
return PartialView("Reminder/_ReminderRecords", result);
6262
}
6363
[TypeFilter(typeof(CollaboratorFilter))]
6464
[HttpGet]
@@ -124,11 +124,11 @@ public IActionResult GetAddReminderRecordPartialView(ReminderRecordInput? remind
124124
{
125125
if (reminderModel is not null)
126126
{
127-
return PartialView("_ReminderRecordModal", reminderModel);
127+
return PartialView("Reminder/_ReminderRecordModal", reminderModel);
128128
}
129129
else
130130
{
131-
return PartialView("_ReminderRecordModal", new ReminderRecordInput());
131+
return PartialView("Reminder/_ReminderRecordModal", new ReminderRecordInput());
132132
}
133133
}
134134
[HttpGet]
@@ -160,7 +160,7 @@ public IActionResult GetReminderRecordForEditById(int reminderRecordId)
160160
CustomMonthIntervalUnit = result.CustomMonthIntervalUnit,
161161
Tags = result.Tags
162162
};
163-
return PartialView("_ReminderRecordModal", convertedResult);
163+
return PartialView("Reminder/_ReminderRecordModal", convertedResult);
164164
}
165165
private bool DeleteReminderRecordWithChecks(int reminderRecordId)
166166
{

‎Controllers/Vehicle/RepairController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public IActionResult GetCollisionRecordsByVehicleId(int vehicleId)
2121
{
2222
result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
2323
}
24-
return PartialView("_CollisionRecords", result);
24+
return PartialView("Collision/_CollisionRecords", result);
2525
}
2626
[HttpPost]
2727
public IActionResult SaveCollisionRecordToVehicleId(CollisionRecordInput collisionRecord)
@@ -73,7 +73,7 @@ public IActionResult SaveCollisionRecordToVehicleId(CollisionRecordInput collisi
7373
[HttpGet]
7474
public IActionResult GetAddCollisionRecordPartialView()
7575
{
76-
return PartialView("_CollisionRecordModal", new CollisionRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields });
76+
return PartialView("Collision/_CollisionRecordModal", new CollisionRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields });
7777
}
7878
[HttpGet]
7979
public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
@@ -99,7 +99,7 @@ public IActionResult GetCollisionRecordForEditById(int collisionRecordId)
9999
RequisitionHistory = result.RequisitionHistory,
100100
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.RepairRecord).ExtraFields)
101101
};
102-
return PartialView("_CollisionRecordModal", convertedResult);
102+
return PartialView("Collision/_CollisionRecordModal", convertedResult);
103103
}
104104
private bool DeleteCollisionRecordWithChecks(int collisionRecordId)
105105
{

‎Controllers/Vehicle/ServiceController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public IActionResult GetServiceRecordsByVehicleId(int vehicleId)
2121
{
2222
result = result.OrderBy(x => x.Date).ThenBy(x => x.Mileage).ToList();
2323
}
24-
return PartialView("_ServiceRecords", result);
24+
return PartialView("Service/_ServiceRecords", result);
2525
}
2626
[HttpPost]
2727
public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceRecord)
@@ -73,7 +73,7 @@ public IActionResult SaveServiceRecordToVehicleId(ServiceRecordInput serviceReco
7373
[HttpGet]
7474
public IActionResult GetAddServiceRecordPartialView()
7575
{
76-
return PartialView("_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
76+
return PartialView("Service/_ServiceRecordModal", new ServiceRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields });
7777
}
7878
[HttpGet]
7979
public IActionResult GetServiceRecordForEditById(int serviceRecordId)
@@ -99,7 +99,7 @@ public IActionResult GetServiceRecordForEditById(int serviceRecordId)
9999
RequisitionHistory = result.RequisitionHistory,
100100
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.ServiceRecord).ExtraFields)
101101
};
102-
return PartialView("_ServiceRecordModal", convertedResult);
102+
return PartialView("Service/_ServiceRecordModal", convertedResult);
103103
}
104104
private bool DeleteServiceRecordWithChecks(int serviceRecordId)
105105
{

‎Controllers/Vehicle/SupplyController.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public IActionResult GetSupplyRecordsByVehicleId(int vehicleId)
8888
{
8989
result = result.OrderBy(x => x.Date).ToList();
9090
}
91-
return PartialView("_SupplyRecords", result);
91+
return PartialView("Supply/_SupplyRecords", result);
9292
}
9393
[HttpGet]
9494
public IActionResult GetSupplyRecordsForPlanRecordTemplate(int planRecordTemplateId)
@@ -115,7 +115,7 @@ public IActionResult GetSupplyRecordsForPlanRecordTemplate(int planRecordTemplat
115115
viewModel.Supplies = supplies;
116116
viewModel.Usage = planRecordTemplate.Supplies;
117117
}
118-
return PartialView("_SupplyUsage", viewModel);
118+
return PartialView("Supply/_SupplyUsage", viewModel);
119119
}
120120
[TypeFilter(typeof(CollaboratorFilter))]
121121
[HttpGet]
@@ -140,7 +140,7 @@ public IActionResult GetSupplyRecordsForRecordsByVehicleId(int vehicleId)
140140
{
141141
Supplies = result
142142
};
143-
return PartialView("_SupplyUsage", viewModel);
143+
return PartialView("Supply/_SupplyUsage", viewModel);
144144
}
145145
[HttpPost]
146146
public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
@@ -157,7 +157,7 @@ public IActionResult SaveSupplyRecordToVehicleId(SupplyRecordInput supplyRecord)
157157
[HttpGet]
158158
public IActionResult GetAddSupplyRecordPartialView()
159159
{
160-
return PartialView("_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
160+
return PartialView("Supply/_SupplyRecordModal", new SupplyRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields });
161161
}
162162
[HttpGet]
163163
public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
@@ -185,7 +185,7 @@ public IActionResult GetSupplyRecordForEditById(int supplyRecordId)
185185
RequisitionHistory = result.RequisitionHistory,
186186
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.SupplyRecord).ExtraFields)
187187
};
188-
return PartialView("_SupplyRecordModal", convertedResult);
188+
return PartialView("Supply/_SupplyRecordModal", convertedResult);
189189
}
190190
private bool DeleteSupplyRecordWithChecks(int supplyRecordId)
191191
{

‎Controllers/Vehicle/TaxController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public IActionResult GetTaxRecordsByVehicleId(int vehicleId)
2121
{
2222
result = result.OrderBy(x => x.Date).ToList();
2323
}
24-
return PartialView("_TaxRecords", result);
24+
return PartialView("Tax/_TaxRecords", result);
2525
}
2626

2727
[TypeFilter(typeof(CollaboratorFilter))]
@@ -67,7 +67,7 @@ public IActionResult SaveTaxRecordToVehicleId(TaxRecordInput taxRecord)
6767
[HttpGet]
6868
public IActionResult GetAddTaxRecordPartialView()
6969
{
70-
return PartialView("_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
70+
return PartialView("Tax/_TaxRecordModal", new TaxRecordInput() { ExtraFields = _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields });
7171
}
7272
[HttpGet]
7373
public IActionResult GetTaxRecordForEditById(int taxRecordId)
@@ -95,7 +95,7 @@ public IActionResult GetTaxRecordForEditById(int taxRecordId)
9595
Tags = result.Tags,
9696
ExtraFields = StaticHelper.AddExtraFields(result.ExtraFields, _extraFieldDataAccess.GetExtraFieldsById((int)ImportMode.TaxRecord).ExtraFields)
9797
};
98-
return PartialView("_TaxRecordModal", convertedResult);
98+
return PartialView("Tax/_TaxRecordModal", convertedResult);
9999
}
100100
private bool DeleteTaxRecordWithChecks(int taxRecordId)
101101
{

0 commit comments

Comments
 (0)