Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nearing feature complete for driver auth

Browse Source
This commit is contained in:
poprhythm
2013-01-09 21:33:57 -05:00
parent 0b4c7914b3
commit bc019923d2
49 changed files with 609 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/ViewModels/CreateLog/ConfirmCreateLogViewModel.cs
+21 -20
View File
@@ -27,28 +27,29 @@ namespace MileageTraker.Web.ViewModels.CreateLog
DateHowLongAgo = (DateTime.Today - Date).ToVerboseStringHistoric();
var dataService = new DataService();
var endOdometer = int.Parse(createLogViewModel.EndOdometer);
var date = createLogViewModel.Date;
var previousLog = dataService.SearchPreviousLog(endOdometer, createLogViewModel.VehicleId, date, DateTime.Now);
if (previousLog != null)
using (var dataService = new DataService())
{
PreviousOdometer = previousLog.EndOdometer;
PreviousDate = previousLog.Date;
Miles = endOdometer - previousLog.EndOdometer;
var endOdometer = int.Parse(createLogViewModel.EndOdometer);
var date = createLogViewModel.Date;
var previousLog = dataService.SearchPreviousLog(endOdometer, createLogViewModel.VehicleId, date, DateTime.Now);
if (previousLog != null)
{
PreviousOdometer = previousLog.EndOdometer;
PreviousDate = previousLog.Date;
Miles = endOdometer - previousLog.EndOdometer;
}
var matchingCity = dataService.GetCitiesCorrected(CityName);
if (!string.IsNullOrEmpty(matchingCity))
CityName = matchingCity;
var vehicle = dataService.GetVehicle(VehicleId);
VehicleColor = vehicle.Color;
VehicleType = vehicle.Type;
VehicleTagNumber = vehicle.TagNumber;
}
var matchingCity = dataService.GetCitiesCorrected(CityName);
if (!string.IsNullOrEmpty(matchingCity))
CityName = matchingCity;
var vehicle = dataService.GetVehicle(VehicleId);
VehicleColor = vehicle.Color;
VehicleType = vehicle.Type;
VehicleTagNumber = vehicle.TagNumber;
}
}
}
Web/ViewModels/CreateLog/CreateLogViewModel.cs
+5 -14
View File
@@ -32,7 +32,7 @@ namespace MileageTraker.Web.ViewModels.CreateLog
[Display(Name = "Type")]
[NoEditLabel]
public MileageLogTypeWrapper LogType { get; set; }
[Required(ErrorMessage = "Required")]
[Display(Name = "City Name")]
[InputSize("medium")]
@@ -62,17 +62,6 @@ namespace MileageTraker.Web.ViewModels.CreateLog
Mapper.CreateMap<string, double>().ConvertUsing(Convert.ToDouble);
Mapper.CreateMap<string, DateTime>().ConvertUsing(new DateTimeTypeConverter());
Mapper.CreateMap<CreateLogViewModel, Models.Log>();
Mapper.CreateMap<Models.Log, CreateLogViewModel>()
.ForMember(vm => vm.Date, opt => opt.MapFrom(m => m.Date.ToString("d")));
}
public CreateLogViewModel()
{
}
public CreateLogViewModel(Models.Log log)
{
Mapper.Map(log, this);
}
public Models.Log GetLog()
@@ -94,8 +83,10 @@ namespace MileageTraker.Web.ViewModels.CreateLog
ValidationResult result = null;
try
{
var dataService = new DataService();
dataService.ValidateOdometerChronology(VehicleId, int.Parse(EndOdometer), Date);
using (var dataService = new DataService())
{
dataService.ValidateOdometerChronology(VehicleId, int.Parse(EndOdometer), Date);
}
}
catch (Exception ex)
{