From ec419f34bcd180dd0030a9eddf167ccd69e9b456 Mon Sep 17 00:00:00 2001 From: Giulia <20015091@studenti.uniupo.it> Date: Fri, 1 Feb 2019 22:24:24 +0100 Subject: [PATCH] Last fix - modify now works - RIP lime - added location --- .../Controllers/AccountController.cs | 16 +++++++++------- SeniorAssistant/Views/Home/Profile.cshtml | 16 +++++++++++++--- SeniorAssistant/Views/Shared/Messages.cshtml | 2 +- SeniorAssistant/senior.db | Bin 131072 -> 135168 bytes 4 files changed, 23 insertions(+), 11 deletions(-) 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 5dd9a4945ae79bd8f4a02caf70b599d4ac68e88b..3e9f1d3e39635c43a44d23cf52e74aa4d8a7c333 100644 GIT binary patch delta 5096 zcmeHLeNa@_6@TZwxBK3HKI0bmjxCO5b*<%pjO9NQ8$QyMg)qMYRVM2 z37Ry1us-w#kcu-+Q`>1H*bbefZ+eeE(CGoAj~ z85m~wp5OW1bM8IA`|iDOTU*7}KCvU&c9vlnB`O!d+5Sg=wAjl@!w4{nG$MT}4Idl7 zu3rYJ>Olpgd4vVH!b z&mWM3!JI%wPB1Gq6b^*~nORL$m6aPd*83}Js~fA*`S-?F~Cv1aS`O&e>sZ+fgM zBeQX9O?s#bKbxu=tL32I?+;)gEtcP(qyK-4)AIzrl&1v~`TePZU`A#*BjYZKD%Uqv zuB)lrJTrB3-MXgAZI9nAHhb6DMreOHGZ+YlzasQQ|1EYMU~DC2QIUH1-=)c4DpDvX z5Khes1+%h)!CwO3$~7{#sn7~FqQKfdu}!zXLhD+gI>mm`zS6dfxy{Ys_HZ}(Ra}y$ zv-wA(1QMNC^K`9LFrT)yK@#141;oKwZSWGX3^RC}fR6=5ZCjb(3iw zPJBYF5DUZvkTZE-Tn&7ctwV$#-Z*R9(+6(PdYb2K#GYV($TqX9z|Mx*$#4_igrl$r zYM}&XL<{ew&txv?JdG zk!3m!sB>oM2MQ7nZX?syv(JQBsgXihfB-U}eG%r$yX z52p9+K*Ecf_9@y&ou)murW)q8QyBMSOh6Zb+Fc+}nH z?)V~GpthCcK4EE{VVIW8xo9TE1TNGpTBa?K-Q^y7=WWc_)dgPNN~7SQ(N0{%5uaV% z91(zvnS-kj!qQ@cXUef2-&f&YI!-f> zK91(VJ~S_E$5!b+j9$MIT=a4j5@^X@Y_(~v->kr8GIT(nw4io;(?-uVX@%W^TWsHc z9K`N&1NQI7UDPtlwrFed4AyUg-lw?{`_$sHiZQ-WN73&)gYG_DS~2&oD>(RERaei5 z->}2zKo7Npokq^17InD9v>qCiY&Gn(pdB27lfA`^og?PCGIoxPog-uC$k;hDc8=KS z|9Fmg@ZPZ5BD-RA9)xuTFFwSP?vfSn4NqXt&Tftd;^RF^DE@L2By%&Q8S zO;0`van3&#QlKY_ah_2~{=P>rvvsFAu8=%+>55UvQH9LHOrsEwLUQ#~v0eiT$x&g| zC{DIQvW+>Jk(tjF64p~$x2e|@l4Yba5$1D+WE!a~j!PjKMkO~LOAv!`!d_j zewSU&23Rj#h1cLYAP|WjZsTN9LjV3DB)BbwN@TK7J^WxCsFg`Ez1};Dk|&b|YIIth z(kPSpwEwA5lwui$?| UiurBax+0L`LEN>`Qc+D`AsN=4g3h0LCa(Pktk2SIVfm zp2Z3=M@H4PEEbR@lYDbJra0e`QFVPfCJ>a#EOR<0vO-4D_3490;z%+OtIT0 zR7vP#xk+zZy1Ud6Nfe=_BpU^54TwBM8Uy%|U?;DUW$Mz1}SIIsu|z*bK>3@xvy% z(+{OHgeQes;dgN@6vG#MIv?PN6khI?I|T<5Jo3W_H>q4Xk!}k^BCV+e8?EUFHIiKk zCxMryNA6dFhZm)NoSSxqA%R@VQFv~cR#rkHiRS3^l7;d^%CoHf%4bUc|2>Z{05v*=s660T%_$SDBfCxHanwy+i^4y8m02sP6;8X*V0d<|;=sdQlj&Ufo>_N8}Y zkmeoHw1OG!WI=&Mrx09#Ch7?SuBKSDZPPUoo6bdBqu6sSeXyGZTuF2m8$NFK%zaPoy!?bu!bu-Uk2_4O`0w|`0zpvsvAk8#C zxQga^%zP>UR=RvYq|n?Z%tZZJOmtZjR@OAk+>c4x+K9-q@6eFnH0tpXA9=9T4UJg$ z`RA}ZGU86%-!q#nW?TOQ`e`G6ZWhZ%dmC}dVSF1o=2Pg=00w36Nw-fC0JE{-B0Ns_ zjlQPAi>%xKq-_Drw5J;5y^6lf#Z5Er;Amk0