From 69ad659c072d2679c21e4b7ee7e065fb5c00aa3f Mon Sep 17 00:00:00 2001 From: yaso Date: Tue, 12 Nov 2024 11:05:20 +0200 Subject: [PATCH] show business mane in appointment --- .../builder/build_appointment_list.dart | 214 +----------------- 1 file changed, 5 insertions(+), 209 deletions(-) diff --git a/Frontend/patient_manager/lib/mih_packages/appointment/builder/build_appointment_list.dart b/Frontend/patient_manager/lib/mih_packages/appointment/builder/build_appointment_list.dart index fcd0b702..07dce211 100644 --- a/Frontend/patient_manager/lib/mih_packages/appointment/builder/build_appointment_list.dart +++ b/Frontend/patient_manager/lib/mih_packages/appointment/builder/build_appointment_list.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:patient_manager/mih_apis/mih_api_calls.dart'; import 'package:patient_manager/mih_components/mih_pop_up_messages/mih_warning_message.dart'; import 'package:patient_manager/mih_env/env.dart'; import 'package:patient_manager/main.dart'; @@ -37,47 +38,11 @@ class _BuildPatientsListState extends State { // var expireyDate = DateTime.parse(widget.patientQueue[index].revoke_date); line234 += - "Name: ${widget.patientQueue[index].first_name} ${widget.patientQueue[index].last_name}\nID No.: ${widget.patientQueue[index].id_no}\nMedical Aid No: "; - if (widget.patientQueue[index].medical_aid_no == "") { - line234 += "No Medical Aid"; - } else { - // subtitle += - // "\nMedical Aid No: "; - line234 += widget.patientQueue[index].medical_aid_no; - } + "Office: ${widget.patientQueue[index].business_name.toUpperCase()}"; - // String line5 = "\nAccess Request: "; - // String access = ""; - // if (expireyDate.isBefore(nowDate) && - // widget.patientQueue[index].access != "cacelled") { - // access += "EXPIRED"; - // } else { - // access += widget.patientQueue[index].access.toUpperCase(); - // } - // TextSpan accessWithColour; - // if (access == "APPROVED") { - // accessWithColour = TextSpan( - // text: access, - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.successColor())); - // } else if (access == "PENDING") { - // accessWithColour = TextSpan( - // text: access, - // style: TextStyle( - // color: - // MzanziInnovationHub.of(context)!.theme.messageTextColor())); - // } else { - // accessWithColour = TextSpan( - // text: access, - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.errorColor())); - // } - // String line6 = ""; - // line6 += - // "\nAccess Expiration date: ${widget.patientQueue[index].revoke_date.substring(0, 16).replaceAll("T", " ")}"; return ListTile( title: Text( - "Appointment: $title", + "Time: $title", style: TextStyle( color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), ), @@ -93,52 +58,7 @@ class _BuildPatientsListState extends State { // ] ), ), - // Text( - // subtitle, - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // ), - // ), - onTap: () { - // var todayDate = DateTime.now(); - // var revokeDate = DateTime.parse(widget.patientQueue[index].revoke_date); - // // print( - // // "Todays: $todayDate\nRevoke Date: $revokeDate\nHas revoke date passed: ${revokeDate.isBefore(todayDate)}"); - // if (revokeDate.isBefore(todayDate)) { - // expiredAccessWarning(); - // } else if (widget.patientQueue[index].access == "approved") { - // viewConfirmationPopUp(index); - // // Patient selectedPatient; - // // fetchPatients(widget.patientQueue[index].app_id).then( - // // (result) { - // // setState(() { - // // selectedPatient = result; - // // Navigator.of(context).pushNamed('/patient-manager/patient', - // // arguments: PatientViewArguments( - // // widget.signedInUser, - // // selectedPatient, - // // widget.businessUser, - // // widget.business, - // // "business", - // // )); - // // }); - // // }, - // // ); - // } else if (widget.patientQueue[index].access == "declined") { - // accessDeclinedWarning(); - // } else if (widget.patientQueue[index].access == "cancelled") { - // appointmentCancelledWarning(); - // } else { - //viewConfirmationPopUp(index); - //noAccessWarning(); - // } - }, - //leading: getExtendAccessButton(access), - //trailing: getExtendAccessButton(access, index), - // Icon( - // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // ), + onTap: () {}, ); } @@ -150,131 +70,6 @@ class _BuildPatientsListState extends State { } } - // Widget getExtendAccessButton(String accessType, int index) { - // if (isAccessExpired(accessType)) { - // return IconButton( - // icon: const Icon(Icons.cached), - // onPressed: () { - // setState(() { - // daysExtensionController.text = counter.toString(); - // }); - // reapplyForAccess(index); - // }, - // ); - // } else { - // return Icon( - // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // ); - // } - // } - - // void reapplyForAccess(int index) { - // showDialog( - // context: context, - // barrierDismissible: false, - // builder: (context) => MIHWindow( - // fullscreen: false, - // windowTitle: "Extend Access", - // windowTools: const [], - // onWindowTapClose: () { - // Navigator.pop(context); - // }, - // windowBody: [ - // Text( - // "Current Expiration Date : ${widget.patientQueue[index].revoke_date.replaceAll("T", " ")}", - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // fontSize: 15, - // fontWeight: FontWeight.normal, - // ), - // ), - // const SizedBox(height: 5), - // Text( - // "Select the number of days you would like to extend the access by.", - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // fontSize: 15, - // fontWeight: FontWeight.normal, - // ), - // ), - // const SizedBox(height: 5), - // Text( - // "Once you click \"Apply\", an access review request will be triggered to the patient.", - // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // fontSize: 15, - // fontWeight: FontWeight.normal, - // ), - // ), - // const SizedBox(height: 30), - // Row( - // mainAxisAlignment: MainAxisAlignment.center, - // children: [ - // IconButton.filled( - // onPressed: () { - // if (counter > 0) { - // counter--; - // setState(() { - // daysExtensionController.text = counter.toString(); - // }); - // } - // }, - // icon: const Icon(Icons.remove), - // ), - // const SizedBox(width: 15), - // SizedBox( - // width: 100, - // child: MIHTextField( - // controller: daysExtensionController, - // hintText: "Days", - // editable: false, - // required: true, - // ), - // ), - // const SizedBox(width: 15), - // IconButton.filled( - // onPressed: () { - // counter++; - // setState(() { - // daysExtensionController.text = counter.toString(); - // }); - // }, - // icon: const Icon(Icons.add), - // ), - // ], - // ), - // const SizedBox(height: 30), - // SizedBox( - // width: 300, - // height: 50, - // child: MIHButton( - // onTap: () { - // print( - // "Revoke Date (String): ${widget.patientQueue[index].revoke_date}"); - // var revokeDate = DateTime.parse(widget - // .patientQueue[index].revoke_date - // .replaceAll("T", " ")); - // var newRevokeDate = revokeDate.add( - // Duration(days: int.parse(daysExtensionController.text))); - // print("Revoke Date (DateTime): $revokeDate"); - // print("New Revoke Date (DateTime): $newRevokeDate"); - // print( - // "${widget.business!.Name} would like to extend the access expirey date for your appointment on the ${widget.patientQueue[index].date_time}.\nNew Expirey Date: $revokeDate", - // ); - // extendAccessAPICall(index, "$newRevokeDate"); - // }, - // buttonText: "Apply", - // buttonColor: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), - // ), - // ), - // ], - // ), - // ); - // } - void noAccessWarning() { showDialog( context: context, @@ -333,6 +128,7 @@ class _BuildPatientsListState extends State { itemBuilder: (context, index) { //final patient = widget.patients[index].id_no.contains(widget.searchString); //print(index); + return displayQueue(index); }, );