From 6eaf448d5ad59ea7ff0492ea9912d0c3a10bac44 Mon Sep 17 00:00:00 2001
From: mosazaid <mosazaid@gmail.com>
Date: Tue, 30 Mar 2021 16:43:30 +0300
Subject: [PATCH] working on new design for vital sign and admission request

---
 .../patient/vital_signs/Obese_BMI-r.png       | Bin 0 -> 2088 bytes
 .../images/patient/vital_signs/Obese_BMI.png  | Bin 0 -> 2088 bytes
 .../patient/vital_signs/blood_pressure.png    | Bin 0 -> 733 bytes
 .../patient/vital_signs/health_BMI-r.png      | Bin 0 -> 1991 bytes
 .../images/patient/vital_signs/health_BMI.png | Bin 0 -> 1991 bytes
 .../images/patient/vital_signs/heart_rate.png | Bin 0 -> 940 bytes
 assets/images/patient/vital_signs/height.png  | Bin 0 -> 417 bytes
 .../patient/vital_signs/ovrweight_BMI-r.png   | Bin 0 -> 1966 bytes
 .../patient/vital_signs/ovrweight_BMI.png     | Bin 0 -> 1966 bytes
 .../patient/vital_signs/respiration_rate.png  | Bin 0 -> 995 bytes
 .../patient/vital_signs/temperature.png       | Bin 0 -> 854 bytes
 .../patient/vital_signs/underweight_BMI-r.png | Bin 0 -> 1859 bytes
 .../patient/vital_signs/underweight_BMI.png   | Bin 0 -> 1859 bytes
 assets/images/patient/vital_signs/weight.png  | Bin 0 -> 399 bytes
 lib/config/config.dart                        |   4 +-
 lib/config/localized_values.dart              |   9 +-
 .../patient-vital-sign-viewmodel.dart         |  13 +
 .../admission-request-first-screen.dart       |  51 +-
 .../profile/patient_profile_screen.dart       |   2 +-
 .../referral/my-referral-patient-screen.dart  |   2 +-
 .../vital_sign/vital_sign_details_screen.dart | 518 ++++++++++++------
 .../profile/vital_sign/vital_sign_item.dart   | 110 ++--
 lib/util/translations_delegate_base.dart      |   9 +-
 .../patient-referral-item-widget.dart         |  14 +-
 .../patient-profile-header-new-design.dart    |   2 +-
 lib/widgets/shared/app-textfield-custom.dart  | 140 +++++
 pubspec.yaml                                  |   1 +
 27 files changed, 632 insertions(+), 243 deletions(-)
 create mode 100644 assets/images/patient/vital_signs/Obese_BMI-r.png
 create mode 100644 assets/images/patient/vital_signs/Obese_BMI.png
 create mode 100644 assets/images/patient/vital_signs/blood_pressure.png
 create mode 100644 assets/images/patient/vital_signs/health_BMI-r.png
 create mode 100644 assets/images/patient/vital_signs/health_BMI.png
 create mode 100644 assets/images/patient/vital_signs/heart_rate.png
 create mode 100644 assets/images/patient/vital_signs/height.png
 create mode 100644 assets/images/patient/vital_signs/ovrweight_BMI-r.png
 create mode 100644 assets/images/patient/vital_signs/ovrweight_BMI.png
 create mode 100644 assets/images/patient/vital_signs/respiration_rate.png
 create mode 100644 assets/images/patient/vital_signs/temperature.png
 create mode 100644 assets/images/patient/vital_signs/underweight_BMI-r.png
 create mode 100644 assets/images/patient/vital_signs/underweight_BMI.png
 create mode 100644 assets/images/patient/vital_signs/weight.png
 create mode 100644 lib/widgets/shared/app-textfield-custom.dart

diff --git a/assets/images/patient/vital_signs/Obese_BMI-r.png b/assets/images/patient/vital_signs/Obese_BMI-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b3282278f74fe59d8e039517ad1ad66e03f651
GIT binary patch
literal 2088
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
Dr^0ZX

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/Obese_BMI.png b/assets/images/patient/vital_signs/Obese_BMI.png
new file mode 100644
index 0000000000000000000000000000000000000000..540d4bcc57400b92a7486137cb3c5699c6662bd0
GIT binary patch
literal 2088
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

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/blood_pressure.png b/assets/images/patient/vital_signs/blood_pressure.png
new file mode 100644
index 0000000000000000000000000000000000000000..9670187598bb17a46645c1bd23f919665d2325bd
GIT binary patch
literal 733
zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3-oF)&9?BU|^ID@Ck7RazjHy9UL5tjg7Un
zwav}VHO$P6jU5aPZFO|ajg4&$4XyR{Ep>G4w2f`_^z4A*y1JGI239~pT_YPELu)-f
z8(l*y0|N^K0~;L!Yh6QYpsX$kSpt#1zO|kqh^=R6sb^pfL_jH^h`ynf9!P<eu0D_r
zlmap=^?}L^tf5?>y+D;f1XKWG0QG`3LKr}mV3R?DAOtcB$_AMX(gl-(aKYN)YQPMz
z7Le8Giovq~|Nm!xqjm)tK(Qr3e!&dPEUavN!Xl#Ll2X#La*A5I28PBa=9bnDuAbih
z0ij_LQE~ApX?evZW#tw1jeY%-r_Pu;YtfRW%T}z~x^4T81BXwXI(_Esx$C#?Jbd!}
z<*PUE-hcS`<=gikKY#uG*Wk0|8PFoeByV?@IF@UPyMb(0PZ!4!jq}L~42<_qL}+lN
zq#R&jnr9HEW9)h9S)+r15U&#RRD-3m$$}1(y)LbJ)D=|YaY^plwSNVfVa)*(X3RB+
zx#bmikXP;O6BdzxsaN`WM2{H61jf0r9r?C(;>12v=jmo!w}l0_eOR<5Dfhxs#|C2w
zwFN!Cvm7t6pXt4ld_e2$fkjCv*~<<eZg7@L-|%1pUqNZ_0p(l`rAH3?9(r7oxl^%3
z^-gl~-X|NpvJDJ6+L|Q{HyLDdnkroQ$~-aaK*0ufFRO?nRg2V)CI}lCq%pW{;hycB
zqa(h_Wb-aFi3~%QqsOXtGx;W@AK+S}u&&^k-suDH`6uxTCm&GFmlVlTW_irWU~bUt
V)qlqRJuq|_JYD@<);T3K0RUcF@e}|6

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/health_BMI-r.png b/assets/images/patient/vital_signs/health_BMI-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..96189d3432de894d1679564cec0c5ebb9e47c2b0
GIT binary patch
literal 1991
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

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/health_BMI.png b/assets/images/patient/vital_signs/health_BMI.png
new file mode 100644
index 0000000000000000000000000000000000000000..c87a042477e443cce76ba9f6d52b315525facc15
GIT binary patch
literal 1991
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

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/heart_rate.png b/assets/images/patient/vital_signs/heart_rate.png
new file mode 100644
index 0000000000000000000000000000000000000000..7601719484a774003ff6972e5dd4ff226e74768f
GIT binary patch
literal 940
zcmeAS@N?(olHy`uVBq!ia0vp^ia;#M!3-ojgtyOSU|=i{@Ck7Ra-kqJ)WN~Q*w|QG
zTU$lN6U=Z>F*i3baM0DY(YCbIFf&szv{lx#(lIyJG`3aKx70DU(=@cwFtE@zveeMG
zQ8%$xGq%*yw^la-DzMNnvQaa!)H1fvG6qUns2SU68Ch$X*k~DAYMNMU7+V2JbptDP
zV@q`-YmhmHK!z2FVPpkls2f_V8-rwlDuD_#Kn!aQBWrcA0+3=uYfWR2Vojj!Km|Z?
zAQvPHHAfSu1!N9T0Z17{r6y1%SiPo!HJA-iU<uX;Q3Ests0O0N65<{h7bpmJIm|$W
zIMh`jT|mbp#Idpe|Nn2xUVa)F?$sqhe!&ckOw25-Z0uY-d;)?(!lGj0lG3vB3My*q
z8rphB#%AW`);6{d&aQ4={-I$Jkuk9ei5YqM#ibRMRW%KbP0g)c-95b%Cr_O=eb(%`
z^X9KywRYXQbz8P>+qHM!;Uh<noj7^w^qC76uUxxv>+byrFJ8ZW_x{u8uiw7^`2F`^
z|FKCvKxZ%}dAqyRT->G*4`j!9x;TbNNY)-~x0g<2V0-YrXTcSYSqrvZ_!6+#ZT7V;
z+r_g=c1-)0<!X|#<HYat-=)j<D^$p3^nN~m?*95_*9l$sYj&Sd6K_6YtR|ziyN=<j
z{mK-3v4fi({5SFa3$D7xo8f%sw(j49djd65)At;Gr2DeS<L{Mokr^D9xVCz9v4$xg
zU1{q2^421C#+TevnM;B;uQD!CRahI?dB7u3@`zCE>IrTuOc(>b((PFCR`5EnIur1t
z*{dXIR$HTg$huVv&IEQOylS1OG&A=A&#skcoM!YKEj#9OdCk#_7K=PD*R<Y?F^-#k
z==S-IH>{6%%Goo2m{gs??|9>x(ULCbNt`UVTKG<H^Pic`5><D*Y+9dgglw)8L(~iT
z*1{=&7O7uux31FjeD~1Sc4pk2%X8I=6WiC7h;y;{d$g~ctRVN{kF{+WuiTT{3%0#H
toO~?L<C)z9&WGM{{0}_W{$9J|wf&d-r)MzDo8SS;bDpk#F6*2UngCbVMo<6%

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/height.png b/assets/images/patient/vital_signs/height.png
new file mode 100644
index 0000000000000000000000000000000000000000..e176c456879486598e9eab1a4f5fde6586d9337f
GIT binary patch
literal 417
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g-!3-q*zw}=RQY`^KA+A6g2vk%&jg5`f)vXN-
z9CUSU3=OUI^)2=EtPBin^!2TE4K4KaZ1fB*bq#>XO5f00&%g@E(A9?^YkdPNpopG<
zB~%>9FocM}NFY}qs!LBFCJ5H`|NnoNw6_I7M`)D<`2{mDvUBkY2uexoI5@iaMn<J&
zWR;cIG|im7VA+=ahfbckeD~4w_aDFi`1vPl;@^)zU5rWI?k?IYJD+d>Ia57d978nD
zFTHe=k4ce-^}_2mX)Ud;$41KUzWuik;5w(W*oWuiK8N$pv(;E*tUlbd(R{M+K~dS8
zO1-HX<yU_={x&OK8p3e6yL$Utez`e+(%(iDY&xL4RmDo<DsOV)J>LuJMsX_X-;Zvc
zXdn4n=hy+2#<jNUJzM5vFDWlM&30|hpYu<b#;E3K9x+*1&V2p-lBD2Yx&N3<9ZgP%
T|KeZ)I*`HB)z4*}Q$iB})RmAl

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/ovrweight_BMI-r.png b/assets/images/patient/vital_signs/ovrweight_BMI-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff24fc61316cfa875f944329e220e57fa2fadfda
GIT binary patch
literal 1966
zcmai!c~n!^7RDn;l~DAlL<}OCZYILiP^dMas0o-L0ZAAYPzF(gC>3x(z=|luppq~M
zm4^dTAc2UA1PT=#n8}17gH=JX3RVe9OBJLiLEG2A-dgA0yU%y_{(bwLb??paV!Ii`
z&EPN?%$T`}?hT&S;M%cJAKc@E`)<KtdI?^exePF!)s1o(?3Rm5r@eg-g)#_1kJ0F6
zbMsC!dzGmTQ2L0(RtW0EVijn#+QPcWoYJ<EB!?gs4%dyb>OoUFQDpflqSBnuiKVD5
z2;C6Wg`+62WF?lQMiaVFc)10nge=uqk^+raq98ezsK64G7=j9oSE0#r6iI;tgQ&z3
zR2YIBO;VzWDjZRPAuBN?6`H6<5kS5Iiw8gzP%uOV8VrIGMbIi*5hN3pV4wjLWRgG(
zPzp3~Bq_0g45nHI0F^)i<p4N0)mZ=+zyu9|1c1`Ux~UGXRkUzG0H!*)jt@+M1pxp7
z9BfA$052_8%bDwQ&Rx4%9a+nnBZFGdj1H@X{0pnIn-g`Ne{MjB)i$q7(ACb7b<BT>
z+MVhWbiHX$U{3jr(w)^O!v7X(<4+}E^&cZ({VDAq!e{00rT-hu&dv@p41WY~o-)px
z&4JC+)1Pnf#e#)~aHB7c7cKtJlBLTK%S~4x%~o1qaS)zBB3n|d?Y{cj!SS2b->#uK
zIj>v4f#JG|$#UQ9!S?jp;?3du`1<(=ZVL|Cz9Td&d}rjYC|>lQn7#XA_s1t3IC$uA
z;*q43?~kP(PdjmvFF1WhD9X;s%{!N0@Wc7Sq6-%<7nl54T2?NWR8&f@R$aS(qxxoz
zthVl_hM#ZUx!cm(*51+CC0D4_-S>O@`Uie_^!Ulp@Y81_&tJS89eefL>o?<?iMQ`2
zfB$3Z&-WjuXFe|bP<{gJZC<Fm8(nosH4DDM`EVwEJ$D5%v*}b=W(2H7BMpj<K}NY7
ziv0)p)izus>$1%3YD8Li!bOw(#2a>^v|VvH)jeScyQ)tq$t;j3r+6#&+w6QJ-~T9S
z?OkC&eepr38T<D~CAP0iQ0fAcgqYPIANk#9O*>eQnobw`abY3)KOlO}3yK^@tIXE*
zui}rMJ1)J#59Hr^w>+)7xO=e=TwJ`4h49^wBJuLa&)5|+cX*^~>`Px{Ut%K`-QE-3
z_I_DVUC@IJ<11kq_=qI0s`=st>IaUs(HGA|*LvI*2gdNm*Vxpc#^J5MnFs$mvb=H3
zv$n8h?9#&mO;pYxqrS4e0wLvn_tUWl@wGFVZgs;*#$HZ%oMXGVisQPdA*bDcD^VKM
zL*>8RBNa@?PXy97Hpd)B#(6aNu@3nNL>fQKnna)8bc2b*VaFxd7}4SNu68^ATmPJp
z&@q*Sb`H*+TwvSAb2JU_DrsQ{6j3?B-TfHx2@8*FB@=@B63q>X{X^=L5M)<|ldbe6
z<j^5&vc^R;7`+{tG_w-rxZbBDEACuy4R)}5bxmMM_sFY)sXt~t$o$%$gexljj!6^^
zAtoJ6g~>v$>-~A;bH?W0A;vCjuK`cGJVlK`*K(4AJil1v-b6kgJ|F7RyN2l4*mz2)
zhg?zS7U2Z5;#%$1Tim|7KrcEw$0*v@YUR;w0X^gN19<|c?M0#e`p?>4j3%FdbGk4$
z%itBqYSJZF@c48}$AW-gsMMoo_a+R_VsPiG;qB}LDUZvWTyjFoU?)l^>EoM`<6&uQ
zr|b5twsWg8(ZflTuWv!Ld~f`84gZg90<4xF6*5p++U7Dmmgr7<z4c_)O<LsI-dzlX
zg(S;W;;Es!p?A~^oF&BFTsqArlfUc9Rcvzeh&>~E=P7K$koT4Jk!;E(^SpjODfBcJ
zzAyhmx?8>^{X;A>%CC>)N`4iHWrvW95i-fyR9Oz?*}{EvOoXh9+q(QoSlY9vj!ev{
zqYQZ4ZEFtZ&&KO;<e9++I8tA*rPW!Mc{bi~OemqHU-ofz?){Y-n2x*1Xr@X=sDVrO
zC2sbe*J~9}D@%eXsIhMY#IZC2&!X2Uz%7<1tX?|i91s~x!}Dmq6_SwHLEAC3Z>nTQ
z)_@aR@T8J^GLPKqWn$l6ob1ZByecG5B#@g7mx{Jz_>eE>9^BbZYO>7wD)pfEAcP1-
zu%g`Yl@&t%)#t1M))7xuprD$r=G@JTW0c=17ga(}!_JsAMhQnX*IDYI#zLX*P-I&1
z?nW-tXR046GbiQUSc1xk#5=%3SZne&9kFed<+GbTkOp^aHui3<x8~6_J~eH9%nHHH
q>Zuh4`F>tbSs8DQCa5QeHS1<A8nYU9J3R!y2pE&WrdMv*e(WzI8(2yJ

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/ovrweight_BMI.png b/assets/images/patient/vital_signs/ovrweight_BMI.png
new file mode 100644
index 0000000000000000000000000000000000000000..da8e67bbed63d7d19d6b3f9a3c07f95df5c2138b
GIT binary patch
literal 1966
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
G>A-(crSLld

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/respiration_rate.png b/assets/images/patient/vital_signs/respiration_rate.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff695dec77fe9328985304e7e976322b4ac58af2
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)p!3-oN7|sC&7$*hzgt!8^KoA-l>fqpDY;3IH
z;9zNK31sN$=>bUt0|#AQ8$&}|Jv}QO9dm6{Q$s^*9UVJELo1-Tj<J=2fw{iEjh>!0
zP>qhEwSj?^zP_cNk+rU&m5za>fq?}?R@V^7w$U@R)HSrwF|gLxhbRMbt#v_MOFcas
zT?0#feQQ0S$p)5sAaSr72p1$}rDtHR3)E<631lF#f#N`9sjF|TZwOMOr*8#P22ul(
z0$QP`Z>bMtgG~UFKv^r0W55dZpq7I5f=qxRFdL*2h(LOQ4#SWFs{uI}=vufen2S)1
zDh@Xd#K1uR|Np<?ueTc*B`qaEe!&b(%q*-NoLt=e0)nDq;u2D_@=D68YU)}hre+qF
zR@OGQ_72W2u5Rugo?bq_0YSl`$!Y1C*#$+V<rS4xHMK3RZS5WX6DLiXI&H?B`HPk=
zU%h_QmaW@&?A*O~-+_aN4j(;s{N$<AXU?9xaOv{ZYq#&*z4!3htJiPez5nv{+xH(o
zfBpXR_ur)B?;io(!<gjl?$RoHJ?lA;o$u-57$PB=d$2p&yHMu%$Nu}4$~{+AmYiIA
zVVZZux}8tf&E7pR+No=2$m}_{u08wP{`=jVEypike!cYnj{8S_Z_VKMlm2`#)As+N
z>G|nTnlIn{bEeYY_xAnds@j6gGqZEMc1*uw`|Y6Z;=D^MABruUDskjg%R23n7y7)_
z3HrQSr@UI$vE%{6#Bw8b!+L}Eha77CmWnThePV7$v9>)_3+RlU+mN}EIpWRTO&e^&
ze$6=Rx4ws!dv?Db(_5)SSJtUS`Lotu+W4U4^|^&o&lbrUekv(7nfa3^^QFa^lu3(M
z`@2=FunE@9y=S4O`!(^{-fh$P&t!J)zB~DDzM-UMZ)NR=&{uM-QyZVg9-bk$lD&Ab
zEd$flhQ@zK!WRVJVn3t$i@jmfv<C61Nun<%lrdjTQe_wU+P$o0OY<`MQybInO}=B3
zJ?}N&M5pOK;f*J9Q#q%;J1*K~uOVo){O^pLrwdJw>Yq)rdb;m9+vF&9%Nf64{$(x}
W-utS$tl}IfuX?)rxvX<aXaWE!4{KWh

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/temperature.png b/assets/images/patient/vital_signs/temperature.png
new file mode 100644
index 0000000000000000000000000000000000000000..9953a13092cfb0b23e3674a4a1bcc1c792af8e0a
GIT binary patch
literal 854
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i3?z4Pv7|FFFop&Agt!8^5D*#~>fqpDY;3Hp
zt*xTssQ_l{>FH@}JE*H$8yGm~>e^^)TWXk@85-JZo0{tDTk7eV8yZ>}7+C1(+36Zv
z>g!wU=>fS`x?n*A0~?5lo}s0#p@oitHAst*rLF-`nT?*IwXT7so}m>G0hNJN8d`xx
zfPz3ND_wmneM3t<pkf0nAkqaYFaU~J>4Uh|dio$iAgK>l02Tytffj*ef!aZ8K#GAR
z$VR9FkhrCuK1cz?9FUDb!$IO;1kw(XLU2K{VB4W;;EJIdK_(!h|Ns9_Ulz>-4Az2@
zAirP+MkZz!RyKAHE^Z!P0YM>QQ3+`oc?CrcZ5;zkYX?UsXBSs@4=-Q8fZ&j@@QA3m
z<g)ULs_KTOmX6Nuo(U7DOq)4t&fJBIm#$c~cHR2TTeofBxoh|SgQrfPIeY%Xt^1Fj
zJbV7))$2F!-hcS`<=gMS|DtDakOA7wnB?v5Qn;Qy<`Ix><muuVqH(_TQh4y800Gtq
z!V?>k!rv@Pa@>%VBfx8>b0c8mf(U`HN*b2`|DSBXV8r=*$Ne`mt;@wV!jC(eNxyH2
zHMO7cWOGis;v|*nK4%Yxx(14ENR7CXl5KTT+|$%&^XZ(F?%&e9xyH4D^Iu97FlD@4
zeZHnj#WdmB<e!yW_Px?}xSpz2s<JYrVA_=n^Y(Mc{{2=}daPkvh0;PNRp!e}+Bo?Z
z?iO*W*uGrv@&<;z4flh8PRgG+?M&F(e;y`1Y-~GX(<b+|YpaMCZ9OB%X5dv{dd@s-
zcJ?m)IrXWhcJC5&O35nz;Igh<%X(h0NUCIe+uR##62F``sJ)c6{K>rNzKNcz_ilc{
z^n|JP>b;05jK}$l!>pCJ&+S{0`>di<q-n|dXA8UhCdF*Gjf)Sex#Kr8>i>_uDgQ-w
R>@5N14o_D<mvv4FO#sR1BW(Zx

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/underweight_BMI-r.png b/assets/images/patient/vital_signs/underweight_BMI-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f633b4586ee18e60cea3d969e7cf8fe33e9cccd
GIT binary patch
literal 1859
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
F=pXBfFgpMM

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/underweight_BMI.png b/assets/images/patient/vital_signs/underweight_BMI.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b0260af2994b7e46f585cd2cdb33e7afff991f
GIT binary patch
literal 1859
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

literal 0
HcmV?d00001

diff --git a/assets/images/patient/vital_signs/weight.png b/assets/images/patient/vital_signs/weight.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a3bd2cce8158afed222d004714590b022e34970
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAwFLNtxB_V)2n`K&aBwg-HrCeG
z29n0c4mvvKhK9EK`qp}SHhM<Zx`tMIhSs_UR=Nh3dO$Xi0hBVZ)Yk{HE%gkn^?(e0
zsI0yLhz(K$l7cXRB0%*ZHX8c>|G$JuyBW|CS|ve#!3<2yEUau?BH~)w<`$NI{sEa;
zIR!-v7A{)8|IpFnSFT>W`|SCv*YAJ){HHu^>ldId#w2fd7j2cDPdI>_W=|K#5RLQ6
z4?-^-VtP_3v7w7ORl;PWcZSh{2(3p=f0&$vRvFlZIC)NJW#oxyoib51#X{miLoAo#
z!gI$C98f*YF*WhB!;1+iX$e73nmdfU6mKh@JEEX;_T*6}@pjJ)PlL{;IcjHA+Foht
x>Y9phc{0iJ)N{@W>{d2BVff)hvgmU*2K5QS!5a$vb^@Kl;OXk;vd$@?2>@KYeF*>n

literal 0
HcmV?d00001

diff --git a/lib/config/config.dart b/lib/config/config.dart
index 3a72faba..0f615af5 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
 const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
-// const BASE_URL = 'https://hmgwebservices.com/';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL =
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index f30a86e5..aa57f29a 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -84,7 +84,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'speciality': {'en': 'Speciality', 'ar': 'التخصص'},
   'errorMessage': {'en': 'Something went wrong', 'ar': 'حدث خطأ ما'},
   'patientProfile': {'en': 'Patient Profile', 'ar': 'ملف المريض'},
-  'vitalSign': {'en': 'Vital Sign', 'ar': 'المؤشرات الحيوية'},
+  'vitalSign': {'en': 'Vital Signs', 'ar': 'المؤشرات الحيوية'},
   'vital': {'en': 'Vital', 'ar': 'الحيوية'},
   'signs': {'en': 'Signs', 'ar': 'المؤشرات'},
   'labOrder': {'en': 'Lab Order', 'ar': 'نتائج التحاليل'},
@@ -377,6 +377,11 @@ const Map<String, Map<String, String>> localizedValues = {
   'headCircum': {'en': "Head Circum", 'ar': 'محيط الرأس'},
   'leanBodyWeight': {'en': "Lean Body Weight", 'ar': 'وزن الجسم الهزيل'},
   'bodyMassIndex': {'en': "Body Mass Index", 'ar': 'مؤشر كتلة الجسم'},
+  'yourBodyMassIndex': {'en': "Your Body Mass Index is", 'ar': 'مؤشر كتلة جسمك هو'},
+  'bmiUnderWeight': {'en': "UnderWeight", 'ar': 'تحت الوزن'},
+  'bmiHealthy': {'en': "Healthy", 'ar': 'صحي'},
+  'bmiOverWeight': {'en': "OverWeight", 'ar': 'فوق الوزن'},
+  'bmiObese': {'en': "Obese", 'ar': 'سمين'},
   'method': {'en': "Method", 'ar': 'الطريقة'},
   'pulseBeats': {'en': 'Pulse(beats/minute)', 'ar': ' (دقة/دقيقة)النبض'},
   'rhythm': {'en': "Rhythm", 'ar': 'الإيقاع'},
@@ -608,7 +613,7 @@ const Map<String, Map<String, String>> localizedValues = {
   "sys-dias": {"en": "SBP/DBP", "ar": "إنقباض/إنبساط"},
   "body": {"en": "Body \n Mass", "ar": "كتلة\nالجسم"},
   'respirationRate': {'en': 'Respiration Rate', 'ar': 'معدل التنفس'},
-  'heart': {'en': 'Heart', 'ar': 'قلب'},
+  'heart': {'en': 'Heart rate', 'ar': 'معدل ضربات القلب'},
   'medicalReport': {'en': "medical Report", 'ar': "تقرير طبي"},
   'visitDate': {'en': "Visit Date", 'ar': "تاريخ الزيارة"},
   'test': {'en': "Procedures/Test", 'ar': "عمليات/تحاليل"},
diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart
index 2def78db..0a51f7f5 100644
--- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart
+++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart
@@ -99,6 +99,19 @@ class VitalSignsViewModel extends BaseViewModel {
     }
   }
 
+  int getBMIStatus() {
+    var bodyMassIndex = double.parse(bodyMax);
+    if (bodyMassIndex <= 18.5) {
+      return 1;
+    } else if (bodyMassIndex <= 25.0) {
+      return 2;
+    } else if (bodyMassIndex <= 30) {
+      return 3;
+    } else {
+      return 4;
+    }
+  }
+
   String getTempratureMethod(int temperatureCelciusMethod) {
     // temperatureCelciusMethod ( vital sign response field )- master 2005
     if (temperatureCelciusMethod == 1) {
diff --git a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
index 0c1f0de2..1cf69da8 100644
--- a/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
+++ b/lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
@@ -1,4 +1,3 @@
-import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/enum/viewstate.dart';
 import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart';
@@ -6,11 +5,12 @@ import 'package:doctor_app_flutter/core/viewModel/patient-admission-request-view
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
-import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
+import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
+import 'package:doctor_app_flutter/widgets/shared/app-textfield-custom.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@@ -47,12 +47,15 @@ class _AdmissionRequestThirdScreenState
   Widget build(BuildContext context) {
     final routeArgs = ModalRoute.of(context).settings.arguments as Map;
     PatiantInformtion patient = routeArgs['patient'];
+    String patientType = routeArgs['patientType'];
+    String arrivalType = routeArgs['arrivalType'];
     final screenSize = MediaQuery.of(context).size;
     ProjectViewModel projectViewModel = Provider.of(context);
 
     return BaseView<AdmissionRequestViewModel>(
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
+        isShowAppBar: false,
         appBarTitle: TranslationBase.of(context).admissionRequest,
         body: GestureDetector(
           onTap: (){
@@ -62,27 +65,57 @@ class _AdmissionRequestThirdScreenState
             }
           },
           child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Expanded(
                       child: SingleChildScrollView(
                         child: Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            PatientPageHeaderWidget(patient),
+                            // PatientPageHeaderWidget(patient),
+                            PatientProfileHeaderNewDesign(
+                                patient, patientType, arrivalType),
                             Container(
-                              margin: EdgeInsets.symmetric(
-                                  vertical: 16, horizontal: 16),
+                              margin: EdgeInsets.all(16.0),
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  SizedBox(
-                                    height: 16,
+                                  AppText(
+                                    "${TranslationBase.of(context).admission}",
+                                    fontFamily: 'Poppins',
+                                    fontSize: SizeConfig.textMultiplier * 1.6,
+                                    fontWeight: FontWeight.w600,
                                   ),
+                                  AppText(
+                                    "${TranslationBase.of(context).request}",
+                                    fontFamily: 'Poppins',
+                                    fontSize: SizeConfig.textMultiplier * 3,
+                                    fontWeight: FontWeight.bold,
+                                  )
+                                ],
+                              ),
+                            ),
+                            Container(
+                              margin: EdgeInsets.symmetric(
+                                  vertical: 0, horizontal: 16),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
                                   AppText(
                                     TranslationBase.of(context)
                                         .specialityAndDoctorDetail,
-                                    fontWeight: FontWeight.bold,
-                                    fontSize: SizeConfig.textMultiplier * 2.5,
+                                    fontFamily: 'Poppins',
+                                    fontSize: SizeConfig.textMultiplier * 1.8,
+                                    fontWeight: FontWeight.w700,
+                                  ),
+                                  SizedBox(
+                                    height: 10,
+                                  ),
+                                  AppTextFieldCustom(
+                                    height: screenSize.height * 0.070,
+                                    hintText: "test field",
+                                    isDropDown: true,
+                                    controller: _sickLeaveCommentsController,
                                   ),
                                   SizedBox(
                                     height: 10,
diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart
index 85c93e2f..70c9f5b9 100644
--- a/lib/screens/patients/profile/patient_profile_screen.dart
+++ b/lib/screens/patients/profile/patient_profile_screen.dart
@@ -96,7 +96,7 @@ class PatientProfileScreen extends StatelessWidget {
                     if (int.parse(patientType) == 7 ||
                         int.parse(patientType) == 6)
                       Positioned(
-                        top: 195,
+                        top: 175,
                         left: 20,
                         right: 20,
                         child: Row(
diff --git a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart
index 3cab440c..e6cccf48 100644
--- a/lib/screens/patients/profile/referral/my-referral-patient-screen.dart
+++ b/lib/screens/patients/profile/referral/my-referral-patient-screen.dart
@@ -33,7 +33,7 @@ class MyReferralPatientScreen extends StatelessWidget {
               )
             : SingleChildScrollView(
                 child: Container(
-                  margin: EdgeInsets.only(top: 50),
+                  margin: EdgeInsets.only(top: 70),
                   // color: Colors.white,
                   // height: MediaQuery.of(context).size.height,
                   child: Column(
diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
index 2b4877e8..3dd45782 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
@@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
@@ -29,191 +30,378 @@ class VitalSignDetailsScreen extends StatelessWidget {
     String from = routeArgs['from'];
     String to = routeArgs['to'];
     String imageBasePath = 'assets/images/';
+    String assetBasePath = "${imageBasePath}patient/vital_signs/";
 
     return BaseView<VitalSignsViewModel>(
       onModelReady: (model) =>
           model.getPatientVitalSignHistory(patient, from, to),
       builder: (_, mode, widget) => AppScaffold(
-        isShowAppBar: true,
+        isShowAppBar: false,
         baseViewModel: mode,
         appBarTitle: TranslationBase.of(context).vitalSign,
         body: mode.patientVitalSignsHistory.length > 0
-            ? Container(
-                child: ListView(
-                  children: <Widget>[
-                    Row(
-                      children: <Widget>[
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.Height,
-                                      pageTitle:
-                                          TranslationBase.of(context).height,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: Container(
-                            child: VitalSignItem(
-                              des: TranslationBase.of(context).height,
-                              imagePath: "${imageBasePath}vital_height.png",
-                              lastVal: mode.heightCm,
-                              unit: TranslationBase.of(context).cm,
-                            ),
-                          ),
+            ? Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  PatientProfileHeaderNewDesign(
+                      patient, patientType, arrivalType),
+                  Container(
+                    margin: EdgeInsets.all(16.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        AppText(
+                          "${patient.firstName ?? patient.patientDetails.firstName}'s",
+                          fontFamily: 'Poppins',
+                          fontSize: SizeConfig.textMultiplier * 1.6,
+                          fontWeight: FontWeight.w600,
                         ),
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.Weight,
-                                      pageTitle:
-                                          TranslationBase.of(context).weight,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: VitalSignItem(
-                            des: TranslationBase.of(context).weight,
-                            imagePath: "${imageBasePath}vital_weight.png",
-                            unit: TranslationBase.of(context).kg,
-                            lastVal: mode.weightKg,
-                          ),
+                        AppText(
+                          TranslationBase.of(context).vitalSign,
+                          fontFamily: 'Poppins',
+                          fontSize: SizeConfig.textMultiplier * 3,
+                          fontWeight: FontWeight.bold,
+                        )
+                      ],
+                    ),
+                  ),
+                  Container(
+                    height: MediaQuery.of(context).size.height * 0.21,
+                    width: double.infinity,
+                    padding: EdgeInsets.all(12.0),
+                    margin: EdgeInsets.symmetric(horizontal: 16.0),
+                    decoration: BoxDecoration(
+                      shape: BoxShape.rectangle,
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(16),
+                      border: Border.fromBorderSide(BorderSide(
+                        color: Colors.grey.shade400,
+                        width: 0.4,
+                      )),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        AppText(
+                          "${TranslationBase.of(context).yourBodyMassIndex} ${mode.bodyMax}",
+                          fontFamily: 'Poppins',
+                          fontSize: SizeConfig.textMultiplier * 2.0,
+                          fontWeight: FontWeight.w700,
                         ),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Image.asset(
+                                  mode.getBMIStatus() != 1
+                                      ? '${assetBasePath}underweight_BMI.png'
+                                      : '${assetBasePath}underweight_BMI-r.png',
+                                  height:
+                                      MediaQuery.of(context).size.height * 0.10,
+                                ),
+                                const SizedBox(
+                                  height: 4,
+                                ),
+                                AppText(
+                                  "${TranslationBase.of(context).bmiUnderWeight}",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  color: mode.getBMIStatus() == 1
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                                AppText(
+                                  "(1-10)",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  color: mode.getBMIStatus() == 1
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ],
+                            )),
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Image.asset(
+                                  mode.getBMIStatus() != 2
+                                      ? '${assetBasePath}health_BMI.png'
+                                      : '${assetBasePath}health_BMI-r.png',
+                                  height:
+                                  MediaQuery.of(context).size.height * 0.10,
+                                ),
+                                const SizedBox(
+                                  height: 4,
+                                ),
+                                AppText(
+                                  "${TranslationBase.of(context).bmiHealthy}",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 2
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                                AppText(
+                                  "(11-20)",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 2
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                              ],
+                            )),
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Image.asset(
+                                  mode.getBMIStatus() != 3
+                                      ? '${assetBasePath}ovrweight_BMI.png'
+                                      : '${assetBasePath}ovrweight_BMI-r.png',
+                                  height:
+                                  MediaQuery.of(context).size.height * 0.10,
+                                ),
+                                const SizedBox(
+                                  height: 4,
+                                ),
+                                AppText(
+                                  "${TranslationBase.of(context).bmiOverWeight}",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 3
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                                AppText(
+                                  "(21-30)",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 3
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                              ],
+                            )),
+                            Expanded(
+                                child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Image.asset(
+                                  mode.getBMIStatus() != 4
+                                      ? '${assetBasePath}Obese_BMI.png'
+                                      : '${assetBasePath}Obese_BMI-r.png',
+                                  height:
+                                  MediaQuery.of(context).size.height * 0.10,
+                                ),
+                                const SizedBox(
+                                  height: 4,
+                                ),
+                                AppText(
+                                  "${TranslationBase.of(context).bmiObese}",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 4
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                                AppText(
+                                  "(31-40>)",
+                                  fontFamily: 'Poppins',
+                                  fontSize: SizeConfig.textMultiplier * 1.4,
+                                  fontWeight: FontWeight.w700,
+                                  color: mode.getBMIStatus() == 4
+                                      ? Color(0XFFD02127)
+                                      : null,
+                                ),
+                              ],
+                            )),
+                          ],
+                        )
                       ],
                     ),
-                    Row(
-                      children: <Widget>[
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey:
-                                          vitalSignDetails.BodyMeasurements,
-                                      pageTitle: TranslationBase.of(context)
-                                          .bodyMeasurements,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: VitalSignItem(
-                            des: TranslationBase.of(context).body,
-                            imagePath: "${imageBasePath}vital_body_mass.png",
-                            lastVal: mode.bodyMax,
-                            unit: TranslationBase.of(context).mass,
+                  ),
+                  Expanded(
+                    child: Container(
+                      margin: EdgeInsets.symmetric(horizontal: 8.0),
+                      child : GridView.count(
+                        shrinkWrap: true,
+                        physics: NeverScrollableScrollPhysics(),
+                        crossAxisSpacing: 4,
+                        mainAxisSpacing: 4,
+                        childAspectRatio: 1 / 1.0,
+                        crossAxisCount: 3,
+                        children: [
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey: vitalSignDetails.Height,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .height,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
+                            child: Container(
+                              child: VitalSignItem(
+                                des: TranslationBase.of(context).height,
+                                imagePath:
+                                "${assetBasePath}height.png",
+                                lastVal: mode.heightCm,
+                                unit: TranslationBase.of(context).cm,
+                              ),
+                            ),
                           ),
-                        ),
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.Temperature,
-                                      pageTitle: TranslationBase.of(context)
-                                          .temperature,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: Container(
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey: vitalSignDetails.Weight,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .weight,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
                             child: VitalSignItem(
-                              des: TranslationBase.of(context).temperature,
-                              imagePath:
-                                  "${imageBasePath}vital_temperature.png",
-                              lastVal: mode.temperatureCelcius,
-                              unit: TranslationBase.of(context).tempC,
+                              des: TranslationBase.of(context).weight,
+                              imagePath: "${assetBasePath}weight.png",
+                              unit: TranslationBase.of(context).kg,
+                              lastVal: mode.weightKg,
                             ),
                           ),
-                        ),
-                      ],
-                    ),
-                    Row(
-                      children: <Widget>[
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.heart,
-                                      pageTitle:
-                                          TranslationBase.of(context).heart,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: VitalSignItem(
-                            des: TranslationBase.of(context).heart,
-                            imagePath: "${imageBasePath}vital_heart_rate.png",
-                            lastVal: mode.hartRat,
-                            unit: TranslationBase.of(context).bpm,
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey:
+                                  vitalSignDetails.Temperature,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .temperature,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
+                            child: Container(
+                              child: VitalSignItem(
+                                des:
+                                TranslationBase.of(context).temperature,
+                                imagePath:
+                                "${assetBasePath}temperature.png",
+                                lastVal: mode.temperatureCelcius,
+                                unit: TranslationBase.of(context).tempC,
+                              ),
+                            ),
                           ),
-                        ),
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.Respiration,
-                                      pageTitle: TranslationBase.of(context)
-                                          .respirationRate,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: VitalSignItem(
-                            des: TranslationBase.of(context).respirationRate,
-                            imagePath: "${imageBasePath}vital_respiration.png",
-                            lastVal: mode.respirationBeatPerMinute,
-                            unit: TranslationBase.of(context).respirationSigns,
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey: vitalSignDetails.heart,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .heart,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
+                            child: VitalSignItem(
+                              des: TranslationBase.of(context).heart,
+                              imagePath:
+                              "${assetBasePath}heart_rate.png",
+                              lastVal: mode.hartRat,
+                              unit: TranslationBase.of(context).bpm,
+                            ),
                           ),
-                        ),
-                      ],
-                    ),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: <Widget>[
-                        InkWell(
-                          onTap: () => isNotOneAppointment
-                              ? Navigator.push(
-                                  context,
-                                  FadePage(
-                                    page: VitalSignItemDetailsScreen(
-                                      pageKey: vitalSignDetails.BloodPressure,
-                                      pageTitle: TranslationBase.of(context)
-                                          .bloodPressure,
-                                      vitalList: mode.patientVitalSignsHistory,
-                                    ),
-                                  ),
-                                )
-                              : null,
-                          child: VitalSignItem(
-                            des: TranslationBase.of(context).bloodPressure,
-                            imagePath:
-                                "${imageBasePath}vital_blood-pressure.png",
-                            lastVal: mode.bloodPressure,
-                            unit: TranslationBase.of(context).sysDias,
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey:
+                                  vitalSignDetails.Respiration,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .respirationRate,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
+                            child: VitalSignItem(
+                              des: TranslationBase.of(context)
+                                  .respirationRate,
+                              imagePath:
+                              "${assetBasePath}respiration_rate.png",
+                              lastVal: mode.respirationBeatPerMinute,
+                              unit: TranslationBase.of(context)
+                                  .respirationSigns,
+                            ),
                           ),
-                        ),
-                      ],
+                          InkWell(
+                            onTap: () => isNotOneAppointment
+                                ? Navigator.push(
+                              context,
+                              FadePage(
+                                page: VitalSignItemDetailsScreen(
+                                  pageKey:
+                                  vitalSignDetails.BloodPressure,
+                                  pageTitle:
+                                  TranslationBase.of(context)
+                                      .bloodPressure,
+                                  vitalList:
+                                  mode.patientVitalSignsHistory,
+                                ),
+                              ),
+                            )
+                                : null,
+                            child: VitalSignItem(
+                              des:
+                              TranslationBase.of(context).bloodPressure,
+                              imagePath:
+                              "${assetBasePath}blood_pressure.png",
+                              lastVal: mode.bloodPressure,
+                              unit: TranslationBase.of(context).sysDias,
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
-                  ],
-                ),
+                  ),
+                ],
               )
             : Center(
                 child: AppText(
diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart
index 33b25e82..e99e7bad 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart
@@ -1,9 +1,17 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
 
 class VitalSignItem extends StatelessWidget {
+  final String des;
+  final String lastVal;
+  final String unit;
+  final String imagePath;
+  final double height;
+  final double width;
+
   const VitalSignItem(
       {Key key,
       @required this.des,
@@ -14,77 +22,71 @@ class VitalSignItem extends StatelessWidget {
       @required this.imagePath})
       : super(key: key);
 
-  final String des;
-  final String lastVal;
-  final String unit;
-  final String imagePath;
-  final double height;
-  final double width;
-
   @override
   Widget build(BuildContext context) {
     return RoundedContainer(
-      margin: 0.025 * SizeConfig.realScreenWidth,
-      height: 0.15 * SizeConfig.realScreenHeight,
-      width: 0.45 * SizeConfig.realScreenWidth,
+      // margin: 0.025 * SizeConfig.realScreenWidth,
+      // height: 0.15 * SizeConfig.realScreenHeight,
+      // width: 0.45 * SizeConfig.realScreenWidth,
       child: Container(
         padding: EdgeInsets.all(5),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            Container(
-              height: 0.10 * SizeConfig.realScreenHeight,
-              child: Row(
-                children: <Widget>[
-                  Expanded(
-                    flex: 2,
-                    child: Align(
-                      alignment: Alignment.topLeft,
-                      child: Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text(
-                          des,
-                          style: TextStyle(
-                            fontSize: 1.7 * SizeConfig.textMultiplier,
-                            color: HexColor('#B8382C'),
-                            fontWeight: FontWeight.bold,
-                          ),
+            Expanded(
+              child: Container(
+                padding: EdgeInsets.only(top: 8),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: <Widget>[
+                    Expanded(
+                      child: Container(
+                        padding: EdgeInsets.only(left: 8, right: 8),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          children: [
+                            AppText(
+                              "$lastVal",
+                              fontFamily: 'Poppins',
+                              fontSize: SizeConfig.textMultiplier * 1.6,
+                              fontWeight: FontWeight.w800,
+                              margin: 0,
+                            ),
+                            AppText(
+                              "$unit",
+                              fontFamily: 'Poppins',
+                              fontSize: SizeConfig.textMultiplier * 1.3,
+                              fontWeight: FontWeight.w700,
+                              color: HexColor('#B8382C'),
+                              margin: 0,
+                            ),
+                          ],
                         ),
                       ),
                     ),
-                  ),
-                  Expanded(
-                    flex: 1,
-                    child: Container(
+                    Container(
                         child: Image.asset(
                       imagePath,
                       width: 40,
                       height: 40,
-                    )),
-                  )
-                ],
+                    ))
+                  ],
+                ),
               ),
             ),
-            Expanded(
-              child: Container(
-                width: double.infinity,
-                child: Align(
-                  alignment: Alignment.topRight,
-                  child: Container(
-                    margin: EdgeInsets.only(left: 5, right: 5),
-                    child: RichText(
-                      text: TextSpan(
-                          style: TextStyle(color: Colors.black),
-                          children: [
-                            TextSpan(text: "$lastVal "),
-                            TextSpan(
-                              text: unit,
-                              style: TextStyle(
-                                color: HexColor('#B8382C'),
-                              ),
-                            ),
-                          ]),
-                    ),
+            Container(
+              width: double.infinity,
+              child: Align(
+                alignment: Alignment.topLeft,
+                child: Container(
+                  margin: EdgeInsets.only(left: 5, right: 5),
+                  child: AppText(
+                    "$des",
+                    fontFamily: 'Poppins',
+                    fontSize: SizeConfig.textMultiplier * 1.5,
+                    fontWeight: FontWeight.w600,
                   ),
                 ),
               ),
diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart
index 331b2812..df880f9a 100644
--- a/lib/util/translations_delegate_base.dart
+++ b/lib/util/translations_delegate_base.dart
@@ -645,8 +645,13 @@ class TranslationBase {
   String get leanBodyWeight =>
       localizedValues['leanBodyWeight'][locale.languageCode];
 
-  String get bodyMassIndex =>
-      localizedValues['bodyMassIndex'][locale.languageCode];
+  String get bodyMassIndex => localizedValues['bodyMassIndex'][locale.languageCode];
+
+  String get yourBodyMassIndex => localizedValues['yourBodyMassIndex'][locale.languageCode];
+  String get bmiUnderWeight => localizedValues['bmiUnderWeight'][locale.languageCode];
+  String get bmiHealthy => localizedValues['bmiHealthy'][locale.languageCode];
+  String get bmiOverWeight => localizedValues['bmiOverWeight'][locale.languageCode];
+  String get bmiObese => localizedValues['bmiObese'][locale.languageCode];
 
   String get method => localizedValues['method'][locale.languageCode];
 
diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart
index 6e9008e7..14afa5b6 100644
--- a/lib/widgets/patients/patient-referral-item-widget.dart
+++ b/lib/widgets/patients/patient-referral-item-widget.dart
@@ -313,12 +313,14 @@ class PatientReferralItemWidget extends StatelessWidget {
                     ),
                     Row(
                       children: [
-                        AppText(
-                          patientInfo.patientName,
-                          fontSize: SizeConfig.textMultiplier * 2.5,
-                          fontWeight: FontWeight.bold,
-                          backGroundcolor: Colors.white,
-                          fontFamily: 'Poppins',
+                        Expanded(
+                          child: AppText(
+                            patientInfo.patientName,
+                            fontSize: SizeConfig.textMultiplier * 2.5,
+                            fontWeight: FontWeight.bold,
+                            backGroundcolor: Colors.white,
+                            fontFamily: 'Poppins',
+                          ),
                         ),
                         SizedBox(
                           width: 4,
diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design.dart b/lib/widgets/patients/profile/patient-profile-header-new-design.dart
index 5979b8e1..b50a191b 100644
--- a/lib/widgets/patients/profile/patient-profile-header-new-design.dart
+++ b/lib/widgets/patients/profile/patient-profile-header-new-design.dart
@@ -26,7 +26,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
       decoration: BoxDecoration(
         color: Colors.white,
       ),
-      height: 220,
+      height: 200,
       child: Container(
         padding: EdgeInsets.only(
             left: 10, right: 10, bottom: 10),
diff --git a/lib/widgets/shared/app-textfield-custom.dart b/lib/widgets/shared/app-textfield-custom.dart
new file mode 100644
index 00000000..15c8865a
--- /dev/null
+++ b/lib/widgets/shared/app-textfield-custom.dart
@@ -0,0 +1,140 @@
+import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:flutter/material.dart';
+
+import 'app_texts_widget.dart';
+
+class AppTextFieldCustom extends StatefulWidget {
+  final double height;
+  final Function onClick;
+  final String hintText;
+  final TextEditingController controller;
+  final bool isDropDown;
+  final Icon suffixIcon;
+  final Color dropDownColor;
+
+  AppTextFieldCustom(
+      {this.height = 0,
+      this.onClick,
+      this.hintText,
+      this.controller,
+      this.isDropDown = false,
+      this.suffixIcon,
+      this.dropDownColor});
+
+  @override
+  _AppTextFieldCustomState createState() => _AppTextFieldCustomState();
+}
+
+class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: widget.height != 0 ? widget.height : null,
+      decoration:
+          containerBorderDecoration(Color(0Xffffffff), Color(0xFFEFEFEF)),
+      padding: EdgeInsets.only(top: 4.0, bottom: 4.0, left: 8.0, right: 8.0),
+      child: InkWell(
+        onTap: widget.onClick ?? null,
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  if (widget.controller.text != "")
+                    AppText(
+                      widget.hintText,
+                      fontFamily: 'Poppins',
+                      fontSize: SizeConfig.textMultiplier * 1.4,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  TextField(
+                    textAlign: TextAlign.left,
+                    decoration: textFieldSelectorDecoration(
+                        widget.hintText, null, true),
+                    style: TextStyle(
+                      fontSize: 14,
+                      color: Colors.grey.shade600,
+                    ),
+                    controller: widget.controller,
+                  ),
+                ],
+              ),
+            ),
+            widget.isDropDown
+                ? widget.suffixIcon != null
+                    ? widget.suffixIcon
+                    : Icon(
+                        Icons.arrow_drop_down,
+                        color: widget.dropDownColor != null
+                            ? widget.dropDownColor
+                            : Colors.black,
+                      )
+                : Container(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  BoxDecoration containerBorderDecoration(
+      Color containerColor, Color borderColor,
+      {double borderWidth = -1}) {
+    return BoxDecoration(
+      color: containerColor,
+      shape: BoxShape.rectangle,
+      borderRadius: BorderRadius.all(Radius.circular(8)),
+      border: Border.fromBorderSide(BorderSide(
+        color: borderColor,
+        width: borderWidth == -1 ? 2.0 : borderWidth,
+      )),
+    );
+  }
+
+  static InputDecoration textFieldSelectorDecoration(
+      String hintText, String selectedText, bool isDropDown,
+      {Icon suffixIcon, Color dropDownColor}) {
+    return InputDecoration(
+      isDense: true,
+      contentPadding: EdgeInsets.symmetric(horizontal: 0, vertical: 0),
+      enabledBorder: UnderlineInputBorder(
+        borderSide: BorderSide(color: Color(0Xffffffff)),
+      ),
+      focusedBorder: UnderlineInputBorder(
+        borderSide: BorderSide(color: Color(0Xffffffff)),
+      ),
+      border: UnderlineInputBorder(
+        borderSide: BorderSide(color: Color(0Xffffffff)),
+      ),
+      /*focusedBorder: OutlineInputBorder(
+        borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      enabledBorder: OutlineInputBorder(
+        borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      disabledBorder: OutlineInputBorder(
+        borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+        borderRadius: BorderRadius.circular(8),
+      ),*/
+      hintText: selectedText != null ? selectedText : hintText,
+      hintStyle: TextStyle(
+        fontSize: 14,
+        color: Colors.grey.shade600,
+      ),
+      /*suffixIcon: isDropDown
+          ? suffixIcon != null
+          ? suffixIcon
+          : Icon(
+        Icons.arrow_drop_down,
+        color: dropDownColor != null ? dropDownColor : Colors.black,
+      )
+          : null,*/
+      // labelText:
+      // labelStyle:
+    );
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index b564ffda..3aae565e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -107,6 +107,7 @@ flutter:
     - assets/images/dashboard/
     - assets/images/login/
     - assets/images/patient/
+    - assets/images/patient/vital_signs/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.