patient card

merge-requests/548/head
Sultan Khan 5 years ago
parent 426aa03aa5
commit e83032e725

@ -88,8 +88,6 @@ class BaseAppClient {
print("URL : $url"); print("URL : $url");
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
var asd =json.encode(body);
var asd2;
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url, final response = await http.post(url,

@ -58,7 +58,7 @@ class PatientCard extends StatelessWidget {
height: 10, height: 10,
), ),
SERVICES_PATIANT2[int.parse(patientType)] == SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? Padding( ? Padding(
padding: EdgeInsets.only(left: 12.0), padding: EdgeInsets.only(left: 12.0),
child: Row( child: Row(
@ -83,7 +83,7 @@ class PatientCard extends StatelessWidget {
? AppText( ? AppText(
patientInfo.startTime != null patientInfo.startTime != null
? patientInfo.startTime ? patientInfo.startTime
: '', : patientInfo.startTimes,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
) )
@ -253,13 +253,16 @@ class PatientCard extends StatelessWidget {
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: patientInfo.admissionDate ==null?"":TranslationBase.of(context) text: patientInfo.admissionDate == null
.admissionDate + ? ""
" : ", : TranslationBase.of(context)
.admissionDate +
" : ",
style: TextStyle(fontSize: 14)), style: TextStyle(fontSize: 14)),
new TextSpan( new TextSpan(
text:patientInfo.admissionDate ==null?"": text: patientInfo.admissionDate == null
"${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}", ? ""
: "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 15)), fontSize: 15)),
@ -292,72 +295,72 @@ class PatientCard extends StatelessWidget {
// top: 8, // top: 8,
// ), // ),
// ), // ),
if (SERVICES_PATIANT2[int.parse(patientType)] == //if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient") // "List_MyOutPatient")
Container( // Container(
child: Row( // child: Row(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ // children: <Widget>[
AppText( // AppText(
TranslationBase.of(context) // TranslationBase.of(context)
.appointmentDate + // .appointmentDate +
" : ", // " : ",
fontSize: 14, // fontSize: 14,
), // ),
// Container( // // Container(
// child: // // child:
patientInfo.appointmentDate != null // patientInfo.appointmentDate != null
? AppText( // ? AppText(
DateUtils // DateUtils
.convertDateFromServerFormat( // .convertDateFromServerFormat(
patientInfo.appointmentDate // patientInfo.appointmentDate
.toString(), // .toString(),
'yyyy-MM-dd'), // 'yyyy-MM-dd'),
fontSize: 12, // fontSize: 12,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
) // )
: SizedBox(), // : SizedBox(),
//), // //),
patientInfo.startTimes != null // patientInfo.startTimes != null
? // ?
// // //
// Container( // // Container(
// // height: 15, // // // height: 15,
// // width: 60, // // // width: 60,
// padding: EdgeInsets.all(5), // // padding: EdgeInsets.all(5),
// decoration: BoxDecoration( // // decoration: BoxDecoration(
// borderRadius: // // borderRadius:
// BorderRadius.circular(25), // // BorderRadius.circular(25),
// color: HexColor("#20A169"), // // color: HexColor("#20A169"),
// ), // // ),
// child: // // child:
AppText( // AppText(
' ' + patientInfo.startTimes, // ' ' + patientInfo.startTimes,
fontSize: 11, // fontSize: 11,
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
) // )
//) // //)
: SizedBox(), // : SizedBox(),
SizedBox( // SizedBox(
width: 3.5, // width: 3.5,
), // ),
//, // //,
SizedBox( // SizedBox(
height: 0.5, // height: 0.5,
) // )
], // ],
), // ),
margin: EdgeInsets.only( // margin: EdgeInsets.only(
top: 8, // top: 8,
), // ),
) //)
])) ]))
]), ]),
SERVICES_PATIANT2[int.parse(patientType)] == SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? Row( ? Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [

Loading…
Cancel
Save