Cleanup and fixes

This commit is contained in:
2013-01-12 14:58:33 -05:00
parent bc019923d2
commit e50052d41e
27 changed files with 240 additions and 156 deletions
+21 -35
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Linq.Expressions;
using System.Text.RegularExpressions;
using MileageTraker.Web.Context;
using MileageTraker.Web.Models;
using MileageTraker.Web.Utility;
@@ -389,40 +388,6 @@ namespace MileageTraker.Web.DAL
#endregion
#region Employee Name
public string GetEmployeeNameCorrected(string term)
{
var names = GetEmployeeNames().ToList();
return (from potentialName in names
let potentialNameClean = Regex.Replace(potentialName, @"\s*\(.*\)", "").ToLower()
let name = term.ToLower()
let similarity = Algorithms.Similarity(potentialNameClean, name)
where similarity > .7 || potentialNameClean.StartsWith(name)
orderby similarity descending
select potentialName).FirstOrDefault();
}
public IEnumerable<string> GetEmployeeNamesAutocomplete(string term)
{
var termLower = term.ToLower();
return from name in GetEmployeeNames()
let nameLower = name.ToLower()
where nameLower.StartsWith(termLower) || Algorithms.Similarity(nameLower, termLower) > .8
select name;
}
public IEnumerable<string> GetEmployeeNames()
{
var names = _db.Vehicles.Select(v => v.Assigned).Where(n => !String.IsNullOrEmpty(n) && n != "to be sold");
var logNames =
(from l in _db.Users
select l.FullName);
return names.Union(logNames).Distinct();
}
#endregion
#region City
public string GetCitiesCorrected(string term)
@@ -450,6 +415,8 @@ namespace MileageTraker.Web.DAL
#endregion
#region Membership
public void AddUser(User user)
{
user.Created = DateTime.Now;
@@ -530,5 +497,24 @@ namespace MileageTraker.Web.DAL
{
return _db.Roles;
}
public IEnumerable<string> GetUserFullNamesAutocomplete(string term)
{
var termLower = term.ToLower();
return from name in GetUserFullNames()
let nameLower = name.ToLower()
where nameLower.StartsWith(termLower) || Algorithms.Similarity(nameLower, termLower) > .8
select name;
}
public IEnumerable<string> GetUserFullNames()
{
var logNames =
(from l in _db.Users
select l.FullName);
return logNames;
}
#endregion
}
}