Last fix
- modify now works - RIP lime - added location
This commit is contained in:
@@ -106,15 +106,15 @@ namespace IdentityDemo.Controllers
|
|||||||
{
|
{
|
||||||
return await LoggedAccessDataOf(user.Username, false, () => {
|
return await LoggedAccessDataOf(user.Username, false, () => {
|
||||||
var usr = Db.Users.Where(u => u.Username.Equals(user.Username)).FirstOrDefault();
|
var usr = Db.Users.Where(u => u.Username.Equals(user.Username)).FirstOrDefault();
|
||||||
if (user.Password.Equals(""))
|
if (user.Password == null)
|
||||||
user.Password = usr.Password;
|
user.Password = usr.Password;
|
||||||
if (user.Avatar.Equals(""))
|
if (user.Avatar == null)
|
||||||
user.Avatar = usr.Avatar;
|
user.Avatar = usr.Avatar;
|
||||||
if (user.Email.Equals(""))
|
if (user.Email == null)
|
||||||
user.Email = usr.Email;
|
user.Email = usr.Email;
|
||||||
if (user.LastName.Equals(""))
|
if (user.LastName == null)
|
||||||
user.LastName = usr.LastName;
|
user.LastName = usr.LastName;
|
||||||
if (user.Name.Equals(""))
|
if (user.Name == null)
|
||||||
user.Name = usr.Name;
|
user.Name = usr.Name;
|
||||||
|
|
||||||
Db.UpdateAsync(user);
|
Db.UpdateAsync(user);
|
||||||
@@ -122,10 +122,12 @@ namespace IdentityDemo.Controllers
|
|||||||
var doc = Db.Doctors.Where(d => d.Username.Equals(user.Username)).FirstOrDefault();
|
var doc = Db.Doctors.Where(d => d.Username.Equals(user.Username)).FirstOrDefault();
|
||||||
if(doc!=null)
|
if(doc!=null)
|
||||||
{
|
{
|
||||||
if (!doctor.PhoneNumber.Equals(""))
|
if (doctor.PhoneNumber != null)
|
||||||
doc.PhoneNumber = doctor.PhoneNumber;
|
doc.PhoneNumber = doctor.PhoneNumber;
|
||||||
if (!doctor.Schedule.Equals(""))
|
if (doctor.Schedule != null)
|
||||||
doc.Schedule = doctor.Schedule;
|
doc.Schedule = doctor.Schedule;
|
||||||
|
if (doctor.Location != null)
|
||||||
|
doc.Location = doctor.Location;
|
||||||
|
|
||||||
Db.UpdateAsync(doc);
|
Db.UpdateAsync(doc);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,14 +39,21 @@
|
|||||||
{
|
{
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input class="form-control mod-data hide" type="number" value="@Model.Doc.PhoneNumber" id="mod-phone" />
|
<input class="form-control mod-data hide" type="number" value="@Model.Doc.PhoneNumber" id="mod-phone" placeholder="Numero telefono" />
|
||||||
<input class="form-control old-data" disabled type="number" value="@Model.Doc.PhoneNumber" /><br />
|
<input class="form-control old-data" disabled type="number" value="@Model.Doc.PhoneNumber" /><br />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<input class="form-control mod-data hide" type="text" value="@Model.Doc.Schedule" id="mod-schedule" />
|
<input class="form-control mod-data hide" type="text" value="@Model.Doc.Location" id="mod-location" placeholder="Luogo" />
|
||||||
|
<input class="form-control old-data" disabled type="text" value="@Model.Doc.Location" /><br />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="col-sm-10">
|
||||||
|
<input class="form-control mod-data hide" type="text" value="@Model.Doc.Schedule" id="mod-schedule" placeholder="Orari" />
|
||||||
<input class="form-control old-data" disabled type="text" value="@Model.Doc.Schedule" /><br />
|
<input class="form-control old-data" disabled type="text" value="@Model.Doc.Schedule" /><br />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -269,6 +276,8 @@
|
|||||||
var email = $("#mod-email").val();
|
var email = $("#mod-email").val();
|
||||||
var schedule = $("#mod-schedule").val();
|
var schedule = $("#mod-schedule").val();
|
||||||
var phone = $("#mod-phone").val();
|
var phone = $("#mod-phone").val();
|
||||||
|
var location = $("#mod-location").val();
|
||||||
|
|
||||||
if (password != password2) {
|
if (password != password2) {
|
||||||
$("#msg-reg").html("[Le password non coincidono]").show();
|
$("#msg-reg").html("[Le password non coincidono]").show();
|
||||||
return false;
|
return false;
|
||||||
@@ -286,7 +295,8 @@
|
|||||||
},
|
},
|
||||||
Doctor: {
|
Doctor: {
|
||||||
Schedule: schedule,
|
Schedule: schedule,
|
||||||
PhoneNumber: phone
|
PhoneNumber: phone,
|
||||||
|
Location: location
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
<li>
|
<li>
|
||||||
<!-- start notification -->
|
<!-- start notification -->
|
||||||
<a id="message-@message.Id" @if(message.Seen != default) {<text>class= "bg-gray"</text>} href="/Message/@message.Username">
|
<a id="message-@message.Id" @if(message.Seen != default) {<text>class= "bg-gray"</text>} href="/Message/@message.Username">
|
||||||
<i class="fa text-lime">@message.Time</i><br />
|
<i class="fa text-light-blue">@message.Time</i><br />
|
||||||
@message.Body
|
@message.Body
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user