fix issue #17 & 18

fix_issues
Mohammad Aljmma 5 years ago
parent e42ebfbf64
commit a1684bdd9e

@ -12,10 +12,8 @@ class MedicalViewModel extends BaseViewModel {
_medicalService.appoitmentAllHistoryResultList; _medicalService.appoitmentAllHistoryResultList;
getAppointmentHistory() async { getAppointmentHistory() async {
var asd ="";
if (authenticatedUserObject.isLogin) { if (authenticatedUserObject.isLogin) {
setState(ViewState.Busy); setState(ViewState.Busy);
// if (_medicalService.appoitmentAllHistoryResultList.length == 0)
await _medicalService.getAppointmentHistory(); await _medicalService.getAppointmentHistory();
if (_medicalService.hasError) { if (_medicalService.hasError) {
error = _medicalService.error; error = _medicalService.error;

@ -80,11 +80,15 @@ class TimeLineWidget extends StatelessWidget {
height: 4, height: 4,
), ),
Texts( Texts(
DateUtil.getMonthDayYearDateFormatted( DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(appoitmentAllHistoryResul.appointmentDate)),
DateUtil.convertStringToDate(
appoitmentAllHistoryResul.appointmentDate)),
color: Colors.white, color: Colors.white,
fontSize: 10.5, fontSize: 12.5,
fontWeight: FontWeight.normal,
),
Texts(
appoitmentAllHistoryResul.clinicName,
color: Colors.white,
fontSize: 12.5,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
) )
], ],
@ -93,17 +97,23 @@ class TimeLineWidget extends StatelessWidget {
) )
else else
Positioned( Positioned(
top:projectViewModel.isArabic ? 63 : 70, top:projectViewModel.isArabic ? 35 : 50,
child: Container( child: Container(
margin: EdgeInsets.only(left: 2, right: 2), margin: EdgeInsets.only(left: 2, right: 2),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Texts(
appoitmentAllHistoryResul.clinicName,
color: Colors.white,
fontSize: 12.5,
fontWeight: FontWeight.normal,
),
Texts( Texts(
DateUtil.getMonthDayYearDateFormatted( DateUtil.getMonthDayYearDateFormatted(
DateUtil.convertStringToDate( DateUtil.convertStringToDate(
appoitmentAllHistoryResul.appointmentDate)), appoitmentAllHistoryResul.appointmentDate)),
color: Colors.white, color: Colors.white,
fontSize: 10.5, fontSize: 12.5,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),
SizedBox( SizedBox(

Loading…
Cancel
Save