pull/195/head
haroon amjad 4 weeks ago
parent 961a1f5b03
commit b4a7508f7c

@ -172,6 +172,10 @@ class DoctorProfilePage extends StatelessWidget {
child: CustomButton( child: CustomButton(
text: LocaleKeys.viewAvailableAppointments.tr(), text: LocaleKeys.viewAvailableAppointments.tr(),
onPressed: () async { onPressed: () async {
bookAppointmentsViewModel.selectedDoctor.speciality = bookAppointmentsViewModel.doctorsProfileResponseModel.specialty;
bookAppointmentsViewModel.selectedDoctor.specialityN = bookAppointmentsViewModel.doctorsProfileResponseModel.specialty;
bookAppointmentsViewModel.selectedDoctor.name = bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName;
bookAppointmentsViewModel.selectedDoctor.name = bookAppointmentsViewModel.doctorsProfileResponseModel.doctorName;
LoaderBottomSheet.showLoader(); LoaderBottomSheet.showLoader();
bookAppointmentsViewModel.isLiveCareSchedule bookAppointmentsViewModel.isLiveCareSchedule
? await bookAppointmentsViewModel.getLiveCareDoctorFreeSlots( ? await bookAppointmentsViewModel.getLiveCareDoctorFreeSlots(

@ -117,7 +117,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
AppCustomChipWidget( AppCustomChipWidget(
labelText: immediateLiveCareViewModel.patientLiveCareHistoryList[0].stringCallStatus, labelText: immediateLiveCareViewModel.patientLiveCareHistoryList.isNotEmpty ? immediateLiveCareViewModel.patientLiveCareHistoryList[0].stringCallStatus : "",
backgroundColor: AppColors.warningColorYellow.withValues(alpha: 0.20), backgroundColor: AppColors.warningColorYellow.withValues(alpha: 0.20),
textColor: AppColors.alertColor, textColor: AppColors.alertColor,
), ),

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_export.dart'; import 'package:hmg_patient_app_new/core/app_export.dart';
import 'package:hmg_patient_app_new/core/enums.dart'; import 'package:hmg_patient_app_new/core/enums.dart';
import 'package:hmg_patient_app_new/core/utils/date_util.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart'; import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
@ -144,7 +145,16 @@ class TrackerLastValueCard extends StatelessWidget {
break; break;
} }
final formattedDate = lastDate != null ? DateFormat('EEE DD MMM, yy').format(lastDate) : DateFormat('EEE DD MMM, yy').format(DateTime.now()); // final formattedDate = lastDate != null ? DateFormat('EE DD MMM, yy').format(lastDate) : DateFormat('EE DD MMM, yy').format(DateTime.now());
final formattedDate = lastDate != null
? DateUtil.getWeekDayMonthDayYearDateFormatted(
lastDate,
"en",
)
: DateUtil.getWeekDayMonthDayYearDateFormatted(
DateTime.now(),
"en",
);
// Show shimmer while loading // Show shimmer while loading
if (viewModel.isLoading) { if (viewModel.isLoading) {

@ -117,7 +117,7 @@ class AppRoutes {
userInfoSelection: (context) => UserInfoSelectionPage(), userInfoSelection: (context) => UserInfoSelectionPage(),
userInfoFlowManager: (context) => UserInfoFlowManager(), userInfoFlowManager: (context) => UserInfoFlowManager(),
smartWatches: (context) => SmartwatchHomePage(), smartWatches: (context) => SmartwatchHomePage(),
huaweiHealthExample: (context) => HuaweiHealthExample(), // huaweiHealthExample: (context) => HuaweiHealthExample(),
covid19Test: (context) => Covid19LandingPage(), covid19Test: (context) => Covid19LandingPage(),
waterConsumptionPage: (context) => WaterConsumptionPage(), waterConsumptionPage: (context) => WaterConsumptionPage(),
waterMonitorSettingsPage: (context) => WaterMonitorSettingsPage(), waterMonitorSettingsPage: (context) => WaterMonitorSettingsPage(),

Loading…
Cancel
Save