mirror of
https://github.com/hargata/lubelog.git
synced 2025-12-10 00:46:08 -06:00
added past due urgency
This commit is contained in:
parent
f805e311b0
commit
0f70f8212b
@ -94,6 +94,7 @@ namespace CarCareTracker.Controllers
|
||||
_collisionRecordDataAccess.DeleteAllCollisionRecordsByVehicleId(vehicleId) &&
|
||||
_taxRecordDataAccess.DeleteAllTaxRecordsByVehicleId(vehicleId) &&
|
||||
_noteDataAccess.DeleteNoteByVehicleId(vehicleId) &&
|
||||
_reminderRecordDataAccess.DeleteAllReminderRecordsByVehicleId(vehicleId) &&
|
||||
_dataAccess.DeleteVehicle(vehicleId);
|
||||
return Json(result);
|
||||
}
|
||||
@ -582,9 +583,19 @@ namespace CarCareTracker.Controllers
|
||||
};
|
||||
if (reminder.Metric == ReminderMetric.Both)
|
||||
{
|
||||
//if less than a week from today or less than 50 miles from current mileage then very urgent.
|
||||
if (reminder.Date < DateTime.Now.AddDays(7))
|
||||
if (reminder.Date < DateTime.Now)
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.PastDue;
|
||||
reminderViewModel.Metric = ReminderMetric.Date;
|
||||
}
|
||||
else if (reminder.Mileage < currentMileage)
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.PastDue;
|
||||
reminderViewModel.Metric = ReminderMetric.Odometer;
|
||||
}
|
||||
else if (reminder.Date < DateTime.Now.AddDays(7))
|
||||
{
|
||||
//if less than a week from today or less than 50 miles from current mileage then very urgent.
|
||||
reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
|
||||
//have to specify by which metric this reminder is urgent.
|
||||
reminderViewModel.Metric = ReminderMetric.Date;
|
||||
@ -605,7 +616,11 @@ namespace CarCareTracker.Controllers
|
||||
}
|
||||
} else if (reminder.Metric == ReminderMetric.Date)
|
||||
{
|
||||
if (reminder.Date < DateTime.Now.AddDays(7))
|
||||
if (reminder.Date < DateTime.Now)
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.PastDue;
|
||||
}
|
||||
else if (reminder.Date < DateTime.Now.AddDays(7))
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
|
||||
}
|
||||
@ -615,7 +630,12 @@ namespace CarCareTracker.Controllers
|
||||
}
|
||||
} else if (reminder.Metric == ReminderMetric.Odometer)
|
||||
{
|
||||
if (reminder.Mileage < currentMileage + 50)
|
||||
if (reminder.Mileage < currentMileage)
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.PastDue;
|
||||
reminderViewModel.Metric = ReminderMetric.Odometer;
|
||||
}
|
||||
else if (reminder.Mileage < currentMileage + 50)
|
||||
{
|
||||
reminderViewModel.Urgency = ReminderUrgency.VeryUrgent;
|
||||
}
|
||||
@ -629,10 +649,20 @@ namespace CarCareTracker.Controllers
|
||||
return reminderViewModels;
|
||||
}
|
||||
[HttpGet]
|
||||
public IActionResult GetVehicleHaveUrgentOrPastDueReminders(int vehicleId)
|
||||
{
|
||||
var result = GetRemindersAndUrgency(vehicleId);
|
||||
if (result.Where(x=>x.Urgency == ReminderUrgency.Urgent || x.Urgency == ReminderUrgency.PastDue).Any())
|
||||
{
|
||||
return Json(true);
|
||||
}
|
||||
return Json(false);
|
||||
}
|
||||
[HttpGet]
|
||||
public IActionResult GetReminderRecordsByVehicleId(int vehicleId)
|
||||
{
|
||||
var result = GetRemindersAndUrgency(vehicleId);
|
||||
|
||||
result = result.OrderByDescending(x=>x.Urgency).ToList();
|
||||
return PartialView("_ReminderRecords", result);
|
||||
}
|
||||
[HttpPost]
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
{
|
||||
NotUrgent = 0,
|
||||
Urgent = 1,
|
||||
VeryUrgent = 2
|
||||
VeryUrgent = 2,
|
||||
PastDue = 3
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
<div class="col-md-6 col-12" id="reminderOptions">
|
||||
<input type="text" id="workAroundInput" style="height:0px; width:0px; display:none;">
|
||||
<label for="reminderDescription">Description</label>
|
||||
<input type="text" id="reminderDescription" class="form-control" placeholder="Description of item(s) repaired(i.e. Alternator)" value="@Model.Description">
|
||||
<input type="text" id="reminderDescription" class="form-control" placeholder="Reminder Description" value="@Model.Description">
|
||||
<label>Remind me on:</label>
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="reminderMetricOptions" id="reminderMetricDate" value="@(ReminderMetric.Date)" checked="@(Model.Metric == ReminderMetric.Date)">
|
||||
|
||||
@ -30,7 +30,11 @@
|
||||
}
|
||||
else if (reminderRecord.Urgency == ReminderUrgency.Urgent){
|
||||
<td class="col-1"><span class="badge text-bg-warning">Urgent</span></td>
|
||||
} else {
|
||||
} else if (reminderRecord.Urgency == ReminderUrgency.PastDue)
|
||||
{
|
||||
<td class="col-1"><span class="badge text-bg-secondary">Past Due</span></td>
|
||||
}
|
||||
else {
|
||||
<td class="col-1"><span class="badge text-bg-success">Not Urgent</span></td>
|
||||
}
|
||||
@if (reminderRecord.Metric == ReminderMetric.Date)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user