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/DAL/DataService.cs
+20 -10
View File
@@ -34,7 +34,11 @@ namespace MileageTraker.Web.DAL
log.VehiclePreviousLog = previousLog;
var nextLog = SearchNextLog(log);
if (nextLog != null)
{
nextLog.VehiclePreviousLog = log;
nextLog.User = _db.Users.Find(nextLog.User.UserId);
_db.Entry(nextLog).State = EntityState.Modified;
}
_db.SaveChanges();
@@ -43,14 +47,7 @@ namespace MileageTraker.Web.DAL
public void UpdateLog(Log log)
{
_db.Logs.Attach(log);
var original = _db.Logs.Find(log.LogId);
// ignore these properties while updating
log.Created = original.Created;
log.Source = original.Source;
log.UserAgent = original.UserAgent;
log.UserHostAddress = original.UserHostAddress;
// note: assumes log is already attached to current context
// remove from the list
var nextLog =
@@ -58,7 +55,11 @@ namespace MileageTraker.Web.DAL
where l.VehiclePreviousLogId == log.LogId
select l).FirstOrDefault();
if (nextLog != null)
{
nextLog.VehiclePreviousLogId = log.VehiclePreviousLogId;
nextLog.User = _db.Users.Find(nextLog.User.UserId);
_db.Entry(nextLog).State = EntityState.Modified;
}
log.VehiclePreviousLog = null;
log.VehiclePreviousLogId = null;
@@ -69,8 +70,13 @@ namespace MileageTraker.Web.DAL
log.VehiclePreviousLogId = previousLog.LogId;
var newNextLog = SearchNextLog(log);
if (newNextLog != null)
{
newNextLog.VehiclePreviousLogId = log.LogId;
newNextLog.User = _db.Users.Find(newNextLog.User.UserId);
_db.Entry(newNextLog).State = EntityState.Modified;
}
log.User = _db.Users.Find(log.User.UserId);
_db.Entry(log).State = EntityState.Modified;
_db.SaveChanges();
@@ -83,7 +89,11 @@ namespace MileageTraker.Web.DAL
var nextLog = GetNextLog(log.LogId);
if (nextLog != null)
{
nextLog.VehiclePreviousLog = log.VehiclePreviousLog;
nextLog.User = _db.Users.Find(nextLog.User.UserId);
_db.Entry(nextLog).State = EntityState.Modified;
}
_db.Logs.Remove(log);
_db.SaveChanges();
@@ -247,11 +257,11 @@ namespace MileageTraker.Web.DAL
return logs;
}
public IEnumerable<Log> GetRecentLogsByEmployee(string employeeName)
public IEnumerable<Log> GetRecentLogsByUsername(string username)
{
return
(from l in _db.Logs
where l.User.FullName == employeeName
where l.User.Username == username
orderby l.Created descending
select l)
.Take(3)
Web/DAL/VehicleImporter.cs
+1 -6
View File
@@ -17,12 +17,7 @@ namespace MileageTraker.Web.DAL
{
ExcelWriter.WriteXls(vehicles, filename, WorksheetTitle, WorksheetName);
}
public static void Export(IEnumerable<Vehicle> vehicles, Stream stream)
{
ExcelWriter.WriteXls(vehicles, stream, WorksheetTitle, WorksheetName);
}
public static byte[] Export(IEnumerable<Vehicle> vehicles)
{
return ExcelWriter.WriteXls(vehicles, WorksheetTitle, WorksheetName);