Admin import functional

2014-02-02 10:19:02 -05:00
parent 13c5c6cde5
commit 3ab80e283a
41 changed files with 2809 additions and 101 deletions
@@ -39,11 +39,10 @@ namespace MileageTraker.Web.Controllers
 			var name = string.Format(
 				"MileageTrakerUsers_{0:MM-dd-yyyy}", DateTime.Today);

-			var export = ExcelWriter.WriteXls(userViewModels, name, name);
+			var export = ExcelWriter<ExportUserViewModel>.WriteXls(userViewModels, name, name);
 			return File(export, "application/ms-excel", name + ".xls");
 		}

-
 		public ActionResult Details(Guid id)
        {
 	        var user = Membership.GetUser(id);
@@ -56,16 +55,14 @@ namespace MileageTraker.Web.Controllers

 		public ActionResult DetailsFullName(string employeeName)
 		{
-			var user = DataService.FindUserByFullName(employeeName);
-            if (user == null)
-            {
-				user = DataService.FindUserByUsername(employeeName);
-	            if (user == null)
-	            {
-		            TempData["StatusMessage"] = "User " + employeeName + " not found";
-		            return RedirectToAction("Index");
-	            }
-            }
+			var user = 
+				DataService.FindUserByFullName(employeeName) ?? 
+				DataService.FindUserByUsername(employeeName);
+			if (user == null)
+			{
+				TempData["StatusMessage"] = "User " + employeeName + " not found";
+				return RedirectToAction("Index");
+			}
 			return View("Details", user);
 		}

@@ -87,6 +84,12 @@ namespace MileageTraker.Web.Controllers
 			return Json(user != null, JsonRequestBehavior.AllowGet);
 		}

+		public JsonResult ExistsByEitherName(string username)
+		{
+			var user = DataService.FindUserByFullName(username) ?? DataService.FindUserByUsername(username);
+			return Json(user != null, JsonRequestBehavior.AllowGet);
+		}
+
 		public ActionResult Create()
        {
 	        var vm = new CreateUserViewModel