diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index 9bb6b7d7..fd6264ba 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -11,8 +11,7 @@ import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as list; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; -import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'; @@ -20,23 +19,19 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart'; -import 'package:diplomaticquarterapp/widgets/others/not_auh_page.dart'; -import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:provider/provider.dart'; +import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; class MyFamily extends StatefulWidget { final bool isAppbarVisible; @@ -58,7 +53,7 @@ class _MyFamily extends State with TickerProviderStateMixin { AuthenticatedUser user; VitalSignService _vitalSignService = locator(); PharmacyModuleViewModel pharmacyModuleViewModel = locator(); - + ToDoCountProviderModel toDoProvider; var isVaiable = false; @override void initState() { @@ -80,7 +75,7 @@ class _MyFamily extends State with TickerProviderStateMixin { imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'), ); projectViewModel = Provider.of(context); - + toDoProvider = Provider.of(context); return AppScaffold( appBarTitle: TranslationBase.of(context).myFamilyFiles, isShowAppBar: widget.isAppbarVisible, @@ -558,7 +553,7 @@ class _MyFamily extends State with TickerProviderStateMixin { appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { - //getToDoCount(), + getToDoCount(), // Utils.hideProgressDialog(), if (appointmentRateViewModel.isHaveAppointmentNotRate) { @@ -613,4 +608,17 @@ class _MyFamily extends State with TickerProviderStateMixin { }); } } + + getToDoCount() { + toDoProvider.setState(0, true); + ClinicListService service = new ClinicListService(); + service.getActiveAppointmentNo(context).then((res) { + print(res['AppointmentActiveNumber']); + if (res['MessageStatus'] == 1 && res['AppointmentActiveNumber'] != null) { + toDoProvider.setState(res['AppointmentActiveNumber'], true); + } else {} + }).catchError((err) { + print(err); + }); + } } diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index f4f5b2c4..7b0b78dc 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -236,7 +236,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { locationUtils = new LocationUtils(isShowConfirmDialog: false, context: context); WidgetsBinding.instance.addPostFrameCallback((_) { - if (projectViewModel.isLogin) { + if (projectViewModel.isLogin && !projectViewModel.isLoginChild) { familyFileProvider.getSharedRecordByStatus(); } // signalRUtil.startSignalRConnection(); @@ -259,7 +259,10 @@ class _LandingPageState extends State with WidgetsBindingObserver { sharedPref.setString(PUSH_TOKEN, token); if (token != null) { DEVICE_TOKEN = token; - checkUserStatus(token); + if (!projectViewModel.isLoginChild) { + checkUserStatus(token); + } + // if (projectViewModel.isLogin) this.getNotificationCount(DEVICE_TOKEN); } }); diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 0c49c42e..c7f99535 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -34,7 +34,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; - +import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; import '../../config/size_config.dart'; import '../../locator.dart'; import 'drawer_item_widget.dart'; @@ -70,8 +70,7 @@ class _AppDrawerState extends State { @override Widget build(BuildContext context) { projectProvider = Provider.of(context); - // (user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2) - + toDoProvider = Provider.of(context); return Container( width: MediaQuery.of(context).size.width * 0.75, color: Theme.of(context).scaffoldBackgroundColor, @@ -572,7 +571,7 @@ class _AppDrawerState extends State { appointmentRateViewModel .getIsLastAppointmentRatedList() .then((value) => { - //getToDoCount(), + getToDoCount(), //Utils.hideProgressDialog(), if (appointmentRateViewModel.isHaveAppointmentNotRate) { @@ -603,4 +602,17 @@ class _AppDrawerState extends State { void setUserValues(value) async { if (value != null) sharedPref.setObject(IMEI_USER_DATA, value); } + + getToDoCount() { + toDoProvider.setState(0, true); + ClinicListService service = new ClinicListService(); + service.getActiveAppointmentNo(context).then((res) { + print(res['AppointmentActiveNumber']); + if (res['MessageStatus'] == 1 && res['AppointmentActiveNumber'] != null) { + toDoProvider.setState(res['AppointmentActiveNumber'], true); + } else {} + }).catchError((err) { + print(err); + }); + } }