user change.

jitterbox · Nov 28, 2014 · 9f436c4 · 9f436c4
1 parent 18c8ee6
commit 9f436c4
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 1,154 deletions.
diff --git a/FSDTS/Common/CustomValidators.cs b/FSDTS/Common/CustomValidators.cs
@@ -82,11 +82,11 @@ public class UniqueAttribute : ValidationAttribute
             protected override ValidationResult IsValid(object value, ValidationContext validationContext)
             {
                 FSDTSContext fsdtsContext = new FSDTSContext();
-
+                User userFromObject = (User) validationContext.ObjectInstance;
                 if (validationContext.DisplayName.Equals("UserEmail"))
                 {
                     User user = new User();
-                    user = fsdtsContext.User.SingleOrDefault(usr => usr.UserEmail == value.ToString());
+                    user = fsdtsContext.User.SingleOrDefault(usr => usr.UserEmail == value.ToString() && usr.UserId != userFromObject.UserId);
 
                     if (user != null)
                     {

diff --git a/FSDTS/Controllers/UserController.cs b/FSDTS/Controllers/UserController.cs
@@ -77,8 +77,8 @@ public IQueryable<User> GetUser()
             return db.User.OrderBy(user => user.UserLastName);
         }
 
-        [Route("Api/GetUserInfo")]
-        public List<User> GetUserInfo()
+        [Route("Api/GetUserInfoByUserType")]
+        public List<User> GetUserInfoByUserType(string UType)
         {
             cmd = new SqlCommand();
             List<User> lstUser = new List<User>();
@@ -94,8 +94,25 @@ public List<User> GetUserInfo()
 
             cmd.CommandType = CommandType.StoredProcedure;
             cmd.CommandText = "FSDTD_GetUserInfo";
-
-            reader = cmd.ExecuteReader();
+
+            SqlParameter param = new SqlParameter();
+            param.Direction = ParameterDirection.Input;
+            param.DbType = DbType.String;
+            param.ParameterName = "@UserType";
+            param.Precision = 10;
+            param.SqlDbType = SqlDbType.Text;
+            param.SqlValue = UType;
+            param.Value = UType;
+            cmd.Parameters.Add(param);
+
+            if (UType != null)
+            {
+                reader = cmd.ExecuteReader();
+            }
+            else
+            {
+                throw new NullReferenceException("User Type you have entered is not correct.");
+            }
             while (reader.Read())
             {
                 objuser = new User();
@@ -341,17 +358,11 @@ public HttpResponseMessage PatchUser(int id, Delta<User> user)
             {
                 throw new HttpResponseException(HttpStatusCode.NotFound);
             }
-<<<<<<< Updated upstream
-
-
 
             //var EncryptedPassword = UserBO.SymmetricEncryptData(doc.UserPassword);
             //doc.UserPassword = EncryptedPassword;
->>>>>>> Stashed changes
-=======
             //var EncryptedPassword = UserBO.SymmetricEncryptData(doc.UserPassword);
             //doc.UserPassword = EncryptedPassword;
->>>>>>> Stashed changes
 
             user.Patch(doc);
             objContext.Entry(doc).State = EntityState.Modified;
@@ -445,10 +456,14 @@ private bool UserExists(int id)
         /// <param name="userName">string userName</param>
         /// <param name="userPassword">string userPassword</param>
         /// <returns>HttpResponseMessage Success/Failure</returns>
-=======
+
         [ResponseType(typeof(User))]
->>>>>>> Stashed changes
         [FsdtsExceptionHandler]
+<<<<<<< Updated upstream
+=======
+        [Route("Api/Login")]
+        [HttpPost]
+        [HttpPost]
         public HttpResponseMessage Login(User userobj)
         {
             HttpResponse response = HttpContext.Current.Response;

diff --git a/FSDTS/FSDTS.csproj b/FSDTS/FSDTS.csproj
@@ -245,17 +245,9 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\201411181324112_initiald.cs" />
-    <Compile Include="Migrations\201411181324112_initiald.Designer.cs">
-      <DependentUpon>201411181324112_initiald.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201411201157401_initiale.cs" />
-    <Compile Include="Migrations\201411201157401_initiale.Designer.cs">
-      <DependentUpon>201411201157401_initiale.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\201411210713476_initialf.cs" />
-    <Compile Include="Migrations\201411210713476_initialf.Designer.cs">
-      <DependentUpon>201411210713476_initialf.cs</DependentUpon>
+    <Compile Include="Migrations\201411280652397_initialr.cs" />
+    <Compile Include="Migrations\201411280652397_initialr.Designer.cs">
+      <DependentUpon>201411280652397_initialr.cs</DependentUpon>
     </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Models\AccountBindingModels.cs" />
@@ -360,14 +352,8 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Migrations\201411181324112_initiald.resx">
-      <DependentUpon>201411181324112_initiald.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201411201157401_initiale.resx">
-      <DependentUpon>201411201157401_initiale.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201411210713476_initialf.resx">
-      <DependentUpon>201411210713476_initialf.cs</DependentUpon>
+    <EmbeddedResource Include="Migrations\201411280652397_initialr.resx">
+      <DependentUpon>201411280652397_initialr.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <PropertyGroup>

diff --git a/FSDTS/Migrations/201410311151044_Reset.Designer.cs b/FSDTS/Migrations/201410311151044_Reset.Designer.cs
diff --git a/FSDTS/Migrations/201410311151044_Reset.cs b/FSDTS/Migrations/201410311151044_Reset.cs