shcedule page

lib/pages/BookAppointment/DoctorProfile.dart

@@ -44,7 +44,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
   TabController _tabController;
   bool showFooterButton = false;
   var event = RobotProvider();
-
+  dynamic doctorSchedule;
   AppSharedPreferences sharedPref = AppSharedPreferences();
 
   List<DoctorRateDetails> doctorDetailsList = List();
@@ -122,7 +122,11 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                     FadePage(
                       page: SchedulePage(doctorList: widget.doctor),
                     ),
-                  );
+                  ).then((value) {
+                    setState(() {
+                      this.doctorSchedule = value;
+                    });
+                  });
                 },
                 onRatingAndReviewTap: () {
                   getDoctorRatingsDetails();
@@ -170,7 +174,11 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                   physics: NeverScrollableScrollPhysics(),
                   children: [
                     DoctorInformation(docProfileList: widget.docProfileList),
-                    DocAvailableAppointments(doctor: widget.doctor, isLiveCareAppointment: widget.isLiveCareAppointment),
+                    DocAvailableAppointments(
+                      doctor: widget.doctor,
+                      isLiveCareAppointment: widget.isLiveCareAppointment,
+                      doctorSchedule: doctorSchedule,
+                    ),
                   ],
                   controller: _tabController,
                 ),

lib/pages/BookAppointment/components/DocAvailableAppointments.dart

@@ -24,10 +24,7 @@ class DocAvailableAppointments extends StatefulWidget {
   static String selectedTime;
   bool isLiveCareAppointment;
   final dynamic doctorSchedule;
-  DocAvailableAppointments(
+  DocAvailableAppointments({@required this.doctor, this.doctorSchedule, @required this.isLiveCareAppointment});
-      {@required this.doctor,
-      this.doctorSchedule,
-      @required this.isLiveCareAppointment});
 
   @override
   _DocAvailableAppointmentsState createState() => _DocAvailableAppointmentsState();
@@ -55,6 +52,15 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
 
   var language;
 
+  @override
+  void didUpdateWidget(covariant DocAvailableAppointments oldWidget) {
+    if (oldWidget.doctorSchedule != widget.doctorSchedule) {
+      _calendarController.setSelectedDay(DateUtil.convertStringToDate(widget.doctorSchedule['Date']), isProgrammatic: true);
+      _onDaySelected(DateUtil.convertStringToDate(widget.doctorSchedule['Date']), List());
+    }
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   void initState() {
     // TODO: implement initState
@@ -345,14 +351,8 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
                   _events = value,
                   if (widget.doctorSchedule != null)
                     {
-                      _calendarController.setSelectedDay(
+                      _calendarController.setSelectedDay(DateUtil.convertStringToDate(widget.doctorSchedule['Date']), isProgrammatic: true),
-                          DateUtil.convertStringToDate(
+                      _onDaySelected(DateUtil.convertStringToDate(widget.doctorSchedule['Date']), List())
-                              widget.doctorSchedule['Date']),
-                          isProgrammatic: true),
-                      _onDaySelected(
-                          DateUtil.convertStringToDate(
-                              widget.doctorSchedule['Date']),
-                          List())
                     }
                 });
           });

lib/pages/MyAppointments/AppointmentDetails.dart

@@ -28,7 +28,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 class AppointmentDetails extends StatefulWidget {
   AppoitmentAllHistoryResultList appo;
   static bool isLoading = false;
-  final dynamic doctorSchedule;
+  dynamic doctorSchedule;
   static bool showFooterButton = false;
   final int parentIndex;
 
@@ -182,9 +182,13 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                       Navigator.push(
                         context,
                         FadePage(
-                          page: SchedulePage(doctorList: doctorList),
+                          page: SchedulePage(doctorList: doctorList, appo: widget.appo),
                         ),
-                      );
+                      ).then((value) {
+                        setState(() {
+                          widget.doctorSchedule = value;
+                        });
+                      });
                     },
                   ),
                   SizedBox(height: 10),
@@ -586,7 +590,13 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
   }
 
   void openSchedule() {
-    Navigator.push(context, FadePage(page: SchedulePage(doctorList: getDoctorObject())));
+    Navigator.push(
+        context,
+        FadePage(
+            page: SchedulePage(
+          doctorList: getDoctorObject(),
+          appo: widget.appo,
+        )));
   }
 
   setTab() async {

lib/pages/MyAppointments/SchedulePage.dart

@@ -17,8 +17,8 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
 
 class SchedulePage extends StatefulWidget {
-  final DoctorList doctorList;
+  DoctorList doctorList;
-  final AppoitmentAllHistoryResultList appo;
+  AppoitmentAllHistoryResultList appo;
   SchedulePage({
     this.appo,
     this.doctorList,
@@ -202,14 +202,15 @@ class _SchedulePageState extends State<SchedulePage> {
 
   openBookAppointment(selectedDate) {
     //sharedPref.setObject(DOCTOR_SCHEDULE_DATE_SEL, selectedDate);
-    Navigator.push(
+    Navigator.of(context).pop(selectedDate);
-      context,
+    // Navigator.push(
-      FadePage(
+    //   context,
-        page: AppointmentDetails(
+    //   FadePage(
-          appo: widget.appo,
+    //     page: AppointmentDetails(
-          doctorSchedule: selectedDate,
+    //       appo: widget.appo,
-        ),
+    //       doctorSchedule: selectedDate,
-      ),
+    //     ),
-    );
+    //   ),
+    // );
   }
 }