diff --git a/SeniorAssistant/Controllers/AccountController.cs b/SeniorAssistant/Controllers/AccountController.cs index f279c16..6dee372 100644 --- a/SeniorAssistant/Controllers/AccountController.cs +++ b/SeniorAssistant/Controllers/AccountController.cs @@ -106,15 +106,15 @@ namespace IdentityDemo.Controllers { return await LoggedAccessDataOf(user.Username, false, () => { var usr = Db.Users.Where(u => u.Username.Equals(user.Username)).FirstOrDefault(); - if (user.Password.Equals("")) + if (user.Password == null) user.Password = usr.Password; - if (user.Avatar.Equals("")) + if (user.Avatar == null) user.Avatar = usr.Avatar; - if (user.Email.Equals("")) + if (user.Email == null) user.Email = usr.Email; - if (user.LastName.Equals("")) + if (user.LastName == null) user.LastName = usr.LastName; - if (user.Name.Equals("")) + if (user.Name == null) user.Name = usr.Name; Db.UpdateAsync(user); @@ -122,10 +122,12 @@ namespace IdentityDemo.Controllers var doc = Db.Doctors.Where(d => d.Username.Equals(user.Username)).FirstOrDefault(); if(doc!=null) { - if (!doctor.PhoneNumber.Equals("")) + if (doctor.PhoneNumber != null) doc.PhoneNumber = doctor.PhoneNumber; - if (!doctor.Schedule.Equals("")) + if (doctor.Schedule != null) doc.Schedule = doctor.Schedule; + if (doctor.Location != null) + doc.Location = doctor.Location; Db.UpdateAsync(doc); } diff --git a/SeniorAssistant/Views/Home/Profile.cshtml b/SeniorAssistant/Views/Home/Profile.cshtml index d322fe5..f733ea6 100644 --- a/SeniorAssistant/Views/Home/Profile.cshtml +++ b/SeniorAssistant/Views/Home/Profile.cshtml @@ -39,14 +39,21 @@ {
- +
- + +
+
+
+ +
+
+
@@ -269,6 +276,8 @@ var email = $("#mod-email").val(); var schedule = $("#mod-schedule").val(); var phone = $("#mod-phone").val(); + var location = $("#mod-location").val(); + if (password != password2) { $("#msg-reg").html("[Le password non coincidono]").show(); return false; @@ -286,7 +295,8 @@ }, Doctor: { Schedule: schedule, - PhoneNumber: phone + PhoneNumber: phone, + Location: location } }, dataType: "json", diff --git a/SeniorAssistant/Views/Shared/Messages.cshtml b/SeniorAssistant/Views/Shared/Messages.cshtml index bb35463..c804b7c 100644 --- a/SeniorAssistant/Views/Shared/Messages.cshtml +++ b/SeniorAssistant/Views/Shared/Messages.cshtml @@ -35,7 +35,7 @@
  • class= "bg-gray"} href="/Message/@message.Username"> - @message.Time
    + @message.Time
    @message.Body
  • diff --git a/SeniorAssistant/senior.db b/SeniorAssistant/senior.db index 5dd9a49..3e9f1d3 100644 Binary files a/SeniorAssistant/senior.db and b/SeniorAssistant/senior.db differ