merge-requests/538/head
Sultan Khan 5 years ago
parent 822dc7da77
commit d0a39ca3d4

@ -93,7 +93,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
}); });
Navigator.of(context).pushNamed(PATIENTS, arguments: { Navigator.of(context).pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues, "patientSearchForm": _patientSearchFormValues,
"selectedType": _selectedType, "selectedType": isView == false ? '0' : _selectedType,
"isSearch": true, "isSearch": true,
"isView": isView "isView": isView
}); });

@ -214,7 +214,7 @@ class PatientCard extends StatelessWidget {
), ),
), ),
if (SERVICES_PATIANT2[int.parse(patientType)] != if (SERVICES_PATIANT2[int.parse(patientType)] !=
"List_InPatient") "List_MyInPatient")
Container( Container(
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
@ -298,51 +298,52 @@ class PatientCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Expanded( AppText(
child: AppText( TranslationBase.of(context)
TranslationBase.of(context) .appointmentDate +
.appointmentDate + " : ",
" : ", fontSize: 14,
fontSize: 14,
),
), ),
// Container(
// child:
patientInfo.appointmentDate != null
? AppText(
DateUtils
.convertDateFromServerFormat(
patientInfo.appointmentDate
.toString(),
'yyyy-MM-dd'),
fontSize: 12,
fontWeight: FontWeight.bold,
)
: SizedBox(),
//),
patientInfo.startTimes != null patientInfo.startTimes != null
? Container( ?
height: 15, //
width: 60, // Container(
decoration: BoxDecoration( // // height: 15,
borderRadius: // // width: 60,
BorderRadius.circular(25), // padding: EdgeInsets.all(5),
color: HexColor("#20A169"), // decoration: BoxDecoration(
), // borderRadius:
child: AppText( // BorderRadius.circular(25),
patientInfo.startTimes, // color: HexColor("#20A169"),
color: Colors.white, // ),
fontSize: 1.5 * // child:
SizeConfig.textMultiplier,
textAlign: TextAlign.center, AppText(
fontWeight: FontWeight.bold, ' ' + patientInfo.startTimes,
), fontSize: 11,
fontWeight: FontWeight.bold,
) )
//)
: SizedBox(), : SizedBox(),
SizedBox( SizedBox(
width: 3.5, width: 3.5,
), ),
Container( //,
child: patientInfo.appointmentDate != null
? AppText(
DateUtils
.convertDateFromServerFormat(
patientInfo
.appointmentDate
.toString(),
'yyyy-MM-dd'),
fontSize: 1.5 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
)
: SizedBox(),
),
SizedBox( SizedBox(
height: 0.5, height: 0.5,
) )

Loading…
Cancel
Save