From c16b7ffca0e0677480fa3a665717eefdf92cf377 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 23 Mar 2021 12:46:32 +0300 Subject: [PATCH] arrival page updated --- assets/images/type-booked.png | Bin 0 -> 388 bytes assets/images/type-livecare.png | Bin 0 -> 594 bytes assets/images/type-walkin.png | Bin 0 -> 639 bytes lib/models/patient/patiant_info_model.dart | 7 +- lib/widgets/patients/PatientCard.dart | 112 ++++++--------------- 5 files changed, 36 insertions(+), 83 deletions(-) create mode 100644 assets/images/type-booked.png create mode 100644 assets/images/type-livecare.png create mode 100644 assets/images/type-walkin.png diff --git a/assets/images/type-booked.png b/assets/images/type-booked.png new file mode 100644 index 0000000000000000000000000000000000000000..c42945cf1d442c369098ac6171a8641eb9d11542 GIT binary patch literal 388 zcmV-~0ek+5P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10TD?= zK~y-6t&}lJ15p%3&yzt-5jBuPTT3^Q)Pk+z3T!OgfKA*@D#Zo33>yVYL5zYXMh9{% z@&yUW%)rd8{(t|y!@u`40}E0I>R_>6wJ%GD2S6Wa1Ba&8@Fo zJr4B|*e|nKQ4gWo5DZ|p)*uWZvb1<%9&8=8fi5Y~UQHNkPi@q40F(mNb@f6$tAs7H ztZt{C*Ah-&on-|Ln?MWLN~KUcY5f@y`Lekp%jdudcuM0TEJJRw?G%TqA2WQZ2*_RGwPmt iqfTo4T*vCQy88?3SuGtE3Z%*a0000P000gM1^@s6+B&yD00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10pCeP zK~y-6rIbHtQ(+Xve=jdxlxRf+?I40+mY{<;IjA5`QZ2!$EL8L31V>#e3RTgmOF^NVl!%3zzNF3jIpjTgz9tg!!p8@Pd(XM|p6@->9qJSHhr`FR zdW~U2ee@6H`Iz_%?!458b_ zD9Y9>0#)D`a1NNE=i}=^B3a{411|xBFr>S(LR72KnV-kb?JMzW@LL literal 0 HcmV?d00001 diff --git a/assets/images/type-walkin.png b/assets/images/type-walkin.png new file mode 100644 index 0000000000000000000000000000000000000000..555023b3a7ee53b0374c41420f77d329dfa29b11 GIT binary patch literal 639 zcmV-_0)YLAP)A`f`00009a7bBm000id z000id0mpBsWB>pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10t`t+ zK~y-6mDJs9k8v2s@$Y7~Wl>I)gAp2XLY%O6U=AF3DEw=1Q8EUd?MjNl8p zvE*Mqim@fj~LH)CHKso$9vD4b?R=b#_0XpiC-&^QxNr}AqEYo`n93a4JI%RHMi zzygkxYQiL_DwEm;ROR#v{KQi{i*rwK7CSLN3+jmj-LY>(bq@F#&ryfdc$~f^I0}WA@mH3UmgpP3R#Bw~!{H-MiJC$oj0k7lxSY=9SvNIo3O7~Mr zt5QlGWqQ;X@BWlhdrIkAN@*gcG?-HANmz`5pnt+fG{wHRMBT20wxwJr>v0nGu|J$i z<$=uD!9sk+JJgf}=HQnU$4^@ncQhLbTH;3s{|Bm99E5jczdankV^P>@@d58kMyGfw z_v4%55ZoK~-I2`g;>9fBeCP)<(G6h`wRza;sMABm;dnKi zN3jcY@Jew6HAKWiai+OcbgdyyM5^boAfq>hHXi4OaRO6^EN0^t?qNfj2DQbtIF7ok Z_7^n)RX;#$J=y>O002ovPDHLkV1n#u8@vDj literal 0 HcmV?d00001 diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index 7b54af8a..dc3c8b4e 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/lib/models/patient/patiant_info_model.dart @@ -55,6 +55,7 @@ class PatiantInformtion { String visitType; String nationalityFlagURL; int patientStatusType; + int visitTypeId; PatiantInformtion( {this.list, this.projectId, @@ -109,7 +110,8 @@ class PatiantInformtion { this.patientMRN, this.visitType, this.nationalityFlagURL, - this.patientStatusType}); + this.patientStatusType, + this.visitTypeId}); factory PatiantInformtion.fromJson(Map json) => PatiantInformtion( @@ -177,5 +179,6 @@ class PatiantInformtion { nationalityFlagURL: json['NationalityFlagURL'] ?? json['NationalityFlagURL'], patientStatusType: - json['patientStatusType'] ?? json['patientStatusType']); + json['patientStatusType'] ?? json['patientStatusType'], + visitTypeId: json['visitTypeId'] ?? json['visitTypeId']); } diff --git a/lib/widgets/patients/PatientCard.dart b/lib/widgets/patients/PatientCard.dart index 93a176ea..a7e058ac 100644 --- a/lib/widgets/patients/PatientCard.dart +++ b/lib/widgets/patients/PatientCard.dart @@ -36,7 +36,7 @@ class PatientCard extends StatelessWidget { ), child: Stack(children: [ Container( - height: MediaQuery.of(context).size.height * .17, + height: MediaQuery.of(context).size.height * .20, width: 5, decoration: BoxDecoration( borderRadius: BorderRadius.only( @@ -47,7 +47,7 @@ class PatientCard extends StatelessWidget { : Colors.red[800], )), Container( - padding: EdgeInsets.only(left: 10, right: 10, bottom: 10), + padding: EdgeInsets.only(left: 10, right: 0, bottom: 0), child: InkWell( child: Column( children: [ @@ -153,16 +153,6 @@ class PatientCard extends StatelessWidget { Padding( padding: EdgeInsets.only(left: 12.0), child: Container( - // decoration: BoxDecoration( - // boxShadow: [ - // // BoxShadow( - // // color: Color.fromRGBO(0, 0, 0, 0.08), - // // offset: Offset(0.0, 5.0), - // // blurRadius: 16.0) - // // ], - // // borderRadius: BorderRadius.all(Radius.circular(35.0)), - // // color: Color(0xffCCCCCC), - // ), width: 60, height: 60, child: Image.asset( @@ -283,79 +273,39 @@ class PatientCard extends StatelessWidget { ) ])) ]), + SERVICES_PATIANT2[int.parse(patientType)] == + "patientArrivalList" + ? Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Container( + padding: EdgeInsets.all(4), + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(8), + topLeft: Radius.circular(8), + ), + color: Colors.red, + ), + child: Image.asset( + patientInfo.appointmentType == + 'Regular' && + patientInfo.visitTypeId == 100 + ? 'assets/images/type-livecare.png' + : patientInfo.appointmentType == + 'Walkin' + ? 'assets/images/type-walkin.png' + : 'assets/images/type-booked.png', + height: 25, + width: 35, + )), + ]) + : SizedBox() ], ), onTap: onTap, - )) + )), ])); - - // ]), - // TableRow(children: [ - // SizedBox( - // height: 5, - // ), - // SizedBox( - // height: 5, - // ) - // ]), - // TableRow(children: [ - // Container( - // child: RichText( - // text: new TextSpan( - // style: new TextStyle( - // fontSize: 2.0 * SizeConfig.textMultiplier, - // color: Colors.black), - // children: [ - // new TextSpan( - // text: TranslationBase.of(context) - // .nationality + - // " : ", - // style: TextStyle( - // fontWeight: FontWeight.w700, - // fontSize: 2.2 * - // SizeConfig.textMultiplier)), - // // , - // ], - // ), - // ), - // ), - // Container( - // child: RichText( - // text: new TextSpan( - // style: new TextStyle( - // fontSize: 2.0 * SizeConfig.textMultiplier, - // color: Colors.black), - // children: [ - // new TextSpan( - // text: - // TranslationBase.of(context).gender + - // " : ", - // style: TextStyle( - // fontWeight: FontWeight.w700, - // )), - // new TextSpan( - // text: - // patientInfo.gender.toString() == '1' - // ? 'Male' - // : 'Female'), - // ], - // ), - // ), - // ), - // ]), - // ], - //), - - // ), - - // Divider(color: Colors.grey) - //], - //), - //], - //), - // onTap: onTap, - // ), - //); } convertDateFormat2(String str) {