From a1684bdd9e0c4ceab5057ec8bfe81744adfa4923 Mon Sep 17 00:00:00 2001 From: Mohammad Aljmma Date: Sun, 15 Nov 2020 17:36:35 +0200 Subject: [PATCH] fix issue #17 & 18 --- .../medical/medical_view_model.dart | 2 -- .../medical/time_line_widget.dart | 22 ++++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/core/viewModels/medical/medical_view_model.dart b/lib/core/viewModels/medical/medical_view_model.dart index 8621546b..52fd221a 100644 --- a/lib/core/viewModels/medical/medical_view_model.dart +++ b/lib/core/viewModels/medical/medical_view_model.dart @@ -12,10 +12,8 @@ class MedicalViewModel extends BaseViewModel { _medicalService.appoitmentAllHistoryResultList; getAppointmentHistory() async { - var asd =""; if (authenticatedUserObject.isLogin) { setState(ViewState.Busy); - // if (_medicalService.appoitmentAllHistoryResultList.length == 0) await _medicalService.getAppointmentHistory(); if (_medicalService.hasError) { error = _medicalService.error; diff --git a/lib/widgets/data_display/medical/time_line_widget.dart b/lib/widgets/data_display/medical/time_line_widget.dart index ebac57d2..ddb3175a 100644 --- a/lib/widgets/data_display/medical/time_line_widget.dart +++ b/lib/widgets/data_display/medical/time_line_widget.dart @@ -80,11 +80,15 @@ class TimeLineWidget extends StatelessWidget { height: 4, ), Texts( - DateUtil.getMonthDayYearDateFormatted( - DateUtil.convertStringToDate( - appoitmentAllHistoryResul.appointmentDate)), + DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(appoitmentAllHistoryResul.appointmentDate)), color: Colors.white, - fontSize: 10.5, + fontSize: 12.5, + fontWeight: FontWeight.normal, + ), + Texts( + appoitmentAllHistoryResul.clinicName, + color: Colors.white, + fontSize: 12.5, fontWeight: FontWeight.normal, ) ], @@ -93,17 +97,23 @@ class TimeLineWidget extends StatelessWidget { ) else Positioned( - top:projectViewModel.isArabic ? 63 : 70, + top:projectViewModel.isArabic ? 35 : 50, child: Container( margin: EdgeInsets.only(left: 2, right: 2), child: Column( children: [ + Texts( + appoitmentAllHistoryResul.clinicName, + color: Colors.white, + fontSize: 12.5, + fontWeight: FontWeight.normal, + ), Texts( DateUtil.getMonthDayYearDateFormatted( DateUtil.convertStringToDate( appoitmentAllHistoryResul.appointmentDate)), color: Colors.white, - fontSize: 10.5, + fontSize: 12.5, fontWeight: FontWeight.normal, ), SizedBox(