dev_3.3_blood_donation_CR
haroon amjad 2 years ago
parent 274d215291
commit eb4ca5695c

@ -156,6 +156,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
widget.appo.clinicID == 23 || widget.appo.clinicID == 23 ||
widget.appo.clinicID == 253 || widget.appo.clinicID == 253 ||
widget.appo.clinicID == 265 || widget.appo.clinicID == 265 ||
widget.appo.clinicID == 134 ||
widget.appo.isExecludeDoctor || widget.appo.isExecludeDoctor ||
widget.appo.isLiveCareAppointment) { widget.appo.isLiveCareAppointment) {
_tabController.index = _tabController.previousIndex; _tabController.index = _tabController.previousIndex;
@ -173,6 +174,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
widget.appo.clinicID == 47 || widget.appo.clinicID == 47 ||
widget.appo.clinicID == 265 || widget.appo.clinicID == 265 ||
widget.appo.clinicID == 253 || widget.appo.clinicID == 253 ||
widget.appo.clinicID == 134 ||
widget.appo.isExecludeDoctor || widget.appo.isExecludeDoctor ||
widget.appo.isLiveCareAppointment widget.appo.isLiveCareAppointment
? Tab( ? Tab(
@ -489,10 +491,10 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
minWidth: MediaQuery.of(context).size.width, minWidth: MediaQuery.of(context).size.width,
height: 40.0, height: 40.0,
child: CustomTextButton( child: CustomTextButton(
elevation: 0.0, elevation: 0.0,
backgroundColor: Colors.white, backgroundColor: Colors.white,
disabledForegroundColor: new Color(0xFFbcc2c4).withOpacity(0.38), disabledForegroundColor: new Color(0xFFbcc2c4).withOpacity(0.38),
disabledBackgroundColor: new Color(0xFFbcc2c4).withOpacity(0.12), disabledBackgroundColor: new Color(0xFFbcc2c4).withOpacity(0.12),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },

@ -73,7 +73,7 @@ class _AppointmentActionsState extends State<AppointmentActions> {
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (context, index) { itemBuilder: (context, index) {
// bool shouldEnable = ((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) || (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") || appoButtonsList[index].caller == "openReschedule"); // bool shouldEnable = ((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) || (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") || appoButtonsList[index].caller == "openReschedule");
bool shouldEnable = (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) && appoButtonsList[index].caller == "openReschedule") || bool shouldEnable = (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47 || widget.appo.clinicID == 134) && appoButtonsList[index].caller == "openReschedule") ||
(widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc")); (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc"));
return InkWell( return InkWell(
onTap: shouldEnable onTap: shouldEnable

@ -12,6 +12,7 @@ import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/anicllary-orders/ancillary_order_list_model.dart'; import 'package:diplomaticquarterapp/models/anicllary-orders/ancillary_order_list_model.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart';
import 'package:diplomaticquarterapp/pages/Blood/blood_donation_appointment_terms_conditions.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/QRCode.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/QRCode.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart';
import 'package:diplomaticquarterapp/pages/MyAppointments/AppointmentDetails.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/AppointmentDetails.dart';
@ -555,6 +556,9 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
case 30: case 30:
getAppoQR(context, appo); getAppoQR(context, appo);
break; break;
case 40:
openInstructions(appo);
break;
case 50: case 50:
confirmAppointment(appo); confirmAppointment(appo);
break; break;
@ -566,6 +570,12 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
} }
} }
openInstructions(AppoitmentAllHistoryResultList appo) {
if (appo.clinicID == 134) {
Navigator.of(context).push(FadePage(page: BloodDonationAppointmentTermsConditions()));
}
}
Color getNextActionButtonColor(nextAction) { Color getNextActionButtonColor(nextAction) {
switch (nextAction) { switch (nextAction) {
case 0: case 0:
@ -835,7 +845,7 @@ class _ToDoState extends State<ToDo> with SingleTickerProviderStateMixin {
}); });
} }
dataLoaded = true; dataLoaded = true;
if(widget.isFromMyAppointments) { if (widget.isFromMyAppointments) {
getPatientShare(context, widget.appointment); getPatientShare(context, widget.appointment);
} }
}); });

@ -76,9 +76,9 @@ class DoctorHeader extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (_speciality.isNotEmpty) if (_speciality != null && _speciality.isNotEmpty)
Text( Text(
_speciality, _speciality != "null" ? _speciality : "",
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12),
), ),
headerModel.invoiceNo.isNotEmpty ? MyRichText(TranslationBase.of(context).invoiceNo + ":", headerModel.invoiceNo, projectViewModel.isArabic) : Container(), headerModel.invoiceNo.isNotEmpty ? MyRichText(TranslationBase.of(context).invoiceNo + ":", headerModel.invoiceNo, projectViewModel.isArabic) : Container(),

Loading…
Cancel
Save