Booking appointment Marge

merge-update-with-lab-changes
Mirza.Shafique 5 years ago
parent 363cf78884
commit ebf293736d

@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorRateDetails.dart'
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/header_model.dart'; import 'package:diplomaticquarterapp/models/header_model.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/doctor_post_pre_images_page.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/doctor_post_pre_images_page.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/SchedulePage.dart';
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart';
import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
@ -115,7 +116,12 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
widget.doctor.noOfPatientsRate, widget.doctor.noOfPatientsRate,
"", "",
), ),
onTap: () {}, showConfirmMessageDialog: false,
onTap: () {
if (widget.isOpenAppt) {
Navigator.push(context, FadePage(page: SchedulePage(widget.doctor)));
}
},
onRatingAndReviewTap: () { onRatingAndReviewTap: () {
getDoctorRatingsDetails(); getDoctorRatingsDetails();
}, },

@ -24,7 +24,7 @@ class DoctorView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return InkWell( return InkWell(
onTap: () { onTap: () {
if (isShowFlag) getDoctorsProfile(context, doctor); if (isShowFlag) getDoctorsProfile(context, doctor,isAppo: true);
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(

@ -16,6 +16,7 @@ class SchedulePage extends StatefulWidget {
final DoctorList doctorList; final DoctorList doctorList;
SchedulePage(this.doctorList); SchedulePage(this.doctorList);
@override @override
_SchedulePageState createState() => _SchedulePageState(); _SchedulePageState createState() => _SchedulePageState();
} }
@ -27,11 +28,7 @@ class _SchedulePageState extends State<SchedulePage> {
int selectedindex = 0; int selectedindex = 0;
bool isLoading = true; bool isLoading = true;
List<DoctorScheduleResponse> doctorScheduleResponse = []; List<DoctorScheduleResponse> doctorScheduleResponse = [];
final List<Widget> introWidgetsList = <Widget>[ final List<Widget> introWidgetsList = <Widget>[Text('Hello'), Text('Hi'), Text('hey')];
Text('Hello'),
Text('Hi'),
Text('hey')
];
@override @override
void initState() { void initState() {
@ -70,29 +67,13 @@ class _SchedulePageState extends State<SchedulePage> {
child: ListView.builder( child: ListView.builder(
itemCount: model.getDoctorScheduleList.length, itemCount: model.getDoctorScheduleList.length,
itemBuilder: (context, index) => ClipRRect( itemBuilder: (context, index) => ClipRRect(
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(Radius.circular(20.0)),
Radius.circular(20.0)),
child: Container( child: Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 10, right: 10, top: 20, bottom: 20),
left: 10, margin: EdgeInsets.only(left: 20, right: 20, top: 7, bottom: 7),
right: 10, decoration: BoxDecoration(boxShadow: [
top: 20, BoxShadow(color: Colors.green, offset: Offset(-10, 0)),
bottom: 20), ], borderRadius: const BorderRadius.all(Radius.circular(10.0)), color: Colors.white),
margin: EdgeInsets.only(
left: 20,
right: 20,
top: 7,
bottom: 7),
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.green,
offset: Offset(-10, 0)),
],
borderRadius:
const BorderRadius.all(
Radius.circular(10.0)),
color: Colors.white),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -100,26 +81,16 @@ class _SchedulePageState extends State<SchedulePage> {
Column( Column(
children: [ children: [
Texts( Texts(
model model.getDoctorScheduleList[index].dayName,
.getDoctorScheduleList[ color: HexColor('#0bb690'),
index]
.dayName,
color:
HexColor('#0bb690'),
), ),
Texts( Texts(
DateUtil DateUtil.getDayMonthYearDateFormatted(
.getDayMonthYearDateFormatted( DateUtil.convertStringToDate(
DateUtil model.getDoctorScheduleList[index].date,
.convertStringToDate(
model
.getDoctorScheduleList[
index]
.date,
), ),
), ),
color: color: HexColor('#0bb690'),
HexColor('#0bb690'),
) )
], ],
) )
@ -127,10 +98,7 @@ class _SchedulePageState extends State<SchedulePage> {
), ),
Expanded( Expanded(
child: Texts( child: Texts(
model model.getDoctorScheduleList[index].workingHours,
.getDoctorScheduleList[
index]
.workingHours,
color: HexColor('#0bb690'), color: HexColor('#0bb690'),
), ),
) )

Loading…
Cancel
Save