diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 1128832f..a5d8d96e 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -52,7 +52,7 @@ class _PatientsScreenState extends State { final String assetName = 'assets/image.svg'; // List _locations = ['Today', 'Old Date', 'YESTERDAY']; - List _locations = ['Today', 'Tomorrow', 'Next Week']; + List _locations = ['All','Today', 'Tomorrow', 'Next Week']; int _activeLocation = 0; bool _isInit = true; @@ -277,10 +277,10 @@ class _PatientsScreenState extends State { if ((currentTime.day - checkedTime.day) <= -2) { return "Next Week"; } else { - return "Old Date"; + return "All"; } } - return "Old Date"; + return "All"; } /* diff --git a/lib/screens/profile_screen.dart b/lib/screens/profile_screen.dart index 9a09424f..88f9565a 100644 --- a/lib/screens/profile_screen.dart +++ b/lib/screens/profile_screen.dart @@ -1,3 +1,7 @@ + +import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_drawer_widget.dart'; +////////////// import 'package:flutter/material.dart'; import '../config/size_config.dart'; @@ -7,17 +11,28 @@ import '../widgets/shared/profile_image_widget.dart'; import '../widgets/shared/rounded_container_widget.dart'; class ProfileScreen extends StatefulWidget { - ProfileScreen({Key key, this.title}) : super(key: key); + ProfileScreen({Key key, this.title,this.doctorProfileall}) : super(key: key); final String title; + DoctorProfileModel doctorProfileall ; @override _ProfileScreenState createState() => _ProfileScreenState(); } class _ProfileScreenState extends State { +//************************** + DoctorProfileModel doctorProfile ; + //AppDrawer dr; +//****************** @override Widget build(BuildContext context) { + + Map arg=ModalRoute.of(context).settings.arguments as Map;//ModalRoute.of(context).settings.arguments; + doctorProfile = arg['doctorProfileall']; + print("******************"); + //print(doctorProfile.doctorName); + print("******************"); return AppScaffold( appBarTitle: 'Profile', body: ListView(padding: EdgeInsets.zero, children: [ @@ -25,10 +40,10 @@ class _ProfileScreenState extends State { height: SizeConfig.heightMultiplier * 30, child: DrawerHeader( child: ProfileImageWidget( - url: - "https://p.kindpng.com/picc/s/404-4042774_profile-photo-circle-circle-profile-picture-png-transparent.png", - name: "Dr. Chris evans", - des: "Director of medical records", + url:doctorProfile.doctorImageURL, + //"https://p.kindpng.com/picc/s/404-4042774_profile-photo-circle-circle-profile-picture-png-transparent.png", + name: doctorProfile.doctorName,//"Dr. Chris evans", + des: doctorProfile.clinicDescription//"Director of medical records", ), ), ), @@ -36,28 +51,30 @@ class _ProfileScreenState extends State { child: ListView( children: [ DrawerItem( - "Gender", + "Gender" + , Icons.person_pin, color: Colors.black, - subTitle: "Male", + subTitle: doctorProfile.genderDescription//"Male" + , ), DrawerItem( "Clinic", Icons.build, color: Colors.black, - subTitle: "Neurology Clinic", + subTitle: doctorProfile.clinicDescription//"Neurology Clinic", ), DrawerItem( "Hospital", Icons.local_hospital, color: Colors.black, - subTitle: "Al-Takkassussi", + subTitle: doctorProfile.projectName,//"Al-Takkassussi", ), DrawerItem( "Speciality", Icons.crop_square, color: Colors.black, - subTitle: "being great", + subTitle: doctorProfile.doctorRate==0 ?"being bad":"being great", ), ], ), diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index e124a88f..53228c97 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -81,7 +81,11 @@ class _AppDrawerState extends State { ), ), onTap: () { - Navigator.of(context).pushNamed(PROFILE); + //Navigator.of(context).pushNamed(PROFILE); + Navigator.of(context).pushNamed(PROFILE, arguments: {'title':doctorProfile.doctorName, + "doctorProfileall": doctorProfile + }); + }, ), ),