Nearing feature complete for driver auth

Web/ViewModels/User/CreateUserViewModel.cs

@@ -5,8 +5,15 @@ using MileageTraker.Web.Attributes;
 
 namespace MileageTraker.Web.ViewModels.User
 {
-	public class CreateUserViewModel : RolesViewModel
+	public class CreateUserViewModel
 	{
+		[Required]
+		[StringLength(128)]
+		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
+		[InputSize("medium")]
+		[Remote("FullNameAvailable", "User", ErrorMessage = "Name already in use")]
+		public string FullName { get; set; }
+
 		[Required]
 		[StringLength(64)]
 		[InputSize("small")]
@@ -17,19 +24,14 @@ namespace MileageTraker.Web.ViewModels.User
 		[DataType(DataType.EmailAddress)]
 		[RegularExpression(@"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", ErrorMessage = "Must be an email address")]
 		[InputSize("large")]
-		[Remote("EmailAvailable", "User", ErrorMessage = "Email already in use")]
 		public string Email { get; set; }
 
-		[Required]
-		[StringLength(128)]
-		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
-		[InputSize("medium")]
-		public string FullName { get; set; }
+		public CheckBoxViewModel Roles { get; set; }
 
-		[Required, DataType(DataType.Password)]
-		[StringLength(16, MinimumLength = 6)]
-		[InputSize("medium")]
-		public string Password { get; set; }
+		[Required]
+		[Display(Name = "Set password now instead of emailing ")]
+		[NoEditLabel]
+		public bool SetPassword { get; set; }
 
 		static CreateUserViewModel()
 		{

Web/ViewModels/User/EditUserViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
 using AutoMapper;
@@ -7,10 +6,16 @@ using MileageTraker.Web.Attributes;
 
 namespace MileageTraker.Web.ViewModels.User
 {
-	public class EditUserViewModel : RolesViewModel
+	public class EditUserViewModel
 	{
 		[HiddenInput(DisplayValue = false)]
-		public Guid UserId { get; set; } 
+		public Guid UserId { get; set; }
+
+		[Required]
+		[StringLength(128)]
+		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
+		[InputSize("medium")]
+		public string FullName { get; set; }
 
 		[Required]
 		[StringLength(64)]
@@ -23,11 +28,7 @@ namespace MileageTraker.Web.ViewModels.User
 		[InputSize("large")]
 		public string Email { get; set; }
 
-		[Required]
-		[StringLength(128)]
-		[RegularExpression(@"[A-Za-z().]+(\s+[A-Za-z().]+)+", ErrorMessage = "Need complete name")]
-		[InputSize("medium")]
-		public string FullName { get; set; }
+		public CheckBoxViewModel Roles { get; set; }
 
 		static EditUserViewModel()
 		{
@@ -46,9 +47,9 @@ namespace MileageTraker.Web.ViewModels.User
 
 		public void UpdateUser(Models.User user)
 		{
-			user.Username = this.Username;
-			user.FullName = this.FullName;
-			user.Email = this.Email;
+			user.Username = Username;
+			user.FullName = FullName;
+			user.Email = Email;
 		}
 	}
 }

Web/ViewModels/User/RolesViewModel.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace MileageTraker.Web.ViewModels.User
-{
-	public class RolesViewModel
-	{
-		public string[] Roles { get; set; }
-		public IList<string> AvailableRoles { get; set; }
-	}
-}