added flag for optional odometer.
This commit is contained in:
@@ -72,6 +72,7 @@ namespace CarCareTracker.Controllers
|
|||||||
IsElectric = x.IsElectric,
|
IsElectric = x.IsElectric,
|
||||||
IsDiesel = x.IsDiesel,
|
IsDiesel = x.IsDiesel,
|
||||||
UseHours = x.UseHours,
|
UseHours = x.UseHours,
|
||||||
|
OdometerOptional = x.OdometerOptional,
|
||||||
ExtraFields = x.ExtraFields,
|
ExtraFields = x.ExtraFields,
|
||||||
Tags = x.Tags,
|
Tags = x.Tags,
|
||||||
DashboardMetrics = x.DashboardMetrics
|
DashboardMetrics = x.DashboardMetrics
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
public bool IsElectric { get; set; } = false;
|
public bool IsElectric { get; set; } = false;
|
||||||
public bool IsDiesel { get; set; } = false;
|
public bool IsDiesel { get; set; } = false;
|
||||||
public bool UseHours { get; set; } = false;
|
public bool UseHours { get; set; } = false;
|
||||||
|
public bool OdometerOptional { get; set; } = false;
|
||||||
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
|
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
|
||||||
public List<string> Tags { get; set; } = new List<string>();
|
public List<string> Tags { get; set; } = new List<string>();
|
||||||
public bool HasOdometerAdjustment { get; set; } = false;
|
public bool HasOdometerAdjustment { get; set; } = false;
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
public bool IsElectric { get; set; } = false;
|
public bool IsElectric { get; set; } = false;
|
||||||
public bool IsDiesel { get; set; } = false;
|
public bool IsDiesel { get; set; } = false;
|
||||||
public bool UseHours { get; set; } = false;
|
public bool UseHours { get; set; } = false;
|
||||||
|
public bool OdometerOptional { get; set; } = false;
|
||||||
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
|
public List<ExtraField> ExtraFields { get; set; } = new List<ExtraField>();
|
||||||
public List<string> Tags { get; set; } = new List<string>();
|
public List<string> Tags { get; set; } = new List<string>();
|
||||||
//Dashboard Metric Attributes
|
//Dashboard Metric Attributes
|
||||||
|
|||||||
@@ -171,6 +171,7 @@
|
|||||||
function GetVehicleId() {
|
function GetVehicleId() {
|
||||||
return {
|
return {
|
||||||
vehicleId: @Model.Id,
|
vehicleId: @Model.Id,
|
||||||
|
odometerOptional: @Model.OdometerOptional.ToString().ToLower(),
|
||||||
hasOdometerAdjustment: @Model.HasOdometerAdjustment.ToString().ToLower(),
|
hasOdometerAdjustment: @Model.HasOdometerAdjustment.ToString().ToLower(),
|
||||||
odometerDifference: decodeHTMLEntities('@Model.OdometerDifference'),
|
odometerDifference: decodeHTMLEntities('@Model.OdometerDifference'),
|
||||||
odometerMultiplier: decodeHTMLEntities('@Model.OdometerMultiplier')
|
odometerMultiplier: decodeHTMLEntities('@Model.OdometerMultiplier')
|
||||||
|
|||||||
@@ -56,6 +56,10 @@
|
|||||||
<input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours">
|
<input class="form-check-input" type="checkbox" role="switch" id="inputUseHours" checked="@Model.UseHours">
|
||||||
<label class="form-check-label" for="inputUseHours">@translator.Translate(userLanguage, "Use Engine Hours")</label>
|
<label class="form-check-label" for="inputUseHours">@translator.Translate(userLanguage, "Use Engine Hours")</label>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-check form-switch">
|
||||||
|
<input class="form-check-input" type="checkbox" role="switch" id="inputOdometerOptional" checked="@Model.OdometerOptional">
|
||||||
|
<label class="form-check-label" for="inputOdometerOptional">@translator.Translate(userLanguage, "Odometer Optional")</label>
|
||||||
|
</div>
|
||||||
<div class="form-check form-switch">
|
<div class="form-check form-switch">
|
||||||
<input class="form-check-input" type="checkbox" role="switch" onchange="toggleOdometerAdjustment()" id="inputHasOdometerAdjustment" checked="@Model.HasOdometerAdjustment">
|
<input class="form-check-input" type="checkbox" role="switch" onchange="toggleOdometerAdjustment()" id="inputHasOdometerAdjustment" checked="@Model.HasOdometerAdjustment">
|
||||||
<label class="form-check-label" for="inputHasOdometerAdjustment">@translator.Translate(userLanguage, "Odometer Adjustments")</label>
|
<label class="form-check-label" for="inputHasOdometerAdjustment">@translator.Translate(userLanguage, "Odometer Adjustments")</label>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -100,7 +100,7 @@ function getAndValidateCollisionRecordValues() {
|
|||||||
var collisionRecordId = getCollisionRecordModelData().id;
|
var collisionRecordId = getCollisionRecordModelData().id;
|
||||||
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
||||||
//Odometer Adjustments
|
//Odometer Adjustments
|
||||||
if (isNaN(collisionMileage)) {
|
if (isNaN(collisionMileage) && GetVehicleId().odometerOptional) {
|
||||||
collisionMileage = '0';
|
collisionMileage = '0';
|
||||||
}
|
}
|
||||||
collisionMileage = GetAdjustedOdometer(collisionRecordId, collisionMileage);
|
collisionMileage = GetAdjustedOdometer(collisionRecordId, collisionMileage);
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ function getAndValidateGasRecordValues() {
|
|||||||
var vehicleId = GetVehicleId().vehicleId;
|
var vehicleId = GetVehicleId().vehicleId;
|
||||||
var gasRecordId = getGasRecordModelData().id;
|
var gasRecordId = getGasRecordModelData().id;
|
||||||
//Odometer Adjustments
|
//Odometer Adjustments
|
||||||
if (isNaN(gasMileage)) {
|
if (isNaN(gasMileage) && GetVehicleId().odometerOptional) {
|
||||||
gasMileage = '0';
|
gasMileage = '0';
|
||||||
}
|
}
|
||||||
gasMileage = GetAdjustedOdometer(gasRecordId, gasMileage);
|
gasMileage = GetAdjustedOdometer(gasRecordId, gasMileage);
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ function updatePlanRecordProgress(newProgress) {
|
|||||||
focusConfirm: false,
|
focusConfirm: false,
|
||||||
preConfirm: () => {
|
preConfirm: () => {
|
||||||
var odometer = $("#inputOdometer").val();
|
var odometer = $("#inputOdometer").val();
|
||||||
if (odometer.trim() == '') {
|
if (odometer.trim() == '' && GetVehicleId().odometerOptional) {
|
||||||
odometer = '0';
|
odometer = '0';
|
||||||
}
|
}
|
||||||
if (!odometer || isNaN(odometer)) {
|
if (!odometer || isNaN(odometer)) {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ function getAndValidateServiceRecordValues() {
|
|||||||
var serviceRecordId = getServiceRecordModelData().id;
|
var serviceRecordId = getServiceRecordModelData().id;
|
||||||
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
||||||
//Odometer Adjustments
|
//Odometer Adjustments
|
||||||
if (isNaN(serviceMileage)) {
|
if (isNaN(serviceMileage) && GetVehicleId().odometerOptional) {
|
||||||
serviceMileage = '0';
|
serviceMileage = '0';
|
||||||
}
|
}
|
||||||
serviceMileage = GetAdjustedOdometer(serviceRecordId, serviceMileage);
|
serviceMileage = GetAdjustedOdometer(serviceRecordId, serviceMileage);
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ function saveVehicle(isEdit) {
|
|||||||
var vehicleIsElectric = $("#inputFuelType").val() == 'Electric';
|
var vehicleIsElectric = $("#inputFuelType").val() == 'Electric';
|
||||||
var vehicleIsDiesel = $("#inputFuelType").val() == 'Diesel';
|
var vehicleIsDiesel = $("#inputFuelType").val() == 'Diesel';
|
||||||
var vehicleUseHours = $("#inputUseHours").is(":checked");
|
var vehicleUseHours = $("#inputUseHours").is(":checked");
|
||||||
|
var vehicleOdometerOptional = $("#inputOdometerOptional").is(":checked");
|
||||||
var vehicleHasOdometerAdjustment = $("#inputHasOdometerAdjustment").is(':checked');
|
var vehicleHasOdometerAdjustment = $("#inputHasOdometerAdjustment").is(':checked');
|
||||||
var vehicleOdometerMultiplier = $("#inputOdometerMultiplier").val();
|
var vehicleOdometerMultiplier = $("#inputOdometerMultiplier").val();
|
||||||
var vehicleOdometerDifference = parseInt(globalParseFloat($("#inputOdometerDifference").val())).toString();
|
var vehicleOdometerDifference = parseInt(globalParseFloat($("#inputOdometerDifference").val())).toString();
|
||||||
@@ -129,6 +130,7 @@ function saveVehicle(isEdit) {
|
|||||||
extraFields: extraFields.extraFields,
|
extraFields: extraFields.extraFields,
|
||||||
purchaseDate: vehiclePurchaseDate,
|
purchaseDate: vehiclePurchaseDate,
|
||||||
soldDate: vehicleSoldDate,
|
soldDate: vehicleSoldDate,
|
||||||
|
odometerOptional: vehicleOdometerOptional,
|
||||||
hasOdometerAdjustment: vehicleHasOdometerAdjustment,
|
hasOdometerAdjustment: vehicleHasOdometerAdjustment,
|
||||||
odometerMultiplier: vehicleOdometerMultiplier,
|
odometerMultiplier: vehicleOdometerMultiplier,
|
||||||
odometerDifference: vehicleOdometerDifference,
|
odometerDifference: vehicleOdometerDifference,
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ function getAndValidateUpgradeRecordValues() {
|
|||||||
var upgradeRecordId = getUpgradeRecordModelData().id;
|
var upgradeRecordId = getUpgradeRecordModelData().id;
|
||||||
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
var addReminderRecord = $("#addReminderCheck").is(":checked");
|
||||||
//Odometer Adjustments
|
//Odometer Adjustments
|
||||||
if (isNaN(upgradeMileage)) {
|
if (isNaN(upgradeMileage) && GetVehicleId().odometerOptional) {
|
||||||
upgradeMileage = '0';
|
upgradeMileage = '0';
|
||||||
}
|
}
|
||||||
upgradeMileage = GetAdjustedOdometer(upgradeRecordId, upgradeMileage);
|
upgradeMileage = GetAdjustedOdometer(upgradeRecordId, upgradeMileage);
|
||||||
|
|||||||
Reference in New Issue
Block a user