Merge branch 'master' of c:/Users/Milad/Documents/Jobs/Codiato/sevomin-git

Sevomin.Models/DovominViewModel.cs

@@ -6,6 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Sevomin.Models.Helpers;
 using System.ComponentModel;
+using Sevomin.Models.Repositories;
 
 namespace Sevomin.Models
 {
@@ -68,8 +69,7 @@ namespace Sevomin.Models
             this.EnglishResume = dovomin.EnglishResume;
             this.PersianResume = dovomin.PersianResume;
 
-            if (dovomin.DovominParameters == null)
-                return;
+            ParameterRepository.Current.AddParametersToDovomin(dovomin);
 
             Parameters = new List<DovominParameterViewModel>();
             foreach (var jp in dovomin.DovominParameters)

Sevomin.Models/Repositories/IRepository.cs

@@ -25,5 +25,6 @@ namespace Sevomin.Models.Repositories
     public interface IParameterRepository : IRepository<long, Parameter>
     {
         IQueryable<Parameter> ListAll();
+        void AddParametersToDovomin(Dovomin dovomin);
     }
 }

Sevomin.Models/Repositories/ParameterRepository.cs

@@ -62,6 +62,18 @@ namespace Sevomin.Models.Repositories
         {
             SevominDbContext.Current.SaveChanges();
         }
+
+        public void AddParametersToDovomin(Dovomin dovomin)
+        {
+            foreach (var param in ListAll())
+            {
+                if (dovomin.DovominParameters.Count(x => x.ParameterId == param.Id) == 0)
+                {
+                    dovomin.DovominParameters.Add(new DovominParameter(dovomin, param));
+                }
+            }
+        }
         #endregion
+
     }
 }

Sevomin.WebFrontend.Controllers/AccountController.cs

@@ -138,5 +138,22 @@ namespace Sevomin.WebFrontend.Controllers
                 ModelState.AddModelError("", error);
             }
         }
+
+        [Authorize]
+        private async Task<ActionResult> Profile()
+        {
+            User u = await UserManager.FindByNameAsync(User.Identity.Name);
+            if (u is Avalin)
+            {
+                return View("ProfileAvalin", u as Avalin);
+            }
+            else
+            {
+                Dovomin dovomin = (Dovomin)u;
+                DovominViewModel dvm = new DovominViewModel(dovomin);
+                return View("ProfileDovomin", dvm);
+            }
+        }
+
     }
 }