Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Haroon6138:952589253673b8d8f1b3edad3b50f445b2b2bb04
Branches Tags
Haroon6138:king_kahild_app
Haroon6138:king_kahild_app_updated_3.32
Haroon6138:dev_v3.13.6
Haroon6138:dev_v_3.13.6_CR_6804
Haroon6138:dev_3.13.6_CR6750
Haroon6138:dev_v3.13.6_PenguinIn
Haroon6138:dev_3.13.6_Development
Haroon6138:dev_v3.13.6_BLE_Faiz
Haroon6138:development_v3.3
Haroon6138:dev_3.3_BLE
Haroon6138:dev_3.3_ER_Online_CheckIn
Haroon6138:dev_3.3_Floward
Haroon6138:dev_v3.13.6_voipcall
Haroon6138:Dev_3.3_InPatient_CR
Haroon6138:dev_3.3_CCHI
Haroon6138:dev_3.3_Queueing
Haroon6138:development_v3.3_voipcall
Haroon6138:dev_3.3_AmbulanceRequestCR
Haroon6138:dev_3.3_faiz_payfort
Haroon6138:dev_3.3_LabReportEnhancementCR
Haroon6138:dev_3.3_blood_donation_CR
Haroon6138:dev_3.3_merge_vida_plus
Haroon6138:PatientApp_VIDA_Plus_3.3
Haroon6138:Dev_3.3_MedicalReportCR
Haroon6138:sultan_v3.3
Haroon6138:faiz_development
Haroon6138:development_huawei_v2.5
Haroon6138:development_v2.5
Haroon6138:development_amir
Haroon6138:webrtc_with_signalr
Haroon6138:sikander_family_profile_switch
Haroon6138:sikander_video_call_improvements
Haroon6138:development_CS_v2.5
Haroon6138:fatima_v2
Haroon6138:development_new_design_2.0
Haroon6138:Fatima-New-Design
Haroon6138:development
Haroon6138:diplomatic-quarter-live
Haroon6138:fatima-new
Haroon6138:diplomatic-quarter-haroon
Haroon6138:master
Haroon6138:fix_bugs_Mar
Haroon6138:ed_online
Haroon6138:enad_pharmacy2
Haroon6138:fix_er
Haroon6138:dq_and_master
Haroon6138:geofencing_wifi
Haroon6138:fix_insurance_update
Haroon6138:fix_issues
Haroon6138:fix_authentication
Haroon6138:fix_login
Haroon6138:er_location
Haroon6138:find_us
...
compare: Haroon6138:655a7db924191c42d3fc4a150127317906f036b2
Branches Tags
Haroon6138:king_kahild_app
Haroon6138:king_kahild_app_updated_3.32
Haroon6138:dev_v3.13.6
Haroon6138:dev_v_3.13.6_CR_6804
Haroon6138:dev_3.13.6_CR6750
Haroon6138:dev_v3.13.6_PenguinIn
Haroon6138:dev_3.13.6_Development
Haroon6138:dev_v3.13.6_BLE_Faiz
Haroon6138:development_v3.3
Haroon6138:dev_3.3_BLE
Haroon6138:dev_3.3_ER_Online_CheckIn
Haroon6138:dev_3.3_Floward
Haroon6138:dev_v3.13.6_voipcall
Haroon6138:Dev_3.3_InPatient_CR
Haroon6138:dev_3.3_CCHI
Haroon6138:dev_3.3_Queueing
Haroon6138:development_v3.3_voipcall
Haroon6138:dev_3.3_AmbulanceRequestCR
Haroon6138:dev_3.3_faiz_payfort
Haroon6138:dev_3.3_LabReportEnhancementCR
Haroon6138:dev_3.3_blood_donation_CR
Haroon6138:dev_3.3_merge_vida_plus
Haroon6138:PatientApp_VIDA_Plus_3.3
Haroon6138:Dev_3.3_MedicalReportCR
Haroon6138:sultan_v3.3
Haroon6138:faiz_development
Haroon6138:development_huawei_v2.5
Haroon6138:development_v2.5
Haroon6138:development_amir
Haroon6138:webrtc_with_signalr
Haroon6138:sikander_family_profile_switch
Haroon6138:sikander_video_call_improvements
Haroon6138:development_CS_v2.5
Haroon6138:fatima_v2
Haroon6138:development_new_design_2.0
Haroon6138:Fatima-New-Design
Haroon6138:development
Haroon6138:diplomatic-quarter-live
Haroon6138:fatima-new
Haroon6138:diplomatic-quarter-haroon
Haroon6138:master
Haroon6138:fix_bugs_Mar
Haroon6138:ed_online
Haroon6138:enad_pharmacy2
Haroon6138:fix_er
Haroon6138:dq_and_master
Haroon6138:geofencing_wifi
Haroon6138:fix_insurance_update
Haroon6138:fix_issues
Haroon6138:fix_authentication
Haroon6138:fix_login
Haroon6138:er_location
Haroon6138:find_us

2 Commits
9525892536 ... 655a7db924

Author SHA1 Message Date
Aamir Muhammad 655a7db924 Merge branch 'king_kahild_app' into king_kahild_app_updated_3.32 4 months ago
Sultan khan 58a55682f2 book appointment code commented. 4 months ago
3 changed files with 70 additions and 66 deletions
Show Stats

41
lib/pages/BookAppointment/DoctorProfile.dart
Unescape Escape View File

@ -135,21 +135,21 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
showConfirmMessageDialog: false, showConfirmMessageDialog: false,
isNeedToShowButton: !widget.isLiveCareAppointment, isNeedToShowButton: !widget.isLiveCareAppointment,
onTap: () { onTap: () {
Navigator.push( // Navigator.push(
context, // context,
FadePage( // FadePage(
page: SchedulePage(doctorList: widget.doctor), // page: SchedulePage(doctorList: widget.doctor),
), // ),
).then((value) { // ).then((value) {
setState(() { // setState(() {
if (_tabController.index == 0) { // if (_tabController.index == 0) {
_tabController.animateTo((_tabController.index + 1) % 2); // _tabController.animateTo((_tabController.index + 1) % 2);
showFooterButton = true; // showFooterButton = true;
} // }
this.doctorSchedule = value; // this.doctorSchedule = value;
}); // });
}); // });
projectViewModel.analytics.appointment.book_appointment_schedule(appointment_type: 'regular', doctor: widget.doctor); // projectViewModel.analytics.appointment.book_appointment_schedule(appointment_type: 'regular', doctor: widget.doctor);
}, },
onRatingAndReviewTap: () { onRatingAndReviewTap: () {
getDoctorRatingsDetails(); getDoctorRatingsDetails();
@ -162,12 +162,12 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
onTap: (index) { onTap: (index) {
setState(() { setState(() {
if (index == 1) { if (index == 1) {
if (widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) { // if (widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) {
_tabController.index = _tabController.previousIndex; _tabController.index = _tabController.previousIndex;
showFooterButton = false; showFooterButton = false;
} else { // } else {
showFooterButton = true; // showFooterButton = true;
} // }
} }
print(showFooterButton); print(showFooterButton);
}); });
@ -185,6 +185,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
), ),
), ),
Tab( Tab(
child: Text( child: Text(
TranslationBase.of(context).availableAppo, TranslationBase.of(context).availableAppo,
style: TextStyle( style: TextStyle(

68
lib/pages/MyAppointments/AppointmentDetails.dart
Unescape Escape View File

@ -131,20 +131,20 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
showConfirmMessageDialog: false, showConfirmMessageDialog: false,
onRatingAndReviewTap: getDoctorRatingsDetails, onRatingAndReviewTap: getDoctorRatingsDetails,
onTap: () { onTap: () {
Navigator.push( // Navigator.push(
context, // context,
FadePage( // FadePage(
page: SchedulePage(doctorList: doctorList, appo: widget.appo), // page: SchedulePage(doctorList: doctorList, appo: widget.appo),
), // ),
).then((value) { // ).then((value) {
setState(() { // setState(() {
if (_tabController!.index == 0) { // if (_tabController!.index == 0) {
_tabController!.animateTo((_tabController!.index + 1) % 2); // _tabController!.animateTo((_tabController!.index + 1) % 2);
this.enableFooterButton(); // this.enableFooterButton();
} // }
widget.doctorSchedule = value; // widget.doctorSchedule = value;
}); // });
}); // });
}, },
), ),
SizedBox(height: 10), SizedBox(height: 10),
@ -154,20 +154,22 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
onTap: (index) { onTap: (index) {
setState(() { setState(() {
if (index == 1) { if (index == 1) {
if (widget.appo.clinicID == 17 ||
widget.appo.clinicID == 47 ||
widget.appo.clinicID == 23 ||
widget.appo.clinicID == 253 ||
widget.appo.clinicID == 265 ||
widget.appo.clinicID == 134 ||
widget.appo.clinicID == 253 ||
widget.appo.isExecludeDoctor! ||
widget.appo.isLiveCareAppointment!) {
_tabController!.index = _tabController!.previousIndex; _tabController!.index = _tabController!.previousIndex;
AppointmentDetails.showFooterButton = false; AppointmentDetails.showFooterButton = false;
} else { // if (widget.appo.clinicID == 17 ||
AppointmentDetails.showFooterButton = true; // widget.appo.clinicID == 47 ||
} // widget.appo.clinicID == 23 ||
// widget.appo.clinicID == 253 ||
// widget.appo.clinicID == 265 ||
// widget.appo.clinicID == 134 ||
// widget.appo.clinicID == 253 ||
// widget.appo.isExecludeDoctor! ||
// widget.appo.isLiveCareAppointment!) {
// _tabController!.index = _tabController!.previousIndex;
// AppointmentDetails.showFooterButton = false;
// } else {
// AppointmentDetails.showFooterButton = true;
// }
} }
}); });
}, },
@ -591,13 +593,13 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
} }
void openSchedule() { void openSchedule() {
Navigator.push( // Navigator.push(
context, // context,
FadePage( // FadePage(
page: SchedulePage( // page: SchedulePage(
doctorList: getDoctorObject(), // doctorList: getDoctorObject(),
appo: widget.appo, // appo: widget.appo,
))); // )));
} }
setTab() async { setTab() async {

27
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -672,19 +672,20 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
// changeIndex: changeCurrentTab, // changeIndex: changeCurrentTab,
// index: currentTab, // index: currentTab,
// ), // ),
floatingActionButtonLocation: FloatingActionButtonLocation.endContained, // floatingActionButtonLocation: FloatingActionButtonLocation.endContained,
floatingActionButton: // floatingActionButton:
(projectViewModel.havePrivilege(34) && currentTab == 0) // (projectViewModel.havePrivilege(34) && currentTab == 0)
? Padding( // ? Padding(x
padding: const EdgeInsets.only(bottom: 50.0, right: 10), // padding: const EdgeInsets.only(bottom: 50.0, right: 10),
child: FloatingButton( // child: FloatingButton(
elevation: true, // elevation: true,
onTap: () { // onTap: () {
changeCurrentTab(2); // changeCurrentTab(2);
}, // },
), // ),
) // )
: null); // : null);
);
} }
triggerRobot() { triggerRobot() {

Write Preview
Loading…
Cancel
Save