From 6c0debaf5e6543ea20f15e6dc6a6854485888655 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 21 May 2024 15:04:27 +0300 Subject: [PATCH 01/76] fixes --- lib/core/service/patient/LiveCarePatientServices.dart | 6 +++--- pubspec.yaml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/core/service/patient/LiveCarePatientServices.dart b/lib/core/service/patient/LiveCarePatientServices.dart index 9a3079f3..2ee18a16 100644 --- a/lib/core/service/patient/LiveCarePatientServices.dart +++ b/lib/core/service/patient/LiveCarePatientServices.dart @@ -60,9 +60,9 @@ class LiveCarePatientServices extends BaseService { } }); - removedPatientList.forEach((element) { - _patientList.remove(element); - }); + // removedPatientList.forEach((element) { + // _patientList.remove(element); + // }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/pubspec.yaml b/pubspec.yaml index 086f8a89..5b904af2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -130,6 +130,8 @@ dependencies: flutter_math_fork: ^0.7.2 + flutter_zoom_videosdk: ^1.10.11 + dart_jsonwebtoken: ^2.14.0 dependency_overrides: From 9fb6997e1d7650de92eb0c12a4dd4a3bcc695b5a Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 22 May 2024 17:06:25 +0300 Subject: [PATCH 02/76] updates & fixes --- lib/config/config.dart | 4 +- lib/core/model/radiology/final_radiology.dart | 4 +- .../insurance_approval_screen_patient.dart | 1 + .../patients/insurance_approvals_details.dart | 1099 +++++++---------- .../profile/diagnosis/diagnosis_screen.dart | 2 +- .../profile/lab_result/labs_home_page.dart | 2 +- .../prescription/new_prescriptions_page.dart | 2 +- .../shared/loader/gif_loader_container.dart | 3 +- pubspec.yaml | 6 +- 9 files changed, 448 insertions(+), 675 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index e7423937..3b502940 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -7,11 +7,11 @@ const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://webservices.hmg.com/'; +// const BASE_URL = 'https://webservices.hmg.com/'; // const BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; //Vida Plus URL diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 7149ff2f..9a14b2d8 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -45,7 +45,7 @@ class FinalRadiology { bool? isRadMedicalReport; bool? isLiveCareAppodynamicment; bool? isRecordFromVidaPlus; - String? invoiceType; + dynamic invoiceType; FinalRadiology( {this.setupID, @@ -105,7 +105,7 @@ class FinalRadiology { doctorID = json['DoctorID']; clinicID = json['ClinicID']; orderDate = AppDateUtils.convertStringToDate(json['OrderDate']); - reportDate = AppDateUtils.convertStringToDate(json['ReportDate']); + reportDate = AppDateUtils.convertStringToDate(json['ReadOn']); reportData = json['ReportData']; imageURL = json['ImageURL']; procedureID = json['ProcedureID']; diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index 1c672582..302b0009 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -185,6 +185,7 @@ class _InsuranceApprovalScreenNewState '', branch2: model .insuranceApproval[index].projectName!, + onTap: (){}, ), ), ), diff --git a/lib/screens/patients/insurance_approvals_details.dart b/lib/screens/patients/insurance_approvals_details.dart index 2e9f0099..1b2e31e1 100644 --- a/lib/screens/patients/insurance_approvals_details.dart +++ b/lib/screens/patients/insurance_approvals_details.dart @@ -38,7 +38,7 @@ class _InsuranceApprovalsDetailsState extends State { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; + // final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; return BaseView( onModelReady: (model) => model.insuranceApprovalInPatient.length == 0 @@ -48,676 +48,472 @@ class _InsuranceApprovalsDetailsState extends State { ? (model) => model.getInsuranceApproval(patient, appointmentNo: patient!.appointmentNo, projectId: patient!.projectId) : (model) => model.getInsuranceApproval(patient) : null, - builder: (BuildContext context, InsuranceViewModel model, Widget? child) => - AppScaffold( - isShowAppBar: true, - baseViewModel: model, - appBar: PatientProfileAppBar(patient!), - body: patient!.admissionNo != null - ? SingleChildScrollView( - child: Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ServiceTitle( - title: TranslationBase.of(context).insurance22, - subTitle: TranslationBase.of(context).approvals22, - ), - Container( - margin: EdgeInsets.all(10), - decoration: BoxDecoration( - border: Border.all( - width: 0.5, - color: Colors.white, - ), - borderRadius: BorderRadius.all( - Radius.circular(15.0), - ), - color: Colors.white), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( + builder: (BuildContext context, InsuranceViewModel model, Widget? child) => AppScaffold( + isShowAppBar: true, + baseViewModel: model, + appBar: PatientProfileAppBar(patient!), + body: patient!.admissionNo != null + ? SingleChildScrollView( + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ServiceTitle( + title: TranslationBase.of(context).insurance22, + subTitle: TranslationBase.of(context).approvals22, + ), + Container( + margin: EdgeInsets.all(10), + decoration: BoxDecoration( + border: Border.all( + width: 0.5, + color: Colors.white, + ), + borderRadius: BorderRadius.all( + Radius.circular(15.0), + ), + color: Colors.white), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( children: [ - Row( - children: [ - AppText( - model - .insuranceApprovalInPatient[ - indexInsurance] - .approvalStatusDescption != - null - ? model - .insuranceApprovalInPatient[ - indexInsurance] - .approvalStatusDescption ?? - "" - : "", - color: model - .insuranceApprovalInPatient[ - indexInsurance] - .approvalStatusDescption != - null - ? "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == - "Approved" || - "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == - "تمت الموافقة" - ? AppGlobal.appGreenColor - : Color(0xffD02127) - : Color(0xffD02127), - letterSpacing: -0.4, - fontWeight: FontWeight.w600, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.7, - ), - ], - ), - Row( - children: [ - AppText( - model - .insuranceApprovalInPatient[ - indexInsurance] - .doctorName! - .toUpperCase(), - color: Color(0xff2E303A), - fontSize: 16, - letterSpacing: -0.64, - fontWeight: FontWeight.w600, - ) - ], + AppText( + model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption != null + ? model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption ?? "" + : "", + color: model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption != null + ? "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == "Approved" || + "${model.insuranceApprovalInPatient[indexInsurance].approvalStatusDescption}" == "تمت الموافقة" + ? AppGlobal.appGreenColor + : Color(0xffD02127) + : Color(0xffD02127), + letterSpacing: -0.4, + fontWeight: FontWeight.w600, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7, ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: Row( + ], + ), + Row( + children: [ + AppText( + model.insuranceApprovalInPatient[indexInsurance].doctorName!.toUpperCase(), + color: Color(0xff2E303A), + fontSize: 16, + letterSpacing: -0.64, + fontWeight: FontWeight.w600, + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Row( + children: [ + Column( children: [ - Column( - children: [ - Container( - height: MediaQuery.of(context) - .size - .height * - 0.065, - width: MediaQuery.of(context) - .size - .height * - 0.065, - child: CircleAvatar( - radius: SizeConfig - .imageSizeMultiplier! * - 12, - // radius: (52) - child: ClipRRect( - borderRadius: - BorderRadius.circular( - 50), - child: Image.network( - model - .insuranceApprovalInPatient[ - indexInsurance] - .doctorImage!, - fit: BoxFit.fill, - width: 700, - ), - ), - backgroundColor: - Colors.transparent, + Container( + height: MediaQuery.of(context).size.height * 0.065, + width: MediaQuery.of(context).size.height * 0.065, + child: CircleAvatar( + radius: SizeConfig.imageSizeMultiplier! * 12, + // radius: (52) + child: ClipRRect( + borderRadius: BorderRadius.circular(50), + child: Image.network( + model.insuranceApprovalInPatient[indexInsurance].doctorImage!, + fit: BoxFit.fill, + width: 700, ), ), - ], - ), - Expanded( - child: Padding( - padding: - const EdgeInsets.symmetric( - horizontal: 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - //mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox( - height: 25.0, - ), - CustomRow( - label: TranslationBase.of( - context) - .clinic + - ": ", - value: model - .insuranceApprovalInPatient[ - indexInsurance] - .clinicName!, - ), - CustomRow( - label: TranslationBase.of( - context) - .approvalNo + - ": ", - value: model - .insuranceApprovalInPatient[ - indexInsurance] - .approvalNo - .toString(), - ), - CustomRow( - label: 'Unused Count:', - value: model - .insuranceApprovalInPatient[ - indexInsurance] - .unUsedCount - .toString(), - ), - CustomRow( - label: TranslationBase.of( - context) - .companyName + - ": ", - value: 'Sample'), - CustomRow( - label: TranslationBase.of( - context) - .receiptOn + - ": ", - value: - '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn ?? ""), isArabic: projectViewModel.isArabic)}'), - CustomRow( - label: TranslationBase.of( - context) - .expiryDate + - ": ", - value: - '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate ?? ""), isArabic: projectViewModel.isArabic)}'), - ], - ), + backgroundColor: Colors.transparent, ), ), ], ), - ), - SizedBox( - height: 20.0, - ), - Container( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: Row( - children: [ - Expanded( - child: AppText( - TranslationBase.of(context) - .procedure, - fontWeight: FontWeight.w600, - color: Color(0xff2E303A), - letterSpacing: -0.48, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.9, - ), - ), - Expanded( - child: AppText( - TranslationBase.of(context) - .status, - fontWeight: FontWeight.w600, - color: Color(0xff2E303A), - letterSpacing: -0.48, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.9, - ), - ), - Expanded( - child: AppText( - TranslationBase.of(context) - .usageStatus, - fontWeight: FontWeight.w600, - color: Color(0xff2E303A), - letterSpacing: -0.48, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.9, - ), - ) - ], - ), - ), - Divider( - color: Colors.black, + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + //mainAxisAlignment: MainAxisAlignment.center, + children: [ + SizedBox( + height: 25.0, + ), + CustomRow( + label: TranslationBase.of(context).clinic + ": ", + value: model.insuranceApprovalInPatient[indexInsurance].clinicName!, + ), + CustomRow( + label: TranslationBase.of(context).approvalNo + ": ", + value: model.insuranceApprovalInPatient[indexInsurance].approvalNo.toString(), + ), + CustomRow( + label: 'Unused Count:', + value: model.insuranceApprovalInPatient[indexInsurance].unUsedCount.toString(), + ), + CustomRow(label: TranslationBase.of(context).companyName + ": ", value: model.insuranceApprovalInPatient[indexInsurance].companyName.toString()), + CustomRow( + label: TranslationBase.of(context).receiptOn + ": ", + value: + '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].receiptOn ?? ""), isArabic: projectViewModel.isArabic)}'), + CustomRow( + label: TranslationBase.of(context).expiryDate + ": ", + value: + '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApprovalInPatient[indexInsurance].expiryDate ?? ""), isArabic: projectViewModel.isArabic)}'), + ], ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: ListView.builder( - shrinkWrap: true, - physics: ScrollPhysics(), - itemCount: model - .insuranceApprovalInPatient[ - indexInsurance] - .apporvalDetails! - .length, - itemBuilder: - (BuildContext context, - int index) { - return Container( - child: Column( + ), + ), + ], + ), + ), + SizedBox( + height: 20.0, + ), + Container( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Row( + children: [ + Expanded( + child: AppText( + TranslationBase.of(context).procedure, + fontWeight: FontWeight.w600, + color: Color(0xff2E303A), + letterSpacing: -0.48, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, + ), + ), + Expanded( + child: AppText( + TranslationBase.of(context).status, + fontWeight: FontWeight.w600, + color: Color(0xff2E303A), + letterSpacing: -0.48, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, + ), + ), + Expanded( + child: AppText( + TranslationBase.of(context).usageStatus, + fontWeight: FontWeight.w600, + color: Color(0xff2E303A), + letterSpacing: -0.48, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, + ), + ) + ], + ), + ), + Divider( + color: Colors.black, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: ListView.builder( + shrinkWrap: true, + physics: ScrollPhysics(), + itemCount: model.insuranceApprovalInPatient[indexInsurance].apporvalDetails!.length, + itemBuilder: (BuildContext context, int index) { + return Container( + child: Column( + children: [ + Row( children: [ - Row( - children: [ - Expanded( - child: Container( - child: AppText( - model - .insuranceApprovalInPatient[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.procedureName ?? - "", - textAlign: - TextAlign - .center, - fontSize: - SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.7, - letterSpacing: - -0.4, - color: Color( - 0xff575757), - fontWeight: - FontWeight - .w500, - ), - ), + Expanded( + child: Container( + child: AppText( + model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.procedureName ?? "", + textAlign: TextAlign.center, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7, + letterSpacing: -0.4, + color: Color(0xff575757), + fontWeight: FontWeight.w500, ), - Expanded( - child: Container( - child: AppText( - model - .insuranceApprovalInPatient[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.status ?? - "", - textAlign: - TextAlign - .center, - fontSize: - SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.7, - letterSpacing: - -0.4, - color: Color( - 0xff575757), - fontWeight: - FontWeight - .w500, - ), - ), - ), - Expanded( - child: Container( - child: AppText( - model - .insuranceApprovalInPatient[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.isInvoicedDesc ?? - "", - textAlign: - TextAlign - .center, - fontSize: - SizeConfig - .getTextMultiplierBasedOnWidth() * - 2.7, - letterSpacing: - -0.4, - color: Color( - 0xff575757), - fontWeight: - FontWeight - .w500, - ), - ), - ), - ], + ), ), - SizedBox( - width: 5, + Expanded( + child: Container( + child: AppText( + model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.status ?? "", + textAlign: TextAlign.center, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7, + letterSpacing: -0.4, + color: Color(0xff575757), + fontWeight: FontWeight.w500, + ), + ), ), - Divider( - color: Colors.black38, + Expanded( + child: Container( + child: AppText( + model.insuranceApprovalInPatient[indexInsurance]?.apporvalDetails![index]?.isInvoicedDesc ?? "", + textAlign: TextAlign.center, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.7, + letterSpacing: -0.4, + color: Color(0xff575757), + fontWeight: FontWeight.w500, + ), + ), ), ], ), - ); - }), - ), - ], + SizedBox( + width: 5, + ), + Divider( + color: Colors.black38, + ), + ], + ), + ); + }), ), - ), - ], + ], + ), ), - ), + ], ), - ], + ), ), - ), - ) - : SingleChildScrollView( - child: Container( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( + ], + ), + ), + ) + : SingleChildScrollView( + child: Container( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( children: [ - Row( - children: [ - AppText( - TranslationBase.of(context).insurance22, - fontSize: 15.0, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', - ), - ], - ), - Row( - children: [ - AppText( - TranslationBase.of(context).approvals22, - fontSize: 30.0, - fontWeight: FontWeight.w700, - ), - ], + AppText( + TranslationBase.of(context).insurance22, + fontSize: 15.0, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', ), ], ), - ), - Container( - margin: EdgeInsets.all(10), - decoration: BoxDecoration( - border: Border.all( - width: 0.5, - color: Colors.white, - ), - borderRadius: BorderRadius.all( - Radius.circular(15.0), + Row( + children: [ + AppText( + TranslationBase.of(context).approvals22, + fontSize: 30.0, + fontWeight: FontWeight.w700, ), - color: Colors.white), - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Column( + ], + ), + ], + ), + ), + Container( + margin: EdgeInsets.all(10), + decoration: BoxDecoration( + border: Border.all( + width: 0.5, + color: Colors.white, + ), + borderRadius: BorderRadius.all( + Radius.circular(15.0), + ), + color: Colors.white), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( children: [ - Row( - children: [ - AppText( - model - .insuranceApproval[ - indexInsurance] - .approvalStatusDescption != - null - ? model - .insuranceApproval[ - indexInsurance] - .approvalStatusDescption ?? - "" - : "", - color: model - .insuranceApproval[ - indexInsurance] - .approvalStatusDescption != - null - ? "${model.insuranceApproval[indexInsurance].approvalStatusDescption}" == - "Approved" - ? AppGlobal.appGreenColor - : Color(0xffD02127) - : Color(0xffD02127), - ), - ], + AppText( + model.insuranceApproval[indexInsurance].approvalStatusDescption != null ? model.insuranceApproval[indexInsurance].approvalStatusDescption ?? "" : "", + color: model.insuranceApproval[indexInsurance].approvalStatusDescption != null + ? "${model.insuranceApproval[indexInsurance].approvalStatusDescption}" == "Approved" + ? AppGlobal.appGreenColor + : Color(0xffD02127) + : Color(0xffD02127), ), - Row( - children: [ - AppText( - model - .insuranceApproval[indexInsurance] - .doctorName! - .toUpperCase(), - color: Colors.black, - fontSize: 18, - fontWeight: FontWeight.bold, - ) - ], - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: Row( + ], + ), + Row( + children: [ + AppText( + model.insuranceApproval[indexInsurance].doctorName!.toUpperCase(), + color: Colors.black, + fontSize: 18, + fontWeight: FontWeight.bold, + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Row( + children: [ + Column( children: [ - Column( - children: [ - Container( - height: 85.0, - width: 85.0, - child: CircleAvatar( - radius: SizeConfig - .imageSizeMultiplier! * - 12, - // radius: (52) - child: ClipRRect( - borderRadius: - BorderRadius.circular( - 50), - child: Image.network( - model - .insuranceApproval[ - indexInsurance] - .doctorImage!, - fit: BoxFit.fill, - width: 700, - ), - ), - backgroundColor: - Colors.transparent, + Container( + height: 85.0, + width: 85.0, + child: CircleAvatar( + radius: SizeConfig.imageSizeMultiplier! * 12, + // radius: (52) + child: ClipRRect( + borderRadius: BorderRadius.circular(50), + child: Image.network( + model.insuranceApproval[indexInsurance].doctorImage!, + fit: BoxFit.fill, + width: 700, ), ), - ], + backgroundColor: Colors.transparent, + ), ), - Expanded( - child: Padding( - padding: - const EdgeInsets.symmetric( - horizontal: 8.0), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - //mainAxisAlignment: MainAxisAlignment.center, + ], + ), + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + //mainAxisAlignment: MainAxisAlignment.center, + children: [ + SizedBox( + height: 25.0, + ), + Row( children: [ - SizedBox( - height: 25.0, + AppText( + TranslationBase.of(context).clinic + ": ", + color: Colors.grey[500], + fontSize: 14, ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .clinic + - ": ", - color: Colors.grey[500], - fontSize: 14, - ), - Expanded( - child: AppText( - model - .insuranceApproval[ - indexInsurance] - .clinicName!, - fontSize: 14, - ), - ) - ], + Expanded( + child: AppText( + model.insuranceApproval[indexInsurance].clinicName!, + fontSize: 14, + ), + ) + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).approvalNo + ": ", + color: Colors.grey[500], + fontSize: 14, ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .approvalNo + - ": ", - color: Colors.grey[500], - fontSize: 14, - ), - AppText( - model - .insuranceApproval[ - indexInsurance] - .approvalNo - .toString(), - fontSize: 14, - ) - ], + AppText( + model.insuranceApproval[indexInsurance].approvalNo.toString(), + fontSize: 14, + ) + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).unusedCount + ": ", + color: Colors.grey[500], + fontSize: 14, ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .unusedCount + - ": ", - color: Colors.grey[500], - fontSize: 14, - ), - AppText( - model - .insuranceApproval[ - indexInsurance] - .unUsedCount - .toString(), - fontSize: 14, - ) - ], + AppText( + model.insuranceApproval[indexInsurance].unUsedCount.toString(), + fontSize: 14, + ) + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).companyName + ": ", + color: Colors.grey[500], ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .companyName + - ": ", - color: Colors.grey[500], - ), - AppText('Sample') - ], + AppText('Sample') + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).receiptOn + ": ", + color: Colors.grey[500], ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .receiptOn + - ": ", - color: Colors.grey[500], - ), - Expanded( - child: AppText( - '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn!), isArabic: projectViewModel.isArabic)}', - color: Colors.black, - fontWeight: - FontWeight.w600, - ), - ), - ], + Expanded( + child: AppText( + '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].rceiptOn!), isArabic: projectViewModel.isArabic)}', + color: Colors.black, + fontWeight: FontWeight.w600, + ), ), - Row( - children: [ - AppText( - TranslationBase.of( - context) - .expiryDate + - ": ", - color: Colors.grey[500], - ), - if (model - .insuranceApproval[ - indexInsurance] - .expiryDate != - null) - AppText( - '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate!), isArabic: projectViewModel.isArabic)}', - color: Colors.black, - fontWeight: - FontWeight.w600, - ), - ], + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).expiryDate + ": ", + color: Colors.grey[500], ), + if (model.insuranceApproval[indexInsurance].expiryDate != null) + AppText( + '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromServerFormat(model.insuranceApproval[indexInsurance].expiryDate!), isArabic: projectViewModel.isArabic)}', + color: Colors.black, + fontWeight: FontWeight.w600, + ), ], ), - ), + ], ), - ], + ), ), - ), - SizedBox( - height: 20.0, - ), - Container( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: Row( - children: [ - Expanded( - child: AppText( - TranslationBase.of(context) - .procedure, - fontWeight: FontWeight.w700, - ), - ), - Expanded( - child: AppText( - TranslationBase.of(context) - .status, - fontWeight: FontWeight.w700, - ), - ), - Expanded( - child: AppText( - TranslationBase.of(context) - .usageStatus, - fontWeight: FontWeight.w700, - ), - ) - ], + ], + ), + ), + SizedBox( + height: 20.0, + ), + Container( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: Row( + children: [ + Expanded( + child: AppText( + TranslationBase.of(context).procedure, + fontWeight: FontWeight.w700, + ), ), - ), - Divider( - color: Colors.black, - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0), - child: (model.insuranceApproval[indexInsurance].apporvalDetails != null && model.insuranceApproval[indexInsurance].apporvalDetails!.isNotEmpty) ? ListView.builder( + Expanded( + child: AppText( + TranslationBase.of(context).status, + fontWeight: FontWeight.w700, + ), + ), + Expanded( + child: AppText( + TranslationBase.of(context).usageStatus, + fontWeight: FontWeight.w700, + ), + ) + ], + ), + ), + Divider( + color: Colors.black, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0), + child: (model.insuranceApproval[indexInsurance].apporvalDetails != null && model.insuranceApproval[indexInsurance].apporvalDetails!.isNotEmpty) + ? ListView.builder( shrinkWrap: true, physics: ScrollPhysics(), - itemCount: model - .insuranceApproval[ - indexInsurance] - .apporvalDetails! - .length, - itemBuilder: - (BuildContext context, - int index) { + itemCount: model.insuranceApproval[indexInsurance].apporvalDetails!.length, + itemBuilder: (BuildContext context, int index) { return Container( child: Column( children: [ @@ -726,48 +522,24 @@ class _InsuranceApprovalsDetailsState extends State { Expanded( child: Container( child: AppText( - model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.procedureName ?? - "", - textAlign: - TextAlign - .start, + model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.procedureName ?? "", + textAlign: TextAlign.start, ), ), ), Expanded( child: Container( child: AppText( - model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.status ?? - "", - textAlign: - TextAlign - .center, + model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.status ?? "", + textAlign: TextAlign.center, ), ), ), Expanded( child: Container( child: AppText( - model - .insuranceApproval[ - indexInsurance] - ?.apporvalDetails![ - index] - ?.isInvoicedDesc ?? - "", - textAlign: - TextAlign - .center, + model.insuranceApproval[indexInsurance]?.apporvalDetails![index]?.isInvoicedDesc ?? "", + textAlign: TextAlign.center, ), ), ), @@ -782,19 +554,20 @@ class _InsuranceApprovalsDetailsState extends State { ], ), ); - }) : NoData(), - ), - ], + }) + : NoData(), ), - ), - ], + ], + ), ), - ), + ], ), - ], + ), ), - ), - )), + ], + ), + ), + )), ); } } diff --git a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart index 2bf1d249..f7b89bb4 100644 --- a/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart +++ b/lib/screens/patients/profile/diagnosis/diagnosis_screen.dart @@ -34,7 +34,7 @@ class _ProgressNoteState extends State { {bool isLocalBusy = false}) async { final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; PatiantInformtion patient = routeArgs['patient']; - String type = await sharedPref.getString(SLECTED_PATIENT_TYPE); + String type = await sharedPref.getString(SLECTED_PATIENT_TYPE) == '0' ? "2" : "1"; print(type); GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel = diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 463a971c..a234e9e1 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -182,7 +182,7 @@ class _LabsHomePageState extends State { ), ), ), - if (model.patientLabOrdersList.isEmpty && (patient!.patientStatusType != 43 && patient!.patientStatusType !=null)) + if (model.patientLabOrdersList.isEmpty && patient!.patientStatusType != 43) Center( child: ErrorMessage( error: TranslationBase.of(context).noDataAvailable, diff --git a/lib/screens/prescription/new_prescriptions_page.dart b/lib/screens/prescription/new_prescriptions_page.dart index ddd622c2..e7facba7 100644 --- a/lib/screens/prescription/new_prescriptions_page.dart +++ b/lib/screens/prescription/new_prescriptions_page.dart @@ -28,7 +28,7 @@ class NewPrescriptionsPage extends StatelessWidget { return BaseView( onModelReady: (model) async { await model.getPrescriptionListNew( - mrn: patient.patientMRN, appNo: patient.appointmentNo); + mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo); await model.isPrincipalCovered(patient: patient); }, builder: (_, model, w) => AppScaffold( diff --git a/lib/widgets/shared/loader/gif_loader_container.dart b/lib/widgets/shared/loader/gif_loader_container.dart index 8f315d6a..3871892f 100644 --- a/lib/widgets/shared/loader/gif_loader_container.dart +++ b/lib/widgets/shared/loader/gif_loader_container.dart @@ -14,8 +14,7 @@ class _GifLoaderContainerState extends State with TickerProv controller1 = GifController(vsync: this); WidgetsBinding.instance.addPostFrameCallback((_) { - // controller1.repeat( - // min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true); + controller1.repeat(period: Duration(milliseconds: 750), reverse: true); }); super.initState(); } diff --git a/pubspec.yaml b/pubspec.yaml index 5b904af2..c0ca7a34 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -80,7 +80,7 @@ dependencies: #GIF image # flutter_gifimage: ^1.0.1 - flutter_gif: ^0.0.4 +# flutter_gif: ^0.0.4 gif: ^2.3.0 #Autocomplete TextField autocomplete_textfield: ^2.0.1 @@ -130,8 +130,8 @@ dependencies: flutter_math_fork: ^0.7.2 - flutter_zoom_videosdk: ^1.10.11 - dart_jsonwebtoken: ^2.14.0 +# flutter_zoom_videosdk: ^1.10.11 +# dart_jsonwebtoken: ^2.14.0 dependency_overrides: From c13d7a08a089d5e5b3a44217d95a22013c27af86 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Mon, 19 Aug 2024 10:10:38 +0300 Subject: [PATCH 03/76] logout issue fixed. --- lib/client/base_app_client.dart | 2 +- lib/core/viewModel/authentication_view_model.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 7c06836d..67917cb0 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -44,7 +44,7 @@ class BaseAppClient { if (body == null || body['DoctorID'] == null) { body!['DoctorID'] = doctorProfile.doctorID; } - if (body['DoctorID'] == "") body['DoctorID'] = null; + if (body['DoctorID'] == "") body['DoctorID'] = doctorProfile.doctorID; // changed from null; because create update episode not working if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID; if (body['ProjectID'] == null) { body['ProjectID'] = doctorProfile.projectID; diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart index 28279db7..bd242a88 100644 --- a/lib/core/viewModel/authentication_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -101,7 +101,7 @@ class AuthenticationViewModel extends BaseViewModel { insertIMEIDetailsModel.vidaAuthTokenID = await sharedPref.getString(VIDA_AUTH_TOKEN_ID); insertIMEIDetailsModel.vidaRefreshTokenID = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); insertIMEIDetailsModel.password = userInfo.password; - insertIMEIDetailsModel.loginDoctorID = loggedUser != null ? loggedUser!.listMemberInformation![0].employeeID : user!.doctorID; + insertIMEIDetailsModel.loginDoctorID = loggedUser != null ? loggedUser!.listMemberInformation![0].employeeID : user!.editedBy; await _authService.insertDeviceImei(insertIMEIDetailsModel); if (_authService.hasError) { From 4af8a0a28f9916e529ec9800dbafd989fddad58f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 19 Aug 2024 12:22:58 +0300 Subject: [PATCH 04/76] update to stores version ID 9.1 --- lib/client/base_app_client.dart | 4 ++-- lib/config/config.dart | 2 +- lib/core/model/radiology/final_radiology.dart | 3 ++- .../insurance_approval_screen_patient.dart | 1 + .../prescription/new_prescriptions_page.dart | 24 +++++++++++-------- pubspec.yaml | 3 +-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 67917cb0..6888f1de 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -121,8 +121,8 @@ class BaseAppClient { // print("ProjectID :"); // print(body['ProjectID']); - debugPrint("URL : $url"); - debugPrint("Body : ${json.encode(body)}"); + // debugPrint("URL : $url"); + // debugPrint("Body : ${json.encode(body)}"); var asd = json.encode(body); var asd2; if (await Utils.checkConnection()) { diff --git a/lib/config/config.dart b/lib/config/config.dart index 3b502940..092ed2ae 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -317,7 +317,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 8.9; +const VERSION_ID = 9.1; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 9a14b2d8..fde1b4a3 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -141,7 +141,8 @@ class FinalRadiology { isRadMedicalReport = json['isRadMedicalReport']; isRecordFromVidaPlus = json['IsRecordFromVidaPlus']; invoiceType = json["InvoiceType"]; - } catch (e) { + } + catch (e) { print(e); } } diff --git a/lib/screens/patients/insurance_approval_screen_patient.dart b/lib/screens/patients/insurance_approval_screen_patient.dart index 302b0009..b2673ef4 100644 --- a/lib/screens/patients/insurance_approval_screen_patient.dart +++ b/lib/screens/patients/insurance_approval_screen_patient.dart @@ -91,6 +91,7 @@ class _InsuranceApprovalScreenNewState }, child: DoctorCardInsurance( patientOut: "In Patient", + onTap: (){}, profileUrl: model .insuranceApprovalInPatient[index] .doctorImage!, diff --git a/lib/screens/prescription/new_prescriptions_page.dart b/lib/screens/prescription/new_prescriptions_page.dart index e7facba7..d21b1cbe 100644 --- a/lib/screens/prescription/new_prescriptions_page.dart +++ b/lib/screens/prescription/new_prescriptions_page.dart @@ -27,9 +27,8 @@ class NewPrescriptionsPage extends StatelessWidget { bool isFromLiveCare = routeArgs['isFromLiveCare']; return BaseView( onModelReady: (model) async { - await model.getPrescriptionListNew( - mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo); - await model.isPrincipalCovered(patient: patient); + await model.getPrescriptionListNew(mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : int.parse(patient.appointmentNo.toString())); + await model.isPrincipalCovered(patient: patient); }, builder: (_, model, w) => AppScaffold( baseViewModel: model, @@ -48,8 +47,6 @@ class NewPrescriptionsPage extends StatelessWidget { SizedBox( height: 12, ), - - Padding( padding: const EdgeInsets.all(8.0), child: Column( @@ -62,11 +59,18 @@ class NewPrescriptionsPage extends StatelessWidget { ], ), ), - !model.isPrincipalCovered_ ? Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: Colors.red, textAlign: TextAlign.center, )) :SizedBox(), - SizedBox(height: 20,), - if ((patient.patientStatusType != null && - patient.patientStatusType == 43) || - (isFromLiveCare && patient.appointmentNo != null)) + !model.isPrincipalCovered_ + ? Center( + child: AppText( + TranslationBase.of(context).principalCoveredOrNot, + color: Colors.red, + textAlign: TextAlign.center, + )) + : SizedBox(), + SizedBox( + height: 20, + ), + if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null)) AddNewOrder( onTap: () { Navigator.push( diff --git a/pubspec.yaml b/pubspec.yaml index c0ca7a34..7737d33c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 4.3.5+1 +version: 1.4.14+1 environment: @@ -23,7 +23,6 @@ environment: #dependency_overrides: # intl: 0.17.0-nullsafety.2 - dependencies: flutter: sdk: flutter From b8bdee99a686027d826952a4a09cf5fe3df0757f Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Mon, 2 Sep 2024 11:54:29 +0300 Subject: [PATCH 05/76] referral click fixed, --- android/easypermissions/build.gradle | 52 ++ android/easypermissions/gradle.properties | 18 + android/easypermissions/proguard-rules.pro | 3 + .../src/main/AndroidManifest.xml | 14 + .../AfterPermissionGranted.java | 29 + .../easypermissions/AppSettingsDialog.java | 356 ++++++++++ .../AppSettingsDialogHolderActivity.java | 65 ++ .../easypermissions/EasyPermissions.java | 358 ++++++++++ .../easypermissions/PermissionRequest.java | 260 ++++++++ .../RationaleDialogClickListener.java | 77 +++ .../RationaleDialogConfig.java | 95 +++ .../RationaleDialogFragment.java | 113 ++++ .../RationaleDialogFragmentCompat.java | 97 +++ .../helper/ActivityPermissionHelper.java | 59 ++ .../AppCompatActivityPermissionsHelper.java | 37 ++ .../helper/BaseSupportPermissionsHelper.java | 45 ++ .../helper/LowApiPermissionsHelper.java | 47 ++ .../helper/PermissionHelper.java | 113 ++++ .../SupportFragmentPermissionHelper.java | 36 ++ .../easypermissions/helper/package-info.java | 4 + .../src/main/res/values/colors.xml | 7 + .../src/main/res/values/strings.xml | 8 + .../src/main/res/values/styles.xml | 19 + .../AppSettingsDialogTest.java | 186 ++++++ .../EasyPermissionsLowApiTest.java | 121 ++++ .../easypermissions/EasyPermissionsTest.java | 611 ++++++++++++++++++ .../RationaleDialogClickListenerTest.java | 134 ++++ .../testhelper/ActivityController.java | 45 ++ .../testhelper/FragmentController.java | 44 ++ .../testhelper/TestActivity.java | 40 ++ .../testhelper/TestAppCompatActivity.java | 50 ++ .../testhelper/TestFragment.java | 55 ++ .../TestSupportFragmentActivity.java | 47 ++ .../profile_medical_info_widget_search.dart | 28 +- 34 files changed, 3261 insertions(+), 12 deletions(-) create mode 100644 android/easypermissions/build.gradle create mode 100644 android/easypermissions/gradle.properties create mode 100644 android/easypermissions/proguard-rules.pro create mode 100644 android/easypermissions/src/main/AndroidManifest.xml create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/AfterPermissionGranted.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/PermissionRequest.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragmentCompat.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/ActivityPermissionHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/AppCompatActivityPermissionsHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/BaseSupportPermissionsHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/LowApiPermissionsHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/PermissionHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/SupportFragmentPermissionHelper.java create mode 100644 android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/package-info.java create mode 100644 android/easypermissions/src/main/res/values/colors.xml create mode 100644 android/easypermissions/src/main/res/values/strings.xml create mode 100644 android/easypermissions/src/main/res/values/styles.xml create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/AppSettingsDialogTest.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsLowApiTest.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsTest.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/RationaleDialogClickListenerTest.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/ActivityController.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/FragmentController.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestActivity.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestAppCompatActivity.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestFragment.java create mode 100644 android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestSupportFragmentActivity.java diff --git a/android/easypermissions/build.gradle b/android/easypermissions/build.gradle new file mode 100644 index 00000000..5c6af4bc --- /dev/null +++ b/android/easypermissions/build.gradle @@ -0,0 +1,52 @@ +apply plugin: 'com.android.library' + +// See: https://github.com/vanniktech/gradle-maven-publish-plugin/issues/206 +ext { + RELEASE_REPOSITORY_URL = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + SNAPSHOT_REPOSITORY_URL = "https://s01.oss.sonatype.org/content/repositories/snapshots/" +} + +apply plugin: 'com.vanniktech.maven.publish' + +android { + compileSdkVersion 30 + testOptions.unitTests.includeAndroidResources = true + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 30 + versionCode 1 + versionName "3.0.0" + } + + buildTypes { + debug { + testCoverageEnabled true + } + release { + minifyEnabled false + consumerProguardFiles 'proguard-rules.pro' + } + } + + testOptions { + unitTests { + includeAndroidResources = true + } + } + +} + +dependencies { + api "androidx.appcompat:appcompat:1.1.0" + api "androidx.annotation:annotation:1.1.0" + api "androidx.core:core:1.3.0" + api "androidx.fragment:fragment:1.2.5" + + testImplementation 'junit:junit:4.13' + testImplementation 'com.google.truth:truth:0.42' + testImplementation 'org.robolectric:robolectric:4.1' + testImplementation 'androidx.test:core:1.3.0-rc01' + testImplementation 'androidx.fragment:fragment-testing:1.2.5' + testImplementation 'org.mockito:mockito-core:2.23.4' +} diff --git a/android/easypermissions/gradle.properties b/android/easypermissions/gradle.properties new file mode 100644 index 00000000..3e0ef642 --- /dev/null +++ b/android/easypermissions/gradle.properties @@ -0,0 +1,18 @@ +GROUP=pub.devrel +POM_ARTIFACT_ID=easypermissions +VERSION_NAME=3.0.0 + +POM_NAME=EasyPermissions +POM_PACKAGING=aar + +POM_DESCRIPTION=A wrapper library for basic Android M system permissions logic + +POM_URL=https://github.com/googlesamples/easypermissions +POM_SCM_URL=https://github.com/googlesamples/easypermissions +POM_SCM_CONNECTION=https://github.com/googlesamples/easypermissions.git + +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo + +POM_DEVELOPER_NAME=Google diff --git a/android/easypermissions/proguard-rules.pro b/android/easypermissions/proguard-rules.pro new file mode 100644 index 00000000..e0ba183b --- /dev/null +++ b/android/easypermissions/proguard-rules.pro @@ -0,0 +1,3 @@ +-keepclassmembers class * { + @pub.devrel.easypermissions.AfterPermissionGranted ; +} diff --git a/android/easypermissions/src/main/AndroidManifest.xml b/android/easypermissions/src/main/AndroidManifest.xml new file mode 100644 index 00000000..16a209f6 --- /dev/null +++ b/android/easypermissions/src/main/AndroidManifest.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/AfterPermissionGranted.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AfterPermissionGranted.java new file mode 100644 index 00000000..09202a22 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AfterPermissionGranted.java @@ -0,0 +1,29 @@ +/* + * Copyright Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package pub.devrel.easypermissions; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface AfterPermissionGranted { + + int value(); + +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java new file mode 100644 index 00000000..4407e4fc --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java @@ -0,0 +1,356 @@ +package pub.devrel.easypermissions; + +import android.app.Activity; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.os.Parcel; +import android.os.Parcelable; +import android.text.TextUtils; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import androidx.annotation.StringRes; +import androidx.annotation.StyleRes; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + +/** + * Dialog to prompt the user to go to the app's settings screen and enable permissions. If the user + * clicks 'OK' on the dialog, they are sent to the settings screen. The result is returned to the + * Activity via {@see Activity#onActivityResult(int, int, Intent)}. + *

+ * Use the {@link Builder} to create and display a dialog. + */ +public class AppSettingsDialog implements Parcelable { + + private static final String TAG = "EasyPermissions"; + + public static final int DEFAULT_SETTINGS_REQ_CODE = 16061; + + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override + public AppSettingsDialog createFromParcel(Parcel in) { + return new AppSettingsDialog(in); + } + + @Override + public AppSettingsDialog[] newArray(int size) { + return new AppSettingsDialog[size]; + } + }; + + static final String EXTRA_APP_SETTINGS = "extra_app_settings"; + + @StyleRes + private final int mThemeResId; + private final String mRationale; + private final String mTitle; + private final String mPositiveButtonText; + private final String mNegativeButtonText; + private final int mRequestCode; + private final int mIntentFlags; + + private Object mActivityOrFragment; + private Context mContext; + + private AppSettingsDialog(Parcel in) { + mThemeResId = in.readInt(); + mRationale = in.readString(); + mTitle = in.readString(); + mPositiveButtonText = in.readString(); + mNegativeButtonText = in.readString(); + mRequestCode = in.readInt(); + mIntentFlags = in.readInt(); + } + + private AppSettingsDialog(@NonNull final Object activityOrFragment, + @StyleRes int themeResId, + @Nullable String rationale, + @Nullable String title, + @Nullable String positiveButtonText, + @Nullable String negativeButtonText, + int requestCode, + int intentFlags) { + setActivityOrFragment(activityOrFragment); + mThemeResId = themeResId; + mRationale = rationale; + mTitle = title; + mPositiveButtonText = positiveButtonText; + mNegativeButtonText = negativeButtonText; + mRequestCode = requestCode; + mIntentFlags = intentFlags; + } + + static AppSettingsDialog fromIntent(Intent intent, Activity activity) { + AppSettingsDialog dialog = intent.getParcelableExtra(AppSettingsDialog.EXTRA_APP_SETTINGS); + + // It's not clear how this could happen, but in the case that it does we should try + // to avoid a runtime crash and just use the default dialog. + // https://github.com/googlesamples/easypermissions/issues/278 + if (dialog == null) { + Log.e(TAG, "Intent contains null value for EXTRA_APP_SETTINGS: " + + "intent=" + intent + + ", " + + "extras=" + intent.getExtras()); + + dialog = new AppSettingsDialog.Builder(activity).build(); + } + + dialog.setActivityOrFragment(activity); + return dialog; + } + + private void setActivityOrFragment(Object activityOrFragment) { + mActivityOrFragment = activityOrFragment; + + if (activityOrFragment instanceof Activity) { + mContext = (Activity) activityOrFragment; + } else if (activityOrFragment instanceof Fragment) { + mContext = ((Fragment) activityOrFragment).getContext(); + } else { + throw new IllegalStateException("Unknown object: " + activityOrFragment); + } + } + + private void startForResult(Intent intent) { + if (mActivityOrFragment instanceof Activity) { + ((Activity) mActivityOrFragment).startActivityForResult(intent, mRequestCode); + } else if (mActivityOrFragment instanceof Fragment) { + ((Fragment) mActivityOrFragment).startActivityForResult(intent, mRequestCode); + } + } + + /** + * Display the built dialog. + */ + public void show() { + startForResult(AppSettingsDialogHolderActivity.createShowDialogIntent(mContext, this)); + } + + /** + * Show the dialog. {@link #show()} is a wrapper to ensure backwards compatibility + */ + AlertDialog showDialog(DialogInterface.OnClickListener positiveListener, + DialogInterface.OnClickListener negativeListener) { + AlertDialog.Builder builder; + if (mThemeResId != -1) { + builder = new AlertDialog.Builder(mContext, mThemeResId); + } else { + builder = new AlertDialog.Builder(mContext); + } + return builder + .setCancelable(false) + .setTitle(mTitle) + .setMessage(mRationale) + .setPositiveButton(mPositiveButtonText, positiveListener) + .setNegativeButton(mNegativeButtonText, negativeListener) + .show(); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeInt(mThemeResId); + dest.writeString(mRationale); + dest.writeString(mTitle); + dest.writeString(mPositiveButtonText); + dest.writeString(mNegativeButtonText); + dest.writeInt(mRequestCode); + dest.writeInt(mIntentFlags); + } + + int getIntentFlags() { + return mIntentFlags; + } + + /** + * Builder for an {@link AppSettingsDialog}. + */ + public static class Builder { + + private final Object mActivityOrFragment; + private final Context mContext; + @StyleRes + private int mThemeResId = -1; + private String mRationale; + private String mTitle; + private String mPositiveButtonText; + private String mNegativeButtonText; + private int mRequestCode = -1; + private boolean mOpenInNewTask = false; + + /** + * Create a new Builder for an {@link AppSettingsDialog}. + * + * @param activity the {@link Activity} in which to display the dialog. + */ + public Builder(@NonNull Activity activity) { + mActivityOrFragment = activity; + mContext = activity; + } + + /** + * Create a new Builder for an {@link AppSettingsDialog}. + * + * @param fragment the {@link Fragment} in which to display the dialog. + */ + public Builder(@NonNull Fragment fragment) { + mActivityOrFragment = fragment; + mContext = fragment.getContext(); + } + + /** + * Set the dialog theme. + */ + @NonNull + public Builder setThemeResId(@StyleRes int themeResId) { + mThemeResId = themeResId; + return this; + } + + /** + * Set the title dialog. Default is "Permissions Required". + */ + @NonNull + public Builder setTitle(@Nullable String title) { + mTitle = title; + return this; + } + + /** + * Set the title dialog. Default is "Permissions Required". + */ + @NonNull + public Builder setTitle(@StringRes int title) { + mTitle = mContext.getString(title); + return this; + } + + /** + * Set the rationale dialog. Default is + * "This app may not work correctly without the requested permissions. + * Open the app settings screen to modify app permissions." + */ + @NonNull + public Builder setRationale(@Nullable String rationale) { + mRationale = rationale; + return this; + } + + /** + * Set the rationale dialog. Default is + * "This app may not work correctly without the requested permissions. + * Open the app settings screen to modify app permissions." + */ + @NonNull + public Builder setRationale(@StringRes int rationale) { + mRationale = mContext.getString(rationale); + return this; + } + + /** + * Set the positive button text, default is {@link android.R.string#ok}. + */ + @NonNull + public Builder setPositiveButton(@Nullable String text) { + mPositiveButtonText = text; + return this; + } + + /** + * Set the positive button text, default is {@link android.R.string#ok}. + */ + @NonNull + public Builder setPositiveButton(@StringRes int textId) { + mPositiveButtonText = mContext.getString(textId); + return this; + } + + /** + * Set the negative button text, default is {@link android.R.string#cancel}. + *

+ * To know if a user cancelled the request, check if your permissions were given with {@link + * EasyPermissions#hasPermissions(Context, String...)} in {@see + * Activity#onActivityResult(int, int, Intent)}. If you still don't have the right + * permissions, then the request was cancelled. + */ + @NonNull + public Builder setNegativeButton(@Nullable String text) { + mNegativeButtonText = text; + return this; + } + + /** + * Set the negative button text, default is {@link android.R.string#cancel}. + */ + @NonNull + public Builder setNegativeButton(@StringRes int textId) { + mNegativeButtonText = mContext.getString(textId); + return this; + } + + /** + * Set the request code use when launching the Settings screen for result, can be retrieved + * in the calling Activity's {@see Activity#onActivityResult(int, int, Intent)} method. + * Default is {@link #DEFAULT_SETTINGS_REQ_CODE}. + */ + @NonNull + public Builder setRequestCode(int requestCode) { + mRequestCode = requestCode; + return this; + } + + /** + * Set whether the settings screen should be opened in a separate task. This is achieved by + * setting {@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK#FLAG_ACTIVITY_NEW_TASK} on + * the Intent used to open the settings screen. + */ + @NonNull + public Builder setOpenInNewTask(boolean openInNewTask) { + mOpenInNewTask = openInNewTask; + return this; + } + + /** + * Build the {@link AppSettingsDialog} from the specified options. Generally followed by a + * call to {@link AppSettingsDialog#show()}. + */ + @NonNull + public AppSettingsDialog build() { + mRationale = TextUtils.isEmpty(mRationale) ? + mContext.getString(R.string.rationale_ask_again) : mRationale; + mTitle = TextUtils.isEmpty(mTitle) ? + mContext.getString(R.string.title_settings_dialog) : mTitle; + mPositiveButtonText = TextUtils.isEmpty(mPositiveButtonText) ? + mContext.getString(android.R.string.ok) : mPositiveButtonText; + mNegativeButtonText = TextUtils.isEmpty(mNegativeButtonText) ? + mContext.getString(android.R.string.cancel) : mNegativeButtonText; + mRequestCode = mRequestCode > 0 ? mRequestCode : DEFAULT_SETTINGS_REQ_CODE; + + int intentFlags = 0; + if (mOpenInNewTask) { + intentFlags |= Intent.FLAG_ACTIVITY_NEW_TASK; + } + + return new AppSettingsDialog( + mActivityOrFragment, + mThemeResId, + mRationale, + mTitle, + mPositiveButtonText, + mNegativeButtonText, + mRequestCode, + intentFlags); + } + + } + +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java new file mode 100644 index 00000000..d996dd7f --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialogHolderActivity.java @@ -0,0 +1,65 @@ +package pub.devrel.easypermissions; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.provider.Settings; +import androidx.annotation.RestrictTo; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +public class AppSettingsDialogHolderActivity extends AppCompatActivity implements DialogInterface.OnClickListener { + private static final int APP_SETTINGS_RC = 7534; + + private AlertDialog mDialog; + private int mIntentFlags; + + public static Intent createShowDialogIntent(Context context, AppSettingsDialog dialog) { + Intent intent = new Intent(context, AppSettingsDialogHolderActivity.class); + intent.putExtra(AppSettingsDialog.EXTRA_APP_SETTINGS, dialog); + return intent; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + AppSettingsDialog appSettingsDialog = AppSettingsDialog.fromIntent(getIntent(), this); + mIntentFlags = appSettingsDialog.getIntentFlags(); + mDialog = appSettingsDialog.showDialog(this, this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (mDialog != null && mDialog.isShowing()) { + mDialog.dismiss(); + } + } + + @Override + public void onClick(DialogInterface dialog, int which) { + if (which == Dialog.BUTTON_POSITIVE) { + Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) + .setData(Uri.fromParts("package", getPackageName(), null)); + intent.addFlags(mIntentFlags); + startActivityForResult(intent, APP_SETTINGS_RC); + } else if (which == Dialog.BUTTON_NEGATIVE) { + setResult(Activity.RESULT_CANCELED); + finish(); + } else { + throw new IllegalStateException("Unknown button type: " + which); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + setResult(resultCode, data); + finish(); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java new file mode 100644 index 00000000..dfc20d0e --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/EasyPermissions.java @@ -0,0 +1,358 @@ +/* + * Copyright Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package pub.devrel.easypermissions; + +import android.Manifest; +import android.app.Activity; +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.Build; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Size; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; +import android.util.Log; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import pub.devrel.easypermissions.helper.PermissionHelper; + +/** + * Utility to request and check System permissions for apps targeting Android M (API >= 23). + */ +public class EasyPermissions { + + /** + * Callback interface to receive the results of {@code EasyPermissions.requestPermissions()} + * calls. + */ + public interface PermissionCallbacks extends ActivityCompat.OnRequestPermissionsResultCallback { + + void onPermissionsGranted(int requestCode, @NonNull List perms); + + void onPermissionsDenied(int requestCode, @NonNull List perms); + } + + /** + * Callback interface to receive button clicked events of the rationale dialog + */ + public interface RationaleCallbacks { + void onRationaleAccepted(int requestCode); + + void onRationaleDenied(int requestCode); + } + + private static final String TAG = "EasyPermissions"; + + /** + * Check if the calling context has a set of permissions. + * + * @param context the calling context. + * @param perms one ore more permissions, such as {@link Manifest.permission#CAMERA}. + * @return true if all permissions are already granted, false if at least one permission is not + * yet granted. + * @see Manifest.permission + */ + public static boolean hasPermissions(@NonNull Context context, + @Size(min = 1) @NonNull String... perms) { + // Always return true for SDK < M, let the system deal with the permissions + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + Log.w(TAG, "hasPermissions: API version < M, returning true by default"); + + // DANGER ZONE!!! Changing this will break the library. + return true; + } + + // Null context may be passed if we have detected Low API (less than M) so getting + // to this point with a null context should not be possible. + if (context == null) { + throw new IllegalArgumentException("Can't check permissions for null context"); + } + + for (String perm : perms) { + if (ContextCompat.checkSelfPermission(context, perm) + != PackageManager.PERMISSION_GRANTED) { + return false; + } + } + + return true; + } + + /** + * Request a set of permissions, showing a rationale if the system requests it. + * + * @param host requesting context. + * @param rationale a message explaining why the application needs this set of permissions; + * will be displayed if the user rejects the request the first time. + * @param requestCode request code to track this request, must be < 256. + * @param perms a set of permissions to be requested. + * @see Manifest.permission + */ + public static void requestPermissions( + @NonNull Activity host, @NonNull String rationale, + @IntRange(from = 0, to = 255) int requestCode, @Size(min = 1) @NonNull String... perms) { + requestPermissions( + new PermissionRequest.Builder(host, requestCode, perms) + .setRationale(rationale) + .build()); + } + + /** + * Request permissions from a Support Fragment with standard OK/Cancel buttons. + * + * @see #requestPermissions(Activity, String, int, String...) + */ + public static void requestPermissions( + @NonNull Fragment host, @NonNull String rationale, + @IntRange(from = 0, to = 255) int requestCode, @Size(min = 1) @NonNull String... perms) { + requestPermissions( + new PermissionRequest.Builder(host, requestCode, perms) + .setRationale(rationale) + .build()); + } + + /** + * Request a set of permissions. + * + * @param request the permission request + * @see PermissionRequest + */ + public static void requestPermissions(PermissionRequest request) { + + // Check for permissions before dispatching the request + if (hasPermissions(request.getHelper().getContext(), request.getPerms())) { + notifyAlreadyHasPermissions( + request.getHelper().getHost(), request.getRequestCode(), request.getPerms()); + return; + } + + // Request permissions + request.getHelper().requestPermissions( + request.getRationale(), + request.getPositiveButtonText(), + request.getNegativeButtonText(), + request.getTheme(), + request.getRequestCode(), + request.getPerms()); + } + + /** + * Handle the result of a permission request, should be called from the calling {@link + * Activity}'s {@link ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int, + * String[], int[])} method. + *

+ * If any permissions were granted or denied, the {@code object} will receive the appropriate + * callbacks through {@link PermissionCallbacks} and methods annotated with {@link + * AfterPermissionGranted} will be run if appropriate. + * + * @param requestCode requestCode argument to permission result callback. + * @param permissions permissions argument to permission result callback. + * @param grantResults grantResults argument to permission result callback. + * @param receivers an array of objects that have a method annotated with {@link + * AfterPermissionGranted} or implement {@link PermissionCallbacks}. + */ + public static void onRequestPermissionsResult(@IntRange(from = 0, to = 255) int requestCode, + @NonNull String[] permissions, + @NonNull int[] grantResults, + @NonNull Object... receivers) { + // Make a collection of granted and denied permissions from the request. + List granted = new ArrayList<>(); + List denied = new ArrayList<>(); + for (int i = 0; i < permissions.length; i++) { + String perm = permissions[i]; + if (grantResults[i] == PackageManager.PERMISSION_GRANTED) { + granted.add(perm); + } else { + denied.add(perm); + } + } + + // iterate through all receivers + for (Object object : receivers) { + // Report granted permissions, if any. + if (!granted.isEmpty()) { + if (object instanceof PermissionCallbacks) { + ((PermissionCallbacks) object).onPermissionsGranted(requestCode, granted); + } + } + + // Report denied permissions, if any. + if (!denied.isEmpty()) { + if (object instanceof PermissionCallbacks) { + ((PermissionCallbacks) object).onPermissionsDenied(requestCode, denied); + } + } + + // If 100% successful, call annotated methods + if (!granted.isEmpty() && denied.isEmpty()) { + runAnnotatedMethods(object, requestCode); + } + } + } + + /** + * Check if at least one permission in the list of denied permissions has been permanently + * denied (user clicked "Never ask again"). + * + * Note: Due to a limitation in the information provided by the Android + * framework permissions API, this method only works after the permission + * has been denied and your app has received the onPermissionsDenied callback. + * Otherwise the library cannot distinguish permanent denial from the + * "not yet denied" case. + * + * @param host context requesting permissions. + * @param deniedPermissions list of denied permissions, usually from {@link + * PermissionCallbacks#onPermissionsDenied(int, List)} + * @return {@code true} if at least one permission in the list was permanently denied. + */ + public static boolean somePermissionPermanentlyDenied(@NonNull Activity host, + @NonNull List deniedPermissions) { + return PermissionHelper.newInstance(host) + .somePermissionPermanentlyDenied(deniedPermissions); + } + + /** + * @see #somePermissionPermanentlyDenied(Activity, List) + */ + public static boolean somePermissionPermanentlyDenied(@NonNull Fragment host, + @NonNull List deniedPermissions) { + return PermissionHelper.newInstance(host) + .somePermissionPermanentlyDenied(deniedPermissions); + } + + /** + * Check if a permission has been permanently denied (user clicked "Never ask again"). + * + * @param host context requesting permissions. + * @param deniedPermission denied permission. + * @return {@code true} if the permissions has been permanently denied. + */ + public static boolean permissionPermanentlyDenied(@NonNull Activity host, + @NonNull String deniedPermission) { + return PermissionHelper.newInstance(host).permissionPermanentlyDenied(deniedPermission); + } + + /** + * @see #permissionPermanentlyDenied(Activity, String) + */ + public static boolean permissionPermanentlyDenied(@NonNull Fragment host, + @NonNull String deniedPermission) { + return PermissionHelper.newInstance(host).permissionPermanentlyDenied(deniedPermission); + } + + /** + * See if some denied permission has been permanently denied. + * + * @param host requesting context. + * @param perms array of permissions. + * @return true if the user has previously denied any of the {@code perms} and we should show a + * rationale, false otherwise. + */ + public static boolean somePermissionDenied(@NonNull Activity host, + @NonNull String... perms) { + return PermissionHelper.newInstance(host).somePermissionDenied(perms); + } + + /** + * @see #somePermissionDenied(Activity, String...) + */ + public static boolean somePermissionDenied(@NonNull Fragment host, + @NonNull String... perms) { + return PermissionHelper.newInstance(host).somePermissionDenied(perms); + } + + /** + * Run permission callbacks on an object that requested permissions but already has them by + * simulating {@link PackageManager#PERMISSION_GRANTED}. + * + * @param object the object requesting permissions. + * @param requestCode the permission request code. + * @param perms a list of permissions requested. + */ + private static void notifyAlreadyHasPermissions(@NonNull Object object, + int requestCode, + @NonNull String[] perms) { + int[] grantResults = new int[perms.length]; + for (int i = 0; i < perms.length; i++) { + grantResults[i] = PackageManager.PERMISSION_GRANTED; + } + + onRequestPermissionsResult(requestCode, perms, grantResults, object); + } + + /** + * Find all methods annotated with {@link AfterPermissionGranted} on a given object with the + * correct requestCode argument. + * + * @param object the object with annotated methods. + * @param requestCode the requestCode passed to the annotation. + */ + private static void runAnnotatedMethods(@NonNull Object object, int requestCode) { + Class clazz = object.getClass(); + if (isUsingAndroidAnnotations(object)) { + clazz = clazz.getSuperclass(); + } + + while (clazz != null) { + for (Method method : clazz.getDeclaredMethods()) { + AfterPermissionGranted ann = method.getAnnotation(AfterPermissionGranted.class); + if (ann != null) { + // Check for annotated methods with matching request code. + if (ann.value() == requestCode) { + // Method must be void so that we can invoke it + if (method.getParameterTypes().length > 0) { + throw new RuntimeException( + "Cannot execute method " + method.getName() + " because it is non-void method and/or has input parameters."); + } + + try { + // Make method accessible if private + if (!method.isAccessible()) { + method.setAccessible(true); + } + method.invoke(object); + } catch (IllegalAccessException e) { + Log.e(TAG, "runDefaultMethod:IllegalAccessException", e); + } catch (InvocationTargetException e) { + Log.e(TAG, "runDefaultMethod:InvocationTargetException", e); + } + } + } + } + + clazz = clazz.getSuperclass(); + } + } + + /** + * Determine if the project is using the AndroidAnnotations library. + */ + private static boolean isUsingAndroidAnnotations(@NonNull Object object) { + if (!object.getClass().getSimpleName().endsWith("_")) { + return false; + } + try { + Class clazz = Class.forName("org.androidannotations.api.view.HasViews"); + return clazz.isInstance(object); + } catch (ClassNotFoundException e) { + return false; + } + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/PermissionRequest.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/PermissionRequest.java new file mode 100644 index 00000000..02d2e6d1 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/PermissionRequest.java @@ -0,0 +1,260 @@ +package pub.devrel.easypermissions; + +import android.app.Activity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RestrictTo; +import androidx.annotation.Size; +import androidx.annotation.StringRes; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; + +import java.util.Arrays; + +import pub.devrel.easypermissions.helper.PermissionHelper; + +/** + * An immutable model object that holds all of the parameters associated with a permission request, + * such as the permissions, request code, and rationale. + * + * @see EasyPermissions#requestPermissions(PermissionRequest) + * @see PermissionRequest.Builder + */ +public final class PermissionRequest { + private final PermissionHelper mHelper; + private final String[] mPerms; + private final int mRequestCode; + private final String mRationale; + private final String mPositiveButtonText; + private final String mNegativeButtonText; + private final int mTheme; + + private PermissionRequest(PermissionHelper helper, + String[] perms, + int requestCode, + String rationale, + String positiveButtonText, + String negativeButtonText, + int theme) { + mHelper = helper; + mPerms = perms.clone(); + mRequestCode = requestCode; + mRationale = rationale; + mPositiveButtonText = positiveButtonText; + mNegativeButtonText = negativeButtonText; + mTheme = theme; + } + + @NonNull + @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) + public PermissionHelper getHelper() { + return mHelper; + } + + @NonNull + public String[] getPerms() { + return mPerms.clone(); + } + + public int getRequestCode() { + return mRequestCode; + } + + @NonNull + public String getRationale() { + return mRationale; + } + + @NonNull + public String getPositiveButtonText() { + return mPositiveButtonText; + } + + @NonNull + public String getNegativeButtonText() { + return mNegativeButtonText; + } + + @StyleRes + public int getTheme() { + return mTheme; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + PermissionRequest request = (PermissionRequest) o; + + return Arrays.equals(mPerms, request.mPerms) && mRequestCode == request.mRequestCode; + } + + @Override + public int hashCode() { + int result = Arrays.hashCode(mPerms); + result = 31 * result + mRequestCode; + return result; + } + + @Override + public String toString() { + return "PermissionRequest{" + + "mHelper=" + mHelper + + ", mPerms=" + Arrays.toString(mPerms) + + ", mRequestCode=" + mRequestCode + + ", mRationale='" + mRationale + '\'' + + ", mPositiveButtonText='" + mPositiveButtonText + '\'' + + ", mNegativeButtonText='" + mNegativeButtonText + '\'' + + ", mTheme=" + mTheme + + '}'; + } + + /** + * Builder to build a permission request with variable options. + * + * @see PermissionRequest + */ + public static final class Builder { + private final PermissionHelper mHelper; + private final int mRequestCode; + private final String[] mPerms; + + private String mRationale; + private String mPositiveButtonText; + private String mNegativeButtonText; + private int mTheme = -1; + + /** + * Construct a new permission request builder with a host, request code, and the requested + * permissions. + * + * @param activity the permission request host + * @param requestCode request code to track this request; must be < 256 + * @param perms the set of permissions to be requested + */ + public Builder(@NonNull Activity activity, int requestCode, + @NonNull @Size(min = 1) String... perms) { + mHelper = PermissionHelper.newInstance(activity); + mRequestCode = requestCode; + mPerms = perms; + } + + /** + * @see #Builder(Activity, int, String...) + */ + public Builder(@NonNull Fragment fragment, int requestCode, + @NonNull @Size(min = 1) String... perms) { + mHelper = PermissionHelper.newInstance(fragment); + mRequestCode = requestCode; + mPerms = perms; + } + + /** + * Set the rationale to display to the user if they don't allow your permissions on the + * first try. This rationale will be shown as long as the user has denied your permissions + * at least once, but has not yet permanently denied your permissions. Should the user + * permanently deny your permissions, use the {@link AppSettingsDialog} instead. + *

+ * The default rationale text is {@link R.string#rationale_ask}. + * + * @param rationale the rationale to be displayed to the user should they deny your + * permission at least once + */ + @NonNull + public Builder setRationale(@Nullable String rationale) { + mRationale = rationale; + return this; + } + + /** + * @param resId the string resource to be used as a rationale + * @see #setRationale(String) + */ + @NonNull + public Builder setRationale(@StringRes int resId) { + mRationale = mHelper.getContext().getString(resId); + return this; + } + + /** + * Set the positive button text for the rationale dialog should it be shown. + *

+ * The default is {@link android.R.string#ok} + */ + @NonNull + public Builder setPositiveButtonText(@Nullable String positiveButtonText) { + mPositiveButtonText = positiveButtonText; + return this; + } + + /** + * @see #setPositiveButtonText(String) + */ + @NonNull + public Builder setPositiveButtonText(@StringRes int resId) { + mPositiveButtonText = mHelper.getContext().getString(resId); + return this; + } + + /** + * Set the negative button text for the rationale dialog should it be shown. + *

+ * The default is {@link android.R.string#cancel} + */ + @NonNull + public Builder setNegativeButtonText(@Nullable String negativeButtonText) { + mNegativeButtonText = negativeButtonText; + return this; + } + + /** + * @see #setNegativeButtonText(String) + */ + @NonNull + public Builder setNegativeButtonText(@StringRes int resId) { + mNegativeButtonText = mHelper.getContext().getString(resId); + return this; + } + + /** + * Set the theme to be used for the rationale dialog should it be shown. + * + * @param theme a style resource + */ + @NonNull + public Builder setTheme(@StyleRes int theme) { + mTheme = theme; + return this; + } + + /** + * Build the permission request. + * + * @return the permission request + * @see EasyPermissions#requestPermissions(PermissionRequest) + * @see PermissionRequest + */ + @NonNull + public PermissionRequest build() { + if (mRationale == null) { + mRationale = mHelper.getContext().getString(R.string.rationale_ask); + } + if (mPositiveButtonText == null) { + mPositiveButtonText = mHelper.getContext().getString(android.R.string.ok); + } + if (mNegativeButtonText == null) { + mNegativeButtonText = mHelper.getContext().getString(android.R.string.cancel); + } + + return new PermissionRequest( + mHelper, + mPerms, + mRequestCode, + mRationale, + mPositiveButtonText, + mNegativeButtonText, + mTheme); + } + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java new file mode 100644 index 00000000..d07afffa --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogClickListener.java @@ -0,0 +1,77 @@ +package pub.devrel.easypermissions; + +import android.app.Activity; +import android.app.Dialog; +import android.content.DialogInterface; +import androidx.fragment.app.Fragment; + +import java.util.Arrays; + +import pub.devrel.easypermissions.helper.PermissionHelper; + +/** + * Click listener for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. + */ +class RationaleDialogClickListener implements Dialog.OnClickListener { + + private Object mHost; + private RationaleDialogConfig mConfig; + private EasyPermissions.PermissionCallbacks mCallbacks; + private EasyPermissions.RationaleCallbacks mRationaleCallbacks; + + RationaleDialogClickListener(RationaleDialogFragmentCompat compatDialogFragment, + RationaleDialogConfig config, + EasyPermissions.PermissionCallbacks callbacks, + EasyPermissions.RationaleCallbacks rationaleCallbacks) { + + mHost = compatDialogFragment.getParentFragment() != null + ? compatDialogFragment.getParentFragment() + : compatDialogFragment.getActivity(); + + mConfig = config; + mCallbacks = callbacks; + mRationaleCallbacks = rationaleCallbacks; + + } + + RationaleDialogClickListener(RationaleDialogFragment dialogFragment, + RationaleDialogConfig config, + EasyPermissions.PermissionCallbacks callbacks, + EasyPermissions.RationaleCallbacks dialogCallback) { + + mHost = dialogFragment.getActivity(); + + mConfig = config; + mCallbacks = callbacks; + mRationaleCallbacks = dialogCallback; + } + + @Override + public void onClick(DialogInterface dialog, int which) { + int requestCode = mConfig.requestCode; + if (which == Dialog.BUTTON_POSITIVE) { + String[] permissions = mConfig.permissions; + if (mRationaleCallbacks != null) { + mRationaleCallbacks.onRationaleAccepted(requestCode); + } + if (mHost instanceof Fragment) { + PermissionHelper.newInstance((Fragment) mHost).directRequestPermissions(requestCode, permissions); + } else if (mHost instanceof Activity) { + PermissionHelper.newInstance((Activity) mHost).directRequestPermissions(requestCode, permissions); + } else { + throw new RuntimeException("Host must be an Activity or Fragment!"); + } + } else { + if (mRationaleCallbacks != null) { + mRationaleCallbacks.onRationaleDenied(requestCode); + } + notifyPermissionDenied(); + } + } + + private void notifyPermissionDenied() { + if (mCallbacks != null) { + mCallbacks.onPermissionsDenied(mConfig.requestCode, Arrays.asList(mConfig.permissions)); + } + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java new file mode 100644 index 00000000..c64999c6 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java @@ -0,0 +1,95 @@ +package pub.devrel.easypermissions; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.appcompat.app.AlertDialog; + +/** + * Configuration for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. + */ +class RationaleDialogConfig { + + private static final String KEY_POSITIVE_BUTTON = "positiveButton"; + private static final String KEY_NEGATIVE_BUTTON = "negativeButton"; + private static final String KEY_RATIONALE_MESSAGE = "rationaleMsg"; + private static final String KEY_THEME = "theme"; + private static final String KEY_REQUEST_CODE = "requestCode"; + private static final String KEY_PERMISSIONS = "permissions"; + + String positiveButton; + String negativeButton; + int theme; + int requestCode; + String rationaleMsg; + String[] permissions; + + RationaleDialogConfig(@NonNull String positiveButton, + @NonNull String negativeButton, + @NonNull String rationaleMsg, + @StyleRes int theme, + int requestCode, + @NonNull String[] permissions) { + + this.positiveButton = positiveButton; + this.negativeButton = negativeButton; + this.rationaleMsg = rationaleMsg; + this.theme = theme; + this.requestCode = requestCode; + this.permissions = permissions; + } + + RationaleDialogConfig(Bundle bundle) { + positiveButton = bundle.getString(KEY_POSITIVE_BUTTON); + negativeButton = bundle.getString(KEY_NEGATIVE_BUTTON); + rationaleMsg = bundle.getString(KEY_RATIONALE_MESSAGE); + theme = bundle.getInt(KEY_THEME); + requestCode = bundle.getInt(KEY_REQUEST_CODE); + permissions = bundle.getStringArray(KEY_PERMISSIONS); + } + + Bundle toBundle() { + Bundle bundle = new Bundle(); + bundle.putString(KEY_POSITIVE_BUTTON, positiveButton); + bundle.putString(KEY_NEGATIVE_BUTTON, negativeButton); + bundle.putString(KEY_RATIONALE_MESSAGE, rationaleMsg); + bundle.putInt(KEY_THEME, theme); + bundle.putInt(KEY_REQUEST_CODE, requestCode); + bundle.putStringArray(KEY_PERMISSIONS, permissions); + + return bundle; + } + + AlertDialog createSupportDialog(Context context, Dialog.OnClickListener listener) { + AlertDialog.Builder builder; + if (theme > 0) { + builder = new AlertDialog.Builder(context, theme); + } else { + builder = new AlertDialog.Builder(context); + } + return builder + .setCancelable(false) + .setPositiveButton(positiveButton, listener) + .setNegativeButton(negativeButton, listener) + .setMessage(rationaleMsg) + .create(); + } + + android.app.AlertDialog createFrameworkDialog(Context context, Dialog.OnClickListener listener) { + android.app.AlertDialog.Builder builder; + if (theme > 0) { + builder = new android.app.AlertDialog.Builder(context, theme); + } else { + builder = new android.app.AlertDialog.Builder(context); + } + return builder + .setCancelable(false) + .setPositiveButton(positiveButton, listener) + .setNegativeButton(negativeButton, listener) + .setMessage(rationaleMsg) + .create(); + } + +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java new file mode 100644 index 00000000..c055a4f7 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragment.java @@ -0,0 +1,113 @@ +package pub.devrel.easypermissions; + +import android.app.Dialog; +import android.app.DialogFragment; +import android.app.FragmentManager; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; +import androidx.annotation.StyleRes; + +/** + * {@link DialogFragment} to display rationale for permission requests when the request comes from + * a Fragment or Activity that can host a Fragment. + */ +@RestrictTo(RestrictTo.Scope.LIBRARY) +public class RationaleDialogFragment extends DialogFragment { + + public static final String TAG = "RationaleDialogFragment"; + + private EasyPermissions.PermissionCallbacks mPermissionCallbacks; + private EasyPermissions.RationaleCallbacks mRationaleCallbacks; + private boolean mStateSaved = false; + + public static RationaleDialogFragment newInstance( + @NonNull String positiveButton, + @NonNull String negativeButton, + @NonNull String rationaleMsg, + @StyleRes int theme, + int requestCode, + @NonNull String[] permissions) { + + // Create new Fragment + RationaleDialogFragment dialogFragment = new RationaleDialogFragment(); + + // Initialize configuration as arguments + RationaleDialogConfig config = new RationaleDialogConfig( + positiveButton, negativeButton, rationaleMsg, theme, requestCode, permissions); + dialogFragment.setArguments(config.toBundle()); + + return dialogFragment; + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && getParentFragment() != null) { + if (getParentFragment() instanceof EasyPermissions.PermissionCallbacks) { + mPermissionCallbacks = (EasyPermissions.PermissionCallbacks) getParentFragment(); + } + if (getParentFragment() instanceof EasyPermissions.RationaleCallbacks){ + mRationaleCallbacks = (EasyPermissions.RationaleCallbacks) getParentFragment(); + } + + } + + if (context instanceof EasyPermissions.PermissionCallbacks) { + mPermissionCallbacks = (EasyPermissions.PermissionCallbacks) context; + } + + if (context instanceof EasyPermissions.RationaleCallbacks) { + mRationaleCallbacks = (EasyPermissions.RationaleCallbacks) context; + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + mStateSaved = true; + super.onSaveInstanceState(outState); + } + + /** + * Version of {@link #show(FragmentManager, String)} that no-ops when an IllegalStateException + * would otherwise occur. + */ + public void showAllowingStateLoss(FragmentManager manager, String tag) { + // API 26 added this convenient method + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (manager.isStateSaved()) { + return; + } + } + + if (mStateSaved) { + return; + } + + show(manager, tag); + } + + @Override + public void onDetach() { + super.onDetach(); + mPermissionCallbacks = null; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + // Rationale dialog should not be cancelable + setCancelable(false); + + // Get config from arguments, create click listener + RationaleDialogConfig config = new RationaleDialogConfig(getArguments()); + RationaleDialogClickListener clickListener = + new RationaleDialogClickListener(this, config, mPermissionCallbacks, mRationaleCallbacks); + + // Create an AlertDialog + return config.createFrameworkDialog(getActivity(), clickListener); + } + +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragmentCompat.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragmentCompat.java new file mode 100644 index 00000000..5a9306f4 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogFragmentCompat.java @@ -0,0 +1,97 @@ +package pub.devrel.easypermissions; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; +import androidx.annotation.StyleRes; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatDialogFragment; + +/** + * {@link AppCompatDialogFragment} to display rationale for permission requests when the request + * comes from a Fragment or Activity that can host a Fragment. + */ +@RestrictTo(RestrictTo.Scope.LIBRARY) +public class RationaleDialogFragmentCompat extends AppCompatDialogFragment { + + public static final String TAG = "RationaleDialogFragmentCompat"; + + private EasyPermissions.PermissionCallbacks mPermissionCallbacks; + private EasyPermissions.RationaleCallbacks mRationaleCallbacks; + + public static RationaleDialogFragmentCompat newInstance( + @NonNull String rationaleMsg, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String[] permissions) { + + // Create new Fragment + RationaleDialogFragmentCompat dialogFragment = new RationaleDialogFragmentCompat(); + + // Initialize configuration as arguments + RationaleDialogConfig config = new RationaleDialogConfig( + positiveButton, negativeButton, rationaleMsg, theme, requestCode, permissions); + dialogFragment.setArguments(config.toBundle()); + + return dialogFragment; + } + + /** + * Version of {@link #show(FragmentManager, String)} that no-ops when an IllegalStateException + * would otherwise occur. + */ + public void showAllowingStateLoss(FragmentManager manager, String tag) { + if (manager.isStateSaved()) { + return; + } + + show(manager, tag); + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (getParentFragment() != null) { + if (getParentFragment() instanceof EasyPermissions.PermissionCallbacks) { + mPermissionCallbacks = (EasyPermissions.PermissionCallbacks) getParentFragment(); + } + if (getParentFragment() instanceof EasyPermissions.RationaleCallbacks){ + mRationaleCallbacks = (EasyPermissions.RationaleCallbacks) getParentFragment(); + } + } + + if (context instanceof EasyPermissions.PermissionCallbacks) { + mPermissionCallbacks = (EasyPermissions.PermissionCallbacks) context; + } + + if (context instanceof EasyPermissions.RationaleCallbacks) { + mRationaleCallbacks = (EasyPermissions.RationaleCallbacks) context; + } + } + + @Override + public void onDetach() { + super.onDetach(); + mPermissionCallbacks = null; + mRationaleCallbacks = null; + } + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + // Rationale dialog should not be cancelable + setCancelable(false); + + // Get config from arguments, create click listener + RationaleDialogConfig config = new RationaleDialogConfig(getArguments()); + RationaleDialogClickListener clickListener = + new RationaleDialogClickListener(this, config, mPermissionCallbacks, mRationaleCallbacks); + + // Create an AlertDialog + return config.createSupportDialog(getContext(), clickListener); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/ActivityPermissionHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/ActivityPermissionHelper.java new file mode 100644 index 00000000..74aa4228 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/ActivityPermissionHelper.java @@ -0,0 +1,59 @@ +package pub.devrel.easypermissions.helper; + +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.core.app.ActivityCompat; +import android.util.Log; + +import pub.devrel.easypermissions.RationaleDialogFragment; + +/** + * Permissions helper for {@link Activity}. + */ +class ActivityPermissionHelper extends PermissionHelper { + private static final String TAG = "ActPermissionHelper"; + + public ActivityPermissionHelper(Activity host) { + super(host); + } + + @Override + public void directRequestPermissions(int requestCode, @NonNull String... perms) { + ActivityCompat.requestPermissions(getHost(), perms, requestCode); + } + + @Override + public boolean shouldShowRequestPermissionRationale(@NonNull String perm) { + return ActivityCompat.shouldShowRequestPermissionRationale(getHost(), perm); + } + + @Override + public Context getContext() { + return getHost(); + } + + @Override + public void showRequestPermissionRationale(@NonNull String rationale, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String... perms) { + FragmentManager fm = getHost().getFragmentManager(); + + // Check if fragment is already showing + Fragment fragment = fm.findFragmentByTag(RationaleDialogFragment.TAG); + if (fragment instanceof RationaleDialogFragment) { + Log.d(TAG, "Found existing fragment, not showing rationale."); + return; + } + + RationaleDialogFragment + .newInstance(positiveButton, negativeButton, rationale, theme, requestCode, perms) + .showAllowingStateLoss(fm, RationaleDialogFragment.TAG); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/AppCompatActivityPermissionsHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/AppCompatActivityPermissionsHelper.java new file mode 100644 index 00000000..0bc80a59 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/AppCompatActivityPermissionsHelper.java @@ -0,0 +1,37 @@ +package pub.devrel.easypermissions.helper; + +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; + +/** + * Permissions helper for {@link AppCompatActivity}. + */ +class AppCompatActivityPermissionsHelper extends BaseSupportPermissionsHelper { + + public AppCompatActivityPermissionsHelper(AppCompatActivity host) { + super(host); + } + + @Override + public FragmentManager getSupportFragmentManager() { + return getHost().getSupportFragmentManager(); + } + + @Override + public void directRequestPermissions(int requestCode, @NonNull String... perms) { + ActivityCompat.requestPermissions(getHost(), perms, requestCode); + } + + @Override + public boolean shouldShowRequestPermissionRationale(@NonNull String perm) { + return ActivityCompat.shouldShowRequestPermissionRationale(getHost(), perm); + } + + @Override + public Context getContext() { + return getHost(); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/BaseSupportPermissionsHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/BaseSupportPermissionsHelper.java new file mode 100644 index 00000000..185da5a2 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/BaseSupportPermissionsHelper.java @@ -0,0 +1,45 @@ +package pub.devrel.easypermissions.helper; + +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import android.util.Log; + +import pub.devrel.easypermissions.RationaleDialogFragmentCompat; + +/** + * Implementation of {@link PermissionHelper} for Support Library host classes. + */ +public abstract class BaseSupportPermissionsHelper extends PermissionHelper { + + private static final String TAG = "BSPermissionsHelper"; + + public BaseSupportPermissionsHelper(@NonNull T host) { + super(host); + } + + public abstract FragmentManager getSupportFragmentManager(); + + @Override + public void showRequestPermissionRationale(@NonNull String rationale, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String... perms) { + + FragmentManager fm = getSupportFragmentManager(); + + // Check if fragment is already showing + Fragment fragment = fm.findFragmentByTag(RationaleDialogFragmentCompat.TAG); + if (fragment instanceof RationaleDialogFragmentCompat) { + Log.d(TAG, "Found existing fragment, not showing rationale."); + return; + } + + RationaleDialogFragmentCompat + .newInstance(rationale, positiveButton, negativeButton, theme, requestCode, perms) + .showAllowingStateLoss(fm, RationaleDialogFragmentCompat.TAG); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/LowApiPermissionsHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/LowApiPermissionsHelper.java new file mode 100644 index 00000000..6ec74376 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/LowApiPermissionsHelper.java @@ -0,0 +1,47 @@ +package pub.devrel.easypermissions.helper; + +import android.app.Activity; +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; + +/** + * Permissions helper for apps built against API < 23, which do not need runtime permissions. + */ +class LowApiPermissionsHelper extends PermissionHelper { + public LowApiPermissionsHelper(@NonNull T host) { + super(host); + } + + @Override + public void directRequestPermissions(int requestCode, @NonNull String... perms) { + throw new IllegalStateException("Should never be requesting permissions on API < 23!"); + } + + @Override + public boolean shouldShowRequestPermissionRationale(@NonNull String perm) { + return false; + } + + @Override + public void showRequestPermissionRationale(@NonNull String rationale, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String... perms) { + throw new IllegalStateException("Should never be requesting permissions on API < 23!"); + } + + @Override + public Context getContext() { + if (getHost() instanceof Activity) { + return (Context) getHost(); + } else if (getHost() instanceof Fragment) { + return ((Fragment) getHost()).getContext(); + } else { + throw new IllegalStateException("Unknown host: " + getHost()); + } + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/PermissionHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/PermissionHelper.java new file mode 100644 index 00000000..db95a350 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/PermissionHelper.java @@ -0,0 +1,113 @@ +package pub.devrel.easypermissions.helper; + +import android.app.Activity; +import android.content.Context; +import android.os.Build; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; + +import java.util.List; + +/** + * Delegate class to make permission calls based on the 'host' (Fragment, Activity, etc). + */ +public abstract class PermissionHelper { + + private T mHost; + + @NonNull + public static PermissionHelper newInstance(Activity host) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + return new LowApiPermissionsHelper<>(host); + } + + if (host instanceof AppCompatActivity) + return new AppCompatActivityPermissionsHelper((AppCompatActivity) host); + else { + return new ActivityPermissionHelper(host); + } + } + + @NonNull + public static PermissionHelper newInstance(Fragment host) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + return new LowApiPermissionsHelper<>(host); + } + + return new SupportFragmentPermissionHelper(host); + } + + // ============================================================================ + // Public concrete methods + // ============================================================================ + + public PermissionHelper(@NonNull T host) { + mHost = host; + } + + private boolean shouldShowRationale(@NonNull String... perms) { + for (String perm : perms) { + if (shouldShowRequestPermissionRationale(perm)) { + return true; + } + } + return false; + } + + public void requestPermissions(@NonNull String rationale, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String... perms) { + if (shouldShowRationale(perms)) { + showRequestPermissionRationale( + rationale, positiveButton, negativeButton, theme, requestCode, perms); + } else { + directRequestPermissions(requestCode, perms); + } + } + + public boolean somePermissionPermanentlyDenied(@NonNull List perms) { + for (String deniedPermission : perms) { + if (permissionPermanentlyDenied(deniedPermission)) { + return true; + } + } + + return false; + } + + public boolean permissionPermanentlyDenied(@NonNull String perms) { + return !shouldShowRequestPermissionRationale(perms); + } + + public boolean somePermissionDenied(@NonNull String... perms) { + return shouldShowRationale(perms); + } + + @NonNull + public T getHost() { + return mHost; + } + + // ============================================================================ + // Public abstract methods + // ============================================================================ + + public abstract void directRequestPermissions(int requestCode, @NonNull String... perms); + + public abstract boolean shouldShowRequestPermissionRationale(@NonNull String perm); + + public abstract void showRequestPermissionRationale(@NonNull String rationale, + @NonNull String positiveButton, + @NonNull String negativeButton, + @StyleRes int theme, + int requestCode, + @NonNull String... perms); + + public abstract Context getContext(); + +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/SupportFragmentPermissionHelper.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/SupportFragmentPermissionHelper.java new file mode 100644 index 00000000..cf72eeb3 --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/SupportFragmentPermissionHelper.java @@ -0,0 +1,36 @@ +package pub.devrel.easypermissions.helper; + +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + +/** + * Permissions helper for {@link Fragment} from the support library. + */ +class SupportFragmentPermissionHelper extends BaseSupportPermissionsHelper { + + public SupportFragmentPermissionHelper(@NonNull Fragment host) { + super(host); + } + + @Override + public FragmentManager getSupportFragmentManager() { + return getHost().getChildFragmentManager(); + } + + @Override + public void directRequestPermissions(int requestCode, @NonNull String... perms) { + getHost().requestPermissions(perms, requestCode); + } + + @Override + public boolean shouldShowRequestPermissionRationale(@NonNull String perm) { + return getHost().shouldShowRequestPermissionRationale(perm); + } + + @Override + public Context getContext() { + return getHost().getActivity(); + } +} diff --git a/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/package-info.java b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/package-info.java new file mode 100644 index 00000000..61617bce --- /dev/null +++ b/android/easypermissions/src/main/java/pub/devrel/easypermissions/helper/package-info.java @@ -0,0 +1,4 @@ +@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) +package pub.devrel.easypermissions.helper; + +import androidx.annotation.RestrictTo; diff --git a/android/easypermissions/src/main/res/values/colors.xml b/android/easypermissions/src/main/res/values/colors.xml new file mode 100644 index 00000000..2ca30829 --- /dev/null +++ b/android/easypermissions/src/main/res/values/colors.xml @@ -0,0 +1,7 @@ + + + + #ff212121 + @android:color/black + #ff80cbc4 + diff --git a/android/easypermissions/src/main/res/values/strings.xml b/android/easypermissions/src/main/res/values/strings.xml new file mode 100644 index 00000000..2ceab867 --- /dev/null +++ b/android/easypermissions/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + This app may not work correctly without the requested permissions. + + This app may not work correctly without the requested permissions. + Open the app settings screen to modify app permissions. + + Permissions Required + diff --git a/android/easypermissions/src/main/res/values/styles.xml b/android/easypermissions/src/main/res/values/styles.xml new file mode 100644 index 00000000..91239929 --- /dev/null +++ b/android/easypermissions/src/main/res/values/styles.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/AppSettingsDialogTest.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/AppSettingsDialogTest.java new file mode 100644 index 00000000..2b353846 --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/AppSettingsDialogTest.java @@ -0,0 +1,186 @@ +package pub.devrel.easypermissions; + +import android.app.Application; +import android.content.DialogInterface; +import android.content.Intent; +import android.widget.Button; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowApplication; +import org.robolectric.shadows.ShadowIntent; + +import java.util.Objects; + +import androidx.appcompat.app.AlertDialog; +import androidx.test.core.app.ApplicationProvider; +import pub.devrel.easypermissions.testhelper.ActivityController; +import pub.devrel.easypermissions.testhelper.FragmentController; +import pub.devrel.easypermissions.testhelper.TestActivity; +import pub.devrel.easypermissions.testhelper.TestFragment; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.robolectric.Shadows.shadowOf; +import static pub.devrel.easypermissions.AppSettingsDialog.DEFAULT_SETTINGS_REQ_CODE; + +@RunWith(RobolectricTestRunner.class) +@Config(sdk = 23) +public class AppSettingsDialogTest { + + private static final String TITLE = "TITLE"; + private static final String RATIONALE = "RATIONALE"; + private static final String NEGATIVE = "NEGATIVE"; + private static final String POSITIVE = "POSITIVE"; + private ShadowApplication shadowApp; + private TestActivity spyActivity; + private TestFragment spyFragment; + private FragmentController fragmentController; + private ActivityController activityController; + @Mock + private DialogInterface.OnClickListener positiveListener; + @Mock + private DialogInterface.OnClickListener negativeListener; + @Captor + private ArgumentCaptor integerCaptor; + @Captor + private ArgumentCaptor intentCaptor; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + shadowApp = shadowOf((Application) ApplicationProvider.getApplicationContext()); + + activityController = new ActivityController<>(TestActivity.class); + fragmentController = new FragmentController<>(TestFragment.class); + + spyActivity = Mockito.spy(activityController.resume()); + spyFragment = Mockito.spy(fragmentController.resume()); + } + + // ------ From Activity ------ + + @Test + public void shouldShowExpectedSettingsDialog_whenBuildingFromActivity() { + new AppSettingsDialog.Builder(spyActivity) + .setTitle(android.R.string.dialog_alert_title) + .setRationale(android.R.string.unknownName) + .setPositiveButton(android.R.string.ok) + .setNegativeButton(android.R.string.cancel) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .show(); + + verify(spyActivity, times(1)) + .startActivityForResult(intentCaptor.capture(), integerCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(DEFAULT_SETTINGS_REQ_CODE); + assertThat(Objects.requireNonNull(intentCaptor.getValue().getComponent()).getClassName()) + .isEqualTo(AppSettingsDialogHolderActivity.class.getName()); + + Intent startedIntent = shadowApp.getNextStartedActivity(); + ShadowIntent shadowIntent = shadowOf(startedIntent); + assertThat(shadowIntent.getIntentClass()).isEqualTo(AppSettingsDialogHolderActivity.class); + } + + @Test + public void shouldPositiveListener_whenClickingPositiveButtonFromActivity() { + AlertDialog alertDialog = new AppSettingsDialog.Builder(spyActivity) + .setTitle(TITLE) + .setRationale(RATIONALE) + .setPositiveButton(POSITIVE) + .setNegativeButton(NEGATIVE) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .showDialog(positiveListener, negativeListener); + Button positive = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + positive.performClick(); + + verify(positiveListener, times(1)) + .onClick(any(DialogInterface.class), anyInt()); + } + + @Test + public void shouldNegativeListener_whenClickingPositiveButtonFromActivity() { + AlertDialog alertDialog = new AppSettingsDialog.Builder(spyActivity) + .setTitle(TITLE) + .setRationale(RATIONALE) + .setPositiveButton(POSITIVE) + .setNegativeButton(NEGATIVE) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .showDialog(positiveListener, negativeListener); + Button positive = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE); + positive.performClick(); + + verify(negativeListener, times(1)) + .onClick(any(DialogInterface.class), anyInt()); + } + + @Test + public void shouldShowExpectedSettingsDialog_whenBuildingFromSupportFragment() { + new AppSettingsDialog.Builder(spyFragment) + .setTitle(android.R.string.dialog_alert_title) + .setRationale(android.R.string.unknownName) + .setPositiveButton(android.R.string.ok) + .setNegativeButton(android.R.string.cancel) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .show(); + + verify(spyFragment, times(1)) + .startActivityForResult(intentCaptor.capture(), integerCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(DEFAULT_SETTINGS_REQ_CODE); + assertThat(Objects.requireNonNull(intentCaptor.getValue().getComponent()).getClassName()) + .isEqualTo(AppSettingsDialogHolderActivity.class.getName()); + + Intent startedIntent = shadowApp.getNextStartedActivity(); + ShadowIntent shadowIntent = shadowOf(startedIntent); + assertThat(shadowIntent.getIntentClass()).isEqualTo(AppSettingsDialogHolderActivity.class); + } + + @Test + public void shouldPositiveListener_whenClickingPositiveButtonFromSupportFragment() { + AlertDialog alertDialog = new AppSettingsDialog.Builder(spyFragment) + .setTitle(TITLE) + .setRationale(RATIONALE) + .setPositiveButton(POSITIVE) + .setNegativeButton(NEGATIVE) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .showDialog(positiveListener, negativeListener); + Button positive = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE); + positive.performClick(); + + verify(positiveListener, times(1)) + .onClick(any(DialogInterface.class), anyInt()); + } + + @Test + public void shouldNegativeListener_whenClickingPositiveButtonFromSupportFragment() { + AlertDialog alertDialog = new AppSettingsDialog.Builder(spyFragment) + .setTitle(TITLE) + .setRationale(RATIONALE) + .setPositiveButton(POSITIVE) + .setNegativeButton(NEGATIVE) + .setThemeResId(R.style.Theme_AppCompat) + .build() + .showDialog(positiveListener, negativeListener); + Button positive = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE); + positive.performClick(); + + verify(negativeListener, times(1)) + .onClick(any(DialogInterface.class), anyInt()); + } + +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsLowApiTest.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsLowApiTest.java new file mode 100644 index 00000000..a6c6976b --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsLowApiTest.java @@ -0,0 +1,121 @@ +package pub.devrel.easypermissions; + +import android.Manifest; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.util.ArrayList; + +import androidx.test.core.app.ApplicationProvider; +import pub.devrel.easypermissions.testhelper.ActivityController; +import pub.devrel.easypermissions.testhelper.FragmentController; +import pub.devrel.easypermissions.testhelper.TestActivity; +import pub.devrel.easypermissions.testhelper.TestAppCompatActivity; +import pub.devrel.easypermissions.testhelper.TestFragment; +import pub.devrel.easypermissions.testhelper.TestSupportFragmentActivity; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +/** + * Low-API (SDK = 19) tests for {@link pub.devrel.easypermissions.EasyPermissions}. + */ +@RunWith(RobolectricTestRunner.class) +@Config(sdk = 19) +public class EasyPermissionsLowApiTest { + + private static final String RATIONALE = "RATIONALE"; + private static final String[] ALL_PERMS = new String[]{ + Manifest.permission.READ_SMS, Manifest.permission.ACCESS_FINE_LOCATION}; + + private TestActivity spyActivity; + private TestSupportFragmentActivity spySupportFragmentActivity; + private TestAppCompatActivity spyAppCompatActivity; + private TestFragment spyFragment; + private FragmentController fragmentController; + private ActivityController activityController; + private ActivityController supportFragmentActivityController; + private ActivityController appCompatActivityController; + @Captor + private ArgumentCaptor integerCaptor; + @Captor + private ArgumentCaptor> listCaptor; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + activityController = new ActivityController<>(TestActivity.class); + supportFragmentActivityController = new ActivityController<>(TestSupportFragmentActivity.class); + appCompatActivityController = new ActivityController<>(TestAppCompatActivity.class); + fragmentController = new FragmentController<>(TestFragment.class); + + spyActivity = Mockito.spy(activityController.resume()); + spySupportFragmentActivity = Mockito.spy(supportFragmentActivityController.resume()); + spyAppCompatActivity = Mockito.spy(appCompatActivityController.resume()); + spyFragment = Mockito.spy(fragmentController.resume()); + } + + // ------ General tests ------ + + @Test + public void shouldHavePermission_whenHasPermissionsBeforeMarshmallow() { + assertThat(EasyPermissions.hasPermissions(ApplicationProvider.getApplicationContext(), + Manifest.permission.ACCESS_COARSE_LOCATION)).isTrue(); + } + + // ------ From Activity ------ + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestFromActivity() { + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + // ------ From Support Activity ------ + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestFromSupportFragmentActivity() { + EasyPermissions.requestPermissions(spySupportFragmentActivity, RATIONALE, TestSupportFragmentActivity.REQUEST_CODE, ALL_PERMS); + + verify(spySupportFragmentActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestSupportFragmentActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestFromAppCompatActivity() { + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyAppCompatActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestAppCompatActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestFromFragment() { + EasyPermissions.requestPermissions(spyFragment, RATIONALE, TestFragment.REQUEST_CODE, ALL_PERMS); + + verify(spyFragment, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestFragment.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsTest.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsTest.java new file mode 100644 index 00000000..06ce723c --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/EasyPermissionsTest.java @@ -0,0 +1,611 @@ +package pub.devrel.easypermissions; + +import android.Manifest; +import android.app.Application; +import android.app.Dialog; +import android.app.Fragment; +import android.content.pm.PackageManager; +import android.widget.TextView; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowApplication; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; + +import androidx.test.core.app.ApplicationProvider; +import pub.devrel.easypermissions.testhelper.ActivityController; +import pub.devrel.easypermissions.testhelper.FragmentController; +import pub.devrel.easypermissions.testhelper.TestActivity; +import pub.devrel.easypermissions.testhelper.TestAppCompatActivity; +import pub.devrel.easypermissions.testhelper.TestFragment; +import pub.devrel.easypermissions.testhelper.TestSupportFragmentActivity; + +import static com.google.common.truth.Truth.assertThat; +import static junit.framework.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.robolectric.Shadows.shadowOf; + +/** + * Basic Robolectric tests for {@link pub.devrel.easypermissions.EasyPermissions}. + */ +@RunWith(RobolectricTestRunner.class) +@Config(sdk = 23) +public class EasyPermissionsTest { + + private static final String RATIONALE = "RATIONALE"; + private static final String POSITIVE = "POSITIVE"; + private static final String NEGATIVE = "NEGATIVE"; + private static final String[] ONE_PERM = new String[]{Manifest.permission.READ_SMS}; + private static final String[] ALL_PERMS = new String[]{ + Manifest.permission.READ_SMS, Manifest.permission.ACCESS_FINE_LOCATION}; + private static final int[] SMS_DENIED_RESULT = new int[]{ + PackageManager.PERMISSION_DENIED, PackageManager.PERMISSION_GRANTED}; + + private ShadowApplication shadowApp; + private Application app; + private TestActivity spyActivity; + private TestSupportFragmentActivity spySupportFragmentActivity; + private TestAppCompatActivity spyAppCompatActivity; + private TestFragment spyFragment; + private FragmentController fragmentController; + private ActivityController activityController; + private ActivityController supportFragmentActivityController; + private ActivityController appCompatActivityController; + @Captor + private ArgumentCaptor integerCaptor; + @Captor + private ArgumentCaptor> listCaptor; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + app = ApplicationProvider.getApplicationContext(); + shadowApp = shadowOf(app); + + activityController = new ActivityController<>(TestActivity.class); + supportFragmentActivityController = new ActivityController<>(TestSupportFragmentActivity.class); + appCompatActivityController = new ActivityController<>(TestAppCompatActivity.class); + fragmentController = new FragmentController<>(TestFragment.class); + + spyActivity = Mockito.spy(activityController.resume()); + spySupportFragmentActivity = Mockito.spy(supportFragmentActivityController.resume()); + spyAppCompatActivity = Mockito.spy(appCompatActivityController.resume()); + spyFragment = Mockito.spy(fragmentController.resume()); + } + + // ------ General tests ------ + + @Test + public void shouldNotHavePermissions_whenNoPermissionsGranted() { + assertThat(EasyPermissions.hasPermissions(app, ALL_PERMS)).isFalse(); + } + + @Test + public void shouldNotHavePermissions_whenNotAllPermissionsGranted() { + shadowApp.grantPermissions(ONE_PERM); + assertThat(EasyPermissions.hasPermissions(app, ALL_PERMS)).isFalse(); + } + + @Test + public void shouldHavePermissions_whenAllPermissionsGranted() { + shadowApp.grantPermissions(ALL_PERMS); + assertThat(EasyPermissions.hasPermissions(app, ALL_PERMS)).isTrue(); + } + + @SuppressWarnings("ConstantConditions") + @Test + public void shouldThrowException_whenHasPermissionsWithNullContext() { + try { + EasyPermissions.hasPermissions(null, ALL_PERMS); + fail("IllegalStateException expected because of null context."); + } catch (IllegalArgumentException e) { + assertThat(e).hasMessageThat() + .isEqualTo("Can't check permissions for null context"); + } + } + + // ------ From Activity ------ + + @Test + public void shouldCorrectlyCallback_whenOnRequestPermissionResultCalledFromActivity() { + EasyPermissions.onRequestPermissionsResult(TestActivity.REQUEST_CODE, ALL_PERMS, SMS_DENIED_RESULT, spyActivity); + + verify(spyActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.ACCESS_FINE_LOCATION))); + + verify(spyActivity, times(1)) + .onPermissionsDenied(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.READ_SMS))); + + verify(spyActivity, never()).afterPermissionGranted(); + } + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestAlreadyGrantedPermissionsFromActivity() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + verify(spyActivity, never()).requestPermissions(any(String[].class), anyInt()); + assertThat(integerCaptor.getValue()).isEqualTo(TestActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + @Test + public void shouldCallbackAfterPermissionGranted_whenRequestAlreadyGrantedPermissionsFromActivity() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + // Called 2 times because this is a spy and library implementation invokes super classes annotated methods as well + verify(spyActivity, times(2)).afterPermissionGranted(); + } + + @Test + public void shouldNotCallbackAfterPermissionGranted_whenRequestNotGrantedPermissionsFromActivity() { + grantPermissions(ONE_PERM); + + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyActivity, never()).afterPermissionGranted(); + } + + @Test + public void shouldRequestPermissions_whenMissingPermissionAndNotShowRationaleFromActivity() { + grantPermissions(ONE_PERM); + showRationale(false, ALL_PERMS); + + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyActivity, times(1)) + .requestPermissions(ALL_PERMS, TestActivity.REQUEST_CODE); + } + + @Test + public void shouldShowCorrectDialog_whenMissingPermissionsAndShowRationaleFromActivity() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + EasyPermissions.requestPermissions(spyActivity, RATIONALE, TestActivity.REQUEST_CODE, ALL_PERMS); + + Fragment dialogFragment = spyActivity.getFragmentManager() + .findFragmentByTag(RationaleDialogFragment.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragment.class); + + Dialog dialog = ((RationaleDialogFragment) dialogFragment).getDialog(); + assertThatHasExpectedRationale(dialog, RATIONALE); + } + + @Test + public void shouldShowCorrectDialogUsingRequest_whenMissingPermissionsAndShowRationaleFromActivity() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + PermissionRequest request = new PermissionRequest.Builder(spyActivity, TestActivity.REQUEST_CODE, ALL_PERMS) + .setPositiveButtonText(android.R.string.ok) + .setNegativeButtonText(android.R.string.cancel) + .setRationale(android.R.string.unknownName) + .setTheme(R.style.Theme_AppCompat) + .build(); + EasyPermissions.requestPermissions(request); + + Fragment dialogFragment = spyActivity.getFragmentManager() + .findFragmentByTag(RationaleDialogFragment.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragment.class); + + Dialog dialog = ((RationaleDialogFragment) dialogFragment).getDialog(); + assertThatHasExpectedButtonsAndRationale(dialog, android.R.string.unknownName, + android.R.string.ok, android.R.string.cancel); + } + + @Test + public void shouldHaveSomePermissionDenied_whenShowRationaleFromActivity() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyActivity, ALL_PERMS)).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionDenied_whenNotShowRationaleFromActivity() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyActivity, ALL_PERMS)).isFalse(); + } + + @Test + public void shouldHaveSomePermissionPermanentlyDenied_whenNotShowRationaleFromActivity() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyActivity, Arrays.asList(ALL_PERMS))).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionPermanentlyDenied_whenShowRationaleFromActivity() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyActivity, Arrays.asList(ALL_PERMS))).isFalse(); + } + + @Test + public void shouldHavePermissionPermanentlyDenied_whenNotShowRationaleFromActivity() { + showRationale(false, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyActivity, Manifest.permission.READ_SMS)).isTrue(); + } + + @Test + public void shouldNotHavePermissionPermanentlyDenied_whenShowRationaleFromActivity() { + showRationale(true, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyActivity, Manifest.permission.READ_SMS)).isFalse(); + } + + @Test + public void shouldCorrectlyCallback_whenOnRequestPermissionResultCalledFromAppCompatActivity() { + EasyPermissions.onRequestPermissionsResult(TestAppCompatActivity.REQUEST_CODE, ALL_PERMS, SMS_DENIED_RESULT, spyAppCompatActivity); + + verify(spyAppCompatActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestAppCompatActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.ACCESS_FINE_LOCATION))); + + verify(spyAppCompatActivity, times(1)) + .onPermissionsDenied(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestAppCompatActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.READ_SMS))); + + verify(spyAppCompatActivity, never()).afterPermissionGranted(); + } + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestAlreadyGrantedPermissionsFromAppCompatActivity() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyAppCompatActivity, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + verify(spyAppCompatActivity, never()).requestPermissions(any(String[].class), anyInt()); + assertThat(integerCaptor.getValue()).isEqualTo(TestAppCompatActivity.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + @Test + public void shouldCallbackAfterPermissionGranted_whenRequestAlreadyGrantedPermissionsFromAppCompatActivity() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + // Called 2 times because this is a spy and library implementation invokes super classes annotated methods as well + verify(spyAppCompatActivity, times(2)).afterPermissionGranted(); + } + + @Test + public void shouldNotCallbackAfterPermissionGranted_whenRequestNotGrantedPermissionsFromAppCompatActivity() { + grantPermissions(ONE_PERM); + + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyAppCompatActivity, never()).afterPermissionGranted(); + } + + @Test + public void shouldRequestPermissions_whenMissingPermissionAndNotShowRationaleFromAppCompatActivity() { + grantPermissions(ONE_PERM); + showRationale(false, ALL_PERMS); + + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + verify(spyAppCompatActivity, times(1)) + .requestPermissions(ALL_PERMS, TestAppCompatActivity.REQUEST_CODE); + } + + @Test + public void shouldShowCorrectDialog_whenMissingPermissionsAndShowRationaleFromAppCompatActivity() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS); + + androidx.fragment.app.Fragment dialogFragment = spyAppCompatActivity.getSupportFragmentManager() + .findFragmentByTag(RationaleDialogFragmentCompat.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragmentCompat.class); + + Dialog dialog = ((RationaleDialogFragmentCompat) dialogFragment).getDialog(); + assertThatHasExpectedRationale(dialog, RATIONALE); + } + + @Test + public void shouldShowCorrectDialog_whenMissingPermissionsAndShowRationaleFromSupportFragmentActivity() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + EasyPermissions.requestPermissions(spySupportFragmentActivity, RATIONALE, TestSupportFragmentActivity.REQUEST_CODE, ALL_PERMS); + + Fragment dialogFragment = spySupportFragmentActivity.getFragmentManager() + .findFragmentByTag(RationaleDialogFragment.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragment.class); + + Dialog dialog = ((RationaleDialogFragment) dialogFragment).getDialog(); + assertThatHasExpectedRationale(dialog, RATIONALE); + } + + @Test + public void shouldShowCorrectDialogUsingRequest_whenMissingPermissionsAndShowRationaleFromAppCompatActivity() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + PermissionRequest request = new PermissionRequest.Builder(spyAppCompatActivity, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS) + .setPositiveButtonText(android.R.string.ok) + .setNegativeButtonText(android.R.string.cancel) + .setRationale(android.R.string.unknownName) + .setTheme(R.style.Theme_AppCompat) + .build(); + EasyPermissions.requestPermissions(request); + + androidx.fragment.app.Fragment dialogFragment = spyAppCompatActivity.getSupportFragmentManager() + .findFragmentByTag(RationaleDialogFragmentCompat.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragmentCompat.class); + + Dialog dialog = ((RationaleDialogFragmentCompat) dialogFragment).getDialog(); + assertThatHasExpectedButtonsAndRationale(dialog, android.R.string.unknownName, + android.R.string.ok, android.R.string.cancel); + } + + @Test + public void shouldHaveSomePermissionDenied_whenShowRationaleFromAppCompatActivity() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyAppCompatActivity, ALL_PERMS)).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionDenied_whenNotShowRationaleFromAppCompatActivity() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyAppCompatActivity, ALL_PERMS)).isFalse(); + } + + @Test + public void shouldHaveSomePermissionPermanentlyDenied_whenNotShowRationaleFromAppCompatActivity() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyAppCompatActivity, Arrays.asList(ALL_PERMS))).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionPermanentlyDenied_whenShowRationaleFromAppCompatActivity() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyAppCompatActivity, Arrays.asList(ALL_PERMS))).isFalse(); + } + + @Test + public void shouldHavePermissionPermanentlyDenied_whenNotShowRationaleFromAppCompatActivity() { + showRationale(false, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyAppCompatActivity, Manifest.permission.READ_SMS)).isTrue(); + } + + @Test + public void shouldNotHavePermissionPermanentlyDenied_whenShowRationaleFromAppCompatActivity() { + showRationale(true, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyAppCompatActivity, Manifest.permission.READ_SMS)).isFalse(); + } + + @Test + public void shouldCorrectlyCallback_whenOnRequestPermissionResultCalledFromFragment() { + EasyPermissions.onRequestPermissionsResult(TestFragment.REQUEST_CODE, ALL_PERMS, SMS_DENIED_RESULT, + spyFragment); + + verify(spyFragment, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestFragment.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.ACCESS_FINE_LOCATION))); + + verify(spyFragment, times(1)) + .onPermissionsDenied(integerCaptor.capture(), listCaptor.capture()); + assertThat(integerCaptor.getValue()).isEqualTo(TestFragment.REQUEST_CODE); + assertThat(listCaptor.getValue()) + .containsAllIn(new ArrayList<>(Collections.singletonList(Manifest.permission.READ_SMS))); + + verify(spyFragment, never()).afterPermissionGranted(); + } + + @Test + public void shouldCallbackOnPermissionGranted_whenRequestAlreadyGrantedPermissionsFromFragment() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyFragment, RATIONALE, + TestFragment.REQUEST_CODE, ALL_PERMS); + + verify(spyFragment, times(1)) + .onPermissionsGranted(integerCaptor.capture(), listCaptor.capture()); + verify(spyFragment, never()).requestPermissions(any(String[].class), anyInt()); + assertThat(integerCaptor.getValue()).isEqualTo(TestFragment.REQUEST_CODE); + assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS); + } + + @Test + public void shouldCallbackAfterPermissionGranted_whenRequestAlreadyGrantedPermissionsFragment() { + grantPermissions(ALL_PERMS); + + EasyPermissions.requestPermissions(spyFragment, RATIONALE, TestFragment.REQUEST_CODE, ALL_PERMS); + + // Called 2 times because this is a spy and library implementation invokes super classes annotated methods as well + verify(spyFragment, times(2)).afterPermissionGranted(); + } + + @Test + public void shouldNotCallbackAfterPermissionGranted_whenRequestNotGrantedPermissionsFromFragment() { + grantPermissions(ONE_PERM); + + EasyPermissions.requestPermissions(spyFragment, RATIONALE, TestFragment.REQUEST_CODE, ALL_PERMS); + + verify(spyFragment, never()).afterPermissionGranted(); + } + + @Test + public void shouldRequestPermissions_whenMissingPermissionsAndNotShowRationaleFromFragment() { + grantPermissions(ONE_PERM); + showRationale(false, ALL_PERMS); + + EasyPermissions.requestPermissions(spyFragment, RATIONALE, TestFragment.REQUEST_CODE, ALL_PERMS); + + verify(spyFragment, times(1)) + .requestPermissions(ALL_PERMS, TestFragment.REQUEST_CODE); + } + + @Test + public void shouldShowCorrectDialog_whenMissingPermissionsAndShowRationaleFromFragment() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + EasyPermissions.requestPermissions(spyFragment, RATIONALE, TestFragment.REQUEST_CODE, ALL_PERMS); + + androidx.fragment.app.Fragment dialogFragment = spyFragment.getChildFragmentManager() + .findFragmentByTag(RationaleDialogFragmentCompat.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragmentCompat.class); + + Dialog dialog = ((RationaleDialogFragmentCompat) dialogFragment).getDialog(); + assertThatHasExpectedRationale(dialog, RATIONALE); + } + + @Test + public void shouldShowCorrectDialogUsingRequest_whenMissingPermissionsAndShowRationaleFromFragment() { + grantPermissions(ONE_PERM); + showRationale(true, ALL_PERMS); + + PermissionRequest request = new PermissionRequest.Builder(spyFragment, TestFragment.REQUEST_CODE, ALL_PERMS) + .setPositiveButtonText(POSITIVE) + .setNegativeButtonText(NEGATIVE) + .setRationale(RATIONALE) + .setTheme(R.style.Theme_AppCompat) + .build(); + EasyPermissions.requestPermissions(request); + + androidx.fragment.app.Fragment dialogFragment = spyFragment.getChildFragmentManager() + .findFragmentByTag(RationaleDialogFragmentCompat.TAG); + assertThat(dialogFragment).isInstanceOf(RationaleDialogFragmentCompat.class); + + Dialog dialog = ((RationaleDialogFragmentCompat) dialogFragment).getDialog(); + assertThatHasExpectedButtonsAndRationale(dialog, RATIONALE, POSITIVE, NEGATIVE); + } + + @Test + public void shouldHaveSomePermissionDenied_whenShowRationaleFromFragment() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyFragment, ALL_PERMS)).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionDenied_whenNotShowRationaleFromFragment() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionDenied(spyFragment, ALL_PERMS)).isFalse(); + } + + @Test + public void shouldHaveSomePermissionPermanentlyDenied_whenNotShowRationaleFromFragment() { + showRationale(false, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyFragment, Arrays.asList(ALL_PERMS))).isTrue(); + } + + @Test + public void shouldNotHaveSomePermissionPermanentlyDenied_whenShowRationaleFromFragment() { + showRationale(true, ALL_PERMS); + + assertThat(EasyPermissions.somePermissionPermanentlyDenied(spyFragment, Arrays.asList(ALL_PERMS))).isFalse(); + } + + + @Test + public void shouldHavePermissionPermanentlyDenied_whenNotShowRationaleFromFragment() { + showRationale(false, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyFragment, Manifest.permission.READ_SMS)).isTrue(); + } + + @Test + public void shouldNotHavePermissionPermanentlyDenied_whenShowRationaleFromFragment() { + showRationale(true, Manifest.permission.READ_SMS); + + assertThat(EasyPermissions.permissionPermanentlyDenied(spyFragment, Manifest.permission.READ_SMS)).isFalse(); + } + + private void assertThatHasExpectedButtonsAndRationale(Dialog dialog, int rationale, + int positive, int negative) { + TextView dialogMessage = dialog.findViewById(android.R.id.message); + assertThat(dialogMessage.getText().toString()).isEqualTo(app.getString(rationale)); + TextView positiveMessage = dialog.findViewById(android.R.id.button1); + assertThat(positiveMessage.getText().toString()).isEqualTo(app.getString(positive)); + TextView negativeMessage = dialog.findViewById(android.R.id.button2); + assertThat(negativeMessage.getText().toString()).isEqualTo(app.getString(negative)); + } + + private void assertThatHasExpectedButtonsAndRationale(Dialog dialog, String rationale, + int positive, int negative) { + TextView dialogMessage = dialog.findViewById(android.R.id.message); + assertThat(dialogMessage.getText().toString()).isEqualTo(rationale); + TextView positiveMessage = dialog.findViewById(android.R.id.button1); + assertThat(positiveMessage.getText().toString()).isEqualTo(app.getString(positive)); + TextView negativeMessage = dialog.findViewById(android.R.id.button2); + assertThat(negativeMessage.getText().toString()).isEqualTo(app.getString(negative)); + } + + private void assertThatHasExpectedButtonsAndRationale(Dialog dialog, String rationale, + String positive, String negative) { + TextView dialogMessage = dialog.findViewById(android.R.id.message); + assertThat(dialogMessage.getText().toString()).isEqualTo(rationale); + TextView positiveMessage = dialog.findViewById(android.R.id.button1); + assertThat(positiveMessage.getText().toString()).isEqualTo(positive); + TextView negativeMessage = dialog.findViewById(android.R.id.button2); + assertThat(negativeMessage.getText().toString()).isEqualTo(negative); + } + + private void assertThatHasExpectedRationale(Dialog dialog, String rationale) { + TextView dialogMessage = dialog.findViewById(android.R.id.message); + assertThat(dialogMessage.getText().toString()).isEqualTo(rationale); + } + + private void grantPermissions(String[] perms) { + shadowApp.grantPermissions(perms); + } + + private void showRationale(boolean show, String... perms) { + for (String perm : perms) { + when(spyActivity.shouldShowRequestPermissionRationale(perm)).thenReturn(show); + when(spySupportFragmentActivity.shouldShowRequestPermissionRationale(perm)).thenReturn(show); + when(spyAppCompatActivity.shouldShowRequestPermissionRationale(perm)).thenReturn(show); + when(spyFragment.shouldShowRequestPermissionRationale(perm)).thenReturn(show); + } + } +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/RationaleDialogClickListenerTest.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/RationaleDialogClickListenerTest.java new file mode 100644 index 00000000..c05f99b1 --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/RationaleDialogClickListenerTest.java @@ -0,0 +1,134 @@ +package pub.devrel.easypermissions; + +import android.Manifest; +import android.app.Activity; +import android.app.Dialog; +import android.content.DialogInterface; + +import androidx.fragment.app.Fragment; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import java.util.Arrays; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(RobolectricTestRunner.class) +@Config(sdk = 23) +public class RationaleDialogClickListenerTest { + + private static final int REQUEST_CODE = 5; + private static final String[] PERMS = new String[]{ + Manifest.permission.READ_SMS, Manifest.permission.ACCESS_FINE_LOCATION}; + @Mock + private RationaleDialogFragment dialogFragment; + @Mock + private RationaleDialogFragmentCompat dialogFragmentCompat; + @Mock + private RationaleDialogConfig dialogConfig; + @Mock + private EasyPermissions.PermissionCallbacks permissionCallbacks; + @Mock + private EasyPermissions.RationaleCallbacks rationaleCallbacks; + @Mock + private DialogInterface dialogInterface; + @Mock + private Activity activity; + @Mock + private Fragment fragment; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + when(dialogFragment.getActivity()).thenReturn(activity); + dialogConfig.requestCode = REQUEST_CODE; + dialogConfig.permissions = PERMS; + } + + @Test + public void shouldOnRationaleAccepted_whenPositiveButtonWithRationaleCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_POSITIVE); + + verify(rationaleCallbacks, times(1)).onRationaleAccepted(REQUEST_CODE); + } + + @Test + public void shouldNotOnRationaleAccepted_whenPositiveButtonWithoutRationaleCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, null); + listener.onClick(dialogInterface, Dialog.BUTTON_POSITIVE); + + verify(rationaleCallbacks, never()).onRationaleAccepted(anyInt()); + } + + @Test + public void shouldRequestPermissions_whenPositiveButtonFromActivity() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_POSITIVE); + + verify(activity, times(1)).requestPermissions(PERMS, REQUEST_CODE); + } + + @Test + public void shouldRequestPermissions_whenPositiveButtonFromFragment() { + when(dialogFragmentCompat.getParentFragment()).thenReturn(fragment); + + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragmentCompat, dialogConfig, + permissionCallbacks, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_POSITIVE); + + verify(fragment, times(1)).requestPermissions(PERMS, REQUEST_CODE); + } + + @Test + public void shouldOnRationaleDenied_whenNegativeButtonWithRationaleCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_NEGATIVE); + + verify(rationaleCallbacks, times(1)).onRationaleDenied(REQUEST_CODE); + } + + @Test + public void shouldNotOnRationaleDenied_whenNegativeButtonWithoutRationaleCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, null); + listener.onClick(dialogInterface, Dialog.BUTTON_NEGATIVE); + + verify(rationaleCallbacks, never()).onRationaleDenied(anyInt()); + } + + @Test + public void shouldOnPermissionsDenied_whenNegativeButtonWithPermissionCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + permissionCallbacks, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_NEGATIVE); + + verify(permissionCallbacks, times(1)) + .onPermissionsDenied(REQUEST_CODE, Arrays.asList(PERMS)); + } + + @Test + public void shouldNotOnPermissionsDenied_whenNegativeButtonWithoutPermissionCallbacks() { + RationaleDialogClickListener listener = new RationaleDialogClickListener(dialogFragment, dialogConfig, + null, rationaleCallbacks); + listener.onClick(dialogInterface, Dialog.BUTTON_NEGATIVE); + + verify(permissionCallbacks, never()).onPermissionsDenied(anyInt(), ArgumentMatchers.anyList()); + } +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/ActivityController.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/ActivityController.java new file mode 100644 index 00000000..fc44a2ec --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/ActivityController.java @@ -0,0 +1,45 @@ +package pub.devrel.easypermissions.testhelper; + +import android.app.Activity; + +import androidx.annotation.NonNull; +import androidx.test.core.app.ActivityScenario; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; + +/** + * Helper class to allow starting Activity, similar to the Robolectric ActivityConroller. + */ +public class ActivityController { + + private ActivityScenario scenario; + + public ActivityController(Class clazz) { + scenario = ActivityScenario.launch(clazz); + } + + public synchronized T resume() { + final CompletableFuture ActivityFuture = new CompletableFuture<>(); + + scenario.onActivity(new ActivityScenario.ActivityAction() { + @Override + public void perform(@NonNull T activity) { + ActivityFuture.complete(activity); + } + }); + + try { + return ActivityFuture.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + } + + public void reset() { + scenario.recreate(); + } + +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/FragmentController.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/FragmentController.java new file mode 100644 index 00000000..60447a65 --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/FragmentController.java @@ -0,0 +1,44 @@ +package pub.devrel.easypermissions.testhelper; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.testing.FragmentScenario; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutionException; + +/** + * Helper class to allow starting Fragments, similar to the old SupportFragmentController. + */ +public class FragmentController { + + private FragmentScenario scenario; + + public FragmentController(Class clazz) { + scenario = FragmentScenario.launch(clazz); + } + + public synchronized T resume() { + final CompletableFuture fragmentFuture = new CompletableFuture<>(); + + scenario.onFragment(new FragmentScenario.FragmentAction() { + @Override + public void perform(@NonNull T fragment) { + fragmentFuture.complete(fragment); + } + }); + + try { + return fragmentFuture.get(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + } + + public void reset() { + scenario.recreate(); + } + +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestActivity.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestActivity.java new file mode 100644 index 00000000..cc1b14c0 --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestActivity.java @@ -0,0 +1,40 @@ +package pub.devrel.easypermissions.testhelper; + +import android.app.Activity; + +import java.util.List; + +import androidx.annotation.NonNull; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; + +public class TestActivity extends Activity + implements EasyPermissions.PermissionCallbacks, EasyPermissions.RationaleCallbacks { + + public static final int REQUEST_CODE = 1; + + @Override + public void onPermissionsGranted(int requestCode, @NonNull List perms) { + + } + + @Override + public void onPermissionsDenied(int requestCode, @NonNull List perms) { + + } + + @AfterPermissionGranted(REQUEST_CODE) + public void afterPermissionGranted() { + + } + + @Override + public void onRationaleAccepted(int requestCode) { + + } + + @Override + public void onRationaleDenied(int requestCode) { + + } +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestAppCompatActivity.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestAppCompatActivity.java new file mode 100644 index 00000000..3ca8accc --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestAppCompatActivity.java @@ -0,0 +1,50 @@ +package pub.devrel.easypermissions.testhelper; + +import android.os.Bundle; + +import java.util.List; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; +import pub.devrel.easypermissions.R; + +public class TestAppCompatActivity extends AppCompatActivity + implements EasyPermissions.PermissionCallbacks, EasyPermissions.RationaleCallbacks { + + public static final int REQUEST_CODE = 3; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + getTheme().applyStyle(R.style.Theme_AppCompat, true); + super.onCreate(savedInstanceState); + } + + @Override + public void onPermissionsGranted(int requestCode, @NonNull List perms) { + + } + + @Override + public void onPermissionsDenied(int requestCode, @NonNull List perms) { + + } + + @AfterPermissionGranted(REQUEST_CODE) + public void afterPermissionGranted() { + + } + + @Override + public void onRationaleAccepted(int requestCode) { + + } + + @Override + public void onRationaleDenied(int requestCode) { + + } + +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestFragment.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestFragment.java new file mode 100644 index 00000000..96dbbcbe --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestFragment.java @@ -0,0 +1,55 @@ +package pub.devrel.easypermissions.testhelper; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import java.util.List; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; +import pub.devrel.easypermissions.R; + +public class TestFragment extends Fragment + implements EasyPermissions.PermissionCallbacks, EasyPermissions.RationaleCallbacks { + + public static final int REQUEST_CODE = 4; + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + getContext().getTheme().applyStyle(R.style.Theme_AppCompat, true); + return super.onCreateView(inflater, container, savedInstanceState); + } + + @Override + public void onPermissionsGranted(int requestCode, @NonNull List perms) { + + } + + @Override + public void onPermissionsDenied(int requestCode, @NonNull List perms) { + + } + + @AfterPermissionGranted(REQUEST_CODE) + public void afterPermissionGranted() { + + } + + @Override + public void onRationaleAccepted(int requestCode) { + + } + + @Override + public void onRationaleDenied(int requestCode) { + + } +} diff --git a/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestSupportFragmentActivity.java b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestSupportFragmentActivity.java new file mode 100644 index 00000000..83187e00 --- /dev/null +++ b/android/easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/TestSupportFragmentActivity.java @@ -0,0 +1,47 @@ +package pub.devrel.easypermissions.testhelper; + +import android.os.Bundle; + +import java.util.List; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; + +public class TestSupportFragmentActivity extends FragmentActivity + implements EasyPermissions.PermissionCallbacks, EasyPermissions.RationaleCallbacks { + + public static final int REQUEST_CODE = 5; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public void onPermissionsGranted(int requestCode, @NonNull List perms) { + + } + + @Override + public void onPermissionsDenied(int requestCode, @NonNull List perms) { + + } + + @AfterPermissionGranted(REQUEST_CODE) + public void afterPermissionGranted() { + + } + + @Override + public void onRationaleAccepted(int requestCode) { + + } + + @Override + public void onRationaleDenied(int requestCode) { + + } +} diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index d20a414a..464fb689 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -62,7 +62,9 @@ class _ProfileMedicalInfoWidgetSearchState extends State Date: Wed, 25 Sep 2024 16:00:31 +0300 Subject: [PATCH 06/76] WD: firebase firestore added and url and response mapping added --- lib/client/base_app_client.dart | 30 +++++++++++++++++++++++++++--- lib/utils/exception_report.dart | 19 +++++++++++++++++++ pubspec.yaml | 1 + 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 lib/utils/exception_report.dart diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 6888f1de..06b25072 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/service/NavigationService.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart'; +import 'package:doctor_app_flutter/utils/exception_report.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:http/http.dart' as http; @@ -130,6 +131,8 @@ class BaseAppClient { final int statusCode = response.statusCode; if (statusCode < 200 || statusCode >= 400) { onFailure(Utils.generateContactAdminMsg(), statusCode); + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: "$statusCode"); } else { var parsed = json.decode(response.body.toString()); if (parsed['ErrorType'] == 4) { @@ -141,11 +144,13 @@ class BaseAppClient { if(parsed['ErrorCode'] =='699'){ onSuccess(parsed, statusCode); }else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); onFailure(getError(parsed), statusCode); } } else if (!isAllowAny) { await Provider.of(AppGlobal.CONTEX, listen: false).logout(); - + //todo nofailure is placed here and but have to handle the response here as well Utils.showErrorToast('Your session expired Please login again'); locator().pushNamedAndRemoveUntil(ROOT); } @@ -153,11 +158,15 @@ class BaseAppClient { onFailure(getError(parsed), statusCode); } } else if (parsed['MessageStatus'] == 1) { - if (!parsed['IsAuthenticated']) + if (!parsed['IsAuthenticated']) { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); onFailure(getError(parsed), statusCode); - else + } else onSuccess(parsed, statusCode); } else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); onFailure(getError(parsed), statusCode); } } @@ -291,6 +300,8 @@ class BaseAppClient { if (parsed != null) { onSuccess(parsed, statusCode); } else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); onFailure(getError(parsed), statusCode); } } @@ -302,11 +313,18 @@ class BaseAppClient { } else { if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) { if (parsed['ErrorSearchMsg'] == null) { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: "Server Error found with no available message"); + onFailure("Server Error found with no available message", statusCode); } else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['ErrorSearchMsg']); onFailure(parsed['ErrorSearchMsg'], statusCode); } } else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']); onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); } } @@ -315,8 +333,14 @@ class BaseAppClient { onSuccess(parsed, statusCode); } else { if (parsed['message'] != null) { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['message'] ); + onFailure(parsed['message'] ?? parsed['message'], statusCode); } else { + if(body['DoctorID'] !=null ) + postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']); + onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); } } diff --git a/lib/utils/exception_report.dart b/lib/utils/exception_report.dart new file mode 100644 index 00000000..f49eba7e --- /dev/null +++ b/lib/utils/exception_report.dart @@ -0,0 +1,19 @@ +import 'package:cloud_firestore/cloud_firestore.dart'; + +void postFailureResponse({ + required String doctorId, + required String url, + required String request, + required String response, + required String exception, +}) async { + Map data = { + "url" : url, + "request" : request, + "response" : response, + "exception" : exception + }; + final firestore = FirebaseFirestore.instance; + final collectionRef = firestore.collection(doctorId); + await collectionRef.add(data); +} \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 7737d33c..2070e8c1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -76,6 +76,7 @@ dependencies: # Firebase firebase_messaging: ^14.7.5 firebase_analytics : ^10.7.1 + cloud_firestore: ^4.17.5 #GIF image # flutter_gifimage: ^1.0.1 From 4b06924538bec46a8074d185b7e9237d0dc98d2e Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 26 Sep 2024 09:16:20 +0300 Subject: [PATCH 07/76] WD:date time added to the document reference in collection --- lib/utils/exception_report.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utils/exception_report.dart b/lib/utils/exception_report.dart index f49eba7e..1982f94d 100644 --- a/lib/utils/exception_report.dart +++ b/lib/utils/exception_report.dart @@ -15,5 +15,5 @@ void postFailureResponse({ }; final firestore = FirebaseFirestore.instance; final collectionRef = firestore.collection(doctorId); - await collectionRef.add(data); + await collectionRef.doc(DateTime.now().toIso8601String()).set(data); } \ No newline at end of file From 7b8e0ff7bd6acbcbe653a3d47ac881a4fdf9f390 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 26 Sep 2024 09:27:21 +0300 Subject: [PATCH 08/76] data type changes --- lib/utils/exception_report.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils/exception_report.dart b/lib/utils/exception_report.dart index f49eba7e..141bd071 100644 --- a/lib/utils/exception_report.dart +++ b/lib/utils/exception_report.dart @@ -1,7 +1,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; void postFailureResponse({ - required String doctorId, + required dynamic doctorId, required String url, required String request, required String response, @@ -14,6 +14,6 @@ void postFailureResponse({ "exception" : exception }; final firestore = FirebaseFirestore.instance; - final collectionRef = firestore.collection(doctorId); + final collectionRef = firestore.collection(doctorId.toString()); await collectionRef.add(data); } \ No newline at end of file From fe5d66f57def7f12acc18dc55d55949d752aa146 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Sun, 29 Sep 2024 11:46:11 +0300 Subject: [PATCH 09/76] ECG order number updated. --- lib/screens/patients/ECGPage.dart | 2 +- lib/utils/exception_report.dart | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/screens/patients/ECGPage.dart b/lib/screens/patients/ECGPage.dart index 46cb2cdc..69cd56c4 100644 --- a/lib/screens/patients/ECGPage.dart +++ b/lib/screens/patients/ECGPage.dart @@ -95,7 +95,7 @@ class ECGPage extends StatelessWidget { children: [ new TextSpan(text: TranslationBase.of(context).orderNo, style: TextStyle(fontSize: 12, fontFamily: 'Poppins')), new TextSpan( - text: '${/*model.patientMuseResultsModelList[index].orderNo?? */ '3455'}', + text: '${model.patientMuseResultsModelList[index].orderNo}', style: TextStyle(fontWeight: FontWeight.w600, fontFamily: 'Poppins', fontSize: 14)), ], ), diff --git a/lib/utils/exception_report.dart b/lib/utils/exception_report.dart index 89f0c1ea..480ddbe7 100644 --- a/lib/utils/exception_report.dart +++ b/lib/utils/exception_report.dart @@ -14,8 +14,6 @@ void postFailureResponse({ "exception" : exception }; final firestore = FirebaseFirestore.instance; - final collectionRef = firestore.collection(doctorId.toString()); - await collectionRef.add(data); await collectionRef.doc(DateTime.now().toIso8601String()).set(data); } \ No newline at end of file From 9e7ca2ecf85651106fcde89947fe718714e1c193 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Tue, 1 Oct 2024 10:33:34 +0300 Subject: [PATCH 10/76] update assessment changes. --- .../diabetic_chart/GetDiabeticChartValuesResponseModel.dart | 2 +- .../soap_update/assessment/update_assessment_page.dart | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart index 1e5dd8fd..aa633671 100644 --- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart +++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart @@ -2,7 +2,7 @@ class GetDiabeticChartValuesResponseModel { String? resultType; int? admissionNo; String? dateChart; - int? resultValue; + num? resultValue; int? createdBy; String? createdOn; diff --git a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart index aa745578..65ceb4ff 100644 --- a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart @@ -401,7 +401,9 @@ class _UpdateAssessmentPageState extends State implements } } bool checkPrimaryDiagnosis(){ - List type = mySelectedAssessmentList.where((element) => element.selectedDiagnosisType!.id==2).toList(); + ProjectViewModel projectViewModel = Provider.of(context, listen: false); + bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); + List type = mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id==2 && isVidaPlus ==false) || (element.selectedDiagnosisType!.code=='3' && isVidaPlus==true)).toList(); return type.isEmpty ? false : true; } } From f125efb8c91a9eb5158eb3edec20cfeaf4a46b21 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Tue, 8 Oct 2024 16:36:52 +0300 Subject: [PATCH 11/76] frequency changes --- .../prescription/add_prescription/prescription_form_widget.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/prescription/add_prescription/prescription_form_widget.dart b/lib/screens/prescription/add_prescription/prescription_form_widget.dart index 53616188..7aefa133 100644 --- a/lib/screens/prescription/add_prescription/prescription_form_widget.dart +++ b/lib/screens/prescription/add_prescription/prescription_form_widget.dart @@ -252,7 +252,7 @@ getIcdCodeData() async{ hintText: TranslationBase.of(context).frequency, elementError: frequencyError, // element: frequency, - element: widget.medicineViewModel.itemMedicineListRoute.length == 1 ? frequency = widget.medicineViewModel.itemMedicineListRoute[0] : frequency, + element: widget.medicineViewModel.medicationFrequencyList.length == 1 ? frequency = widget.medicineViewModel.medicationFrequencyList[0] : frequency, elementList: widget.medicineViewModel.itemMedicineList, keyId: 'parameterCode', keyName: 'description', From 8bd73827f82e2d49dad2f7099374e19471154b30 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 9 Oct 2024 09:46:48 +0300 Subject: [PATCH 12/76] Dr app update to stores 9.3 --- android/app/build.gradle | 4 +-- android/app/src/main/AndroidManifest.xml | 4 +++ lib/client/base_app_client.dart | 4 +-- lib/config/config.dart | 2 +- lib/core/service/authentication_service.dart | 2 +- .../PatientMedicalReportService.dart | 3 +- .../viewModel/authentication_view_model.dart | 4 +-- .../all_discharge_summary.dart | 36 +++++++++---------- .../discharge_Summary_widget.dart | 5 ++- .../medical_report/MedicalReportPage.dart | 2 ++ .../assessment/update_assessment_page.dart | 29 ++++++++------- lib/widgets/shared/user-guid/CusomRow.dart | 17 ++++----- pubspec.yaml | 4 +-- 13 files changed, 58 insertions(+), 58 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5457931e..64723504 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 signingConfigs { release { @@ -49,7 +49,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.hmg.hmgDr" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index db0fe5f0..e9c14541 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,6 +29,10 @@ + + + + 0) { user = _authService.dashboardItemsList[0]; sharedPref.setObj(LAST_LOGIN_USER, _authService.dashboardItemsList[0]); - await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); - await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); + // await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); + // await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); this.unverified = true; } setState(ViewState.Idle); diff --git a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart index c4bf99a2..9364def5 100644 --- a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart @@ -68,25 +68,23 @@ class _AllDischargeSummaryState extends State { ], ), ), - Expanded( - child: Container( - padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), - child: ListView.builder( - scrollDirection: Axis.vertical, - itemCount: model.allDisChargeSummaryList.length, - shrinkWrap: true, - itemBuilder: (BuildContext ctxt, int index) { - return Column( - children: [ - InkWell( - child: DischargeSummaryWidget( - dischargeSummary: model - .allDisChargeSummaryList[index]), - ), - ], - ); - }), - ), + Container( + padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), + child: ListView.builder( + scrollDirection: Axis.vertical, + itemCount: model.allDisChargeSummaryList.length, + shrinkWrap: true, + itemBuilder: (BuildContext ctxt, int index) { + return Column( + children: [ + InkWell( + child: DischargeSummaryWidget( + dischargeSummary: model + .allDisChargeSummaryList[index]), + ), + ], + ); + }), ), ], ), diff --git a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart index 140a72e2..9005d5ef 100644 --- a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart +++ b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart @@ -27,13 +27,12 @@ class _DischargeSummaryWidgetState extends State { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return Column( children: [ Container( width: double.infinity, - margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), - padding: EdgeInsets.all(8.0), + // margin: EdgeInsets.only(top: 8.0, left: 8.0, right: 8.0), + // padding: EdgeInsets.all(8.0), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all( diff --git a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart index 72a3c742..1e15da45 100644 --- a/lib/screens/patients/profile/medical_report/MedicalReportPage.dart +++ b/lib/screens/patients/profile/medical_report/MedicalReportPage.dart @@ -23,6 +23,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../../core/model/doctor/doctor_profile_model.dart'; import '../../../../routes.dart'; import 'AddVerifyMedicalReport.dart'; @@ -42,6 +43,7 @@ class _MedicalReportPageState extends State { return BaseView( onModelReady: (model) async { + await model.getDoctorProfile(isGetProfile: true); await model.getMedicalReportList(patient); await model.getMedicalReportTemplate(); }, diff --git a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart index 65ceb4ff..e04d040d 100644 --- a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart @@ -39,7 +39,8 @@ class UpdateAssessmentPage extends StatefulWidget { class _UpdateAssessmentPageState extends State implements AssessmentCallBack { bool isAssessmentExpand = false; List mySelectedAssessmentList = []; - bool isPrescriptionOrder =false; + bool isPrescriptionOrder = false; + @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -324,20 +325,16 @@ class _UpdateAssessmentPageState extends State implements ), InkWell( onTap: () { - if(model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id ==2) { + if (model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id == 2) { Utils.showErrorToast(TranslationBase.of(context).principalDiagnosisCannot); - }else{ - openAssessmentDialog( - context, isUpdate: true, - assessment: assessment, - model: model); - + } else { + openAssessmentDialog(context, isUpdate: true, assessment: assessment, model: model); } }, child: Icon( DoctorApp.edit, size: 18, - color: model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id ==2 ? Colors.grey : Colors.black , + color: model.isPrescriptionOrder && assessment.selectedDiagnosisType!.id == 2 ? Colors.grey : Colors.black, ), ) ], @@ -393,17 +390,19 @@ class _UpdateAssessmentPageState extends State implements nextFunction(model) { if (mySelectedAssessmentList.isEmpty) { Utils.showErrorToast(TranslationBase.of(context).assessmentErrorMsg); - } else if(!checkPrimaryDiagnosis()) { + } else if (!checkPrimaryDiagnosis()) { Utils.showErrorToast(TranslationBase.of(context).onePrimaryDiagnosis); - }else{ + } else { widget.changeLoadingState(true); widget.changePageViewIndex(3); } } - bool checkPrimaryDiagnosis(){ + + bool checkPrimaryDiagnosis() { ProjectViewModel projectViewModel = Provider.of(context, listen: false); - bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); - List type = mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id==2 && isVidaPlus ==false) || (element.selectedDiagnosisType!.code=='3' && isVidaPlus==true)).toList(); - return type.isEmpty ? false : true; + bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); + List type = + mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id == 2 && isVidaPlus == false) || (element.selectedDiagnosisType!.code == '3' && isVidaPlus == true)).toList(); + return type.isEmpty ? false : true; } } diff --git a/lib/widgets/shared/user-guid/CusomRow.dart b/lib/widgets/shared/user-guid/CusomRow.dart index aea3b1e8..3dcb57d8 100644 --- a/lib/widgets/shared/user-guid/CusomRow.dart +++ b/lib/widgets/shared/user-guid/CusomRow.dart @@ -42,16 +42,13 @@ class CustomRow extends StatelessWidget { SizedBox( width: 1, ), - Expanded( - flex: isExpanded ? 1 : 0, - child: AppText( - value, - fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, - color: valueColor ?? Color(0xFF2B353E), - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - isCopyable: isCopyable, - ), + AppText( + value, + fontSize: valueSize ?? SizeConfig.getTextMultiplierBasedOnWidth() * 2.9, + color: valueColor ?? Color(0xFF2B353E), + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + isCopyable: isCopyable, ), ], ); diff --git a/pubspec.yaml b/pubspec.yaml index 2070e8c1..8083cf66 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.4.14+1 +version: 1.4.16+1 environment: @@ -76,7 +76,7 @@ dependencies: # Firebase firebase_messaging: ^14.7.5 firebase_analytics : ^10.7.1 - cloud_firestore: ^4.17.5 + cloud_firestore: ^4.15.8 #GIF image # flutter_gifimage: ^1.0.1 From 53aa39cab99dbe1411b9bbf9054d476c7dd33e1e Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Mon, 28 Oct 2024 14:29:29 +0300 Subject: [PATCH 13/76] Updated --- analysis_options.yaml | 28 + android/app/build.gradle | 13 +- android/build.gradle | 4 +- android/easypermissions/build.gradle | 2 +- android/settings.gradle | 2 +- assets/images/zoom/chat-send@2x.png | Bin 0 -> 1407 bytes assets/images/zoom/chat-send@3x.png | Bin 0 -> 1981 bytes assets/images/zoom/default-avatar.png | Bin 0 -> 2770 bytes assets/images/zoom/hamburger@2x.png | Bin 0 -> 222 bytes assets/images/zoom/hamburger@3x.png | Bin 0 -> 412 bytes assets/images/zoom/index.ts | 22 + assets/images/zoom/locked@2x.png | Bin 0 -> 376 bytes assets/images/zoom/locked@3x.png | Bin 0 -> 567 bytes assets/images/zoom/more@2x.png | Bin 0 -> 5529 bytes assets/images/zoom/more@3x.png | Bin 0 -> 10541 bytes assets/images/zoom/mute@2x.png | Bin 0 -> 5853 bytes assets/images/zoom/mute@3x.png | Bin 0 -> 11098 bytes assets/images/zoom/muted@2x.png | Bin 0 -> 2031 bytes assets/images/zoom/muted@3x.png | Bin 0 -> 2083 bytes assets/images/zoom/question-ballon@2x.png | Bin 0 -> 877 bytes assets/images/zoom/question-ballon@3x.png | Bin 0 -> 1247 bytes assets/images/zoom/share-off@2x.png | Bin 0 -> 12954 bytes assets/images/zoom/share-off@3x.png | Bin 0 -> 24051 bytes assets/images/zoom/share-on@2x.png | Bin 0 -> 9493 bytes assets/images/zoom/share-on@3x.png | Bin 0 -> 17857 bytes assets/images/zoom/speaker-off.png | Bin 0 -> 2022 bytes assets/images/zoom/speaker-on.png | Bin 0 -> 1642 bytes assets/images/zoom/switch-camera.png | Bin 0 -> 2187 bytes assets/images/zoom/talking@2x.png | Bin 0 -> 2063 bytes assets/images/zoom/talking@3x.png | Bin 0 -> 2179 bytes assets/images/zoom/unlocked@2x.png | Bin 0 -> 384 bytes assets/images/zoom/unlocked@3x.png | Bin 0 -> 634 bytes assets/images/zoom/unmute@2x.png | Bin 0 -> 7451 bytes assets/images/zoom/unmute@3x.png | Bin 0 -> 13799 bytes assets/images/zoom/video-off@2x.png | Bin 0 -> 12830 bytes assets/images/zoom/video-off@3x.png | Bin 0 -> 24545 bytes assets/images/zoom/video-on@2x.png | Bin 0 -> 13948 bytes assets/images/zoom/video-on@3x.png | Bin 0 -> 27205 bytes ios/Runner.xcodeproj/project.pbxproj | 46 +- .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes ios/RunnerTests/RunnerTests.swift | 12 + lib/client/base_app_client.dart | 4 +- lib/config/config.dart | 4 +- .../viewModel/authentication_view_model.dart | 4 +- lib/main.dart | 3 +- .../auth/verification_methods_screen.dart | 1 + .../doctor_replay/doctor_repaly_chat.dart | 2 +- lib/screens/live_care/panding_list.dart | 2 +- .../register_patient/VerifyMethodPage.dart | 2 +- lib/widgets/auth/sms-popup.dart | 39 +- .../data_display/list/flexible_container.dart | 2 +- lib/widgets/dialog/AskPermissionDialog.dart | 2 +- lib/widgets/shared/app_texts_widget.dart | 22 +- .../shared/text_fields/TextFields.dart | 8 +- .../user-guid/custom_validation_error.dart | 2 +- linux/.gitignore | 1 + linux/CMakeLists.txt | 145 ++++ linux/flutter/CMakeLists.txt | 88 +++ linux/flutter/generated_plugin_registrant.cc | 19 + linux/flutter/generated_plugin_registrant.h | 15 + linux/flutter/generated_plugins.cmake | 25 + linux/main.cc | 6 + linux/my_application.cc | 124 +++ linux/my_application.h | 18 + macos/.gitignore | 7 + macos/Flutter/Flutter-Debug.xcconfig | 2 + macos/Flutter/Flutter-Release.xcconfig | 2 + macos/Flutter/GeneratedPluginRegistrant.swift | 34 + macos/Podfile | 43 ++ macos/Runner.xcodeproj/project.pbxproj | 705 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 ++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes macos/Runner/Base.lproj/MainMenu.xib | 343 +++++++++ macos/Runner/Configs/AppInfo.xcconfig | 14 + macos/Runner/Configs/Debug.xcconfig | 2 + macos/Runner/Configs/Release.xcconfig | 2 + macos/Runner/Configs/Warnings.xcconfig | 13 + macos/Runner/DebugProfile.entitlements | 12 + macos/Runner/Info.plist | 32 + macos/Runner/MainFlutterWindow.swift | 15 + macos/Runner/Release.entitlements | 8 + macos/RunnerTests/RunnerTests.swift | 12 + pubspec.yaml | 10 +- .../plugins/GeneratedPluginRegistrant.java | 19 + web/android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes web/android/gradlew | 160 ++++ web/android/gradlew.bat | 90 +++ web/android/local.properties | 2 + web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 59 ++ web/ios/Runner/GeneratedPluginRegistrant.h | 19 + web/ios/Runner/GeneratedPluginRegistrant.m | 14 + web/manifest.json | 35 + windows/.gitignore | 17 + windows/CMakeLists.txt | 108 +++ windows/flutter/CMakeLists.txt | 109 +++ .../flutter/generated_plugin_registrant.cc | 32 + windows/flutter/generated_plugin_registrant.h | 15 + windows/flutter/generated_plugins.cmake | 30 + windows/runner/CMakeLists.txt | 40 + windows/runner/Runner.rc | 121 +++ windows/runner/flutter_window.cpp | 71 ++ windows/runner/flutter_window.h | 33 + windows/runner/main.cpp | 43 ++ windows/runner/resource.h | 16 + windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes windows/runner/runner.exe.manifest | 20 + windows/runner/utils.cpp | 65 ++ windows/runner/utils.h | 19 + windows/runner/win32_window.cpp | 288 +++++++ windows/runner/win32_window.h | 102 +++ 128 files changed, 3515 insertions(+), 53 deletions(-) create mode 100644 analysis_options.yaml create mode 100644 assets/images/zoom/chat-send@2x.png create mode 100644 assets/images/zoom/chat-send@3x.png create mode 100644 assets/images/zoom/default-avatar.png create mode 100644 assets/images/zoom/hamburger@2x.png create mode 100644 assets/images/zoom/hamburger@3x.png create mode 100644 assets/images/zoom/index.ts create mode 100644 assets/images/zoom/locked@2x.png create mode 100644 assets/images/zoom/locked@3x.png create mode 100644 assets/images/zoom/more@2x.png create mode 100644 assets/images/zoom/more@3x.png create mode 100644 assets/images/zoom/mute@2x.png create mode 100644 assets/images/zoom/mute@3x.png create mode 100644 assets/images/zoom/muted@2x.png create mode 100644 assets/images/zoom/muted@3x.png create mode 100644 assets/images/zoom/question-ballon@2x.png create mode 100644 assets/images/zoom/question-ballon@3x.png create mode 100644 assets/images/zoom/share-off@2x.png create mode 100644 assets/images/zoom/share-off@3x.png create mode 100644 assets/images/zoom/share-on@2x.png create mode 100644 assets/images/zoom/share-on@3x.png create mode 100644 assets/images/zoom/speaker-off.png create mode 100644 assets/images/zoom/speaker-on.png create mode 100644 assets/images/zoom/switch-camera.png create mode 100644 assets/images/zoom/talking@2x.png create mode 100644 assets/images/zoom/talking@3x.png create mode 100644 assets/images/zoom/unlocked@2x.png create mode 100644 assets/images/zoom/unlocked@3x.png create mode 100644 assets/images/zoom/unmute@2x.png create mode 100644 assets/images/zoom/unmute@3x.png create mode 100644 assets/images/zoom/video-off@2x.png create mode 100644 assets/images/zoom/video-off@3x.png create mode 100644 assets/images/zoom/video-on@2x.png create mode 100644 assets/images/zoom/video-on@3x.png create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 ios/RunnerTests/RunnerTests.swift create mode 100644 linux/.gitignore create mode 100644 linux/CMakeLists.txt create mode 100644 linux/flutter/CMakeLists.txt create mode 100644 linux/flutter/generated_plugin_registrant.cc create mode 100644 linux/flutter/generated_plugin_registrant.h create mode 100644 linux/flutter/generated_plugins.cmake create mode 100644 linux/main.cc create mode 100644 linux/my_application.cc create mode 100644 linux/my_application.h create mode 100644 macos/.gitignore create mode 100644 macos/Flutter/Flutter-Debug.xcconfig create mode 100644 macos/Flutter/Flutter-Release.xcconfig create mode 100644 macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 macos/Podfile create mode 100644 macos/Runner.xcodeproj/project.pbxproj create mode 100644 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner/AppDelegate.swift create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 macos/Runner/Base.lproj/MainMenu.xib create mode 100644 macos/Runner/Configs/AppInfo.xcconfig create mode 100644 macos/Runner/Configs/Debug.xcconfig create mode 100644 macos/Runner/Configs/Release.xcconfig create mode 100644 macos/Runner/Configs/Warnings.xcconfig create mode 100644 macos/Runner/DebugProfile.entitlements create mode 100644 macos/Runner/Info.plist create mode 100644 macos/Runner/MainFlutterWindow.swift create mode 100644 macos/Runner/Release.entitlements create mode 100644 macos/RunnerTests/RunnerTests.swift create mode 100644 web/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java create mode 100644 web/android/gradle/wrapper/gradle-wrapper.jar create mode 100755 web/android/gradlew create mode 100644 web/android/gradlew.bat create mode 100644 web/android/local.properties create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/ios/Runner/GeneratedPluginRegistrant.h create mode 100644 web/ios/Runner/GeneratedPluginRegistrant.m create mode 100644 web/manifest.json create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/flutter/CMakeLists.txt create mode 100644 windows/flutter/generated_plugin_registrant.cc create mode 100644 windows/flutter/generated_plugin_registrant.h create mode 100644 windows/flutter/generated_plugins.cmake create mode 100644 windows/runner/CMakeLists.txt create mode 100644 windows/runner/Runner.rc create mode 100644 windows/runner/flutter_window.cpp create mode 100644 windows/runner/flutter_window.h create mode 100644 windows/runner/main.cpp create mode 100644 windows/runner/resource.h create mode 100644 windows/runner/resources/app_icon.ico create mode 100644 windows/runner/runner.exe.manifest create mode 100644 windows/runner/utils.cpp create mode 100644 windows/runner/utils.h create mode 100644 windows/runner/win32_window.cpp create mode 100644 windows/runner/win32_window.h diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 00000000..0d290213 --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,28 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/app/build.gradle b/android/app/build.gradle index 5457931e..e87052e9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 signingConfigs { release { @@ -49,7 +49,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.hmg.hmgDr" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -59,7 +59,7 @@ android { buildTypes { release { // TODO: Add your own signing config for the release build. - signingConfig signingConfigs.release + signingConfig signingConfigs.debug } debug { @@ -103,14 +103,17 @@ dependencies { //openTok implementation 'com.opentok.android:opentok-android-sdk:2.20.1' //permissions - implementation 'pub.devrel:easypermissions:0.4.0' +// implementation 'pub.devrel:easypermissions:0.4.0' + implementation project(':easypermissions') + //retrofit + implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.okhttp3:okhttp:4.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.6.2' implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0' - + implementation 'com.android.support:multidex:1.0.3' implementation 'com.google.firebase:firebase-analytics:17.4.1' } apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 5254f6aa..98c26f7a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.8.20' + ext.kotlin_version = '2.0.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.3' } diff --git a/android/easypermissions/build.gradle b/android/easypermissions/build.gradle index 5c6af4bc..89a6fb5f 100644 --- a/android/easypermissions/build.gradle +++ b/android/easypermissions/build.gradle @@ -6,7 +6,7 @@ ext { SNAPSHOT_REPOSITORY_URL = "https://s01.oss.sonatype.org/content/repositories/snapshots/" } -apply plugin: 'com.vanniktech.maven.publish' +//apply plugin: 'com.vanniktech.maven.publish' android { compileSdkVersion 30 diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14fb..90238d2f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -include ':app' +include ':app', ':easypermissions' def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() diff --git a/assets/images/zoom/chat-send@2x.png b/assets/images/zoom/chat-send@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..73e7cd31e30fb879e51d34bfed7c60ae389e0d1c GIT binary patch literal 1407 zcmV-_1%UdAP)#@0OuK zQkg=kguPM55@!S}4FfF21k&`Cw*`~0A_XllTOQk{mH;g8BVjSolXHZ#mOvtBX9w+u zelhBXeVHc{@?hV{9Y%4Ck;2`Qr+s7d+G{^W*}kqo$;{(X&afz(X>=Br0J~C8s8E5( zl^kB2k&WIgC^*QzDmH~r*OYIqjJ*aaAB5N`d)%9*PG!vSPQ8{|b4yQLUx z7}ADw2qRDk9Hn6ygN#672=KF9Fn$JxKp4azhantkJhCP-_0J)sj0M$!1kyBqd@M*A zfey#GSUnO@#K?OmF!fO{26`h;lqhHQuRW}+@8W*Jfht)4^kab|GXDNcSi0DccHsWg z5=O4t*m!>A({fSbVqbjtGTMdHulC^5xn8KEBV!P`yDF3jv?6`KQ&A$&(%oIm-TV*j z!qOi*P=zuVo0kHOd|!}3Qe6gVhM({5xED+nN@LLa!xF}?+uB5;hQ6 z1+1>CyNXenT-;E8abn40RD(<|ZZ;g3Xuse8d4Ws6Y+?ODv7vqGSnCf;P>r%mItVg% zD%|ELlA#qgiSp;eq71CNvJ&2{6nF!&l$k%3jB=P*T+1g`fd~qiccfLUPNifK=NW96 zC_Yo?PU7+>uSEKN+Lz*9T*NLAL05R_yQdg>yT^Mk`$|Dwfq|0@3+Iy1Rfr0u^o85c5hpDbC=7C`xru1;#wX6WQ;k-EPRluih4Xz) z^_?y+Z?&Y}(k2jzv-^*gc_A>ZXa~fHSAG0YflCSTY8&91MXlIBVQ70)^tBC&y{I1{eY%Z8$yQ z>n+z{sD?BlZM-^2upeNkf!%Qb`fvNEALZrSGz=1ve|GJScd1pWq#eP&g26?A&-(3( zK<;zm0>;%KvehfX?CXnhB(BJpF3xHq&&Bp^^(XrTa-+5=ekM1x&~=FXo+y26XW!Y^ zH$Bjsx3h0qT$IMTOC)iR#MzPOUi(epaEB+-i4VFUCJBl;(yao;A?nTndyAf6ro&1A z62_95`=Y;yNf-?*@unSVGQ5-)iQzJr9ufh3oGyCRplpPzsiy)QBr;11pbH>jK z;Vu)Hc7KRf9u7|7=ua^=JJ(~w9{?1vg%?L{hMqMCv`pYut~LnQ<9|fTEqd)Zrf>iN N002ovPDHLkV1nfGkT(DT literal 0 HcmV?d00001 diff --git a/assets/images/zoom/chat-send@3x.png b/assets/images/zoom/chat-send@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2c18a6b91d774eee78daab249cfd58d66bd2d366 GIT binary patch literal 1981 zcmV;u2SWIXP)~5JqFYzBoW+jTuX-o4SRoNibL0IS*^ z!-*H)*_3^3#B!C`0m?iM$N!C2dq7nd7LLCd0om7JXdZ-Xt2d90R^F`w;VaMYK!^bt znvNhEU%Pp9aIby#6wHX_J(WZ&8^atoXvFdylIJ{pWoe}B`=vH=f+5FONf`V?WD~2& z_lqC9s7V!8F3SM9naQX@(hx=|$97m|jF%-~*9^gh-n!YY9E)$x9o4;;CT0pR{85 zt2XCRXD0tx$Mw7a;mNZ1;!!xUB;WzvABOPo`%VOfl{W(YzpP;HX$D^6Sq!^Z_sl$2n5>Eu3Fb}3I~nJN9*tsPb(caq+q>2E&D$BbPH!J7E}w%G50i!{#$A7MdQE! zh7TUYms%o!+1{U*F+KMdI^qnPZ>8Y}z7>D@OJBINre$2aI`zso58->Yp4|$c0A14l zUuBXp`N%)dphSCxGe~xkZvWT*{`aPHg5CODzv5Oto)v$q;p7nulY`-g%2+HC$HwWo zjqPfB@5il}{x*U};bQMY`T2gLRDo|R8A;>%xpoYlIaKv=Ig!{^m2|BxRK_^g`Yjft zWJPv(>a}y?hrezsyH7=t-qHW*frdK;D!9TNO1Z>B*hOBIqOpsN9I`O?&n6!JwOLUl zhP&Fs-?ZU!4VGGt?jK(&Gj3G6=fNjw=(ks>m6M$^7G4Uw($cvqtzD%-e&Cu^LuU?3 zt890rrNbHK?FVn55`huSO&7?h6u0sTgkU^hgk2zafZc-IK`PcewHM4y7ntLgbc23Y zGxkDT!Po`fK7Sbf-S5Fo*s6F~p(@%6#+8d^OziQi3STW+PSqZMH#Tz{KN^y?qNQLL zPP^*{8LphDm=zYHonT!3a5EcZwg%{H&;hf01?r~orO-|=w;P>)HzaFiUkj#s3SSB> zU7}l}aSE^7jO2YQm<}m?DKr(Vu@kLoVYeFgorU>1r_c?w6l`HRi+a)373SDi<1iH) zlC`3xVD(st&T%WBeUo%tmZhg4teVkOu$p#PW=^3SuwdGyOtn~8P+VaSJq25@KCRa| zg)c!$)1;%iv|hD2g>DeofpZX2_+m(3!FbAcIf53qb`WVx{;#H>A$u(X^mBz|Gm+mm zZGlM3sLYGoc@ZGHJ{FFDcwPpt;hO$)13{&Q?Cc6i&k9v;vBVH+UofF1LU5L-r-kiD zh_J$@m4ZPJgq@N}hn0ds3k0>yTOn-D!k`5qVJ|pKKEjEmWtcles7`uy?AX@La%6sQ ztW0ro8g1RQRNy`gN<+eSG;#!!HGvrzltxxKrucDt*`kbNe5ctS7!*XzuZ|u6h@b70 zIE0vhK}qD$Yc%)V+IiAC4h@@`!AH!mjUC-KrftE}$RuIgVpoo$GJQy724P&I3M_Ak?3aZbiv&w2KS;?0WE2K}5#on+)}nxtjj+|^@uYN~ zMl`=5d(_dO)LVNU7fvjW%Uv$Q;2~mM#;w6}?^e9tj}gsF_7;n&I5$9kz<_a&O-DFx zu!2}j)mPLC#~0(WM?C`5hH;x^PB6;FtU_wK1X?uyEM`;ao;)lDL!-z#1!gvpxl}3} zEJt0}tm}v`4iI6)2v-+8nKCVXU?RWdR4ol%WY7p#6D-s$gf(Gdbt0YYs;fBR%2grT z;byf<rt=kli`%la&44)wrrey81+-wri0BlM?UH|V zBxi-hV$v=_V`v_3Uo|C-g0h|bZYiGg&f9t3AVer7AQm>UIa^C?s+Ru&>4Y61w>xgF P00000NkvXXu0mjfTrZ#N literal 0 HcmV?d00001 diff --git a/assets/images/zoom/default-avatar.png b/assets/images/zoom/default-avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..c5fd1e71ed2f00f24296dcfac3b371e4ea4cadb8 GIT binary patch literal 2770 zcmai0do&aL8y{I_lKZvBV!dTUOd=(-TqcsRxh+{z?kz)dnKf!6T10Y7C9<_4cOjxo zB+F&T{70qpU8?~cxzu~37{7HFw0+(GlXiTe zKcOw*-Nc6>net^`k-i7XQ2Qw2wCSbGyv-3w#~EX?5~-16LS_q_v{f$DJ#`{>G&V?ST!FF9l+4nvOw~08BY5o?PEpdA` z*1=ensmcpUU-vR*1*V7RHc?VG(xwxRsEr$tB)A(4!#u}}RcraOsie$}5PLs_aN*;l zB*l|`z^?e$@Vrr?MFQ+r9vIVjf&OnmMA>fRGD&1yp4|NB!6>_3CaQFp<93f{4mKay zK9stfUoY^8lx?Y28^)pXtRrmmzI1^?RlA0izJzmg+JC1i;?Jg5B>vo7e|IMGsHTD_oyaJo#-o*@CCo7e+7ZgGT4V zdW6)67WW4KjPfn7mcM=$`Qsoa@9?NMimuWh+&hL6vhw0LSv{oc+O(CtS^b+EA+5tp zsV0Bzc(Uh~G&MN7YrCGBa`_OOh-BEPdh)koL4-*9#M8{WVJ7L)4yDcDTk8p;Xymb) z(Ki1yIP$DUf5C_O8ybO@&=0t;6gbikeqj@O;a8UL1K1g$=iq5<@35Y+4xKwjc38tUg;zlwV8*d)F)u1Z7RA2{N0!b@%~6SO32V#zV3IbssdJMt9M}i--gv#g zb|`5F9N)Y9T3ui>Lt04dNO0RP(@dj{H>A77d15y;RLRS`boyqdA3J4Nd`tX}twe))9cd=hJEPbe1Amqu<=$PYYc=F>LwVN5*bQ?~Ne_O;-VrF$Wa zH1QN(d&BAK-m!}MiTnCv18_z-N_0?jjAqpY^iH3iaJPz!DV4Ne9;z9Svl_bHzyHjV z#e*RvR4Y@xMl@myGJh2BK9Wd%alybaJi{;Dx9H|lvkLwd1wX;}x&M6x;h5z%@x-)G zLo2Ond@2{n2*89W(+BKf$sOr-wAlleheNm4+qgk3zH{HZYFtx~k5s-k1p4uFAO<^= z4_rUu!z@vg&}@*!SB3qH72CT+#QAB43+nXlO^HgX^uIK3nute1fu89UQD)}k())q3 z`{x~g7aeHUT2E@Ijbb>l5+TKviGuSWn}5zRxgq&wy`yed^V$4`Ag6y1Nwe)Ra2>kt zrQLJxw1=gic*!Zl@Hc1uHfy|tyH;u6PkGtp$Z>)mB_n1|368@EF89HVi>Nn_w1&pT zn|svINK18gB-}jtj#1>M?(<@BajshhIBWf7hW-A#wsd0TY=1d1dj(wKfr7_8M6eYc zxar?^eNB7rjC$khVzIRElTiu$Wc+?fC4uD|S3jN60dmZS54=Pqp~-sexqjqWVGxL}rZk5Npv5q9&07x)yV4kaoyD=!P zR<7Gv4@R$}Dj1kxN%VUAwfzj;KnB!9z7TO*Ro@Qv=Jdzs+W*)%GBDn7j;REB$f#2g zH!acA-?Y{SHc#xN78Mn#k~4AB5;6@RRX&5ONxp7X$Xc&m3yp4#YgK$g>i{JsTS>Fu zB=hbpdR&O!kyRG#OED1ve1ZzFL8z!-2V1&r7Y)@%FR7~0xl7nU!QGUZ(z8RkR24P4 zy^7-QIi;iG0+rH6wce&~$+;Szp)vwNVzvLQ4V~Ap(5qfTr(AT{F)#1DPoGcm!Juw+ z?wfA+$bG^uR@qL$9MLFaR{bB>_H3N{y3Lpg;RRuTC`UUNTQ=IC`XBrc4$lAp literal 0 HcmV?d00001 diff --git a/assets/images/zoom/hamburger@2x.png b/assets/images/zoom/hamburger@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9b490c25b08664b424f8089290a444b7ae8a5e1f GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=_q^keENoYnybgM~p)%~~$NQV7+hws%dQ|D% zzm=)|d63M_Vs3^8O^M`nmd9f9BYP|v4w&>9UYAK;w_WF$3`2s8`~%N(0{LOTq=D8m Nc)I$ztaD0e0swXLN7MiS literal 0 HcmV?d00001 diff --git a/assets/images/zoom/hamburger@3x.png b/assets/images/zoom/hamburger@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..434601f96553adf27780028ff7e2d1d4352a7ca6 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z|B0D_s7n`Znh*-c@}U z{4V%0NN>rx;L9a_fTgElM#F7|oPrv`JqinN>=FF@-}4&hNt-!~?`Tdt3pAF2VTYlw z%F1iM)}$_~*eFxh6?)mETK}T%gs#h3k=jwGmulSGt7JRl{rOL#%dg)m%x_j=t=hWh z-kuhZ#%pYkIve0-1k7{gjcWvZ6rP40fCt}PX(-Y==G5x>zMV6fP z(fpM66YDO7oZkQR%i3wji!>B31_CGWE^?h^PhI%z{>}W_HM{=ryl(hlQG}+|dXN5RD^4D7IGf2~#P%kE x=f**a4UglFH~fCRM#D~$d0!7WBpD7=$TFCP%Jk;%`F0HCEKgTImvv4FO#qKGs7(L> literal 0 HcmV?d00001 diff --git a/assets/images/zoom/index.ts b/assets/images/zoom/index.ts new file mode 100644 index 00000000..fce1d508 --- /dev/null +++ b/assets/images/zoom/index.ts @@ -0,0 +1,22 @@ +export const icons = { + chatSend: require('./chat-send.png'), + defaultAvatar: require('./default-avatar.png'), + locked: require('./locked.png'), + more: require('./more.png'), + mute: require('./mute.png'), + muted: require('./muted.png'), + shareOn: require('./share-on.png'), + shareOff: require('./share-off.png'), + speakerOn: require('./speaker-on.png'), + speakerOff: require('./speaker-off.png'), + switchCamera: require('./switch-camera.png'), + hamburger: require('./hamburger.png'), + questionBalloon: require('./question-ballon.png'), + talking: require('./talking.png'), + unmute: require('./unmute.png'), + unlocked: require('./unlocked.png'), + videoOn: require('./video-on.png'), + videoOff: require('./video-off.png'), +}; + +export type IconTypes = keyof typeof icons; diff --git a/assets/images/zoom/locked@2x.png b/assets/images/zoom/locked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d9806098aabaa3b532d1bc8f2d35f149a5d6f9 GIT binary patch literal 376 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 MWmRMh(*gih#p0{&dIWfFd!F?0ko{ke}u7Jm*7 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 literal 0 HcmV?d00001 diff --git a/assets/images/zoom/muted@2x.png b/assets/images/zoom/muted@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3504363215daffb7fb1efa511727f642476b49a6 GIT binary patch literal 2031 zcmbVN3v3f*94|25ZcbQWvVq492m`Kn-?hEACuNVetPOO`t-w&k-Q#O_^l``Ct?STW zV&;H=A_0651Rn`17zBwxBuX4Q5+s@t!y_^Bm;?#xmRkbTsX3(iXpbvGdp7oeYx;P zT~}C=Y;JBgH(SiI8YY3$=_Dzdq-g>n2(2Zqb4enumGm-rpeCr2qDyidGZ;BuZqi*i zQkr%lreta3S|&^=U}Tb0NMNQ6mr_7c$l{bHHJUOm3M7oe7>w&0!h$STX_R$YYn1On zon5}m019m&khRgTmRKxnLesqoClCvya9r;5x^3pEk@pK^mNL}QdAlmkVPrf z(idtcXiE@SSO8dHy9P#?chUJf#4~-g|P5e zns7LHn&2!DP=W{;hRUj$r%LEZa?!r5hAI&;QWnNy<)BDdtRO^K0RspJ03uxohMwK)a9{MZrM^DH;~V%y$}z9py5AN%ImI@sBR!uez?hRUHS0(_g{-VbM4z|Zo$%OyK&q4%61NPrf;8&iVyix%!^M3rBkL>yop5hpXM~1^atO&*{0jVp7$LI(uc2 z`%dQ>dWurz>l*m7@A#=4DYRhO_#0QI9nBl=rPp3!K7Xrj!_WI)d8279KZ@LNtF-vb zk}c7Z8@fvJzQZohJ~+_6$$o9pzRpW$!r>P?ib|iDVBPg;d(+hqmWsD5H`mS?RNQS_ zwRijNUyt9J|M3ZBNVi(NaAHwwVDVR79%duA&3od=LmjQ}mA`%N!lJ>K4@};2;bie) dzHFO%$Ml@ z83=49BFJK78kvwtAQ6UUxRAh-0TPLU$O%zEAqFshi!g=FF+g8$w{w_*#3pTD-}}Aa z|M&lR|GrwXylB#d*%J^1ndB|@l*0FXc+X8wgU`Xd=ydoRuNFV6BS?sA>cm z+b@+@8kN3foS=j(yr|RwOEjcHG=k(UimJR&2Mn|Z)Jn1oyWV{SLnYCLRoH!`Pj!QU zRNSb6vc~1*LSvo4irAusXkL_q1R-GXXfza*buQ|{;=CLjo6`h_#vw+X3(GeRqLsc9 z)U9X$Wh^8vkR**dSPRA2Yz&!;(j-k1q@AE>oMJfA#!(J5abeJ!Ci=Nj&ys{K_~pU^ zhM{r<5s5@B5vxVfY6*&ES%Rbqn#Lgl*BfMmkK(dEXPChQbU~9;LsDeaWaMj z(jgZ@YLZsg6Jde@Bci-YP!`g3DGn5cBu))$!MJfzAV3g=fNbaxOC_;tKrs|Opge#& zxqP1i7+Rk%X=79^p-|FvKm5nF(VH-HO+d82UBj#Jih+G^&_PA?!?jwFYmK1G!L z4I`lroVJ!z5bEIQ`=PLCMBd>46D$gxU(rH5bXf}VwSZ9NS`1AFl5;CTMT3T+I_t=J zuiIUsDSjyk7xdDi0@PdRW+;|naN0t}<@$V_SJn+)7J%2|!eDqTk|c7p6$o|*OW`~% zh`5bmS)3&q9%mdZN%6du=N;nkevcxA%_1=O51j{55g^Au@|-mAlcd##gBp^;0crE& zH4a|Ht-PHAj9s*gqcT+TPUd#m$*V$2*a+B_+q7Xc}`V=giwR{!be_ z1tHc^cB6RTtXR*EyT80#-*eEq{j=x&tGd%Fcb}fSZs%aMdESM?gYC0^y*lZ%nz>as z8tp~%e!Nna`_a=yY5l#v6z9QH)ia3CV+991+aK$jdZ6olU#{gvsqEI{eW~5q2XEa7 zzlnS}u`L`~a=^2#b^qj(AN#1|$KL53N8KxGdF$jF?)C5L_T`MDGEPjBx4pObrsB`Y*@=WF_X`)Zvbs~m zZ2Fihvg4CQhi_({t4hfp|JBB=olVm&{?Ik?D0e9*JH2nyHN7=7hPiS!b>XHX(&E*0 zdnU8~rPUjk&R&Bw?2cv2(~;X7Vx0?vN8hy!#47GgUD8)|XK%CnbQe-xB^C6fTcoUS zt6Ot>c6EGNWpuoo41)aaR?2EFzRTqBGTHsxIO2@-fT5@BDo@}4cwxT(vT-S`R2mWdaFTI;q Xu)nIasq@}u^Ed7-T<-axpnAjKgIm$S literal 0 HcmV?d00001 diff --git a/assets/images/zoom/question-ballon@2x.png b/assets/images/zoom/question-ballon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ba79fd3f69cc04edc6d1cc7ca6f10397d919eb90 GIT binary patch literal 877 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 Qk^lez07*qoM6N<$g1%ET>i_@% literal 0 HcmV?d00001 diff --git a/assets/images/zoom/share-off@3x.png b/assets/images/zoom/share-off@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..46989fea832a1a1887951c15bce7192b49ab0f22 GIT binary patch literal 24051 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 Ef+few^#A|> literal 0 HcmV?d00001 diff --git a/assets/images/zoom/speaker-on.png b/assets/images/zoom/speaker-on.png new file mode 100644 index 0000000000000000000000000000000000000000..f3355ba06447cf851a60838598ab248bf30cd48d GIT binary patch literal 1642 zcmV-w29^1VP)hlD&(*LG}Us07W<58EDsi10!8@=j^&lS4B}E zUKL4zD5#ydzDV*Vx{&PrBFCjEUd5q?BJ}|S*%D<*zt5TZ=WsYuNG=L%71m0um08p5 zMvhyK$=b-i)$N}LtPSn^q@d7j;eu6JTcSykrUimR%nSQ=W`fR2K#2BY>NNXE=O8kBWJRS;DUiko%YtxjARZ#JM}iUk0c)%^NL=408Xl1sBnVLg zLa-IG`nY-EBWqm}kk%puM5;C@JLwt~gDepfMPrgwgJ4av`n!1(58yq+N~x4!w4U~Z zL-^}tncqABGk#1{r1Ufqi07=5HG9Yl_)LgK^o_Ahcw7Owcv&4~lYmr?En*xY@+=-F zwun*1D1vyLSRzIhByW9Q7!VPjHq_!o5fD~oiHZlbflKL!9TWtgniUm9Aq@A>?*KL6 z$q=_m3j*i%K>|X&d7NR01{$pdJ?I5ew@M2*NadQ>1AYP)x!?1{vtXk799RUu7Z+$! zci&m^IH*P$q0zXreB;L26Gc%U8wR~RJZyj0>;2m$c|gE3au{rPNJ6|7$^fm_SC1-{ z+E47qWqzM&8ZTbI{_`7>3o6>D{1{DrNA95OrCEFAy+Gjyr_1zW(JyO%WAF0`Z*3Q!+GR>8mJ;#94xAzXxgsiO9ucKen9DOF&sz3R_l14rgZ{*!w3#__xCze8Ktj5cofRk3mBFy4U3j|DM`M(UjM%(lA z?nao!Nq~`?2=ucmdwYNX9>ph4i7qe#4WXTL9Kw8Fm`_Z=I08o`0Mn!nNg|5R^AnMh zp$ijG*Yy`94QoytW>qFFPU5++xD?j)!463RqKrnvttdW^i^z|sWDH=AAmS|&0IRWm z&&oup)&yU@`r{5|hkb~L1%yJP@aX8DEz>l1sTe>rliQe&Bmk^iIXGx2-%3oUQ7{EFFZcp+oEiMH8MJ%Fd`Cfl7!04 z-MbIIEtf0obb!)|a(ssRzo_4z@C+~L}jn%fM zY4@FjkFJk?Wsf~4xnPCt6?vV%Q|qKtgt0;a|i~Fz!_SUvvT+&LdyPg z27)JaFpaXX2x$!S%6IuG0znV4g*c zEgqO=aU~ZK_9ibPV!%M3HGE(2cApeabYyceT0{%eTFd0XjHA)|Dv)~d^uW8EoGJ>k3iHb}VJ0KeT90rKoeHlT}>*Lx3q&oj941WEd o`@QjskWT-99R@!~E3NSRA0w|k&45_Ni~s-t07*qoM6N<$g7ir8`Tzg` literal 0 HcmV?d00001 diff --git a/assets/images/zoom/switch-camera.png b/assets/images/zoom/switch-camera.png new file mode 100644 index 0000000000000000000000000000000000000000..5927b7b7c04840c44f8edc5c71d1f0501eacc12d GIT binary patch literal 2187 zcmV;62z2*}P)JNc95#p1OR;mh36m^yCqtbmv_Nc5wMc0XvbyH>CMC_9`i&kAwbga! z3S*ZVj7DAz{x(SKB=wdq0Lx60X_W>w0FAh?W+1K@AP*LqB*~C{fdL*tk{8=#Ls(>r zBtaH|AS^;=j5`e2;gKK-ZY_gAxN4A^$6aehj!Y8kvc`H`4TOcsjCY5PJOG~=rIb!} zWNW7v4&uAWEPh)7D8@I)flE8FK%CP}X7|u4z%{`d5gTn4;dTiW zz03>Sq299#aMD?P&|Bg~0aA$5r_c5W0+Bnqt`GCWkeze$`P^JKo4Nb)<&y`b1|V>Y zECqJ4rJ>$CPKwam``+;JhX9-BatY*dGqfqH6Czbke3z*id|S~ z>bn6pfE4+j3PL0PNfugdGQUekQ2e|T$&k-eY;|?vN;0{YAURkUt(!FE1+AIi-#JZ=kx#JO{cIT7?+j!2K`xh> z;R~PRXp_)1gc{B9XXW$5et*y(k1zj1a*#$ZEH(B80%3=imrrD~*{|2vm+n=v5R^bZ zUkAU3<|q+)y`HgPu;;cUEA+vI;l9$!m~-bo`ju>E*<3C=v$ponq_`+E`E-4vX`Vhj zX3-$FwYB|7#4jcwbmBzsl-KK>GoF=i^M`7i1G&uP!UGc|o3Q+Fw4Oj|uXSwOL$v zSc*IWJQs;{Jw}qk>z&qOZHdvI+S>h2!u8yGl0#wE{9sU3- zW-s)R)FX!&h%fCa6I5B+8sV6?=Vl_7nbs2+ExaU7HI_3hppHbNgO3Xj-B5iDL7*~l zF+7T4?t7pQjwh2Fv1l|n=CHqYQ!X=HOCkV>#6%F>cXxMtl57Iu;Q904dO3E=7E5bI z8U&`vMX&^a6LE|chQkJ{i>O?Xi5H}FIW`&4jJw5$s<0uw; zI4~y(<5AXi6k+eyUqK+;SQde}K-+;GmdJha zPodC-dx=EyenGN2P+XhDot)r;d4k+cATYXpB?hh>B?-z5Thh0fpQSp1SvAb4@m_*u zuLQ(Z?sG?E%`v>8c6>GSHXOGzC-B}xAcxwtA?69F8Q^+->Z6EWKTJ9ALT%X(wA zJ_+BGee1UVHUpAI#SX2OSvmX>rLupM0LD`_nby*&!;OW|;P$N`s(_MZog^+gfj@)> zx*bS7&}~$L9j&MxNVG*BU{`EwWfEy5j}G&lsKp| zQ0wK$0qWJuk)82hgEbzu6+U1Dkh$to;$4t_SF2pRPM&tZr;TGxc%{{RXKqjGOGweJ7` N002ovPDHLkV1j)V@V5W} literal 0 HcmV?d00001 diff --git a/assets/images/zoom/talking@2x.png b/assets/images/zoom/talking@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..676d61dd40db7350ad48a1c4e08462df482eb1b6 GIT binary patch literal 2063 zcmbVNdrT8|9ItVbA!9n2lg+uE2b(&*-m4tFn^m!`QlSXgNr^_eSKAA1?{;_4QX^qZ z@DY<`f6PaiaSrBV_=r)*f>F#CXN+W-MyE?uj4o^ubvol?7-hdJrNafC*(G=PyWj8g z`+Ps&$M1V|#JFh^gYjSh0tXRq?a{&zcF%h%$g6B{{#y>upt@{8yW{94h?z-MJYrHLGc%jFSB3v8z*ZHh$4qiE!BuGOss!8akoFjov^`gEx@5 zt}-)tx)q1AZnvcN_O*UXviCY(xp}c_Y1WSyB0ZmP(EL4J!h6RX=Q=yzsT>#B@Mqb{ zZ=84A=$?}g)}Ppwy35pi^o3iKm8rz#=}K&47jtde!&4ui<9pmYW}Wqae5Lj6^t-LG z`4iI~ZHpB?y3(DM)6_R*UH8oS!QvGyk4N8FemXXC<(J+i`!iiX6ad~+$f^6}Z6Tk6I;vo{wVTUtJLE%#g3xt-gOwD-5KSk!)I!lzZH@r9c|t6Mj6 z`BB^D3}y1`%U>=UnU`I9w`BZn%lY2a`_%bgI*#3|pLn_GyBjI*SF~r<&z||N4!aOI(l>px6tIr1jgyQO?ySK*nO-;eL^Y^(F^{c3Ulq}tNm z4c)&swvW0ns^g<&DckBNA6;eH?{!|PIK1TG^}YL=uZ_9W*S9R~_EoH|)4J&XIPx_j zhEFNpG@)bXo*d3ry%pQOwYcr-_iNK1P2T}Gb+qpJ`UX+A>8;W- literal 0 HcmV?d00001 diff --git a/assets/images/zoom/talking@3x.png b/assets/images/zoom/talking@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..7028a357f81b95ee98df9ce61c0ba48e6acac7ed GIT binary patch literal 2179 zcmbVO3s4kg9A6Mp@r727uX0(me6+WZd#_vycZkFm%DveL<@huz|IciQjv%BAZ-|zeXe*ee! zpDjyCP8t$5CJKU}A@*6eRPdez?g;~)0?)3vz)0{K=$kcPhM*XedWR*hB{Cr>@;2|x zP%<2^QjF-;(5&d^tqUxwoX6fofB6dDeAJ%UUHEJ(Lq3XIih41v2LN{$7IR|(+^M+$5e zB@Q-daFoGu5;mGOgh8h>;4i@>PU0A@#|RQ73>2=T2qPT45Wps}ZYtF_Gsp$LEJ(JZ z_$UnX`~4cfRwGJT7-2S>F`UFm5(NlUE)WztfC_SKuLTFI!YZIa_>$ z>Cp1O2ta5Zju6K~wRpWD3Ry|a2W|ud@=&zwEbwtyDkqD162m3t1DUa^H$KWLakL^z zPEqvqCMu;@GE5R05}xFs8D3DGnA~RzXQLI)f`GgcD6U5dt&`NMdDD|qaWjSEJy3_p z^6rAZP$NoeorIPmhzFsdXjodI{}aqIlv|X%G;o>s(penl6S5FE6iCV{dPE5j19jTI z^LDE>MH1b-2Q0{`NeQq$(P|*f1_MfJh;F$K2W1yzg%%jjZnGdDJQ|*7Db`>h8QiQ# z4MvhfbtZ;EX_woK>WnmllUmYc()YLv_S-}zPb~sanmOj9L#Iiv*|nhs5KF zn1lQM*&HzXm@4UEmqoYYrzI{v3&idT>JWRBe3{OFy!aCix;ZBR(-P>_j&VOVLr^$rx5Ya% zmVJ|Pb?%`V(N)KH7O#n(iqFfuR6MjkYI{E>G9!Fm+s=~A$dn~tMSZ&TM*p$W*2+;A zCz98GIM?pJo!{EkR=?`-#Mpac*v6&pC2TzT%jlw(gs2sE&HUJ5G1sS5)JDt*g9j4p z-<`fKe)S+|Y}MqI>{+wI!M9o9}w_Op}BgKnU&MRsn_tP3C56;sh()qX1a z!@!@~v})7)OO8Ajx%$NZgQueRj;PrlF%yyo``#*O4R3Ayy`?SPr5)3d9ML8~bCOIQ zx1irF!#}!s<}?3IXG7Ac-Gv92@7lkhp{cTUtmB=6%7WpQW6sa>Y$_unYmOW}y5L-T z)zC4HYFX$w@IrY_ZAQbQ`^)llOD+#SKa~= z-~YU9Kx&<9yL~Hcjh4BPPG2>Ww)IOAE`3oW}6$gPGjY63@z4 z>TS6Y{=u1DR5=8#Qj+nL&f}%E{c$2<;l{<4TTU-&Kf5a`aI>kXvE%iO>CV6I)~z^D z9XW0B-Mk%BHpF$Tzjor-ceAV0uXYX#Piq$WpEvkv%h(-jh1}N6H!C2xctm|#Gm-qQ zvvciaaclKq&RJLXM_f`-PQ~ui@Q>@Hw6?wIvGhg7lf{|KqrSK?a!uWZ1n0>-`@K(U c?+m(PY+1aiseWBVk@}lpPfWJeBxIKS4WWz%;Q#;t literal 0 HcmV?d00001 diff --git a/assets/images/zoom/unlocked@2x.png b/assets/images/zoom/unlocked@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..aa5403e233d941318773bff2b4f94e0a4ec7952a GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36l5$8 za(7}_cTVOdki(Mh=ZP~I_o#8?s3W8Xntj>@2h=&pWc34_icXAr?uZMmVF3%Co7S8a+`+l#X~H* zQ^f583k;5)Fl;bq`*2O8AZ>4v(<9MtK9WWOu4sPwf?hl$>UYWPu>Z- zpwjU3%GM2X9d}yyfHfUsxF>Poc0AjTMb^*G=LsdWzmvJhe)4^Z&i0F;MwylNE-o%6 aUgnAXNt(V<^J;+s#^CAd=d#Wzp$Py)*`5;s literal 0 HcmV?d00001 diff --git a/assets/images/zoom/unlocked@3x.png b/assets/images/zoom/unlocked@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..25f9390fcfb33174c7b8bbd47706043f9f201db4 GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ79h;%I?XTvD9BhG z6tp*KIv9g&Xab#IiERK?$ogUZH(l?>w&*P1YFUW|V2s}MM@qWJUw}qt>JvKE6*t?t$h!u-0>vIWWyV9)_ zy=YNE?6)786W@nws}%J}wZltOrlnc3 z-CbmP%pmDzv&^hyW!o1#Y`3H)?4MzJ(@gG}D38a%1`#5NX^b=X{Jv~5jWM*Y`b+?u z^0exY4EvMf|K!z@)<9>FVdQ&MBb@0DCtGssI20 literal 0 HcmV?d00001 diff --git a/assets/images/zoom/unmute@2x.png b/assets/images/zoom/unmute@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6d2393f3c69bb2466ca712cb59e961ffbaea21 GIT binary patch literal 7451 zcmV+$9pvJPP)TnHH_d1nU=gQlOYnO57)r@Pade^VW68(cTK)l9^eL*Rd zGU@8%}2No(A4(Z|%+fDxddip(66^dt#dpJ-c9_)i4rERg{#B>Eq*&s=1YROCi`@f(xcGia_-G>i z)G&heOI(MD1Ba?bM%y^I`LgKt3os2;F5>P1tn<_FAcd!v15xV{*arsLH7(-2GiG!CKMaC>{6dqGR zcu$v@SPK?FI)&_%;QQNw@wr)r!w@%x>ebN7Rbod?rBM&&XS;9l|+9c8x{v_Ybr&Lu9 zKOPL`^It@xO-Dwf;y+tj)`?!wh)}5F4V?`j~2upP^SUn;f9(HkE z-HFG=Vig~?w{L1mr%U1tbVC#z3d&aD5qS+5!%lezb3bTn+X|2@g2m6h1&v_6Hfq#m zM=8*IB7%8dP0eW3y~=0M7=~k@*poKB1Z=V>z$*j;n+pYvnw1Y&ny7K3qtVdod-kjq z{t*S3U^NR5$Sc6KqfyXSNg<&9C>E>xO+&*4qL)NX+m=kOTiMy^=bT0@`$Tx4WnKYB zDW52cpx%P^_{fn{I6sL3C=8d|XDy?1=ZThi<SXAIG*BP)znP>=aC~% z%a!-AP^jQ7nu)zIqaMw2jrVjzG9UB! ze~HA}vukQ5geKzA3m7}l>xn-f+8=0Z6N%PhKY8Z>m$I}N5&U-hytltz&tmHZYmXMeFPY(RTL4)FBY(Z*IvD$Qh?Tn zfYB`ek0_9e0ZboP^M$+ytq%bs-w0Si^H?!}anGly#d2@SOVIidFjB$uSTTSRtR~?z zc?DV-09MfEW-$xrK08>$#kKj_y||v=(z5lY&6{V(ZM$5*pjWV?)-M6eMg0u4f_YaA zU}g6uhJFNEp8!^tXAS$IdF&OHy@qk$ivaMRZ<*eLR!AE~QlDs;FZ9R8#>)r*@4YG4 z8_)`Eqc5oJ0n=L{g=~rB3tBO4_)TRGn8{qzWbIC+^4j9h1==sxuYW36o$++K?B}^+ z0Q2Qc#I9u0Y3IbMDrfz&yrU!U-_me{W}ZTc)y=e4!YspEBtgkOLaEbL{kVJ0vqR#r~rSwud+xNBGQqSn@4 zMZI%@_Vmu3OSReUtq>GJ1#4I_vBW0f!*`W=9PRSKgD3JtFJptl!r`Qj8}cMC4~O!+ zVZQZs7km71EY^6-mMsf}Kh!J={CT8e0Hf_6EqtK*P$;gCbdL&$hb?JuUxoRmlP7q2 zl6Q0@65@Hop6X~$B%14#7nlpQXTJY_nedPFkCFA7iUEvLU9#f=Ch(Nl?IJx4Bu~S`|O9&XaxtPHIAO-()RY{Pwm{f;I=JW78P?W++$iO3Y=1k z`Pm1~C3gy+i0=1`haY}z)UxCpMldelxN&xGzm+n(v2n_2)z!`!!M9pk78diZnF48s zC~zJtM#H#c$~`e(LR8eILBU{~HjSLq_^p(DwS>;fjN!viKDD~~1aqIP4>XMe_9syw z6?>+Gb3&u=iD()V>GZY}Dl128rjy}xO3tdO85Xpxc*L?KxJ;u~{%p{oQNJ28M z4*lu4Xw)f3&(N&HN6?D;J;q{x35U{tiSU^S1mk{%hLZS2zw0+|e)-D!`iXG$9XH=6 z^Z1e|0Luk(+)I|1dd-H3TGzqWK6Bsm`=0zT{5|2Sx3i8dWtu0-uw>Bn05FJ z8o$_A)KP6OejKbxWPXpMEQpZ|Ml|@`8xx0elYKCcMVUjA7qP@<(GP!4+)cgts#AeP z@31JaNL~eh3qHwOPE=yh777o@OTZ3@GZQ5OP5(ZA(c~3i1nYp%GExaZqqE`3?uHjm zhbFq#*9o6aQx&=v>rF_@BS(boJSIFMFMsxdEQjx$xiS@=Nzx^w4e`JU@AiDg(e-~4X#D0*j==oKy( z9+HuRO=H=e3@(Q5YG{z()S0$@d%ghB+RPLl@64A1FcP;friz1`UKb_!ZTnLF zULwCrLk;sSl3!*-kGbG2l%A-Rr=}JP4=3AxL>%)xQ6ehkPsq}1p9wK=TDGl3)J}aUg@{8(1Vi|9eG))+91Vxs+`PcXlZ{YDR^q!@~+1w$^b-mAUJvQm)x8HsnJmio=(mQtS5XT&IOuD_j-HBGOS+m9hpnuPY?r)Nn3`CF1jf2$}6u}5JEYXVElnl zC}c+>5jz%(*)=saHpZB~@4owNv~TC?dyakT&K`+PitL&9|;oo3Vg#S-CEjV;#!O(~8i7RC3JZ0R*@PpR1JRi7=lwl}4Lc z(}uPCsLq%mST^%A?Wm)UvRAEI zWqtki*8!B1>C2Wa3mO(AxMIbM8wL#;bS~4-ue;7V>#XHSPaXkrxkBKkAygG5@pcFEv_&1afinpprqX4)D^J`-3?6dn#9 z%&>pdo5Q0F_b8f~MMnd0{Z0Wz&=z0LqSp zILDcq2<-|ZZ>XxOiWbtsz(j3rtRs55{%xqPs}Kno1w0PXL;|DN-RoO56m$UGZNlyfOSOcO*fD-CdUT0k+!MxE4d zY9@ga3M>Jj0xF+0ZD=D@QBe`4(CUt(tqP1O!nPq$)WQ_|Mu1SBV-5lAAk*z7sqb0qnccF)N@674GOu$p&jhYcHcDDF*Q)N6Wf`s9;O?yRe;8wF+!M_L1z zHyG7;~ z3F-mfU<_(7o(CiUuTbtqmc8MI8^(S0)mMKDke09<2D}nL%z5?q>Ew_X&Mo z3}v{9ed0WbJe49dH-^=`mN&_X_?m033Deo&00{LApa3BPW z%z~L1YXWxXop(+}*&}fs!TkEY2FcDr1O-|(jP+JmS2wV30;1FLJU>@CNcG0$%a{KK z4B3+_9h!4*Lqo$*j)!+p0~x2&pL_1PACZ9&)Os>{)~s2_>ojQJhZtWY#{dvNw7Vg+ z@hI|*WE<@NEw|h<20$(8E z5BDtd1IhhMn9aB5&!7Lh)vH&}1w-WdeaurMk3II-8GMEYzOs1n;@_L~LI7_&_uO+E zSTBSk1c0Na`G%HM;C%!pFAO2!-HG}$AIeo=ED_9c&%XQayVGFWobQ-HP-eaV{`(K$ z{UYW8u(I#amcPUENz4QDzkJ@jdDE9HS@KW1&j9KwSdZ(Wonbr&ISp|sm0@FU&oK)y zWTHuw&s=wjy&%`nLd(@~=4^NpgWx>%$AN|ymPd@pGSud=^RTC#pd;%We z>tn}`{d>(=2*{wTufF;eFiX}8VTzfK6f`#s;iF)2evZIWM2&G+7zf7?zUr#0Rsi^S z0j~2c%nv^J;IpYyr@nL3O*gIKm{E5G&csh(b>-hpvJViLU!Q;e`Tup=X{Y@M`gj}K zmdE3u=~qJ=!}PkrgCLz9cDK8EEDH!ulw6e3!{MY4TPz&|NO+d!&@1Gf?khErMLF4G zP?ot6gx5yLgWjVIZRz)vu<6sMe}hhQvQ0ocQeS@gh#&OXFty|(4{B-(9&(tti?>DwV5_;+7ZxdxsJs6 zGbEHf48yId z5IO^N=WWxha2wZ=45cPhYR$H(jQ}Lc#W~W`ia}1j5DW@?7r>JB z(NY*)qG@CPH0sF`E(#yaU>IX!U$X)QBEtZJ#CBOG<W>V8QOMBFNS!`m!i2vO zJrD(l0zu*CvI3zmb0;KgO%`%>O75jl!>}-wCJ_vfj5qTs2?=2RA?Gm+QlJb$%K{Yx zk)PEdv+5wT0ZN){GZLiFHu_-^D5TSI$#QsTRup5XIYD>5%FL$CVd)2D0p$EZN6D;L z0Z(%%>t#ekWE1-&dE*vdg2%NWrv&iCQjV5GaDo;nA$4Mm;EmJ*@P=l)112%RfC3lZ zj7!S7g$=ppvXHA`*>`{?fU;nChvnEwXw>ErBSy%4U}Oy$$~lJl0Te-D2f}cTkJR<8 zT)DD^=>$jYyLz`36Vf`AWp;&^iil**pAZ(dB?pds+SDLJ>fLvTD8&>KYMA*RW{?t2 zl3J_hX|qolZ<^y~`(}a)$5DV&5M((Oz{^}SoZJV!`s%CyefQmWub}pFe#I-!fhn2- zlxv0g+>LQ0;iP0Yn8WdKcS?2yt|eFLax$f9AtOHe=p*M>r{Tq2eCC;F*0Q{wXsK;* z(a!@TY`xm(JxOu_0&_qgJEZ%eRho+tBvw+Yu6pijK79iy!oDc?%}-F z{`ljMkB66d#|0N$Fb#dU?}{s~h(Y*dUpa?iVV@THk_wG*W3oc6!0S~M<0w@8b7b#%I2cYkvmD zx9o2`SlBLOz3eaRX5XH9=9wGZ`PQyo`v=rL9_bUnvq=Ex>iyM^#r^LYF%p?D76Fg- zwBZ}b0hpA0AZ>H2gF#9#LaH&CwGNBJo4Lr<(qj@=^H|8@>GBpw(3{87$9vx(y6u{b?@Nxvc>pYIME0w*gdwMnMZh;w#aP ztQUFP(Cs$#g>BNo;C@{d%Ew^Rj^tPn*xrQ2xQt>TFLw%PV%g>%B?vUhTm&*?Rt>9j z*hwdyGz|N3>!EdDv+o*bjHw#=xXuV8&!9^$z4V7P*|0#H5v!z?i6eav#{}hQg8(EI zX!>sF3z$B)5Jc!iE@Hum2qx4hq_&DNHx5?p-K{01!JG~-mMi{F>{%t0Lm;<6xTmJ# ziCoW+p>ne2-VsAWWCGIZWpGaGLYX+r+nLA%<9Ku>Ij40JXs&%YzoB0h04B<43V`ZD z`yF6J657r+8S7+Pm@Yk;iE^C;oAttUF(gz$K-mYbIn`XsIh76bONJKByT!jx3|f@!gL zf6UGoFbRg*7vn*k5SS2#>lwja#|HJ#UerT{}mSYHIuVTN^rWYWlyBZFX~3>ne01VgwsNzn~`{yYc;N4aJQJo_h5poPrVm9c#O7LuN*UX z%h4ZdJ{Rb6L2YNEF%npF3BY$86U(zs*2jMH*aHE?-GX4~yc9sW##F%t3LQgLL3r7= zvN%E=U`m27X<7!{rGR4^N_D4QLga8d+^3Cr_5kx4!JwPWN*SwTEUy!T@5CTFFt<^) z`Ne`b0O~@%E&$vGX3;dIAw69L4uegouu_tfzYa4&2$Gz4H~@f>P;Df^REDnPGbIum zi%DpUtb>xzI>0R14%_2r)RUm-V7fSsyf-cjiw(Q#$e7K|-H8A$)wt z{>9Z;6BwtQzu0F!1C%ZRm%u#%GZqIhvJGAk7|AET6PcJP9k6!ri}PD2+LpZHcmQUC zjuYp4o&!-%U(QAI{z#wX)hCtoi6PEIoNH?IrA`i2tBYxsDxW^XSiuumxJT8!!nk6t z=a@QylvQ4zbJUkBPfVYkbk$vvql_-cK2{kgz6R-w<56R(;i)e@Cbg*>b6?%OuhbXY zFxrvN#u-oYL+&7Gp4$bUZByO+T~Jbf1hP>-zY*1k`+Qo>44Rv$DvjL?3*V%y%&=>|(yY0%G68n$BnA zprv^^z_Kn^9`jJBQ@_rat3D%YkX487r#TJ-M8_hy1kF4Es_PA!hgDtenQi3~Dl?){ zJXkJrfFp>y)7>#DM@O>0hLr2G>vB%T?kAsRwv|WTTy=KW|Df5ATw}_kZl``1pWJ*X zEx9_SsW%N5(#f9Mv%1OOQ(akPnk2ov5&88=?5BMVj5`8fdY}eqfCgxQ255i=Xn+c# Z{|7JK0PZ%-DvbaD002ovPDHLkV1jxkFu?!- literal 0 HcmV?d00001 diff --git a/assets/images/zoom/unmute@3x.png b/assets/images/zoom/unmute@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..dad68fac22ed2751d3848544478b3030571b5e02 GIT binary patch literal 13799 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%0D^vJ$camn!Z503^UXK^FY5`2 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 + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 4ba725f4..0b02bfc6 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + + + + PreviewsEnabled + + + diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 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 0) { user = _authService.dashboardItemsList[0]; sharedPref.setObj(LAST_LOGIN_USER, _authService.dashboardItemsList[0]); - await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); - await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); + // await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); + // await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); this.unverified = true; } setState(ViewState.Idle); diff --git a/lib/main.dart b/lib/main.dart index 92478404..35398c97 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -70,7 +70,8 @@ class MyApp extends StatelessWidget { //buttonColor: HexColor('#D02127'), fontFamily: 'Poppins', dividerColor: Colors.grey[350], - backgroundColor: Color.fromRGBO(255, 255, 255, 1), + + // backgroundColor: Color.fromRGBO(255, 255, 255, 1), useMaterial3: false), navigatorKey: locator().navigatorKey, navigatorObservers: [ diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index e3c82850..d9bf516c 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -430,6 +430,7 @@ class _VerificationMethodsScreenState extends State { type, authenticationViewModel.loggedUser != null ? authenticationViewModel.loggedUser!.mobileNumber : authenticationViewModel.user!.mobile, (value) { + showDialog( context: context, builder: (BuildContext context) { diff --git a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart index d6f15ebf..c2e1c274 100644 --- a/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart +++ b/lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart @@ -337,7 +337,7 @@ class _DoctorReplayChatState extends State { child: Image.asset( widget .previousModel - .doctorProfile + .doctorProfile !.gender == 0 ? 'assets/images/male_avatar.png' diff --git a/lib/screens/live_care/panding_list.dart b/lib/screens/live_care/panding_list.dart index d14e1bb3..b5c6b914 100644 --- a/lib/screens/live_care/panding_list.dart +++ b/lib/screens/live_care/panding_list.dart @@ -59,7 +59,7 @@ class _LiveCarePandingListState extends State { ? Center( child: Text( _liveCareProvider.errorMsg, - style: TextStyle(color: Theme.of(context).errorColor), + style: TextStyle(color: Colors.red), ), ) : Column( diff --git a/lib/screens/patients/register_patient/VerifyMethodPage.dart b/lib/screens/patients/register_patient/VerifyMethodPage.dart index 45359dea..9e9659cd 100644 --- a/lib/screens/patients/register_patient/VerifyMethodPage.dart +++ b/lib/screens/patients/register_patient/VerifyMethodPage.dart @@ -434,7 +434,7 @@ class _ActivationPageState extends State { ), focusedErrorBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), - borderSide: BorderSide(color: Theme.of(context).errorColor), + borderSide: BorderSide(color: Colors.red), ), ); } diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index d555cd56..ec496b5d 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -7,6 +7,8 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import '../../config/config.dart'; +import 'package:cloudflare_turnstile/cloudflare_turnstile.dart'; class SMSOTP { final AuthMethodTypes type; @@ -46,7 +48,16 @@ class SMSOTP { late ProjectViewModel projectProvider; String displayTime = ''; bool isClosed = false; + final TurnstileController _controller = TurnstileController(); + final TurnstileOptions _options = TurnstileOptions( + size: TurnstileSize.normal, + theme: TurnstileTheme.light, + refreshExpired: TurnstileRefreshExpired.manual, + language: 'en', + retryAutomatically: false, + ); + String? _token; displayDialog(BuildContext context) async { double dialogWidth = MediaQuery.of(context).size.width * 0.90; double dialogInputWidth = (dialogWidth / 4) - (SizeConfig.isWidthLarge ? SizeConfig.getWidthMultiplier(width: dialogWidth) * 4.5 : 20); @@ -235,6 +246,7 @@ class SMSOTP { )), ), ), + Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( TranslationBase.of(context).validationMessage + ' ', @@ -251,7 +263,32 @@ class SMSOTP { fontWeight: FontWeight.bold, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, ) - ]) + ]), + Column(children: [ + CloudflareTurnstile( + siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', + baseUrl: BASE_URL, + options: _options, + controller: _controller, + onTokenReceived: (token) { + setState(() { + print("Cloudflare token: $token"); + _token = token; + }); + }, + // onTokenRecived: (token) { + // setState(() { + // print("Cloudflare token: $token"); + // _token = token; + // }); + // }, + onTokenExpired: () {}, + // mode: TurnstileMode.managed, + // errorBuilder: (context, error) { + // return Text(error.message); + // }, + ), + ],), ], ), ), diff --git a/lib/widgets/data_display/list/flexible_container.dart b/lib/widgets/data_display/list/flexible_container.dart index 4e4d63b3..7bd95a5b 100644 --- a/lib/widgets/data_display/list/flexible_container.dart +++ b/lib/widgets/data_display/list/flexible_container.dart @@ -34,7 +34,7 @@ class FlexibleContainer extends StatelessWidget { child: ClipRRect( borderRadius: BorderRadius.circular(8.0), child: Material( - color: Theme.of(context).backgroundColor, + // color: Theme.of(context).backgroundColor, child: Container( padding: padding, width: double.infinity, diff --git a/lib/widgets/dialog/AskPermissionDialog.dart b/lib/widgets/dialog/AskPermissionDialog.dart index 8b7eacb3..3c3d74ba 100644 --- a/lib/widgets/dialog/AskPermissionDialog.dart +++ b/lib/widgets/dialog/AskPermissionDialog.dart @@ -70,7 +70,7 @@ class _AskPermissionDialogState extends State { height: MediaQuery.of(context).size.height / 6, ), AppButton( - fontColor: Theme.of(context).backgroundColor, + // fontColor: Theme.of(context).backgroundColor, color: Colors.red[700]!, title: "Turn On Camera, Microphone", onPressed: () async { diff --git a/lib/widgets/shared/app_texts_widget.dart b/lib/widgets/shared/app_texts_widget.dart index 07c0c7e9..27e98074 100644 --- a/lib/widgets/shared/app_texts_widget.dart +++ b/lib/widgets/shared/app_texts_widget.dart @@ -210,27 +210,27 @@ class _AppTextState extends State { TextStyle? _getFontStyle() { switch (widget.style) { case "headline2": - return Theme.of(context).textTheme.headline2; + return Theme.of(context).textTheme.headlineSmall; case "headline3": - return Theme.of(context).textTheme.headline3; + return Theme.of(context).textTheme.headlineSmall; case "headline4": - return Theme.of(context).textTheme.headline4; + return Theme.of(context).textTheme.headlineMedium; case "headline5": - return Theme.of(context).textTheme.headline5; + return Theme.of(context).textTheme.headlineMedium; case "headline6": - return Theme.of(context).textTheme.headline6; + return Theme.of(context).textTheme.headlineLarge; case "bodyText2": - return Theme.of(context).textTheme.bodyText2; + return Theme.of(context).textTheme.bodyMedium; case "bodyText_15": - return Theme.of(context).textTheme.bodyText2!.copyWith(fontSize: 15.0); + return Theme.of(context).textTheme.bodyLarge!.copyWith(fontSize: 15.0); case "bodyText1": - return Theme.of(context).textTheme.bodyText1; + return Theme.of(context).textTheme.bodySmall; case "caption": - return Theme.of(context).textTheme.caption; + return Theme.of(context).textTheme.displayMedium; case "overline": - return Theme.of(context).textTheme.overline; + return Theme.of(context).textTheme.displaySmall; case "button": - return Theme.of(context).textTheme.button; + return Theme.of(context).textTheme.displayMedium; default: return TextStyle(fontSize: 5); } diff --git a/lib/widgets/shared/text_fields/TextFields.dart b/lib/widgets/shared/text_fields/TextFields.dart index 7e4a832e..8bf82589 100644 --- a/lib/widgets/shared/text_fields/TextFields.dart +++ b/lib/widgets/shared/text_fields/TextFields.dart @@ -251,7 +251,7 @@ class _TextFieldsState extends State { autofocus: widget.autoFocus ?? false, validator: widget.validator, onSaved: widget.onSaved, - style: Theme.of(context).textTheme.bodyText1!.copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: widget.fontSize, fontWeight: widget.fontWeight), inputFormatters: widget.keyboardType == TextInputType.phone ? [ // WhitelistingTextInputFormatter.digitsOnly, @@ -274,16 +274,16 @@ class _TextFieldsState extends State { ), contentPadding: widget.padding != null ? widget.padding : EdgeInsets.symmetric(vertical: (widget.bare && !widget.keepPadding) ? 0.0 : 10.0, horizontal: 16.0), filled: true, - fillColor: widget.bare ? Colors.transparent : Theme.of(context).backgroundColor, + // fillColor: widget.bare ? Colors.transparent : Theme.of(context).backgroundColor, suffixIcon: _buildSuffixIcon(), prefixIcon: widget.prefixIcon, errorStyle: TextStyle(fontSize: 12.0, fontWeight: widget.fontWeight, height: widget.borderOnlyError ? 0.0 : null), errorBorder: OutlineInputBorder( - borderSide: widget.hasBorder ? BorderSide(color: Theme.of(context).errorColor.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0), + borderSide: widget.hasBorder ? BorderSide(color:Colors.red.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0), borderRadius: widget.hasBorder ? BorderRadius.circular(widget.bare ? 0.0 : widget.borderRadius) : BorderRadius.circular(0.0), ), focusedErrorBorder: OutlineInputBorder( - borderSide: widget.hasBorder ? BorderSide(color: Theme.of(context).errorColor.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0), + borderSide: widget.hasBorder ? BorderSide(color: Colors.red.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0), borderRadius: BorderRadius.circular(widget.bare ? 0.0 : widget.borderRadius)), focusedBorder: OutlineInputBorder( borderSide: widget.hasBorder ? BorderSide(color: widget.borderColor!, width: widget.borderWidth) : BorderSide(color: Colors.transparent, width: 0), diff --git a/lib/widgets/shared/user-guid/custom_validation_error.dart b/lib/widgets/shared/user-guid/custom_validation_error.dart index 6154255d..b4517861 100644 --- a/lib/widgets/shared/user-guid/custom_validation_error.dart +++ b/lib/widgets/shared/user-guid/custom_validation_error.dart @@ -23,7 +23,7 @@ class CustomValidationError extends StatelessWidget { margin: EdgeInsets.symmetric(horizontal: 3), child: AppText( error, - color: Theme.of(context).errorColor, + color: Colors.red, fontSize: 14, ), ), diff --git a/linux/.gitignore b/linux/.gitignore new file mode 100644 index 00000000..d3896c98 --- /dev/null +++ b/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt new file mode 100644 index 00000000..2bce06eb --- /dev/null +++ b/linux/CMakeLists.txt @@ -0,0 +1,145 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "doctor_app_flutter") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.hmg.doctor_app_flutter") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt new file mode 100644 index 00000000..d5bd0164 --- /dev/null +++ b/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..dbec55e5 --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) maps_launcher_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "MapsLauncherPlugin"); + maps_launcher_plugin_register_with_registrar(maps_launcher_registrar); + g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); +} diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..e0f0a47b --- /dev/null +++ b/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake new file mode 100644 index 00000000..6c56d5b0 --- /dev/null +++ b/linux/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + maps_launcher + url_launcher_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linux/main.cc b/linux/main.cc new file mode 100644 index 00000000..e7c5c543 --- /dev/null +++ b/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/linux/my_application.cc b/linux/my_application.cc new file mode 100644 index 00000000..626c7fd5 --- /dev/null +++ b/linux/my_application.cc @@ -0,0 +1,124 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "doctor_app_flutter"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "doctor_app_flutter"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/linux/my_application.h b/linux/my_application.h new file mode 100644 index 00000000..72271d5e --- /dev/null +++ b/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/macos/.gitignore b/macos/.gitignore new file mode 100644 index 00000000..746adbb6 --- /dev/null +++ b/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 00000000..4b81f9b2 --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 00000000..5caa9d15 --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000..ab8bc62a --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,34 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import cloud_firestore +import connectivity_macos +import firebase_analytics +import firebase_core +import firebase_messaging +import flutter_inappwebview_macos +import maps_launcher +import path_provider_foundation +import shared_preferences_foundation +import speech_to_text_macos +import sqflite +import url_launcher_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) + ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin")) + FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) + FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) + InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin")) + MapsLauncherPlugin.register(with: registry.registrar(forPlugin: "MapsLauncherPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + SpeechToTextMacosPlugin.register(with: registry.registrar(forPlugin: "SpeechToTextMacosPlugin")) + SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) +} diff --git a/macos/Podfile b/macos/Podfile new file mode 100644 index 00000000..c795730d --- /dev/null +++ b/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..5595a9da --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,705 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* doctor_app_flutter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "doctor_app_flutter.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* doctor_app_flutter.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* doctor_app_flutter.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorAppFlutter.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/doctor_app_flutter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/doctor_app_flutter"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorAppFlutter.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/doctor_app_flutter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/doctor_app_flutter"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorAppFlutter.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/doctor_app_flutter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/doctor_app_flutter"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift new file mode 100644 index 00000000..d53ef643 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..a2ec33f1 --- /dev/null +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z zKpxF`G*X(YOz2^@7i#D+s-~A1E;3&x%%qL5hkiy^JhYjJ74{hvVmAx*6BH`M`!qGC zO9pjEsR)A-n1`6KLACSL%FS_Kcm+?4*z-V?WAZPs?RkzoijIr~I+oh1^~T`q^dCFvG$Gbd8AnTYBjLKYUmayaQz#S1le7Q^Hyr#;X&h*1wDpm+gZC!rSKom zq|+o&UGpeXtlQ1;?@JukKG!8PGS1Io0z6O}ZeL&DsON^I0K+>Mxv#ohK+;ByAZ`Eb z2orY{j0Pa3edA(#-pJA0AaJ6h& z81Gl(pd#j~mrizktoid14K5ig7u8FvZmLLP%l@dl05IprCyqDB?mA2fc*6UB+49lb zZ8`V9epdo=OeZoiY%zw-w`8DNwTORV_>>3T{r)1-YsGSo0E2s>tix9OBqKFBjg#}G z`pgkCblKMYs!Z)r^(qT_c+}gLhR|gnq!1~Qr|~kt&2@_yswx{i$KEn`8J1W8BGljl zr@GEG#W(s#AKKyuqLp+cl1C}7%`m#-!$15XF{M(M*-fD%+i#mFbP35jlgN3{8#A-dmj&OQtG)!031jTwGMal=&YtPfq2AUWekP9J-JT(p099!L`+yen$ zVH1?kRrhV7(mGKkm_jPP_U@Xd;x=ppk}4WY0Rbr> z0MJM_;$GGxL*P68y%KBqHntF{>X&<{aeI4m6+{TQ%~Zp}v%Pujr)zg5mV;cFKqeA- zQm5`#Sd{B6Rc*4PS-rO(vf>YEdXmOK?>K@`L5}|9q}#t_IE%g+U<-1qw3mr5&v;2A zCQ}BEn9_u;;>n5N#dP0RhCF-_UplC+U(i~Zjh>U5+b8%@p3HK(R*IMQwE!uritb}< zF)AK2?+0@-aE3LYkg`B*&N&m~JWB9>(Z>`aqRwgioU)0w{U1K4?>-#i|ZfhNa9hV)2)(%ch zJMH1twoeZWwkE@I!dz$ma+;9GeACv>Ncupl@+gBSeU_uzfj!$+h&@EACkZG_vwLGA z(?^;rcJu1$5H~xI@6lHIYC-$+b&hF1p`AoAOKqw{t0Fu#X`OGt$)7Q!nmJ=&)xjq@ zHoxT4pcYKSPT5(4yzIuQ^S*N2NJpR4v0?rB-^JuaXNLis?E(l>Jo8mUw(gsFLLOy? zEszHWGaCn|lw$LSwoj{G7Uq(zK0W^VVWu#ms8BMRlF2z%-g`fOXmndgC(na8fc)s` zz$GAoxP+l|+T_S4$r1sLwkV77ew1Gug*`|HiE*?FGLm1q; z^p0A0eqqbmk3?|!CB9DBN1Zof6d7+ zJSn!`VD~tVaqy<*Mw^8dM5v3Bvj2VdVFb=)U3L2eDM3@>n(P z?Rr_=I17+r4fE{>1LBQG0&o97nef67n-aNnVP<{dd6*B!Q344 zZbsAof&jw+;CLeK2d87t9s~YZ5?6Qwf&{NPEBN+)LbjOcZRXNcR&h)x`TtdpI+b!>$E~h0o1L*2OddpR9!Gw~-E^Cj(7i69S<66ak$)AYMv|xG+;uR(`;h zGIV3}?+Qxdjz)s;s}jHY{JPmeo@-tN$H@hxaV@)}K?y~ts~E6H(F|SlsN5oH8g7*h zGiC!8c1doE3U|D}Vul1yPmXuCk*hmyU4MG2ml#V0+(G5I+`L_=3cD$%$I=@*8m-LU-!fn&-sZO1%ls63+w}AiAK`Jv z>`q~ztr&&(gCkFpci+*1Ekdv*MhBCzGfPBj9dM|YEjZk(tWBuz4?MGeq+*)t>Q=z6UXF_w z{QDUT4^JQ8J%hW;d2xGB>Fl4Y-bRT!ttP2GE5jYoI1e(eVK0&V5W+>zludt=nf|UN zi1IV;MK$Fy%$yw<oGeW?JIGjmfGLH$Y;l|T0p1V!N*Jvu zHSAG0WpwPip0vm7%VRq8$2O2>P5b!WBfTz*6dZ4Wd6O9Y(8A;nOuG((y?F`ac_u2( z#~17CoTK)1G<~~Z4jXlout{e&nZbDHyHf(=a?OtaJ(2Q(!g#)Ugw-QQ?A?mN#yN%T zBtJ`sA6Lpg`k>Pi8a7GssiY$eG0Be8LCoQL{GDqi-;j0pLmT!Z)szldvbN7GVcu*S zzb1rEq|M)1qa7rM*I8!<#w7FnQ?{v^? z0`MlS3+`#ZB5$DT4+`7e-Hlp_2G0`*F@STbRJ|!tk3cC~1T%NR-p4s=sTT+RqsMjF zyrp-Jv?CD4Y3N&Zb1gr=%`MFR8;|r)uxQ6*X{OpEhQ~+tu}^n8Wijiy`pSMw0uKNi zSNX^Z1y;WirM0o_x%zft0U2GcLm_2BS`b{Z>g|9VOVr%QF*R?pTpiJsEbj4jLVAyd zTA;x15=f~b0^(e*Vo;Tn;WTJSxpI9LmL($Lxob<^S!k7mGhnnVNnAC*g!$ms0#Q|q zs=25I0<>fUw_&+KU`}5P9wlmjRWdMYh%Np6n?AAHQ;JzG?s(Z9UR`pNh79Nzk~DF+ zX~jy>>f-2bl?drlM8 z3NfIQnrT@pLmv+QA6efWPv!sqe;mh3_RcOj5>Ya;4hhN13dtx*_TJ-=kX_kZQDkPz zIw}#e_dK%au@1*L&iUP^cfH?zf1iK)tHv=t|>-9mMT!;;Vg|svSzWkN7q#t$c4N$Q;tl3EYwef_4q>GO<#I89VhY;`X*hz$n*GZ%f+;uViG z?uLlxD1OIeid}0r9%Ssoc7@vJjZIsZlU9zvYpjhYiOrzD5sq3OC zpf-X;Nb!DLpxqX^zDIK%=46-Z3%i-bac`RIBS5*wcw5Pu>G|kF>TQP$dGRYh#1hwD z{|cbbTOKL>Gb1-;X6?vWLC+KJ_^Ij?KzJ7eZ?^8XNgoYU9^z&>d zsIjX*uOK`#Wu!`>L@y!=XpQcW+mBaRjm|XrB@etLdr}Ob57e7EkE;7a*t7=M#XFL6 za;KHHk-rBNTjp-gS^;ehKNv>K>+_jPQ45J%4><1HyKJ?;T9#~k_23?xD}B&@Wp{%H z($hU+nWR?g!9dsJkgVz(J_Yrdns+m~9V_gQ7Sb`&F4wZZ!k}##j$>O{4{?avCbCZfyW zO$)m7LE=P?$CXHDU_RUD+sYwT;nKI7 zSs_XTv!BuxpJ!7(b~uYfsgzt~mj5(vf2r~`LHwpePs!o2A3zEr@#sxo8HEe8>V||d zBiz0@e&6}p*}!6jsm}I0bN9Mc2(c#jg@;Nu6!Kv&4&P8-UcQ-00WJIO%4OuUn;^jU z;I3r=T3KQtiMQ7&x32eVtB`mCe)9ws^7u%2P`B%Xc}=Qc&O^{FmS^{~Rho}^s`B+H z=1_T);9LRK?{$Vx22!5m)Er8aoPOA8&{7fyt`t@~Vw%gtx~+g3qs8LFR%(2Uny28A6dFYnNQgcUa>Sq=%alFh&8#@1o_qgwve* zVFimnUtL{4aHP6s?FB%bu2SP=e*VGqXC8iuZ-JOc{5%Lx0g|VvyWkdh&FD^Gkc!0N zhoolXvp6GC8wj?Y+V;r*EN+<1ac`-+!8Mqb@Nz)=OqV?4gxhR^t7*+^+AfxxVt(n{ z+fkk|-xSGqmkZa@Q%`;;r`-Z|? z0fR6b@l%pTwK*@xY+(MwBUwf^z+F*~piC64BWTrz}-HS1-XF-IA%?Zs_#F8 zcmUuEZ6Of>YIJOe$&{V;3vIBw7|jSGPeS6cvTMdj96Y~pI-z7InGW;(DhFqaiTTO9@KWvQi9__j0btLZ9 zAa~-Po%^sDFfme4@Yiq}r`BgnYK2eTwCjg9_zC4V{{&_GTm-!qHGVR6JXDjw;}GzF z6lXA{xo1+tQM{9vwb1&sRXPdGDHbEMbnwh}t+%tvcw5p4J4r#hEpDl=A{;Mjc%0)T zsG}v<$^HhdcE)5IJ^iBWK{7?Zn)vb%c!5eIj4 zbT}CGO*u)Od@^LuIC@_2{=AP2-O99NglFudj{!T}0e8wtTQcB@F9QW6$J!0Ye`T+U zXDx84b$!hD#4YzSyZLy~!IIZuFa3%eU zG4eg5?}sZ6Yj29P^-PcXG*8%VzLL$0!oL?c(!oQ+G!kORsa+lsf5YER>PX83R4LgF zgPNQJ#Bo#)MXU%J9k?RWD;c>|as5b5p>xAwau=X5XbERX`_ZHB8_XSNDe`s?n(e>) zGF$G%n6o+W{6A-@4hsIK0*J%jpB#Y*G^B48eQD(CDZR5oBl-P=)r7fH^PLf?!aK6V zwkIM35?l*I6p@;^H}JIDNs-fF*IFN?k?kj(M)QKM%%?dSkf1d$Nly2z(>)oq8z}0H zH?Qa{x&36#W@y04!9zx@x7un@ob$&)V8#f~0n1|jF0kFs4aZ{ND1~QjWHToIY5)LY zrgKDCj@dFCx&-w$QMi=CqD*=`$NqC~2k366pPXl#>Y7A=iQD}f`)+B-pS@LIW_M?9 zlBS_)(vGz!L$#P`?<3Hvonw@B1uJ244y)M?0)z0-hq++sJ0GZ+{oiiH;lFi&wy(C! z0Bv9z^M;`4@)USP)7dhg@K5K&U&|7&-@I0Sk>I+ZH75_xEn>qh9qmc%aA@NEKBsVBgUuK zC=b{w-0oU|)~tAVI zyJ3BAB}%rsjz7qZ?x_XCWe6!_u-{e_3u68Asso0IvwKdxq1lN#%4w>J zi>}P;$JZ>58(ZAjsmSJl6BWUTe`0eGEf3f_yS#H6vx;UJWO7CCK!{)4C}`C$j5gNj|k znb$4QRurEE3tPEe!JzG-a0DmvXePO zSD#Q-qOAjTMm|=aBSnvwHoEbgyVIz@J$hT*legak-hhb}e#%cm2$nR2 zV9A{kc)WT$np=5coPQIskbGMO@Fn2NxPv$@SJZdG6}jV;+%(cH+*RFQ(+DjsJlman zy`D(yN?8MCtjWD3w}Q|jQccb$}BDW%M$zZZnri2+5ls)@@(wQD`jt_GpTKL_^CO&SSCcHbfMX#JXYFI^*947 zPh&S-G=l*C@`E5CU1$m7ao(Q&oSmY7)ZZ#5_fEyYzLsFJwJ%GfErFeRN@7lUbUrL| z$6;gQSNsI91LJvT+$Zb0>g<4g8T{B!U05lfKmoSRH^pB^^8sJ3{8PzVq0NeypMF5k zU3qOqksdq{>AUjm3O~dZx^vS6C$ldgCWszl?xd8-sJ;-kPnISB*-f=L*8XggOx$?u zg%B-QovSjBbj}%sShZv~r?`*6PiiQW;nee<-=+y4}S#}q_BgXIJoSOf$YbE7vXt4;Np zrKzZf6Ny0aES8(-cqmnIGMg&ieYWryBZ0VTB=4<*@auP4NdIk&q(Mt(OLPm|Yl za!0OpC9sA#tk>OsaCSx0;!$5r6naw ztzLBo>#LKaxxsO=yWe%yGilL`A|6E#TK! z+1VRQlo*D?(k0-mlRM+`OMT8kVB*-%ZGv}Aj1u^j!wu*~>L<-T+u?6sX!3C}lQte- zk(6_=iwXsQ0JbRvJDwMnk!c99w~s~uD_4vMB=m~-ft-*|z~$*g4g;pgG~Ap1m@@Fx zWS)8IKSN6`^vVQ8hv^Oc+O(Rt7!U%wVsGP+Y6fyS%GG+v+dIdVfCXPzAV~~li+3m5 ztFQmbE)(#2#Oi@k$1#zUS6ijD_yYsa{+BHZAw+^zAEI3bc(h0qm?|pNf?oS}Km#OG zrOfCKn_-CVO;}DXu|5YE#d8I2o>}vUxYlv&>=+I28WY>a1;uI)HUM_IvpF;Ln4ROT zf!=1rpKihNFUo=R@sD-pT!EOm%%ncl43f;aem^;|A#s3`b6vjeAzO!M-gwc`-Kj~{ zBX)tq64*kJl#TrgW4o%hTY3x$P01nD6a6s2#MmwM$vyX5PU|YngU*wXGK*?f?#Eg$~^OWW3I@of-=XVuu-b%A1Z|nqY_2 z;~jD&=QnB#WGU>;RwFq(I< z34K1fCMwf9F}G%k(&?~2EY&)W*-_z0ReS$;7+I1)zz`)M zpAF{5ZHLPMJhYU z;GE*@hM1NM{G{L94dL$!Y-h6A9K9W=I6AYb`Y=v{(tpyLQz^^Aibea(q()R*TU|-m zozpyr!|-BZ_Dn+$*2|vq2Y@ghHo!-`WjVtU-bab(SJp2*2i-}$UP9^qnF_OIFS~-< zYj^VS!)Wu}vn6!LDIt!HJ1SU-@ce>z8f4cT4R9V@O^Xg9)4`VpjsXm*~@%l^Ux;Rf#Zck`BNXu0Y(!C zj%Z}UAmD00nsOS%Uull)dU(fZgJ$bo>3Oa`8h~Wt)EM?v(ndlTS1p0|E9Pg>=&>58 zghD~%R;YpqZAw;F;M(lx5b_wkVbnd+ER+6A-SYj^1XUgNGn0I~ES|f|5emjyPIW)S z0z8i6)BZt&h(qQxih4HbFYa6~jyeKbc_`QEdLD@9SBGButjw|b^l*oQjDk<7Nig08IK zb`ATVGzK%LP+>9aFM0hr8t+m`uNr?h&8o3Rp$T&ql||K}7GgobFhCViaDH~+F#yC- zt>7T3&_PZ*feTKTyd6vlF~JmEA1f+*>CCE4ex}5N^$4o)YuxX&3T$P0(IS!+kan^J z_p>v#1J8bWELml|S02YAQe-&yVew+kipZr~H-I@yc$=8#rZ-8L<_nDx&Qv3dJDwUX z!)@=h1`~R2M{$J8bM^1O&Gy2oxe1T;K?NA{iv_eYuhpLyc3%xu%z`dVc}Z}%cHGHQ<7P!Q|e?dwnSpL!AUf!B^!?#^Q#W!Ry+7ofwPZ1mZq z(Id0{htmX1W?2cAYWZo_lOtT#+Us-nlP$=CGK|Ri4x0Xh>(|iN9y1 z=9y26A4Y}ViRi9Fxzm{>J`YM>GX1D|$4BY9xJrY{oY2~Z&};B{Zq9Pp!pox`8e#0C z-h~@fohA74(#ws!{7kIe4v6XUX<)9bd)g66Bz%^Y4p0~OF+rY;l$v&7T<3~4y!bv> zR$r#LblZcVgy2lq!ff+>yuR4qCcljQa03x|dTcG7`CHcxh#POtGKt6ymNd_0qF7Wf zBj_KC8{jl!zZ>0neDp19n3sD?HC=|WM3!}cK4zCnu6Uoj*hbV1<#F2BD)@A~y%@VXx+u}Hcn=_s-({PxzmMZ^xJ1SV zoZMY*FarYvO_@z8Lr2ep)%HgIL7rhYa~#X&&V8oYSw zA4m{3{hw1Vb~~26K^xro&e7i9eg^SqK0i}kG3z(!_~E?sjJlSWIWXJqKiHAWTG*SpPcCMD`kEc1gx`R^YkYWz zEN4vEIkj@&e4tC!(_~x`-K$w6CU%X7U2Y z)Y}T5stEyoSsB{H{+xfST3tov~6@lO}2gx#N(rHXiOAHT!dp6FiV8V)B4{L_P_% zmX0rPa^-{1xG6|#uEGo+!v)QAOjRe|jg2ICcXU!|Cr+LMbLHlhJ)ErR*P9*z$NLlt zmYjAUbljq004ZyOco?HJovV7M*Wb2nF8vT2D;3kGi%F)6Kr#TVW>}zTHnUQxoGmD0CY9J`|d%8@}n;_co2q zWr98`R_c@PQbMi}x3bWo4XZj{it6qYj+o*XvNoS4>rF;7WNn;vA*|A!3H}Wh-uk@n z*hV0S+XnX;K;BOoz?&*9_{NnM25s4^^QUt|>R!()^Z6#G3OmL{CU^-IG_M7_a~B+& zCrV;ouC1ljbK(K=ygqAE_-}ewnH2&&t0enS7}I4i0wJgNvCf|P$`|DHku`K`HfDa2=n@DCg8MRi_)vpMR2Mxy4PE2Qe! zD||kNXy=0WeU(43v%md9Hg9Zu#CP%d%C67gk_#pfXs8lf>M=betm(}0fdDKq0{26# z_c?J!Cgo-~*=wswLXkR|W8d+rDdV00`22Ouv=_Hod9bmB!=D$I4r@7DZX7e+0tO!9 zR{0d}A6^K#yRx@ykotO4(WUJsmFvN)d-o-wZ(wcDSUS`8jO-JSAMa4y@MK4fDP`(P zzxQ2})ofiauWKj9{Rm$Yw^?g=?`oO(Vf|T^I+-A+o1#F`>tn59d=FtgVJAV=y;G&` z0GMvtEeil5;e$Ln8-41(UeMl2kYLk%vPl?0+Egg_;g)494o5FsvdeZKP;&&fjw7o{ z|B+e%Z|)8Ts?=>@p|hr!nYXgV=ZjI4Cp#$E>+g^6r7Nd3<>-t=G%B5IyZUI{e{49G zqnIXEB=M@5Ndf1J#l5YWcLG=A4ufF8S{z5Kz-uM?Ni{{%mr);=l0=473h#cIc{K3> zZ-VUw_Ng5^HgWQhs5tQU@qv-YBej9`R$a^|lknX<*+sSVXue8M0#EPBJ6_Liwl*8l z_zoD#!l%WIXJZ$jm?|zUu0LdeP&8IW*(|39&QzKGnem$6--u{ZGtHt#Hro*h)?lu zXGKo-4Hv1WP*VLj;uA6UwGSV*6ro%PRbwR{@tXoCOb=OFTB4ru-|Id!rP5Y6LF*-D zy|t0qDSVPo$ffyoj#CIZV?l3VsPRYye$F^xxv~Z78_fwlCWbwW!nYCR2nx0_+@tg3C_UDMVa2Br=X3hfP}^Cp4Yg=#OK}K zKYVY`V9jEKD!UrCbSX6Xym2T-cg}!n;?;o{mM|zWj0P@D|FO-rQ zKt#ApEh#AX%_f%9!G6`I*K=bSnMIhQ%W5&BOMntzVr*eS;WR;FgM)+k`#+Vze*z&V zkU^I-R|!Nwy<~>eeQ~hJqa2|DdpX15kD=6U73Du;T|VarycBP^n#IZeIJ&H3S9#@oec~poZELqX$DAc>XZyuIqd^GK0Jq~0kI=d zA7gMo8%zmkEdnqMh)tkp?V0I;Tm3`>aU3^~dXw zlhdd3=iygnUgYu#GRhxln}4D?Gokczq?T;RjCk0=fUHy18$lt!-q!%sNxee7No^+N$9d?Es*``)0UJ4SC&FNY0pf z_MlbGdUy$|F}YDvJ9GTCkZbsNKj3DL5;=BGBx8xI;n)=A0d0j6MP7Mi6MQdk@Tux2Qy`oI_&*%EQ0bE?|R>P$rDhcFa8O?JIK zPOpFDa?-L*+Q7RrCg#y5z$l0d>n@+OYo3g>-Z*x&`Jj5|=*UOYaJer6;FAbdtt0O? zrFGUE?!XeUG}G8wMgeTs%+r;3uUU;Nq5EuU{h-g&UOBKhdS`;J=m!~xn*ztv_p@dD zR)tR!P=~5kX)FRsx9)uyuu?0dh%Ht7`PTM@e#Cq!z2ts;O;L)tQ1ipDiWqbGz@o_p z^D=UKR#`S7HAt4vQtD(_SeWyj_av~#tJKlb9>-s5Ykuzx_E1ZNl4)~f=zG$*;-y=T z2ozmFva9az<{2&63fQ?(Q8{IPx@t1LuFcxP-LXVctWh3AwazVTt2)w^*Zn-#eB`bD zSHoAusjOBK5(>uQPGj=ijdOH3jqG?(<5#C{*JQ?Lt~@zow=Ii4Al$Vr!#+Cf-gx)A z`_h(>b@7?*6bYM8%628gGW^rwWoG$mK_eCk`}B&llStfwHf12*{5spmTeNH$4{gCY z@Yuwr*k@%m;T<60bw9z6^WpWi@Bu^qe-g;YAzI+VjgsuZaGA=^G*I{KLy@rIjSpWb zFQNsCp2T;S$VaJtZ<(waRu8y7^X;>YhsWp zM)mKgCeE@K;J4vQSV z&-(Gl5AJCp>K*2-`U|4i;u3p8xo6(isu-38>cY zml1Eo&FBBKJpour?}q&nggpFiGM%m+YX`ng8P+uRnJiMyWcv*_AZ8KAB$w;rfmN8C z<-2EB6TqZO>A~P{*<);wYqZgxQS8E*syOXvGkGxF@s(scud0uv?T)fQ z(DGrwM7lvpitUG~6!*}kZUpBn9PuP`5^nMK@($xI^0Q~axP5qU>L~uF{R_<9&m z({}$$WuD1y-QzMVb3jLPk`~bDJNkw(Dv-6cKUb4uzD= z-w?i0NZ2K}AbT}Zi^uOZ32xmSxJw+6(3j%a!~Tdy-@RxVx6YUw2|V6JX+mSJNclfl zF~SD#eo+lnB=ZpHLl{)E+`sI^-V1Vn!6#Ml_W4aH*Pe(++sNI`M=5L3?X1z0;CJeE zJiX5Mp6JH*=R9W0t(1@>>1y=lP^F=yJil6JxU~I}EpTsBx?rJ5LbCbQ zuLBmmX1MO&!E}khx=+#hCesIB53`IWwqyFtR{AUv7vJ{Q^dn1S0@*^UOmRwctFy&> zd={(J@avBzmu$MbyamRMt_$kfHY<*v)%%&nY4hUDH=$k)$8LHlUG0G3Kv#T~-vQjw z)hXbsNIg?~b-jRw)ir5Q(gfwM+Zk+0haf z+4ER%>T8RnKAoJ-(s&tu&-iZ@A?^J|d z6md=9C4am*v2r=aa&a?~37bc($n#wQ<8UGXL+!RtrRXGSj-2INJ#+3J=}e6nOC}G8 zN~lvCS@rxoq7w$CLg-wx!%V%ymw>~xhUw4cADX*$A}D~{21F$!Y61aHwpdL!QcrsN zl~$s5kk%7HWHkZ43%mOcwlk3RcbKGQ*}K(Fxput)rpE0zH0vY(EyY=blQZ`odG#hD z)~{&r6XkSE(^csqsaMm>2c%xsT2&g_Nab1bTY%fIoNHatDY@C@Ei~v@19|F?szU6SWRS)uDXqNY!48RlAb;S*ijqus; zp;bteR835>3BXML2CewOM<^q3M*ubU`}gnI-oS&(vf=GF|JJB-inGOH_dc1xb|iqR zWgrcNy?1*8)vAlAaiBE%K3Q>5Ygy-#Wf$>FqL|Kvgb&6H?iQC*Z|PN)xZJhH#d#=a z@s9O0oea6Lg}submzNZ{iZ*_okZ$6G*h5YO!dE=7c4=YA9g$y%1xjkVl#|1DShEjM zH3(sS?uRfB3mhW5Wrm} zrY>KpBxM&CC;s5Ie_{o}upN{vdb8x<_$5iiQN49`z`+Zz`&E`yLAim;X&}$HAfKmT zkO2Dgdno95mWMH~h2c4);H=MigT8hyzl|4g;dU7F;p^X>w!fa0zf{^rf?>~ z0w{=F_R}ru{g5i@&xwC%R-!-1x|(k6pSb5_)$f`zyErIvSCs{z`iVvU4x_znFKti!!av6BkRX_=+kEc;*`_rla zB`g4ruCJGT3XVTTrlh3Yj>1>PNIy?sV%Yo*=qaBIOY87_?P04yx6TV?_{~K? zOHEo3|2EA2JAMPYZM!H<{|!s-$r>l5{19icxV`Wf-{<0I>{v&H4FZaCy$B6Ludz{v zRH!!HV#JGP?5(L!Zp#}NlOODgWqjO+yo~+LasPYxH+ht2KjdfCFQr(oovP3?vkFK^5FvPJ4^LD=DpYQi4tUXuY1;erJaBQ79 zHcp(>mKvoD+)bq5SX9siR>(%CL??*D>Snn%p}NfGO4(RY^puLI+j$Pw)NZLb5bKo{s|0L~ z-A3R~;QHMg0bHSgESOM&N&@oF4|8gkPF-nVM=sQ;d}wcS{{!iW-)yQ``D6t#xlh(O zRF0Z@O>0uMz9g)u{P))ptV5lH2(gC8I5i(FDRG5Gp1bgBydKgxJy5gBfK(#D7NzZU zatG}S^z#KL*Do5=K*F7hk(`mbdgI1XoM!8*-};#UzNtEG@Nki#`7)GfV;VlfW^)=` zBaAjK5>gx@wf_D!B!2C6xBK^K4%x|+#?P@5N7tlfWo6xWJD~Wz^cnPfFF($Ixt4!j z9%x^1$on56XZB0Irm^kw-*rd1YVO;(*LbB21@7OPJspo%WO676#~oUMws(zP#+shG+$ns0IC3W z_{kYU>N5<_6=j>*0d}r-?8U+--eXfy2M+opoYL|=I932TMp=&k#tzJ^72OtRJ8BVOvTYPh;@EE=LJLeOk`y?d|Dd9%fWlhON^LnB^6x0LyZqz@imyogJ`$C@Lr9Z4o)ZQz>NCavG$$@e2#r3 z4I=}I5KgV>wl)~_Ja7gLQGju0c1{h%cV&6c`doWWv$>q*=ZLc8J{hBiKXNK?zx2Nr zz!pph;BLU2OaZTv>Pzj(VpSp2&OWNCF<~>NgL!nezhxEgj;&2 zl>z@V#>sykFCnFL?|(j)J3SFr|FFa`n@KbhC2pZB7 z#3>qIn&~mG_Vki=p8_x&CFeD4V7MvgJlk^G7H;(apFxr+7Gc0+1KfI6$@aeF+d7DJ~_-A|H=0?Da#&^Cqb=!=fVz>giW5nw=jWQBS%L^t1EZ@ zCm9;qlG{($@0W3T&l17ownc5pWhfM8Mwn-fLtb7H|IYl)8@QikEc_Le+s60x?&B*m z5kObB5{BD}gGr7l84~vP{N)C~3V;xhBWd%=^j0&KBw3T3-HU`;hqWA3OWW~<8nl-M zfYn-BI0_?g`3$_;&Exw<(G{QM|8)Kq28x9NF-F$>r@_BO)t^T*i-U1bX01<)zC_uE zR@8qEQQ#cm$YbXIUPVO?z7KI$pw@r=-V{V@>dC9Hn==1QBVy_b;#*jR+&f*$AwCl?o&G?2Uk4=*Ej zFK^Yvw*HTO9n!XRBWe++o3)4O!OC9PC=_l_<$M(W8(Akk`zv5?nJifb^rH3N?Hhio zo$=nNmSEz_QFHj|XF!vQEcdqPyZz_4|M_GBH)k)KA9XGRlTJD;3*y1c#?ZWkeaQM* z^`Bf04#Z)ARgrE4rMmlk8E5F=NpaW8xKNd3)-orW$m+kh(W12jQbQ7oi z)=#qbmhkplt}u`FC0sV9sdnb5$E!zX_xlA{4wW&j0*DCm`=1;Sh_sB1xiH@C89Z93;8d)EUk=lPNIZ`o3H`Vd+Ig`=CV}#?PAXvzWk{x96fn z0(rYh<>?PJ>Hd8v@c8=*vm+)>P1k@i2>yMaKw2nihLV6Z;wcdc*E2{8=xNh(FkEe3 zq_pc;ISw&}`?lqKx<4vIa67!xu|P}G$c3MDyg?u^InS?uM6Zzys0QM9ChW>g-ypzA zkOUSfvhTTWq{_>TJ{+kpgwX{@>P5ptiJ1NTO5)8 z8BiLUY_!*AJ$V386^TicK@z0qOPWP#Ea5?}!$_&fQ zOcRKuR^tLX*&CM(ahYftiNg!a=uU|He)2nU2(~iX@Yo|foZp906;o=d%aK09YEW7_ z-yX*;XE#z@?zZ&fQ?2fYX!T8@-$(K5Jo+AkyOM+(944x4B%2NR&avFFJY^9_br5UtzSX5@gmYYm@ z@S$jtqFn18bXQr0IYhQ=+2~ZDB_DRW3d=*B+3q`-*1P$i!GVIG(AMp=vBQ#^_mNxp z(;4Iz#_~&9jZ}}7oW?R;_x8&h?b0N326NJq4~>W^TeI^!o4=G5G{|9ff|`NN5+?ns zL@IWva(*@PXPmVGQ#rgIOY*nnoqNDDy$hd2uMT>wBgzg>YT&BV2U{k1ah1(1j_v0` z@o;6~SUGW=!+j!oa9ko_2^G75?VolPmWk=Pb-h{k=phZga( z88Rp7QzbHkpYG!aug9e^DF63Bi|1#CeAW^CpakO9DTT!p$yhuT8Aq10^cl2O@Zl-2RXr`+zCPj#_FqXs}W2{Qvn2Y{BmNsG45? zB{BF_rVgT$u0 zE8o6|@C>uOK1Ba}!V zx!M$9J1B7#_JSs90cKlucib?T&HqQpLE9YV1?v{gh2NWKEt9FX8;3DePnCL5Z=k)Flp=?-i$<5H4zc z`?2ZZ+p~Y8FYr;m3Vn2(u5Z`Av6#S}zkpQpZ|vNP0DY^I-oa$HXzg+ajQC7%wldRN zfOAL!UwFtuphqqR41v|3He4cQF5;UU9M~lti-k<HSTs^#>-Tf|C2&~#m%6WZAy1jz!Q_-IbpZP z8ht8}UG13lz+N-7+01+RlE)6OT^3px7fn@1|_b7^{bhPet}< z_)77(<^>8-qQ2X(n4faVhm@T0@Z{5HFSWs~EDXtV@7IAMbVUP6;v8^%l3PZ#wOZ-* z*Vk4lRj6OYpAZ_$*`t|tYKmLar&&{5{d+5cst)rQTn`n8>Xi+0zXc6YbTPMgzewFg z23F=+`8=FXXF6b*CDVN$v3|6iy;TSFSYh$qrbhKDcT^U9l zj}3g#zty{k*>s8S+>t|cng#3@Rz`z}njy{*?90mV6_Mkvv=iL9pb0ttHf$7;TxkX1 z-klTGb`2~-Mxx6~+{b-KiFd3XG`p?+6-0PMorB#Q@TY_CH5)En#5WrmHqj;@Fvi1A zeGpO@wuYIPOgRY&02e-U+j7!$LZ#5mS72R3MJS^gfheL5`kQV_n{8}KXaj)V%4b~As zFrQ7yZal}~{ELX@8c#V?2LlM@)g(|;VvcBjEuTJ=`WkOem{DL!+7Lr!U;F!mGm_^~ z+V^T?%bz+8noq9{ybcq16Gzd^fS2`skac)@6|;8X8l6Q19epZ@l^3@1ES!x2XLNA4 z_FI8#x5sq7hXVr83D;_5$sU!*Ye}zyx1wMC?Q{DSgrUx#fM?_Fj@{syA2x2yL^J{S zPPLkQ#O+9E9a^H*USdriL6rGHDt$B!vu~t7^)@_e=(<|SVd!MenX48AP(Z$4WoC9_ zeN;I;hEAr{ZvB^gK*1AWfI~5H0a{Y#2UBjn9`7;3JDrI5leeufemoZol*pDlVTSHP z3#8@6kxsJwUFg9(;)>Xm!{nsFC<7}Xwv_?o=eP)$>vvvj>yw z=YS7{pIOg(u@mJ%G0G^TM@L6>l)?_{_e`(yLxmX%h*D zMJS13@e!}HFR{?GNtq;%=4#zUgfFP^$g|Ax1<`vC&qIPbwGNo}3>ZM?=Evk6r|J&S zi$UD-za)A$kcqu)8)1mG z{FI*zS4{wM6S3;RP-!$0&8!6*;>|%T%HJxZt}cmap#~4vD0Pkx22gBbPo~=2iEMFa zSN<~qRz>jf54?e)>3%j;Gc6C1_YO0C|CDQDt7+bE({$0($tizZ)xn2L?@6_ zR3$`yiwH?E%X*^k*^oQ=z!1GA|E&fXHPR=rIEGq4%0=SGvror2Y%k#d`aPmx5@~7a zdkmPa1d-<`6M%& zp9rn|?C(5SRowEcasXoE$)s`=GvJk9wPt|2VX31T2F}6x3#(&IMqZND*a1muBh9?X zX_HSLo?$y$a;qFx^U1W|YAd%)Gaf|AEHqZ*{PW96FF*&nO-@c?c6t5=K_z@2f$8<^ zY}d|9NRviy7sF$61>@bV$B3*VeDg4DX3qScxVTL~5Go^T?}aG+th- z2`EduJx~ZcSssR;yX%oW&ze|$TF?;>HGHp~Eq?$w&SAD?d#s$$|4F@l*T7}X$7>}7 zRvPwxrPaLO5X-qYiQ7{P^4Ui2GDbq&DJ3Yu`)8zfMi1{>HEq`+uR1bJ4x!#n0D6_M8Zs_# z3mc%u30aK|avL-!XI&?{^%v4OXUr4OzaL*|-HV&M5GPx)SUqYMWw@Ex;%DHx^&FOD zncjYHD@AiYbGx1O(rsKW>Eg}cid)6bqA}!r!G{?x#)c?^k+q_uv%Xh3ha^A^{%wnpRPY({1LqK{NQy>!UjUc8f7x2` zgyLiGpsKlFO75ee2#drn3Glyna)PvUP}e(t6P z(8^W6g23+fzT5gZQQ^L-Yg#^P;QK8FTZAe)*|CKS6(I>8a2aoN+XEkYf2jAF!Zi3! zjS($tF@bu(ypeC>`IZtF;jz`F6A-Y7ZUQBuZxp&q4zHb9cc*!1`T3p9xL9`nWhNVr z!2lf=fCA>;1E&E|yfmrHqB#XnUCu28b*4#eZ{lLL(42#`ui?BO&uZj|d_Fh!Bw8g$ zn@2uezsJz@^XM(T{!CEw+EyG*eaF`FuTN%C zOZg)khBpDobCl(3ud$bhr>EdmuQ^l^Cic|y2m>LM+gsZGYKUAeJE5YUX9}j^JDoojv<}Cm&t+agmp?JE0%d#fo}m_cYogpjn5&egilTvDFz-Df}1i zB4)bXfn$dqb!cCa13DdCgMNehaa&${n5Mw&bxeKfNmHq%e{T_H@WB!H3QgFK2gNpB zP<;xkez-y-Lr(0^P^G!YH~WLut`0=mPXbVN64iv6Nd`s=eUQ;?V((+QU0&B4SF3*{Pm$AVrq;v&)c>VLy_UCe45VEsI@ZWM2TaB# zRU6XaLx0^H=0)Z!$rIu`3*s{Z!W7pU@6aHvX*vUuzME+!B5H}k_gFD)3=f;nI zi1|B!@iO%p;L{!JSEI~vyUByf_{HY=;RuAK##-h!06XFwxYi?xl}oWStJ*P{OcVe~ z_v(y8!+BaLQB`(D(XrL0ReKMn$R)8mU2@$q$Pq; zbZq-$IkP4V(`m}e<)cwnZLrjiA-X0@VY~Gi5-PKX20#Eag!JOw1br%7Rr}`(v@d!u zCo@&wE1SwM=zt~$K!eJ**9GAv!}Cogn9(d0X~BwPkU4gaWh?WVRcE3N?C%_R_D)Vw z(YmJTJ_0~fhItqHPqoIFGQYE2!~?aSRa{vjcDWhy5>oT zGOMFTWfL`aLx-!QL(9r?~D6y9Uhq=af8z!rqg#p zXk%gE-;=@G>MUv7p@P#ni@zP*$YQwA0Dlc21`%pV;p!_F@xI(^eA5&SZ{rU?^Wj}! z6Y%C^eMYilc_~MAwqV`h=I0;WA)MqJ^$IvyJ-O0)*RuLYjTL1TWd|(NbhIZ;nOop( z`4bc=fsxaeI@zc!vvYFFetFRKSMjef2_#oIzzPIxZ4oB0sxKOzX4Wltz#G@LD2Qr5 zm9o~xF;EU*_!O`}IigC{sU%1^$$B@>Fa_H0*>*1Amc^7tnKxcPpr8zZTme`6(0@J| zXfBE;0)lcuv%tqq05V8P2B^)Nhq~qdR|1KCfe>(GeuFaNc)T~zvma>o)FZv;sVD@D zynx%jpd8m<{zI zz44BQcmN85TNhy2plu`Nt$b;sKELSBpW)my@*ZnL{lFaD|7-8c-;zw*wh@(1yH+~o zQd6mwOU~P(B4CS|mX=v+F44&NRvMbQpcpDmU!|BhndzGgrsa}~;RGs*v>~aLX|A9$ zxrCyC3y6ZiciVh3@BH@t1LJY%FM8{e94DY4JQ} zYS0fcOC|N!{@iq*a@H$Qe9ONriBWJrhLhC?o5K2)!=~i)0hGh-mMd~RkqdIGCB(fU zy5*IvHssJ&gxudt>g(3w2{)axskJ_#h96qTc~<{c!`n^f zg+SOfdm8=UI!4%}d%RkXd}yWU1H66h)eDTsQr!qkcZE^zbI#F$k(dn7l7z}@YSv1+ zIcEYw{HJjfg()x7R@zQ&o;LdJ2vi6Fkl?OHM-Ga!%w}co(6=I5LZ>n{9pr~6!z|S$ zq_VfE7##n|{H(t$wPI-D`~L#((@V(MZ>p6Eb8k%4{lIGT;hZ9cg%~HhcbDCd%0RbM zs?uZG1wSL{Z0f+NzDiO?w9~XT^dWptKJ@M~0(@5*az*ZgabU465JN9eFY7vD8Wdz_ zlAIonnlivB;uDXov3sIgoKx2>G6a;@?v0qg;r`RnZ{4wMw2%}(e*c8k`R7sNT@>H} zfUU~mHR~8!4rJTHVlT=v3wz2kx&95Nz?@Tj8)s5E}t{|AFA=d_Y zOTqb{ATx>U``k~NJ2hYk3r#Gn1}|1Xj}jq!9%;{k(?9!WZt1z#{OATvapC-}#$LWi zi2R>~v0v6A<|?Eg)Ye#VyRyr7RJ$N4vFEFfmb1jHF(yZN^rc!ULDen>KWu(D9Z5!P ze(qg(G2HmSqyi2B&W`vo@N=3l?+dXbWn-`1LrY1^_mSilpKLLxQp}@s?=Tqw6Do5Pui*IhPZtaT|GAE&MF$;(4s9Bt5f+vbITElRv3( ze&@3GgY%ltiz;PZXq||TeA+sP9bc(#*G<2ck&zF3W?0$Bxit`EwvZb7jke;810>h3 zb}}!oS_xUbJ^$_PWrSlJ-;v4qq!@|L9uM#ALcMu|+|fni+AqPpu+CtjBrs#Y1jKVU zEc6L$d!2l-MgMi5&7?{Dfxj)qn;mIZudn7I6V$88%05A!PtCQTGSxXKMGh;qXa|fE zJBUmhM!}@e#A?s%bajm+=Ka1WxHZWaj;k#XT{T#;bH9c5zA8txVHEz(EeE*PP9eD9 z<2|evdxmVLj_n@`lp>6@ zy_ZTczm54_lGjPwPaq$dF1HdIks&Mp;%bge$QZnnp${}#&Z3)z95ei@b9;c=kJpY- z$G#RZbgyTi3&d4=3%+gXOSp|g^~^%K1id>re4gTka;7m@WA}bFo`GUbT8-n19VVdO}IkuW(H_iil_S}@$xy(Q*fCcNaD60 zxqsWK5lESLWnKgy^ci@da#k9^aW5)oLzbFxlUVBA&UM~79PF7=rW@Ot`>9(Gju3N{A4%EK0dPuz{=J_LUv|Pe^*x3eq_ExMNjB3?{$+xH^_Y z;e5pH)*~Lo@y=;b=P$Iqp9KR|j(>D-kaI4WeI&&HPFRtbZBMiQ^PwE`pF$Z7#(@UF zP2~&InXDTNx3`4)H2mD8yHl{Jk(|C(VA2vwY}3IRqo*qy9HvN7a!$$hlZqjmb6tZy zp1fLd^be5LmcI`_d3@@A`jLDS!b0qXVvP%y>+DfL86Ie=*TZ)PL??Lk^F};4=dwv; zPRBV>*)f&NE0vtjYHw@vs9l(Dk*g-}ARSciwv!f)E361d_9y<;9b7)PBw$3dh`AZi zAY4)BVh3t>;gR=s)nZW3PT_3bOLDK)eTZT^*m%P!HdC!FvK=Z=_iA>Bg!`SsC|P3u zz+oMr^PUcTebccFK>bqp475+?5RUC{Y7klp^p=Q;ZM+c8Zq6wBtH*5c=QHlp7wZS%6AszeebN>>_2^H7uuK@g%1{vF}DT>U{h`}c+u5ubXcFMH)fZ6-l z!y=qVN>jqgj)3T!mALcM;1!8}PDcMCU6<9?l#euNff${zE=b0d%;TcPFfw`y>zjLg#_WgnwatH|t}Y&WrR32m5W_AWNa`OqIc{ zW{_mX(Ck1psRCgMhJ*hXhcAG1ocb_kuY)%9rlYzq8h$K;X}=5m+8CYpJ4Yw6zLi%S zpu}dkAc_hVv>NfWy9eLsQ-6OzoBl{WAkRi|U;anmJ5dFwz(C9~-A(!Vfw z(E!S5ua;@}(q5GrIc6|PAOSPg{il$s$UBI}tk5xuP-VedGyZd}xqXvWvU_`{;Cf0> z5fN79T(#iq-q$RLb(of0ZA0lfepj^!a2-6 zv{v^7r2J*xmj&XVgZ>Wd=RqwGGe1`-Svll~bz(-y7*N1ooU5J*aY@&5ea5ss6n(a? z`N9l?w~=^1g2wLDVRD5ovqLc^Z#YRDFR+QYV4emH*fzOpzer3>Pudh??f``be>dD3 z)xB}1O6bZpnt=j(m92Fxq0dz89n>B05xx10QDL-YDz&e>h_u@9+RG)Pv4{2IYNiMy z8auH}j+fW*;q%Ymtbq+KI_r4gxGUeYJ>hq~vbe!N3%NntH+Dyh7I70!cu(qE_`Vp; z07NvH4Q2s#9;mKj;>umoviK|H+#CbgGq`D+QxI*$r6&D`yf%-M^{H;6gi4*j3?c9c z8$}NK?0I4%b?c`p2;SvL3*xY`0fe_KIZqPm`M%{DCrPUt{bS|zlhbHBNlUe7zcK}E z$L2zIl+z#Z!thJW!}{G&JAC@Pg`H(}GLM_m;uV}C9Yt(vF+F0Dy7{`k zY&v=ZZf?8^qSD>~2iP#{qQK632aMplZye6Q3X>dctS@JHSz2)zJaqXvFEZlr>9$oY z^&9^4pN`1EJcEw_wi@P{zJqQX470?WZTB*5Y7F!3#xJO^z|Gw@)bFoY5#daTP5OgI zcbKI$Ok(|9g_%#If*$3ga=U0_n%|#}eWwyeW~(19Te+!xF*(rd=LU(nM15;<7Z&oA zrqIw#r7}&_qgCdvS7+!|3?8w7JNRtHQ$~8Yyw(xC+n=- z7SQBo3+)tbg2NJn^=lukNOCkiEsgt~4tCrZ{aSnrHRMk@_?1^whFrEn3mT1NSC9B&c-(JrWu@FUhSNf+(>-_%kX#@LYnzq`^M#XX}(*!_LZCY za24(5Y$WH^=;GY^#0c{Y4{_!GPvm_bd#&6ypUpfwu%|+=UEe^Q+oe$7cXnyF@O67L3%SKO#rdayD^4^vH2hG{w%vp|_*jKf4 z=jb?40UP4S+Mi~(Uz(^cvgVB+r+Rt|;wnFRYcz(i=&Q14Ok=V-tTPw4%v&;ZrxI#w z6&rvLjj#yzBr5~N*7o09CkIE=>EWwo`ceL*@Y=504RB*xY#SY{)p3Gvn9zBL_FCN0 zl^axu8p~su8HpiDNi{%5ojAv1{0?t7*mflF9&Y_x4#)X(jyLl~c+s6*I1G7{zBI;tH*_ z94)o##4$cU4ohj~e#C^E><)3E`d;ftdwTQZpDmp)9)n5^+h%BE?)8LI2A`L!zjTBL zPYE&+#0&jDFc&4Tg}VC}E@4ZGyWbiK2dvn6Mpu!cQT_^6!RG!7)fE>V>?PNFm?vc5 z>A8gcW=5Xm2#LEW_;XgMQ$=Y-#lc|zs2}}2ny_4Kb%D@Vrtu6rOmUe!ph7;;L`XHi zXcDHc;OYbIk44?|A9-=Ml{Xap)^{jb5$Kl?v`CIT`bDXV*x{h+UARtzOd}#US>a%X zOdU`5^_P@lkQxB*B<&RQB?FgJOH2-~rMnXf_{5%~s&OlUM^i30FeOM{`XOXs)3_BU zEAyNr%bz8RJ=Cvw8y=)3p z`K|i!j$l~LqQ)kabHK}7WeyB$x*({t#cQWf98qh&X{R*Y--9)~g)?XCL>&z;v9#hY zTFY?DV&1fPE&*z}6Ki`Y5#(-eVYB;OzZjPSDnN%ArA8D>wODpQT4Jt}ah556JE+G_! z_P0uQ!qDhR94VdpAqajIOl4~>oTaQ8H5yXaTZUOb%cRAkWYV?KSNlTqgSM=Wgf)JP zz=?Q5f5zPEVO!NbOCbqEwP^Ff_O_`gdm67#U{Mp^_bKcq2IoO%zcJb(M5z`cjv1Ck z+!awNRhwjj6CQqu+xC#{UWo^3+h?6ymzq3r?3JV}<|u_9x=MWAm`1AqAnOsJ*@)^4 zr|`FkZlg{Cd!#Chmhn=_ZQe;~-DTUOv>)Tbmh0{z_42vWa|vNUO% z_5KA1xNHBgw0zjUH|s5xg$b4k z@Koa#-AFizrr6h2#$k*41tm7_jp$yL4X*DZcklq!u+>9E0WnhcOFPn7Vh^ao@~tno z@RwY)*+8&|Hpdq)`a=L*Teuw;_B@u;o!a!YaOO@bs-?*gqpm?nRkXl~mKFfF z+OVzE%RlC`M5-+KM_GXZ@9b;=2C(sq+R&Ko_RzZ%5P~kDieK3yzV4BN*{$E%KY;4k z)s?*vacHYN~u+?SoI`e@S2!9Co!cdvz;@N@{yj`0-9^8osR(V7PR-O&gM)x3owqs5oJpIwc zgY`#VzjI$V>YYDrIr8D;0JK<10@ycefw z;;oV(!gUR*xBg%xTl-#d>u(5}#jFrLKo}q0b{IuuZhuO7n++ zo@9)d#`(AT$mbW5g;c;&z>1_2Nk%;L?TIhfeK%PYp>5N<5wdihxw4-qvVsN6t@bol zDFgi~t`B&ZU3ek!#fXVE5Ao$7AwI+@amT_m2SclwQE{cLcv3kwhokq+!S%>Fe_*(Z z75)vhq@YqZqa~Hf$0S?T@nr_%mV%*aT${~4)6|(P@Bq_Q!VC4tZa`7?ra`4?oV+wSr2`TVSUmKS_>V@3%0*S#!+L=3f@oF=4k9U9xv0p1;Fx&}V;X2J~h zcz^}G3|;s8JyEFR*LB*fPUm+?f+ofnBQ5uK%NrwA+RV_~h<6-mw_wU?NGRI!zNTh% z&>ty6x8&gW75gdW)?p->&%?{*brS|k@b|(>&<^nyO55Pi_q*eK)=J*Uunw2cw--p%E!VXuDa? ztZ$HPKJ6$Sh7!UrpxVBLFSnpZOw$(ftvg!Nk1LVfL+FL(u zh1Abu(oCSmgqQ2IrE;Zz2f2DAD%T4XO6tU&)2IB}vV3{^xpz1MYFEPy_09RP2QvmA zIqw<(UaCnCs!mFX$+3sjnV*(O5)y`jW!*wzF-l^K`Bxgap+0Ej z@c^nf{Ic`6I5#9bcE7fwiiP8JZ9dr3FsD~SBiW_`8{UgFt*{$@qj#E)90JYra>Zs3 z$sCTuzOye2GdTO;4@;wgJK@!ij-|c--insluCR}{#q=D6Xz#nL6;`rkc*UzLTR%Y{ zN2YK;Zcz4YY=+|(0_?E=#~3U@I1fIyRiBF zIeWj=id+b|L;kSMs>NMfeB^(={IdrC;NYJy_$L+olL`OdOqgH0OpSa?FTRhwb<|%A Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 00000000..4a0df9a9 --- /dev/null +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = doctor_app_flutter + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorAppFlutter + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2024 com.hmg. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /dev/null +++ b/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 00000000..dff4f495 --- /dev/null +++ b/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 00000000..42bcbf47 --- /dev/null +++ b/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements new file mode 100644 index 00000000..dddb8a30 --- /dev/null +++ b/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist new file mode 100644 index 00000000..4789daa6 --- /dev/null +++ b/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 00000000..3cc05eb2 --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements new file mode 100644 index 00000000..852fa1a4 --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 00000000..5418c9f5 --- /dev/null +++ b/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import FlutterMacOS +import Cocoa +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/pubspec.yaml b/pubspec.yaml index 2070e8c1..c9edd783 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ version: 1.4.14+1 environment: - sdk: ">=3.0.0 <3.13.0" + sdk: ">=3.5.0 <4.0.0" #dependency_overrides: @@ -76,7 +76,7 @@ dependencies: # Firebase firebase_messaging: ^14.7.5 firebase_analytics : ^10.7.1 - cloud_firestore: ^4.17.5 + cloud_firestore: ^4.15.8 #GIF image # flutter_gifimage: ^1.0.1 @@ -95,7 +95,7 @@ dependencies: flutter_html: ^3.0.0-beta.2 sticky_headers: ^0.3.0+2 - file_picker: 5.2.0+1 + file_picker: ^8.1.3 #speech to text # speech_to_text: @@ -108,7 +108,7 @@ dependencies: # Html Editor Enhanced #html_editor_enhanced: any - html_editor_enhanced: ^2.5.1 + html_editor_enhanced: ^2.6.0 jhijri_picker: ^1.0.1 jhijri: ^1.0.0 @@ -129,7 +129,7 @@ dependencies: # flutter_math_fork: ^0.6.0 flutter_math_fork: ^0.7.2 - + cloudflare_turnstile: ^3.0.1 # flutter_zoom_videosdk: ^1.10.11 # dart_jsonwebtoken: ^2.14.0 diff --git a/web/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/web/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java new file mode 100644 index 00000000..539ab022 --- /dev/null +++ b/web/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java @@ -0,0 +1,19 @@ +package io.flutter.plugins; + +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import io.flutter.Log; + +import io.flutter.embedding.engine.FlutterEngine; + +/** + * Generated file. Do not edit. + * This file is generated by the Flutter tool based on the + * plugins that support the Android platform. + */ +@Keep +public final class GeneratedPluginRegistrant { + private static final String TAG = "GeneratedPluginRegistrant"; + public static void registerWith(@NonNull FlutterEngine flutterEngine) { + } +} diff --git a/web/android/gradle/wrapper/gradle-wrapper.jar b/web/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ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 H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/web/android/gradlew b/web/android/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/web/android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/web/android/gradlew.bat b/web/android/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/web/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/web/android/local.properties b/web/android/local.properties new file mode 100644 index 00000000..48e2e8c6 --- /dev/null +++ b/web/android/local.properties @@ -0,0 +1,2 @@ +sdk.dir=/Users/sultankhan/Library/Android/sdk +flutter.sdk=/Users/sultankhan/Documents/flutter \ No newline at end of file diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 zcmZ`-2T+sGz6~)*FVZ`aW+(v>MIm&M-g^@e2u-B-DoB?qO+b1Tq<5uCCv>ESfRum& zp%X;f!~1{tzL__3=gjVJ=j=J>+nMj%ncXj1Q(b|Ckbw{Y0FWpt%4y%$uD=Z*c-x~o zE;IoE;xa#7Ll5nj-e4CuXB&G*IM~D21rCP$*xLXAK8rIMCSHuSu%bL&S3)8YI~vyp@KBu9Ph7R_pvKQ@xv>NQ`dZp(u{Z8K3yOB zn7-AR+d2JkW)KiGx0hosml;+eCXp6+w%@STjFY*CJ?udJ64&{BCbuebcuH;}(($@@ znNlgBA@ZXB)mcl9nbX#F!f_5Z=W>0kh|UVWnf!At4V*LQP%*gPdCXd6P@J4Td;!Ur z<2ZLmwr(NG`u#gDEMP19UcSzRTL@HsK+PnIXbVBT@oHm53DZr?~V(0{rsalAfwgo zEh=GviaqkF;}F_5-yA!1u3!gxaR&Mj)hLuj5Q-N-@Lra{%<4ONja8pycD90&>yMB` zchhd>0CsH`^|&TstH-8+R`CfoWqmTTF_0?zDOY`E`b)cVi!$4xA@oO;SyOjJyP^_j zx^@Gdf+w|FW@DMdOi8=4+LJl$#@R&&=UM`)G!y%6ZzQLoSL%*KE8IO0~&5XYR9 z&N)?goEiWA(YoRfT{06&D6Yuu@Qt&XVbuW@COb;>SP9~aRc+z`m`80pB2o%`#{xD@ zI3RAlukL5L>px6b?QW1Ac_0>ew%NM!XB2(H+1Y3AJC?C?O`GGs`331Nd4ZvG~bMo{lh~GeL zSL|tT*fF-HXxXYtfu5z+T5Mx9OdP7J4g%@oeC2FaWO1D{=NvL|DNZ}GO?O3`+H*SI z=grGv=7dL{+oY0eJFGO!Qe(e2F?CHW(i!!XkGo2tUvsQ)I9ev`H&=;`N%Z{L zO?vV%rDv$y(@1Yj@xfr7Kzr<~0{^T8wM80xf7IGQF_S-2c0)0D6b0~yD7BsCy+(zL z#N~%&e4iAwi4F$&dI7x6cE|B{f@lY5epaDh=2-(4N05VO~A zQT3hanGy_&p+7Fb^I#ewGsjyCEUmSCaP6JDB*=_()FgQ(-pZ28-{qx~2foO4%pM9e z*_63RT8XjgiaWY|*xydf;8MKLd{HnfZ2kM%iq}fstImB-K6A79B~YoPVa@tYN@T_$ zea+9)<%?=Fl!kd(Y!G(-o}ko28hg2!MR-o5BEa_72uj7Mrc&{lRh3u2%Y=Xk9^-qa zBPWaD=2qcuJ&@Tf6ue&)4_V*45=zWk@Z}Q?f5)*z)-+E|-yC4fs5CE6L_PH3=zI8p z*Z3!it{1e5_^(sF*v=0{`U9C741&lub89gdhKp|Y8CeC{_{wYK-LSbp{h)b~9^j!s z7e?Y{Z3pZv0J)(VL=g>l;<}xk=T*O5YR|hg0eg4u98f2IrA-MY+StQIuK-(*J6TRR z|IM(%uI~?`wsfyO6Tgmsy1b3a)j6M&-jgUjVg+mP*oTKdHg?5E`!r`7AE_#?Fc)&a z08KCq>Gc=ne{PCbRvs6gVW|tKdcE1#7C4e`M|j$C5EYZ~Y=jUtc zj`+?p4ba3uy7><7wIokM79jPza``{Lx0)zGWg;FW1^NKY+GpEi=rHJ+fVRGfXO zPHV52k?jxei_!YYAw1HIz}y8ZMwdZqU%ESwMn7~t zdI5%B;U7RF=jzRz^NuY9nM)&<%M>x>0(e$GpU9th%rHiZsIT>_qp%V~ILlyt^V`=d z!1+DX@ah?RnB$X!0xpTA0}lN@9V-ePx>wQ?-xrJr^qDlw?#O(RsXeAvM%}rg0NT#t z!CsT;-vB=B87ShG`GwO;OEbeL;a}LIu=&@9cb~Rsx(ZPNQ!NT7H{@j0e(DiLea>QD zPmpe90gEKHEZ8oQ@6%E7k-Ptn#z)b9NbD@_GTxEhbS+}Bb74WUaRy{w;E|MgDAvHw zL)ycgM7mB?XVh^OzbC?LKFMotw3r@i&VdUV%^Efdib)3@soX%vWCbnOyt@Y4swW925@bt45y0HY3YI~BnnzZYrinFy;L?2D3BAL`UQ zEj))+f>H7~g8*VuWQ83EtGcx`hun$QvuurSMg3l4IP8Fe`#C|N6mbYJ=n;+}EQm;< z!!N=5j1aAr_uEnnzrEV%_E|JpTb#1p1*}5!Ce!R@d$EtMR~%9# zd;h8=QGT)KMW2IKu_fA_>p_und#-;Q)p%%l0XZOXQicfX8M~7?8}@U^ihu;mizj)t zgV7wk%n-UOb z#!P5q?Ex+*Kx@*p`o$q8FWL*E^$&1*!gpv?Za$YO~{BHeGY*5%4HXUKa_A~~^d z=E*gf6&+LFF^`j4$T~dR)%{I)T?>@Ma?D!gi9I^HqvjPc3-v~=qpX1Mne@*rzT&Xw zQ9DXsSV@PqpEJO-g4A&L{F&;K6W60D!_vs?Vx!?w27XbEuJJP&);)^+VF1nHqHBWu z^>kI$M9yfOY8~|hZ9WB!q-9u&mKhEcRjlf2nm_@s;0D#c|@ED7NZE% zzR;>P5B{o4fzlfsn3CkBK&`OSb-YNrqx@N#4CK!>bQ(V(D#9|l!e9(%sz~PYk@8zt zPN9oK78&-IL_F zhsk1$6p;GqFbtB^ZHHP+cjMvA0(LqlskbdYE_rda>gvQLTiqOQ1~*7lg%z*&p`Ry& zRcG^DbbPj_jOKHTr8uk^15Boj6>hA2S-QY(W-6!FIq8h$<>MI>PYYRenQDBamO#Fv zAH5&ImqKBDn0v5kb|8i0wFhUBJTpT!rB-`zK)^SNnRmLraZcPYK7b{I@+}wXVdW-{Ps17qdRA3JatEd?rPV z4@}(DAMf5EqXCr4-B+~H1P#;t@O}B)tIJ(W6$LrK&0plTmnPpb1TKn3?f?Kk``?D+ zQ!MFqOX7JbsXfQrz`-M@hq7xlfNz;_B{^wbpG8des56x(Q)H)5eLeDwCrVR}hzr~= zM{yXR6IM?kXxauLza#@#u?Y|o;904HCqF<8yT~~c-xyRc0-vxofnxG^(x%>bj5r}N zyFT+xnn-?B`ohA>{+ZZQem=*Xpqz{=j8i2TAC#x-m;;mo{{sLB_z(UoAqD=A#*juZ zCv=J~i*O8;F}A^Wf#+zx;~3B{57xtoxC&j^ie^?**T`WT2OPRtC`xj~+3Kprn=rVM zVJ|h5ux%S{dO}!mq93}P+h36mZ5aZg1-?vhL$ke1d52qIiXSE(llCr5i=QUS?LIjc zV$4q=-)aaR4wsrQv}^shL5u%6;`uiSEs<1nG^?$kl$^6DL z43CjY`M*p}ew}}3rXc7Xck@k41jx}c;NgEIhKZ*jsBRZUP-x2cm;F1<5$jefl|ppO zmZd%%?gMJ^g9=RZ^#8Mf5aWNVhjAS^|DQO+q$)oeob_&ZLFL(zur$)); zU19yRm)z<4&4-M}7!9+^Wl}Uk?`S$#V2%pQ*SIH5KI-mn%i;Z7-)m$mN9CnI$G7?# zo`zVrUwoSL&_dJ92YhX5TKqaRkfPgC4=Q&=K+;_aDs&OU0&{WFH}kKX6uNQC6%oUH z2DZa1s3%Vtk|bglbxep-w)PbFG!J17`<$g8lVhqD2w;Z0zGsh-r zxZ13G$G<48leNqR!DCVt9)@}(zMI5w6Wo=N zpP1*3DI;~h2WDWgcKn*f!+ORD)f$DZFwgKBafEZmeXQMAsq9sxP9A)7zOYnkHT9JU zRA`umgmP9d6=PHmFIgx=0$(sjb>+0CHG)K@cPG{IxaJ&Ueo8)0RWgV9+gO7+Bl1(F z7!BslJ2MP*PWJ;x)QXbR$6jEr5q3 z(3}F@YO_P1NyTdEXRLU6fp?9V2-S=E+YaeLL{Y)W%6`k7$(EW8EZSA*(+;e5@jgD^I zaJQ2|oCM1n!A&-8`;#RDcZyk*+RPkn_r8?Ak@agHiSp*qFNX)&i21HE?yuZ;-C<3C zwJGd1lx5UzViP7sZJ&|LqH*mryb}y|%AOw+v)yc`qM)03qyyrqhX?ub`Cjwx2PrR! z)_z>5*!*$x1=Qa-0uE7jy0z`>|Ni#X+uV|%_81F7)b+nf%iz=`fF4g5UfHS_?PHbr zB;0$bK@=di?f`dS(j{l3-tSCfp~zUuva+=EWxJcRfp(<$@vd(GigM&~vaYZ0c#BTs z3ijkxMl=vw5AS&DcXQ%eeKt!uKvh2l3W?&3=dBHU=Gz?O!40S&&~ei2vg**c$o;i89~6DVns zG>9a*`k5)NI9|?W!@9>rzJ;9EJ=YlJTx1r1BA?H`LWijk(rTax9(OAu;q4_wTj-yj z1%W4GW&K4T=uEGb+E!>W0SD_C0RR91 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 00000000..05eb0e9f --- /dev/null +++ b/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + doctor_app_flutter + + + + + + + + + + diff --git a/web/ios/Runner/GeneratedPluginRegistrant.h b/web/ios/Runner/GeneratedPluginRegistrant.h new file mode 100644 index 00000000..7a890927 --- /dev/null +++ b/web/ios/Runner/GeneratedPluginRegistrant.h @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GeneratedPluginRegistrant_h +#define GeneratedPluginRegistrant_h + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface GeneratedPluginRegistrant : NSObject ++ (void)registerWithRegistry:(NSObject*)registry; +@end + +NS_ASSUME_NONNULL_END +#endif /* GeneratedPluginRegistrant_h */ diff --git a/web/ios/Runner/GeneratedPluginRegistrant.m b/web/ios/Runner/GeneratedPluginRegistrant.m new file mode 100644 index 00000000..efe65ecc --- /dev/null +++ b/web/ios/Runner/GeneratedPluginRegistrant.m @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#import "GeneratedPluginRegistrant.h" + +@implementation GeneratedPluginRegistrant + ++ (void)registerWithRegistry:(NSObject*)registry { +} + +@end diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 00000000..2b893959 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "doctor_app_flutter", + "short_name": "doctor_app_flutter", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 00000000..d492d0d9 --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 00000000..809a511f --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(doctor_app_flutter LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "doctor_app_flutter") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 00000000..903f4899 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 00000000..ad50cab8 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,32 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include +#include +#include +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + CloudFirestorePluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("CloudFirestorePluginCApi")); + FirebaseCorePluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); + FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi")); + LocalAuthPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("LocalAuthPlugin")); + MapsLauncherPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("MapsLauncherPlugin")); + PermissionHandlerWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 00000000..dc139d85 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 00000000..3e03a259 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,30 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + cloud_firestore + firebase_core + flutter_inappwebview_windows + local_auth_windows + maps_launcher + permission_handler_windows + url_launcher_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 00000000..394917c0 --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 00000000..7e94e81a --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.hmg" "\0" + VALUE "FileDescription", "doctor_app_flutter" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "doctor_app_flutter" "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.hmg. All rights reserved." "\0" + VALUE "OriginalFilename", "doctor_app_flutter.exe" "\0" + VALUE "ProductName", "doctor_app_flutter" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 00000000..955ee303 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 00000000..6da0652f --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 00000000..fd6b974f --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"doctor_app_flutter", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 00000000..66a65d1e --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 00000000..a42ea768 --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 00000000..b2b08734 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length <= 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 00000000..3879d547 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 00000000..60608d0f --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 00000000..e901dde6 --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_ From 415b2174e726e28d31673f9c748fcc0f30dce437 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Wed, 30 Oct 2024 17:00:42 +0300 Subject: [PATCH 14/76] update. --- lib/widgets/auth/sms-popup.dart | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index ec496b5d..ea39e17c 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -61,7 +61,7 @@ class SMSOTP { displayDialog(BuildContext context) async { double dialogWidth = MediaQuery.of(context).size.width * 0.90; double dialogInputWidth = (dialogWidth / 4) - (SizeConfig.isWidthLarge ? SizeConfig.getWidthMultiplier(width: dialogWidth) * 4.5 : 20); - double dialogHeight = SizeConfig.isHeightVeryShort ? MediaQuery.of(context).size.height * 0.50 : MediaQuery.of(context).size.height * 0.40; + double dialogHeight = SizeConfig.isHeightVeryShort ? MediaQuery.of(context).size.height * 0.60 : MediaQuery.of(context).size.height * 0.50; return showDialog( context: context, builder: (ctx) => Center( @@ -137,7 +137,7 @@ class SMSOTP { children: [ Container( width: dialogInputWidth, - height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 30, + height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 25, margin: EdgeInsets.symmetric(vertical: 2, horizontal: 5), child: TextFormField( textInputAction: TextInputAction.next, @@ -164,7 +164,7 @@ class SMSOTP { ), Container( width: dialogInputWidth, - height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 30, + height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 25, margin: EdgeInsets.symmetric(vertical: 2, horizontal: 5), child: TextFormField( focusNode: focusD2, @@ -194,7 +194,7 @@ class SMSOTP { Container( margin: EdgeInsets.symmetric(vertical: 2, horizontal: 5), width: dialogInputWidth, - height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 30, + height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 25, child: TextFormField( focusNode: focusD3, textInputAction: TextInputAction.next, @@ -222,7 +222,7 @@ class SMSOTP { Container( margin: EdgeInsets.symmetric(vertical: 2, horizontal: 5), width: dialogInputWidth, - height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 30, + height: SizeConfig.getHeightMultiplier(height: dialogHeight) * 25, child: TextFormField( focusNode: focusD4, maxLength: 1, @@ -264,6 +264,7 @@ class SMSOTP { fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5, ) ]), + SizedBox(height: 10,), Column(children: [ CloudflareTurnstile( siteKey: '0x4AAAAAAAkmbvEy63pcxBBt', @@ -274,6 +275,7 @@ class SMSOTP { setState(() { print("Cloudflare token: $token"); _token = token; + checkValue(); }); }, // onTokenRecived: (token) { @@ -341,7 +343,7 @@ class SMSOTP { } checkValue() async { - if (verifyAccountForm.currentState!.validate()) { + if (verifyAccountForm.currentState!.validate() && _token !=null) { // if (digit1.text.isNotEmpty && digit2.text.isNotEmpty && digit3.text.isNotEmpty && digit4.text.isNotEmpty) { onSuccess(digit1.text.toString() + digit2.text.toString() + digit3.text.toString() + digit4.text.toString()); this.isClosed = true; From 204d4531a59450cf2f3cff2e3a5e73594648b718 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 31 Oct 2024 10:48:22 +0300 Subject: [PATCH 15/76] WIP: start of vida plus soap index --- lib/routes.dart | 1 + .../chief_complaint/chief_complaints.dart | 0 .../update_soap_index_vida_plus.dart | 270 ++++++++++++++++++ 3 files changed, 271 insertions(+) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart diff --git a/lib/routes.dart b/lib/routes.dart index 71434262..ca3ae6e4 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -59,6 +59,7 @@ const String PATIENT_INSURANCE_APPROVALS_NEW = 'patients/patient_insurance_appro const String VITAL_SIGN_DETAILS = 'patients/vital-sign-details'; const String CREATE_EPISODE = 'patients/create-episode'; const String UPDATE_EPISODE = 'patients/update-episode'; +const String UPDATE_EPISODE_VIDA_PLUS = 'patients/update-episode-vida-plus'; const String PATIENT_ADMISSION_REQUEST = 'patients/admission-request'; const String PATIENT_ADMISSION_REQUEST_2 = 'patients/admission-request-second'; const String PATIENT_ADMISSION_REQUEST_3 = 'patients/admission-request-third'; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart new file mode 100644 index 00000000..20b8b5f9 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -0,0 +1,270 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; + +import 'assessment/update_assessment_page.dart'; +import 'objective/update_objective_page.dart'; +import 'plan/update_plan_page.dart'; + +class UpdateSoapIndex extends StatefulWidget { + final bool isUpdate; + + const UpdateSoapIndex({Key? key, this.isUpdate = false}) : super(key: key); + + @override + _UpdateSoapIndexState createState() => _UpdateSoapIndexState(); +} + +class _UpdateSoapIndexState extends State with TickerProviderStateMixin { + PageController? _controller; + int _currentIndex = 0; + List myAllergiesList = []; + List myHistoryList = []; + + changePageViewIndex(pageIndex, {isChangeState = true}) { + if (pageIndex != _currentIndex && isChangeState) changeLoadingState(true); + _controller!.jumpToPage(pageIndex); + setState(() { + _currentIndex = pageIndex; + }); + } + + bool _isLoading = true; + + @override + void initState() { + _controller = new PageController(); + + super.initState(); + } + + void changeLoadingState(isLoading) { + setState(() { + _isLoading = isLoading; + }); + } + + void changeStateFun() { + setState(() {}); + } + + @override + Widget build(BuildContext context) { + final routeArgs = ModalRoute.of(context)!.settings.arguments as Map; + PatiantInformtion patient = routeArgs['patient']; + return BaseView( + builder: (_, model, w) => AppScaffold( + isLoading: _isLoading, + isShowAppBar: true, + appBar: PatientProfileAppBar(patient), + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + decoration: BoxDecoration(boxShadow: [], color: Theme.of(context).scaffoldBackgroundColor), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + color: Theme.of(context).scaffoldBackgroundColor, + height: MediaQuery.of(context).size.height * 0.73, + child: PageView( + physics: NeverScrollableScrollPhysics(), + controller: _controller, + onPageChanged: (index) { + setState(() { + _currentIndex = index; + }); + }, + scrollDirection: Axis.horizontal, + children: [ + //todo add widgets here + + ], + ), + ) + ], + ), + ), + ], + ), + ), + bottomSheet: _isLoading + ? Container( + height: 0, + ) + : Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Column( + children: [ + SizedBox( + height: 10, + ), + Container( + child: FractionallySizedBox(widthFactor: .80, child: getBottomSheet(model, patient)), + ), + SizedBox( + height: 5, + ), + ], + ), + ), + ), + ); + } + + Widget getBottomSheet(SOAPViewModel model, PatiantInformtion patient) { + switch (_currentIndex) { + case 0: + { + return Center( + child: AppButton( + title: TranslationBase.of(context).next, + fontWeight: FontWeight.w600, + color: Colors.red[700]!, + onPressed: () async { + model.nextOnSubjectPage(model); + }, + ), + ); + } + break; + case 1: + { + return Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + // height: SizeConfig.heightMultiplier! * + // (SizeConfig.isHeightVeryShort ? 8 : 6), + // padding: 10, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () { + changePageViewIndex(0); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: patient.admissionNo != null && patient.admissionNo!.isNotEmpty && !model.isAddExamInProgress ? TranslationBase.of(context).finish : TranslationBase.of(context).next, + fontWeight: FontWeight.w600, + color: Colors.red[700]!, + // height: SizeConfig.heightMultiplier! * + // (SizeConfig.isHeightVeryShort ? 8 : 6), + // padding: 10, + disabled: model.state == ViewState.BusyLocal, + onPressed: () async { + await model.nextOnObjectivePage(model); + }, + ), + ), + ], + ), + ); + } + break; + case 2: + { + return Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + disabled: model.state == ViewState.BusyLocal, + onPressed: () async { + changePageViewIndex(1); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).next, + fontWeight: FontWeight.w600, + color: Colors.red[700]!, + disabled: model.state == ViewState.BusyLocal, + onPressed: () async { + model.nextOnAssessmentPage(model); + }, + ), + ), + ], + ), + ); + } + break; + case 3: + { + return Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + disabled: model.state == ViewState.BusyLocal, + onPressed: () async { + changePageViewIndex(2); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: model.isAddProgress ? TranslationBase.of(context).next : TranslationBase.of(context).finish, + fontWeight: FontWeight.w600, + color: Colors.red[700]!, + disabled: model.progressNoteText.isEmpty, + onPressed: () async { + model.nextOnPlanPage(model); + }, + ), + ), + ], + ), + ); + } + break; + } + return SizedBox(); + } +} From 564e70c0f622309ba703bd1565fd857d0d7acebe Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 31 Oct 2024 10:51:16 +0300 Subject: [PATCH 16/76] WIP: moved to different folder --- .../chief_complaint/chief_complaints.dart | 0 .../subjective/chief_complaint/chief_complaints.dart | 11 +++++++++++ 2 files changed, 11 insertions(+) delete mode 100644 lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart diff --git a/lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/chief_complaint/chief_complaints.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart new file mode 100644 index 00000000..62b9258c --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -0,0 +1,11 @@ +import 'package:flutter/cupertino.dart'; + +// class CheifComplaints extends StatelessWidget{ +// final List complaints; +// +// @override +// Widget build(BuildContext context) { +// +// } +// +// } \ No newline at end of file From 1fbd511161f5b6a0aba86a9ef98ddbdf479362b5 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 31 Oct 2024 11:19:56 +0300 Subject: [PATCH 17/76] WIP:add button added. --- assets/images/svgs/add-square.svg | 4 + assets/images/svgs/unavailable.svg | 3 + lib/config/localized_values.dart | 1 + .../patient_profile_screen.dart | 1 + .../chief_complaint/chief_complaints.dart | 40 ++- .../widgets/add_chief_complaint.dart | 31 ++ .../widgets/complaint_items.dart | 5 + .../widgets/empty_complaints.dart | 25 ++ .../subjective/update_subjective_page.dart | 274 ++++++++++++++++++ .../translations_delegate_base_utils.dart | 3 + 10 files changed, 378 insertions(+), 9 deletions(-) create mode 100644 assets/images/svgs/add-square.svg create mode 100644 assets/images/svgs/unavailable.svg create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart diff --git a/assets/images/svgs/add-square.svg b/assets/images/svgs/add-square.svg new file mode 100644 index 00000000..6c6363f5 --- /dev/null +++ b/assets/images/svgs/add-square.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svgs/unavailable.svg b/assets/images/svgs/unavailable.svg new file mode 100644 index 00000000..7e692d97 --- /dev/null +++ b/assets/images/svgs/unavailable.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index c31788f9..422ceb8b 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1160,6 +1160,7 @@ const Map> localizedValues = { "afterOrderCreation": {"en": "After order created, you cannot modify the principal diagnosis, Do you want to continue?", "ar":"بعد إنشاء الطلب، لا يمكنك تعديل التشخيص الأساسي، هل تريد المتابعة؟"}, "principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"}, "complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"}, + "noComplaintsFound": {"en": "No Chief Complaints added, please add it from the button above", "ar":"لم تتم إضافة شكاوى رئيسية ، يرجى إضافتها من الزر أعلاه"}, diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 80162a49..afb3319d 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -290,6 +290,7 @@ class _PatientProfileScreenState extends State with Single eventCategory: "Patient Profile ", eventAction: "Update Episode", ); + //todo change the navigator to vida plus screen if ((isFromLiveCare && patient.appointmentNo != null && patient.appointmentNo != 0) || patient.patientStatusType == 43 || isInpatient) { Navigator.of(context).pushNamed(UPDATE_EPISODE, arguments: {'patient': patient}); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 62b9258c..465eb02d 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,11 +1,33 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; -// class CheifComplaints extends StatelessWidget{ -// final List complaints; -// -// @override -// Widget build(BuildContext context) { -// -// } -// -// } \ No newline at end of file +class UpdateChiefComplaints extends StatelessWidget { + final List complaints; + + const UpdateChiefComplaints({Key? key, required this.complaints}) + : super(key: key); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(12.0), + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + AddChiefComplaint( + onAddCheifComplaintClicked: () {}, + ), + if (complaints.isEmpty) ...{ + EmptyComplaints() + } else ...{ + ListView.builder( + itemBuilder: (_, index) => ComplaintItems(complaints[index], onCrossClicked:(){ + + })) + } + ]), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart new file mode 100644 index 00000000..e36e627f --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart @@ -0,0 +1,31 @@ +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class AddChiefComplaint extends StatelessWidget{ + final VoidCallback onAddCheifComplaintClicked; + + const AddChiefComplaint({super.key, required this.onAddCheifComplaintClicked}); + @override + Widget build(BuildContext context) { + return Row( + children: [ + Expanded( + child: AppButton( + icon: SvgPicture.asset('assets/images/svgs/add-square.svg'), + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + disabled: true, + onPressed: () async { + onAddCheifComplaintClicked(); + }, + ), + ), + ], + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart new file mode 100644 index 00000000..46f1914f --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -0,0 +1,5 @@ +// import 'package:flutter/material.dart'; +// +// class ComplaintItems extends StatelessWidget{ +// +// } \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart new file mode 100644 index 00000000..1c8d4802 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart @@ -0,0 +1,25 @@ +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +import '../../../../../../../utils/translations_delegate_base_utils.dart'; + +class EmptyComplaints extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment : MainAxisAlignment.center, + children: [ + SvgPicture.asset('assets/images/svgs/unavailable.svg'), + SizedBox(height: 10,), + AppText( + TranslationBase.of(context).noComplaintsFound, + fontSize: 12, + fontWeight: FontWeight.w400, + color: Color(0xFFADADAD), + ) + ], + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart new file mode 100644 index 00000000..e3f728ed --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart @@ -0,0 +1,274 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; + +import 'chief_complaint/chief_complaints.dart'; + + + +class UpdateSubjectivePage extends StatefulWidget { + final Function changePageViewIndex; + final Function changeLoadingState; + final PatiantInformtion patientInfo; + final int currentIndex; + + UpdateSubjectivePage({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); + + @override + _UpdateSubjectivePageState createState() => _UpdateSubjectivePageState(); +} + +class _UpdateSubjectivePageState extends State implements SubjectiveCallBack { + bool isChiefExpand = false; + bool isHistoryExpand = false; + bool isAllergiesExpand = false; + TextEditingController illnessController = TextEditingController(); + TextEditingController complaintsController = TextEditingController(); + TextEditingController medicationController = TextEditingController(); + + final formKey = GlobalKey(); + List myAllergiesList = []; + List myHistoryList = []; + + getHistory(SOAPViewModel model) async { + widget.changeLoadingState(true); + if (model.patientHistoryList.isNotEmpty) { + model.patientHistoryList.forEach((element) { + if (element.historyType == MasterKeysService.HistoryFamily.getMasterKeyService()) { + MasterKeyModel? history = model.getOneMasterKey( + masterKeys: MasterKeysService.HistoryFamily, + id: element.historyId, + ); + if (history != null) { + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + myHistoryList.add(mySelectedHistory); + } + } + if (element.historyType == MasterKeysService.HistoryMedical.getMasterKeyService()) { + MasterKeyModel? history = model.getOneMasterKey( + masterKeys: MasterKeysService.HistoryMedical, + id: element.historyId, + ); + if (history != null) { + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + myHistoryList.add(mySelectedHistory); + } + } + if (element.historyType == MasterKeysService.HistorySports.getMasterKeyService()) { + MasterKeyModel? history = model.getOneMasterKey( + masterKeys: MasterKeysService.HistorySports, + id: element.historyId, + ); + if (history != null) { + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + myHistoryList.add(mySelectedHistory); + } + } + if (element.historyType == MasterKeysService.HistorySurgical.getMasterKeyService()) { + MasterKeyModel? history = model.getOneMasterKey( + masterKeys: MasterKeysService.HistorySurgical, + id: element.historyId, + ); + if (history != null) { + MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + myHistoryList.add(mySelectedHistory); + } + } + }); + } + } + + getAllergies(SOAPViewModel model) async { + if (model.patientAllergiesList.isNotEmpty) { + model.patientAllergiesList.forEach((element) { + MasterKeyModel? selectedAllergy = model.getOneMasterKey(masterKeys: MasterKeysService.Allergies, id: element.allergyDiseaseId, typeId: element.allergyDiseaseType); + MasterKeyModel? selectedAllergySeverity; + if (element.severity == 0) { + selectedAllergySeverity = MasterKeyModel(id: 0, typeId: MasterKeysService.AllergySeverity.getMasterKeyService(), nameAr: '', nameEn: ''); + } else { + selectedAllergySeverity = model.getOneMasterKey( + masterKeys: MasterKeysService.AllergySeverity, + id: element.severity, + )!; + } + + MySelectedAllergy mySelectedAllergy = SoapUtils.generateMySelectedAllergy( + allergy: selectedAllergy, isChecked: element.isChecked, createdBy: element.createdBy!, remark: element.remarks, isLocal: false, allergySeverity: selectedAllergySeverity); + + if (selectedAllergy != null && selectedAllergySeverity != null) myAllergiesList.add(mySelectedAllergy); + }); + } + } + + @override + Widget build(BuildContext context) { + return BaseView( + onModelReady: (model) async { + myAllergiesList.clear(); + myHistoryList.clear(); + model.setSubjectiveCallBack(this); + await model.onUpdateSubjectStepStart(widget.patientInfo); + + if (model.patientChiefComplaintList.isNotEmpty) { + isChiefExpand = true; + complaintsController.text = Utils.parseHtmlString(model.patientChiefComplaintList[0].chiefComplaint!); + illnessController.text = model.patientChiefComplaintList[0].hopi!; + medicationController.text = model.patientChiefComplaintList[0].currentMedication != null + ? !(model.patientChiefComplaintList[0].currentMedication!).isNotEmpty + ? model.patientChiefComplaintList[0].currentMedication! + '\n \n' + : model.patientChiefComplaintList[0].currentMedication! + : ""; + } + if (widget.patientInfo.admissionNo == null) { + await getHistory(model); + + await getAllergies(model); + } + + widget.changeLoadingState(false); + }, + builder: (_, model, w) => AppScaffold( + isShowAppBar: false, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SOAPStepHeader( + currentIndex: widget.currentIndex, + changePageViewIndex: widget.changePageViewIndex, + patientInfo: widget.patientInfo, + ), + ExpandableSOAPWidget( + headerTitle: TranslationBase.of(context).chiefComplaints, + onTap: () { + setState(() { + isChiefExpand = !isChiefExpand; + }); + }, + child: UpdateChiefComplaints( + complaints: [], + ), + isExpanded: isChiefExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + if (widget.patientInfo.admissionNo == null) + ExpandableSOAPWidget( + headerTitle: TranslationBase.of(context).histories, + isRequired: false, + onTap: () { + setState(() { + isHistoryExpand = !isHistoryExpand; + }); + }, + child: Column( + children: [UpdateHistoryWidget(myHistoryList: myHistoryList)], + ), + isExpanded: isHistoryExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + if (widget.patientInfo.admissionNo == null) + ExpandableSOAPWidget( + headerTitle: TranslationBase.of(context).allergiesSoap, + isRequired: false, + onTap: () { + setState(() { + isAllergiesExpand = !isAllergiesExpand; + }); + }, + child: Column( + children: [ + UpdateAllergiesWidget( + myAllergiesList: myAllergiesList, + ), + SizedBox( + height: 30, + ), + ], + ), + isExpanded: isAllergiesExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 20 : 10), + ), + ], + ), + ), + ), + ), + ), + ); + } + + addSubjectiveInfo({required SOAPViewModel model, required List myAllergiesList, required List myHistoryList}) async { + if (FocusScope.of(context).hasFocus) FocusScope.of(context).unfocus(); + widget.changeLoadingState(true); + formKey.currentState!.save(); + formKey.currentState!.validate(); + + model.complaintsControllerError = ''; + model.medicationControllerError = ''; + model.illnessControllerError = ''; + if (complaintsController.text.isNotEmpty && illnessController.text.isNotEmpty) { + await model.postSubjectServices( + patientInfo: widget.patientInfo, + complaintsText: complaintsController.text, + medicationText: medicationController.text, + illnessText: illnessController.text, + myHistoryList: myHistoryList, + myAllergiesList: myAllergiesList, + ); + + widget.changeLoadingState(true); + + widget.changePageViewIndex(1); + } else { + setState(() { + if (complaintsController.text.isEmpty) { + model.complaintsControllerError = TranslationBase.of(context).emptyMessage; + } + + if (illnessController.text.isEmpty) { + model.illnessControllerError = TranslationBase.of(context).emptyMessage; + } + + if (medicationController.text.isEmpty) { + model.medicationControllerError = TranslationBase.of(context).emptyMessage; + } + }); + + widget.changeLoadingState(false); + Utils.showErrorToast(TranslationBase.of(context).chiefComplaintErrorMsg); + } + } + + @override + Function nextFunction(model) { + addSubjectiveInfo(model: model, myAllergiesList: myAllergiesList.where((i) => i.isChecked).toList(), myHistoryList: myHistoryList); + return () {}; + } +} diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index e2579e3d..c456d65f 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1463,6 +1463,9 @@ class TranslationBase { String get complexDiagnosis => localizedValues['complexDiagnosis']![locale.languageCode]!; String get updateAssessmentDetails => localizedValues['updateAssessmentDetails']![locale.languageCode]!; + + String get noComplaintsFound => + localizedValues['noComplaintsFound']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { From e3ccf398bc441ed0aaf50494ea97186ca6fa6fec Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 31 Oct 2024 11:21:31 +0300 Subject: [PATCH 18/76] WIP:add button added. --- .../subjective/chief_complaint/chief_complaints.dart | 4 ++-- .../chief_complaint/widgets/add_chief_complaint.dart | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 465eb02d..bdfc0762 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -16,8 +16,8 @@ class UpdateChiefComplaints extends StatelessWidget { return Padding( padding: const EdgeInsets.all(12.0), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - AddChiefComplaint( - onAddCheifComplaintClicked: () {}, + AddSoapItem( + onAddSoapItemClicked: () {}, ), if (complaints.isEmpty) ...{ EmptyComplaints() diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart index e36e627f..66214d72 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart @@ -3,10 +3,10 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -class AddChiefComplaint extends StatelessWidget{ - final VoidCallback onAddCheifComplaintClicked; +class AddSoapItem extends StatelessWidget{ + final VoidCallback onAddSoapItemClicked; - const AddChiefComplaint({super.key, required this.onAddCheifComplaintClicked}); + const AddSoapItem({super.key, required this.onAddSoapItemClicked}); @override Widget build(BuildContext context) { return Row( @@ -20,7 +20,7 @@ class AddChiefComplaint extends StatelessWidget{ fontWeight: FontWeight.w600, disabled: true, onPressed: () async { - onAddCheifComplaintClicked(); + onAddSoapItemClicked(); }, ), ), From 8bf2ca3a63c3e340ea5b55bb740586d0850a11f0 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 31 Oct 2024 15:51:27 +0300 Subject: [PATCH 19/76] routing added --- lib/routes.dart | 4 + .../patient_profile_screen.dart | 28 ++- .../subjective/allergies/add_allergies.dart | 154 ++++++++++++++ .../subjective/allergies/allergies_item.dart | 180 ++++++++++++++++ ..._key_checkbox_search_allergies_widget.dart | 165 +++++++++++++++ .../allergies/update_allergies_widget.dart | 193 ++++++++++++++++++ .../chief_complaint/chief_complaints.dart | 8 +- .../update_soap_index_vida_plus.dart | 10 +- 8 files changed, 729 insertions(+), 13 deletions(-) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/allergies_item.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart diff --git a/lib/routes.dart b/lib/routes.dart index ca3ae6e4..3e6b2b8c 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -26,6 +26,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_pat import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_home_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/update_soap_index.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart'; import 'package:doctor_app_flutter/screens/patients/profile/vte_assessment/vte_assessment_screen.dart'; import 'package:doctor_app_flutter/screens/prescription/new_prescriptions_page.dart'; import 'package:doctor_app_flutter/screens/prescription/old_prescriptions_page.dart'; @@ -121,6 +122,9 @@ var routes = { UPDATE_EPISODE: (_) => UpdateSoapIndex( isUpdate: true, ), + UPDATE_EPISODE_VIDA_PLUS: (_) => UpdateSoapIndexVidaPlus( + isUpdate: true, + ), IN_PATIENT_PRESCRIPTIONS_DETAILS: (_) => InpatientPrescriptionDetailsScreen(), ADD_SICKLEAVE: (_) => PatientSickLeaveScreen(), ORDER_PRESCRIPTION_OLD: (_) => OldPrescriptionsPage(), diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index afb3319d..588a9b13 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -292,7 +292,20 @@ class _PatientProfileScreenState extends State with Single ); //todo change the navigator to vida plus screen if ((isFromLiveCare && patient.appointmentNo != null && patient.appointmentNo != 0) || patient.patientStatusType == 43 || isInpatient) { - Navigator.of(context).pushNamed(UPDATE_EPISODE, arguments: {'patient': patient}); + if(Utils.isVidaPlusProject( + projectViewModel, + patient.projectId!, + )){ + Navigator.of(context).pushNamed( + UPDATE_EPISODE_VIDA_PLUS, arguments: { + 'patient': patient + }); + }else { + Navigator.of(context).pushNamed( + UPDATE_EPISODE, arguments: { + 'patient': patient + }); + } } }), ], @@ -408,7 +421,18 @@ class _PatientProfileScreenState extends State with Single Utils.showErrorToast(model.error); } else { patient.episodeNo = model.episodeID; - Navigator.of(context).pushNamed(CREATE_EPISODE, arguments: {'patient': patient}); + if(Utils.isVidaPlusProject( + Provider.of(context), + patient.projectId!, + )){ + Navigator.of(context).pushNamed( + UPDATE_EPISODE_VIDA_PLUS, arguments: { + 'patient': patient + }); + }else { + Navigator.of(context).pushNamed( + CREATE_EPISODE, arguments: {'patient': patient}); + } } } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart new file mode 100644 index 00000000..bc17b2e4 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -0,0 +1,154 @@ +import 'package:autocomplete_textfield/autocomplete_textfield.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; + +import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; +import 'master_key_checkbox_search_allergies_widget.dart'; + +class AddAllergies extends StatefulWidget { + final Function? addAllergiesFun; + final List? myAllergiesList; + + const AddAllergies({Key? key, this.addAllergiesFun, this.myAllergiesList}) : super(key: key); + + @override + _AddAllergiesState createState() => _AddAllergiesState(); +} + +class _AddAllergiesState extends State { + List allergiesList = []; + List allergySeverityList = []; + List myAllergiesListLocal = []; + + @override + initState() { + super.initState(); + myAllergiesListLocal = [...?widget.myAllergiesList]; + } + + GlobalKey key = new GlobalKey>(); + bool isFormSubmitted = false; + + @override + Widget build(BuildContext context) { + return AppScaffold( + // baseViewModel: model, + isShowAppBar: true, + appBar: BottomSheetTitle( + title: TranslationBase.of(context).addAllergies, + ), + body: Center( + child: Container( + child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + SizedBox( + height: 10, + ), + SizedBox( + height: 16, + ), + Expanded( + child: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Center( + child: BaseView( + onModelReady: (model) async {}, + builder: (_, model, w) { + return MasterKeyCheckboxSearchAllergiesWidget( + model: model, + masterList: model.allergiesList, + removeAllergy: (master) { + // setState(() { + // removeAllergyFromLocalList(master); + // }); + }, + addAllergy: (MySelectedAllergy mySelectedAllergy) { + addAllergyLocally(mySelectedAllergy); + }, + addSelectedAllergy: () { + setState(() { + widget.addAllergiesFun!(myAllergiesListLocal); + }); + }, + isServiceSelected: (master) => isServiceSelected(master), + getServiceSelectedAllergy: (master) => getSelectedAllergy(master), + ); + }), + ), + ), + ), + ), + SizedBox( + height: MediaQuery.of(context).size.height * 0.11, + ), + ]), + ), + ), + bottomSheet: + // model.state != ViewState.Idle + // ? + // Container( + // height: 0, + // ) + // : + CustomBottomSheetContainer( + label: TranslationBase.of(context).addAllergies, + onTap: () { + setState(() { + widget.addAllergiesFun!(myAllergiesListLocal); + }); + }, + ), + ); + } + + isServiceSelected(MasterKeyModel masterKey) { + Iterable allergy = + myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); + if (allergy.length > 0) { + return true; + } + return false; + } + + removeAllergyFromLocalList(MasterKeyModel masterKey) { + myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); + } + + MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { + Iterable allergy = + myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); + if (allergy.length > 0) { + return allergy.first; + } + return MySelectedAllergy(); + } + + addAllergyLocally(MySelectedAllergy mySelectedAllergy) { + if (mySelectedAllergy.selectedAllergy == null) { + Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + } else { + setState(() { + List allergy = + // ignore: missing_return + myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); + + if (allergy.isEmpty) { + myAllergiesListLocal.add(mySelectedAllergy); + } else { + allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; + allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; + allergy.first.remark = mySelectedAllergy.remark; + allergy.first.isChecked = mySelectedAllergy.isChecked; + } + }); + } + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/allergies_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/allergies_item.dart new file mode 100644 index 00000000..66c488ac --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/allergies_item.dart @@ -0,0 +1,180 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; +import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:eva_icons_flutter/eva_icons_flutter.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../soap_update/soap_utils.dart'; + + +class AddAllergiesItem extends StatefulWidget { + final SOAPViewModel? model; + final Function(MasterKeyModel)? removeAllergy; + final Function(MySelectedAllergy mySelectedAllergy)? addAllergy; + final bool Function(MasterKeyModel)? isServiceSelected; + final MySelectedAllergy Function(MasterKeyModel)? getServiceSelectedAllergy; + final MasterKeyModel? item; + + const AddAllergiesItem({Key? key, this.model, this.removeAllergy, this.addAllergy, this.isServiceSelected, this.getServiceSelectedAllergy, this.item}) : super(key: key); + + @override + _AddAllergiesItemState createState() => _AddAllergiesItemState(); +} + +class _AddAllergiesItemState extends State { + MasterKeyModel _selectedAllergySeverity = MasterKeyModel(); + bool isSubmitted = false; + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + + bool isSelected = widget.isServiceSelected!(widget.item!); + MySelectedAllergy mySelectedAllergy = MySelectedAllergy(); + if (isSelected) { + mySelectedAllergy = widget.getServiceSelectedAllergy!(widget.item!); + } + TextEditingController remarkController = TextEditingController(text: isSelected ? mySelectedAllergy.remark : null); + TextEditingController severityController = TextEditingController( + text: isSelected + ? mySelectedAllergy.selectedAllergySeverity != null + ? projectViewModel.isArabic + ? mySelectedAllergy.selectedAllergySeverity!.nameAr + : mySelectedAllergy.selectedAllergySeverity!.nameEn + : null + : null); + return HeaderBodyExpandableNotifier( + headerWidget: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Checkbox( + value: widget.isServiceSelected!(widget.item!), + activeColor: Colors.red[800], + onChanged: (bool? newValue) { + onTapItem(); + }), + InkWell( + onTap: onTapItem, + child: Container( + child: AppText( + projectViewModel.isArabic + ? widget.item!.nameAr != "" + ? widget.item!.nameAr! + : widget.item!.nameEn! + : widget.item!.nameEn!, + color: Color(0xFF575757), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3 : 3.8), + letterSpacing: -0.56, + ), + width: MediaQuery.of(context).size.width * 0.55, + ), + ), + ], + ), + InkWell( + onTap: () { + if (mySelectedAllergy != null) { + setState(() { + mySelectedAllergy.isExpanded = mySelectedAllergy.isExpanded == null ? false : true; + }); + } + }, + child: Icon( + (mySelectedAllergy != null ? mySelectedAllergy.isExpanded! : false) ? EvaIcons.arrowIosUpwardOutline : EvaIcons.arrowIosDownwardOutline, + color: Color(0xFF575757), + size: 20, + ), + ) + ], + ), + bodyWidget: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Center( + child: Column( + children: [ + AppTextFieldCustom( + onClick: widget.model!.allergySeverityList != null + ? () { + MasterKeyDailog dialog = MasterKeyDailog( + list: widget.model!.allergySeverityList, + selectedValue: mySelectedAllergy.selectedAllergySeverity!, + okText: TranslationBase.of(context).ok, + okFunction: (selectedValue) { + setState(() { + mySelectedAllergy.selectedAllergySeverity = selectedValue; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : () {}, + isTextFieldHasSuffix: true, + hintText: TranslationBase.of(context).selectSeverity + "*", + enabled: false, + maxLines: 1, + minLines: 1, + height: Utils.getTextFieldHeight(), + validationError: mySelectedAllergy != null && mySelectedAllergy.selectedAllergySeverity == null && mySelectedAllergy.hasValidationError! + ? TranslationBase.of(context).severityValidationError + : "", + controller: severityController, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 10, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarkController, + maxLines: 25, + minLines: 3, + hasBorder: true, + onChanged: (value) { + mySelectedAllergy.remark = value; + }, + inputType: TextInputType.multiline, + onClick: () {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 10, + ), + ], + ), + ), + ), + ), + isExpand: mySelectedAllergy != null ? mySelectedAllergy.isExpanded! : false, + ); + } + + onTapItem() { + setState(() { + if (widget.isServiceSelected!(widget.item!)) { + widget.removeAllergy!(widget.item!); + } else { + MySelectedAllergy mySelectedAllergy = SoapUtils.generateMySelectedAllergy(allergy: widget.item, allergySeverity: _selectedAllergySeverity, remark: null, isChecked: true, isExpanded: true); + widget.addAllergy!(mySelectedAllergy); + } + }); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart new file mode 100644 index 00000000..1f1ef378 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -0,0 +1,165 @@ +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; + +import 'allergies_item.dart'; + +class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { + final SOAPViewModel model; + final Function() addSelectedAllergy; + final Function(MasterKeyModel) removeAllergy; + final Function(MySelectedAllergy mySelectedAllergy) addAllergy; + final bool Function(MasterKeyModel) isServiceSelected; + final MySelectedAllergy Function(MasterKeyModel) getServiceSelectedAllergy; + + final List masterList; + final String? buttonName; + final String? hintSearchText; + + MasterKeyCheckboxSearchAllergiesWidget( + {Key? key, + required this.model, + required this.addSelectedAllergy, + required this.removeAllergy, + required this.masterList, + required this.addAllergy, + required this.isServiceSelected, + this.buttonName, + this.hintSearchText, + required this.getServiceSelectedAllergy}) + : super(key: key); + + @override + _MasterKeyCheckboxSearchAllergiesWidgetState createState() => _MasterKeyCheckboxSearchAllergiesWidgetState(); +} + +class _MasterKeyCheckboxSearchAllergiesWidgetState extends State { + List items = []; + + TextEditingController filteredSearchController = TextEditingController(); + + @override + void initState() { + items.addAll(widget.masterList); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Container( + child: Column( + children: [ + Expanded( + child: Container( + height: Utils.getTextFieldHeight(), + child: Center( + child: Container( + decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white), + child: Column( + children: [ + AppTextFieldCustom( + hintText: TranslationBase.of(context).selectAllergy, + isTextFieldHasSuffix: true, + hasBorder: false, + controller: filteredSearchController, + onChanged: (value) { + // filterSearchResults(value); + }, + onFieldSubmitted: () { + + // widget.model.getMasterLookup( + // MasterKeysService.Allergies, + // searchKey: filteredSearchController.text); + // widget.model.getMasterLookup( + // MasterKeysService.AllergySeverity, + // searchKey: ""); + }, + // onFieldSubmitted: (value) { + // widget.model.getMasterLookup(MasterKeysService.Allergies!, searchKey: filteredSearchController.text!); + // widget.model.getMasterLookup(MasterKeysService.AllergySeverity, searchKey: ""); + // }, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Colors.black, + ), + onPressed: () { + + widget.model.getMasterLookup(MasterKeysService.Allergies, searchKey: filteredSearchController.text); + widget.model.getMasterLookup(MasterKeysService.AllergySeverity, searchKey: ""); + }, + ), + ), + DividerWithSpacesAround(), + SizedBox( + height: 10, + ), + Expanded( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Container( + height: MediaQuery.of(context).size.height * 0.60, + child: widget.model.state == ViewState.Idle + ? ListView.builder( + itemCount: widget.model.allergiesList.length, + itemBuilder: (context, index) { + return AddAllergiesItem( + item: widget.model.allergiesList[index], + model: widget.model, + removeAllergy: widget.removeAllergy, + addAllergy: widget.addAllergy, + isServiceSelected: widget.isServiceSelected, + getServiceSelectedAllergy: widget.getServiceSelectedAllergy, + ); + }, + ) + : widget.model.state == ViewState.Busy + ? Center(child: CircularProgressIndicator()) + : Container(), + ), + ), + ), + ], + ), + ), + ), + ), + ), + SizedBox( + height: 10, + ), + ], + ), + ); + } + + void filterSearchResults(String query) { + List dummySearchList = []; + dummySearchList.addAll(widget.masterList); + if (query.isNotEmpty) { + List dummyListData = []; + dummySearchList.forEach((items) { + if (items.nameAr!.toLowerCase().contains(query.toLowerCase()) || items.nameEn!.toLowerCase().contains(query.toLowerCase())) { + dummyListData.add(items); + } + }); + setState(() { + items.clear(); + items.addAll(dummyListData); + }); + return; + } else { + setState(() { + items.clear(); + items.addAll(widget.masterList); + }); + } + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart new file mode 100644 index 00000000..1b02197c --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -0,0 +1,193 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remark_text.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../soap_update/shared_soap_widgets/SOAP_open_items.dart'; +import 'add_allergies.dart'; + +// ignore: must_be_immutable +class UpdateAllergiesWidget extends StatefulWidget { + List? myAllergiesList; + + UpdateAllergiesWidget({Key? key, this.myAllergiesList}); + + @override + _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); +} + +class _UpdateAllergiesWidgetState extends State { + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + changeAllState() { + setState(() { + print(widget.myAllergiesList); + }); + } + + return Column( + children: [ + SOAPOpenItems( + label: "${TranslationBase.of(context).addAllergies}", + onTap: () { + openAllergiesList(context, changeAllState, removeAllergy); + }, + ), + SizedBox( + height: 20, + ), + Container( + margin: EdgeInsets.only(left: 15, right: 15, top: 15), + child: Column( + children: widget.myAllergiesList!.map((selectedAllergy) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), + textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + bold: true, + color: Color(0xFF2B353E), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + // fontHeight:0.18 , + ), + AppText( + projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), + textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + color: Color(0xFFCC9B14), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + ), + ], + ), + width: MediaQuery.of(context).size.width * 0.5, + ), + if (selectedAllergy.isChecked) + RemoveButton( + onTap: () => removeAllergy(selectedAllergy), + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Row( + children: [ + RemarkText( + remark: selectedAllergy.remark ?? "", + ), + ], + ), + ), + DividerWithSpacesAround() + ], + ), + SizedBox( + height: 10, + ), + ], + ); + }).toList()), + ) + ], + ); + } + + removeAllergy(MySelectedAllergy mySelectedAllergy) { + List allergy = + // ignore: missing_return + widget.myAllergiesList! + .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) + .toList(); + + if (allergy.length > 0) { + if (allergy.first.isLocal) { + setState(() { + widget.myAllergiesList!.remove(allergy.first); + }); + } + setState(() { + allergy[0].isChecked = false; + }); + } + } + + openAllergiesList(BuildContext context, Function changeParentState, removeAllergy) { + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + isDismissible: false, + context: context, + builder: (context) { + return AddAllergies( + myAllergiesList: widget.myAllergiesList, + addAllergiesFun: (List mySelectedAllergy) { + bool isAllDataFilled = true; + mySelectedAllergy.forEach((element) { + if (element.selectedAllergySeverity == null) { + element.hasValidationError = true; + isAllDataFilled = false; + } + }); + if (isAllDataFilled) { + mySelectedAllergy.forEach((element) { + if ( + widget.myAllergiesList!.singleWhere( + (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + orElse: () => MySelectedAllergy(), + ).selectedAllergySeverity + == + null) { + widget.myAllergiesList!.add(element); + } + }); + + /// remove items. + List removedList = []; + widget.myAllergiesList!.forEach((element) { + if ( + mySelectedAllergy.singleWhere( + (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + orElse: () => MySelectedAllergy(), + ) + .selectedAllergySeverity == + null) { + removedList.add(element); + } + }); + + removedList.forEach((element) { + removeAllergy(element); + }); + changeParentState(); + + Navigator.of(context).pop(); + } else { + Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + } + }); + }); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index bdfc0762..c07649a4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -22,10 +22,10 @@ class UpdateChiefComplaints extends StatelessWidget { if (complaints.isEmpty) ...{ EmptyComplaints() } else ...{ - ListView.builder( - itemBuilder: (_, index) => ComplaintItems(complaints[index], onCrossClicked:(){ - - })) + // ListView.builder( + // itemBuilder: (_, index) => ComplaintItems(complaints[index], onCrossClicked:(){ + // + // })) } ]), ); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 20b8b5f9..0a3b8ba5 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -14,20 +14,16 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; -import 'assessment/update_assessment_page.dart'; -import 'objective/update_objective_page.dart'; -import 'plan/update_plan_page.dart'; - -class UpdateSoapIndex extends StatefulWidget { +class UpdateSoapIndexVidaPlus extends StatefulWidget { final bool isUpdate; - const UpdateSoapIndex({Key? key, this.isUpdate = false}) : super(key: key); + const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) : super(key: key); @override _UpdateSoapIndexState createState() => _UpdateSoapIndexState(); } -class _UpdateSoapIndexState extends State with TickerProviderStateMixin { +class _UpdateSoapIndexState extends State with TickerProviderStateMixin { PageController? _controller; int _currentIndex = 0; List myAllergiesList = []; From 726f25b91b43e1bf031a10142665976cc363f138 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 31 Oct 2024 15:55:29 +0300 Subject: [PATCH 20/76] WIP:merge issue resolve --- .../patient_profile_screen.dart | 2 +- .../chief_complaint/chief_complaints.dart | 11 ++- .../widgets/complaint_items.dart | 32 ++++++-- .../update_soap_index_vida_plus.dart | 78 +++++++++++-------- 4 files changed, 82 insertions(+), 41 deletions(-) diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 588a9b13..7b49ea34 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -302,7 +302,7 @@ class _PatientProfileScreenState extends State with Single }); }else { Navigator.of(context).pushNamed( - UPDATE_EPISODE, arguments: { + UPDATE_EPISODE_VIDA_PLUS, arguments: { 'patient': patient }); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index c07649a4..0ce7ce7b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; @@ -22,10 +23,12 @@ class UpdateChiefComplaints extends StatelessWidget { if (complaints.isEmpty) ...{ EmptyComplaints() } else ...{ - // ListView.builder( - // itemBuilder: (_, index) => ComplaintItems(complaints[index], onCrossClicked:(){ - // - // })) + ListView.builder( + itemBuilder: (_, index) => ComplaintItems( + complaint: complaints[index], + onCrossClicked: (complaints) { + + })) } ]), ); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index 46f1914f..1719e2cc 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -1,5 +1,27 @@ -// import 'package:flutter/material.dart'; -// -// class ComplaintItems extends StatelessWidget{ -// -// } \ No newline at end of file +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; + +class ComplaintItems extends StatelessWidget{ + final String complaint; + final Function(String) onCrossClicked; + + const ComplaintItems({super.key, required this.complaint, required this.onCrossClicked}); + + @override + Widget build(BuildContext context) { + return ListTile( + title: AppText(complaint,fontWeight: FontWeight.w400, fontSize: 14,color: Color(0xFF575757),), + + trailing: IconButton( + onPressed: (){ + onCrossClicked(complaint); + }, + icon: Icon( + Icons.close, + color: Color(0xFFD02127), + ), + ), + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 0a3b8ba5..d088f8d4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -14,16 +14,18 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; + class UpdateSoapIndexVidaPlus extends StatefulWidget { final bool isUpdate; const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) : super(key: key); @override - _UpdateSoapIndexState createState() => _UpdateSoapIndexState(); + _UpdateSoapIndexVidaPlusState createState() => _UpdateSoapIndexVidaPlusState(); } -class _UpdateSoapIndexState extends State with TickerProviderStateMixin { +class _UpdateSoapIndexVidaPlusState extends State + with TickerProviderStateMixin { PageController? _controller; int _currentIndex = 0; List myAllergiesList = []; @@ -70,7 +72,9 @@ class _UpdateSoapIndexState extends State with TickerPr crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - decoration: BoxDecoration(boxShadow: [], color: Theme.of(context).scaffoldBackgroundColor), + decoration: BoxDecoration( + boxShadow: [], + color: Theme.of(context).scaffoldBackgroundColor), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -88,8 +92,11 @@ class _UpdateSoapIndexState extends State with TickerPr }, scrollDirection: Axis.horizontal, children: [ - //todo add widgets here - + UpdateSubjectivePage( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState) ], ), ) @@ -101,32 +108,35 @@ class _UpdateSoapIndexState extends State with TickerPr ), bottomSheet: _isLoading ? Container( - height: 0, - ) + height: 0, + ) : Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(0.0), - ), - border: Border.all(color: HexColor('#707070'), width: 0), - ), - height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 12 : 10), - width: double.infinity, - child: Column( - children: [ - SizedBox( - height: 10, - ), - Container( - child: FractionallySizedBox(widthFactor: .80, child: getBottomSheet(model, patient)), - ), - SizedBox( - height: 5, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Column( + children: [ + SizedBox( + height: 10, + ), + Container( + child: FractionallySizedBox( + widthFactor: .80, + child: getBottomSheet(model, patient)), + ), + SizedBox( + height: 5, + ), + ], + ), ), - ], - ), - ), ), ); } @@ -171,7 +181,11 @@ class _UpdateSoapIndexState extends State with TickerPr ), Expanded( child: AppButton( - title: patient.admissionNo != null && patient.admissionNo!.isNotEmpty && !model.isAddExamInProgress ? TranslationBase.of(context).finish : TranslationBase.of(context).next, + title: patient.admissionNo != null && + patient.admissionNo!.isNotEmpty && + !model.isAddExamInProgress + ? TranslationBase.of(context).finish + : TranslationBase.of(context).next, fontWeight: FontWeight.w600, color: Colors.red[700]!, // height: SizeConfig.heightMultiplier! * @@ -246,7 +260,9 @@ class _UpdateSoapIndexState extends State with TickerPr ), Expanded( child: AppButton( - title: model.isAddProgress ? TranslationBase.of(context).next : TranslationBase.of(context).finish, + title: model.isAddProgress + ? TranslationBase.of(context).next + : TranslationBase.of(context).finish, fontWeight: FontWeight.w600, color: Colors.red[700]!, disabled: model.progressNoteText.isEmpty, From f1b87f2568836b0f3b505039c9741a9db277e768 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Sun, 3 Nov 2024 10:06:01 +0300 Subject: [PATCH 21/76] allergies work in progress --- lib/config/config.dart | 5 +++ lib/config/localized_values.dart | 1 + lib/core/service/base/lookup-service.dart | 2 + .../soap/SOAP_service.dart | 19 ++++++++ .../allergies/update_allergies_widget.dart | 43 ++++++++++++++++--- .../chief_complaint/chief_complaints.dart | 1 + .../widgets/add_chief_complaint.dart | 9 ++-- .../subjective/update_subjective_page.dart | 10 ++--- .../update_soap_index_vida_plus.dart | 4 +- .../translations_delegate_base_utils.dart | 2 + 10 files changed, 78 insertions(+), 18 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 1fbdc041..d49cb1bc 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -285,6 +285,11 @@ const DOCTOR_RADIOLOGY_CRITICAL_FINDINGS = "Services/DoctorApplication.svc/REST/ const ACKNOWLEDGE_RADIOLOGY_CRITICAL_FINDINGS = "Services/DoctorApplication.svc/REST/Acknowledgeradcriticalfindings"; + + /*vida plus API */ + +const PATIENT_ALLERGIES = 'Services/DoctorApplication.svc/REST/PatientAllergies'; + var selectedPatientType = 1; //*********change value to decode json from Dropdown ************ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 422ceb8b..e6876f49 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1161,6 +1161,7 @@ const Map> localizedValues = { "principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"}, "complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"}, "noComplaintsFound": {"en": "No Chief Complaints added, please add it from the button above", "ar":"لم تتم إضافة شكاوى رئيسية ، يرجى إضافتها من الزر أعلاه"}, + "noKnownAllergies": {"en": "No Known Allergies", "ar":"لا يوجد حساسية معروفة"}, diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index f1e086a1..b9f6a69f 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -214,4 +214,6 @@ class LookupService extends BaseService { break; } } + + } diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index ab87eeb8..87d2bc57 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -336,4 +336,23 @@ class SOAPService extends LookupService { "DoctorID":patientInfo.doctorId, }); } +/* vida plus API allergies */ + + Future patientAllergies(GeneralGetReqForSOAP generalGetReqForSOAP) async { + hasError = false; + + await baseAppClient.post(PATIENT_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + patientAllergiesList.clear(); + + response['List_Allergies']['entityList'].forEach((v) { + patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: generalGetReqForSOAP.toJson()); + } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 1b02197c..762401bf 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -11,19 +11,20 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../soap_update/shared_soap_widgets/SOAP_open_items.dart'; +import '../chief_complaint/widgets/add_chief_complaint.dart'; import 'add_allergies.dart'; // ignore: must_be_immutable -class UpdateAllergiesWidget extends StatefulWidget { +class UpdateAllergiesWidgetVidaPlus extends StatefulWidget { List? myAllergiesList; - UpdateAllergiesWidget({Key? key, this.myAllergiesList}); + UpdateAllergiesWidgetVidaPlus({Key? key, this.myAllergiesList}); @override _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); } - -class _UpdateAllergiesWidgetState extends State { +bool noKnownAllergies = false; +class _UpdateAllergiesWidgetState extends State { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -35,15 +36,39 @@ class _UpdateAllergiesWidgetState extends State { return Column( children: [ - SOAPOpenItems( - label: "${TranslationBase.of(context).addAllergies}", - onTap: () { + SizedBox( + height: 20, + ), + AddSoapItem( + title: "${TranslationBase.of(context).addAllergies}", + onAddSoapItemClicked: (){ openAllergiesList(context, changeAllState, removeAllergy); }, + ), SizedBox( height: 20, ), + + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Checkbox( + value: noKnownAllergies, + checkColor: Colors.white, + activeColor: Colors.red, + onChanged: (value) { + noKnownAllergies = value!; + setState(() {}); + }, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox + visualDensity: VisualDensity.compact, // Minimizes size further + ), + AppText(TranslationBase.of(context).noKnownAllergies) + ], + ), + + Container( margin: EdgeInsets.only(left: 15, right: 15, top: 15), child: Column( @@ -190,4 +215,8 @@ class _UpdateAllergiesWidgetState extends State { }); }); } + + loadPatientAllergies(){ + + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 0ce7ce7b..44024e88 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -18,6 +18,7 @@ class UpdateChiefComplaints extends StatelessWidget { padding: const EdgeInsets.all(12.0), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ AddSoapItem( + title: "Add Chief Complaint", onAddSoapItemClicked: () {}, ), if (complaints.isEmpty) ...{ diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart index 66214d72..e8f2104e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart @@ -5,8 +5,9 @@ import 'package:flutter_svg/flutter_svg.dart'; class AddSoapItem extends StatelessWidget{ final VoidCallback onAddSoapItemClicked; + final String title; - const AddSoapItem({super.key, required this.onAddSoapItemClicked}); + const AddSoapItem({super.key, required this.onAddSoapItemClicked, required this.title}); @override Widget build(BuildContext context) { return Row( @@ -14,11 +15,11 @@ class AddSoapItem extends StatelessWidget{ Expanded( child: AppButton( icon: SvgPicture.asset('assets/images/svgs/add-square.svg'), - title: TranslationBase.of(context).previous, - color: Colors.grey[300]!, + title:this.title, + color: Color(0xffEAEAEA), fontColor: Colors.black, fontWeight: FontWeight.w600, - disabled: true, + disabled: false, onPressed: () async { onAddSoapItemClicked(); }, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart index e3f728ed..a2f3a6f3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart @@ -9,7 +9,6 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -17,23 +16,24 @@ import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; +import 'allergies/update_allergies_widget.dart'; import 'chief_complaint/chief_complaints.dart'; -class UpdateSubjectivePage extends StatefulWidget { +class UpdateSubjectivePageVidaPlus extends StatefulWidget { final Function changePageViewIndex; final Function changeLoadingState; final PatiantInformtion patientInfo; final int currentIndex; - UpdateSubjectivePage({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); + UpdateSubjectivePageVidaPlus({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); @override _UpdateSubjectivePageState createState() => _UpdateSubjectivePageState(); } -class _UpdateSubjectivePageState extends State implements SubjectiveCallBack { +class _UpdateSubjectivePageState extends State implements SubjectiveCallBack { bool isChiefExpand = false; bool isHistoryExpand = false; bool isAllergiesExpand = false; @@ -202,7 +202,7 @@ class _UpdateSubjectivePageState extends State implements }, child: Column( children: [ - UpdateAllergiesWidget( + UpdateAllergiesWidgetVidaPlus( myAllergiesList: myAllergiesList, ), SizedBox( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index d088f8d4..9509f368 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_al import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -92,7 +92,7 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ - UpdateSubjectivePage( + UpdateSubjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index c456d65f..48181ae9 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1466,6 +1466,8 @@ class TranslationBase { String get noComplaintsFound => localizedValues['noComplaintsFound']![locale.languageCode]!; + + String get noKnownAllergies => localizedValues['noKnownAllergies']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { From 6788c00ced4f479884691dd3cecd973c946a1bde Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 3 Nov 2024 16:13:59 +0300 Subject: [PATCH 22/76] WIP:ui of add cheif complaint added --- lib/config/localized_values.dart | 11 +- lib/routes.dart | 1 + .../chief_complaint/AddChiefComplaints.dart | 56 + .../chief_complaint/chief_complaints.dart | 22 +- .../widgets/ComplaintSelection.dart | 262 ++++ .../widgets/add_chief_complaint.dart | 1 - .../widgets/complaint_items.dart | 46 +- .../widgets/listOfComplaints.dart | 104 ++ .../widgets/previous_cheif_complaints.dart | 62 + ... => update_subjective_page_vida_plus.dart} | 8 +- .../update_soap_index_vida_plus.dart | 3 +- .../widgets/previous_data_item.dart | 0 .../translations_delegate_base_utils.dart | 1237 +++++++++++------ macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 14 files changed, 1385 insertions(+), 430 deletions(-) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart rename lib/screens/patients/profile/soap_update_vida_plus/subjective/{update_subjective_page.dart => update_subjective_page_vida_plus.dart} (96%) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/widgets/previous_data_item.dart diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 422ceb8b..db5e01f3 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -677,6 +677,7 @@ const Map> localizedValues = { "progressNoteSOAP": {"en": "Progress Note", "ar": "ملاحظة التقدم"}, "addProgressNote": {"en": "Add Progress Note", "ar": "أضف ملاحظة التقدم"}, "createdBy": {"en": "Created By :", "ar": "أضيفت عن طريق: "}, + "createdOn": {"en": "Created On :", "ar": "تم إنشاؤه في: "}, "riskScore": {"en": "Risk Score :", "ar": "درجة المخاطر"}, "editedBy": {"en": "Edited By :", "ar": "عدلت من : "}, "currentMedications": {"en": "Current Medications", "ar": "الأدوية الحالية"}, @@ -1161,7 +1162,13 @@ const Map> localizedValues = { "principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"}, "complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"}, "noComplaintsFound": {"en": "No Chief Complaints added, please add it from the button above", "ar":"لم تتم إضافة شكاوى رئيسية ، يرجى إضافتها من الزر أعلاه"}, - - + "addChiefComplaint": {"en": "Add Chief Complaints*", "ar":"إضافة الشكاوى الرئيسية*"}, + "myFavoriteList": {"en": "My Favourite List", "ar":"قائمتي المفضلة"}, + "generalList": {"en": "General list", "ar":"قائمة عامة"}, + "specialList": {"en": "Special List", "ar":"قائمة خاصة"}, + "enterChiefCompliants": {"en": "Enter Chief Compliants", "ar":"أدخل رئيس الامتثال"}, + "previousChiefCompaints": {"en": "Previous Chief Compaints", "ar":"رئيس الرسامين السابق"}, + "listOfActiveEpisodes": {"en": "List of active episodes , select one to procedd", "ar":"قائمة الحلقات النشطة ، حدد واحدة لتقديمها"}, + "select": {"en": "Select", "ar":"اختار"}, }; diff --git a/lib/routes.dart b/lib/routes.dart index 3e6b2b8c..fa0aa3ab 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -26,6 +26,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/in_pat import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_home_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/refer_details/refer-patient-screen-in-patient.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/update_soap_index.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart'; import 'package:doctor_app_flutter/screens/patients/profile/vte_assessment/vte_assessment_screen.dart'; import 'package:doctor_app_flutter/screens/prescription/new_prescriptions_page.dart'; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart new file mode 100644 index 00000000..ef076dcf --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -0,0 +1,56 @@ +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; + +class AddChiefComplaint extends StatelessWidget { + final List complaints; + final String selectedType; + final String? firstField; + final String? secondField; + final String? thirdField; + + const AddChiefComplaint( + {super.key, + required this.complaints, + required this.selectedType, + this.firstField, + this.secondField, + this.thirdField}); + + @override + Widget build(BuildContext context) { + return BaseView( + builder: (_, model, w) => AppScaffold( + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).addChiefComplaint + ), + body: Padding( + padding: const EdgeInsets.all(20.0), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + ComplaintSelection( + complaints: ['option1' ,'option 2'], + selectedType: selectedType, + firstField: firstField, + secondField: secondField, + thirdField: thirdField, + ), + SizedBox(height: 16,), + PreviousCheifComplaints() + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 0ce7ce7b..861e4458 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; @@ -18,17 +19,28 @@ class UpdateChiefComplaints extends StatelessWidget { padding: const EdgeInsets.all(12.0), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ AddSoapItem( - onAddSoapItemClicked: () {}, + onAddSoapItemClicked: () { + Navigator.push( + context, + //Todo(handle the parameter here) + MaterialPageRoute( + builder: (BuildContext context) => AddChiefComplaint( + complaints: complaints, + selectedType: '', + firstField: '', + secondField: '', + thirdField: ''), + )); + }, ), + SizedBox(height: 16), if (complaints.isEmpty) ...{ - EmptyComplaints() + Center(child: EmptyComplaints()) } else ...{ ListView.builder( itemBuilder: (_, index) => ComplaintItems( complaint: complaints[index], - onCrossClicked: (complaints) { - - })) + onCrossClicked: (complaints) {})) } ]), ); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart new file mode 100644 index 00000000..03ddd396 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -0,0 +1,262 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; + +class ComplaintSelection extends StatefulWidget { + final List complaints; + final String selectedType; + final String? firstField; + final String? secondField; + final String? thirdField; + + const ComplaintSelection({super.key, + required this.complaints, + required this.selectedType, + this.firstField, + this.secondField, + this.thirdField}); + + @override + State createState() => _ComplaintSelectionState(); +} + +class _ComplaintSelectionState extends State { + final TextEditingController firstEditingController = TextEditingController(); + final TextEditingController secondEditingController = TextEditingController(); + final TextEditingController thirdEditingController = TextEditingController(); + OverlayEntry? _overlayEntry; + + @override + void initState() { + super.initState(); + firstEditingController.text = widget.firstField ?? ''; + secondEditingController.text = widget.secondField ?? ''; + thirdEditingController.text = widget.thirdField ?? ''; + _focus.addListener(_onFocusChange); + } + + void _onFocusChange() { + removeOverlay(); + } + + void _showOverlay(BuildContext context) { + print("the function is called"); + + _overlayEntry?.remove(); + + final overlay = Overlay.of(context); + final renderBox = context.findRenderObject() as RenderBox; + final position = renderBox.localToGlobal(Offset.zero); + print( + 'the position is $position and render box is ${renderBox.size.height}'); + _overlayEntry = OverlayEntry( + builder: (context) => + Positioned( + left: position.dx, + top: position.dy + renderBox.size.height - 12, + child: Material( + elevation: 4.0, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + SizedBox(width: MediaQuery + .sizeOf(context) + .width - 50, child: Text("Option 1"),) + ], + ), + ), + ), + ), + ); + + overlay?.insert(_overlayEntry!); + } + + void removeOverlay() { + _overlayEntry?.remove(); + _overlayEntry = null; + } + + @override + Widget build(BuildContext context) { + return Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase + .of(context) + .addChiefComplaint, + fontSize: 16, + fontWeight: FontWeight.w600, + textAlign: TextAlign.start, + color: Colors.black, + ), + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + value: true, + enabled: false, + activeColor: Color(0xFFD02127), + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + controlAffinity: ListTileControlAffinity.leading, + onChanged: (bool? value) {}, + title: AppText( + TranslationBase + .of(context) + .addChiefComplaint, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + contentPadding: EdgeInsets.zero), + ), + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + value: true, + activeColor: Color(0xFFD02127), + controlAffinity: ListTileControlAffinity.leading, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + onChanged: (bool? value) {}, + title: AppText( + TranslationBase + .of(context) + .generalList, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + contentPadding: EdgeInsets.zero), + ), + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + activeColor: Color(0xFFD02127), + contentPadding: EdgeInsets.zero, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + value: false, + controlAffinity: ListTileControlAffinity.leading, + onChanged: (bool? value) {}, + title: AppText( + TranslationBase + .of(context) + .specialList, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + ), + ), + TextWithSelectedItems() + ], + ), + ), + ); + } + + FocusNode _focus = FocusNode(); + + Widget TextWithSelectedItems() { + return Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 8,), + Padding( + padding: const EdgeInsets.only(left: 8.0), + child: AppText(TranslationBase + .of(context) + .enterChiefCompliants, + fontWeight: FontWeight.w600, + fontSize: 11, + textAlign: TextAlign.start, + ), + ), + SizedBox(height: 8,), + SizedBox( + height: 43, + child: Row( + children: [ + Expanded( + child: ListView.builder(scrollDirection: Axis.horizontal, + itemCount: widget.complaints.length + 1, + itemBuilder: (context, index) { + if (index == widget.complaints.length) { + return SizedBox( + width: MediaQuery + .sizeOf(context) + .width, + child: TextField( + decoration: InputDecoration.collapsed( + hintText: '', + ), + onChanged: (value) { + + },), + ); + } else { + return ComplaintItems( + complaint: widget.complaints[index], + onCrossClicked: (complaints) {}); + } + }), + ), + ], + ), + ), + SizedBox(height: 8,), + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart index 66214d72..afcd5492 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart @@ -18,7 +18,6 @@ class AddSoapItem extends StatelessWidget{ color: Colors.grey[300]!, fontColor: Colors.black, fontWeight: FontWeight.w600, - disabled: true, onPressed: () async { onAddSoapItemClicked(); }, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index 1719e2cc..ff6a513a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -1,27 +1,47 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; -class ComplaintItems extends StatelessWidget{ +class ComplaintItems extends StatelessWidget { final String complaint; final Function(String) onCrossClicked; - const ComplaintItems({super.key, required this.complaint, required this.onCrossClicked}); + const ComplaintItems( + {super.key, required this.complaint, required this.onCrossClicked}); @override Widget build(BuildContext context) { - return ListTile( - title: AppText(complaint,fontWeight: FontWeight.w400, fontSize: 14,color: Color(0xFF575757),), + return Padding( + padding: const EdgeInsets.all(8.0), + child: Material( + color: Color(0XAAA5A5A5), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5),), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox(width: 6,), + AppText( + complaint, + fontWeight: FontWeight.w400, + fontSize: 14, + color: Color(0xFF575757), + ), + SizedBox(width: 8,), + InkWell( + onTap: () { + onCrossClicked(complaint); + }, + child: Icon( + Icons.close, + size: 16, + color: Color(0xFFD02127), + ), + ), + SizedBox(width: 4,), - trailing: IconButton( - onPressed: (){ - onCrossClicked(complaint); - }, - icon: Icon( - Icons.close, - color: Color(0xFFD02127), + ], ), ), ); } - -} \ No newline at end of file +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart new file mode 100644 index 00000000..0e29f6ae --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart @@ -0,0 +1,104 @@ +import 'package:flutter/material.dart'; + +import '../../../../../../../utils/translations_delegate_base_utils.dart'; +import '../../../../../../../widgets/shared/app_texts_widget.dart'; +import '../../../../../../../widgets/shared/buttons/app_buttons_widget.dart'; + +class ListOfComplaintsItem extends StatelessWidget { + final String name; + final String createdBy; + final String createdAt; + final VoidCallback onSendClick; + + const ListOfComplaintsItem( + {super.key, + required this.name, + required this.createdBy, + required this.createdAt, + required this.onSendClick}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + name, + fontWeight: FontWeight.w600, + fontSize: 16, + textAlign: TextAlign.start, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + Row( + children: [ + AppText( + TranslationBase.of(context).createdBy, + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFF2E303A), + textAlign: TextAlign.start, + ), + SizedBox( + width: 4, + ), + AppText( + createdBy, + fontWeight: FontWeight.w400, + fontSize: 15, + textAlign: TextAlign.start, + color: Color(0xFF2E303A), + ), + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).createdOn, + fontWeight: FontWeight.w400, + textAlign: TextAlign.start, + fontSize: 15, + color: Color(0xFF2E303A), + ), + SizedBox( + width: 4, + ), + AppText( + createdAt, + fontWeight: FontWeight.w400, + textAlign: TextAlign.start, + fontSize: 15, + color: Color(0xFF2E303A), + ), + ], + ) + ], + ), + + SizedBox( + width: 77, + height: 27, + child: AppButton( + title: TranslationBase.of(context).select, + hPadding: 8, + color: Color(0xFFD02127), + fontColor: Colors.white, + onPressed: () { + onSendClick(); + }, + ), + ), + ], + ), + ], + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart new file mode 100644 index 00000000..06443a35 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart @@ -0,0 +1,62 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:flutter/material.dart'; + +import '../../../../../../../widgets/shared/app_texts_widget.dart'; + +class PreviousCheifComplaints extends StatelessWidget { + const PreviousCheifComplaints({super.key}); + + @override + Widget build(BuildContext context) { + return Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).previousChiefCompaints, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 16, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 16, + ), + AppText( + TranslationBase.of(context).listOfActiveEpisodes, + fontWeight: FontWeight.w400, + fontSize: 14, + textAlign: TextAlign.start, + color: Color(0xFF575757), + ), + SizedBox( + height: 16, + ), + Flexible( + child: ListView.separated( + shrinkWrap: true, + itemCount: 2, + separatorBuilder: (context, index) => Divider(), + itemBuilder: (context, index) { + return ListOfComplaintsItem( + name: "name", + createdBy: "createdBy", + createdAt: "createdAt", + onSendClick: () {}); + })) + ], + ), + )); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart similarity index 96% rename from lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart rename to lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index e3f728ed..fd5ba8b3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -21,19 +21,19 @@ import 'chief_complaint/chief_complaints.dart'; -class UpdateSubjectivePage extends StatefulWidget { +class UpdateSubjectivePageVidaPlus extends StatefulWidget { final Function changePageViewIndex; final Function changeLoadingState; final PatiantInformtion patientInfo; final int currentIndex; - UpdateSubjectivePage({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); + UpdateSubjectivePageVidaPlus({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); @override - _UpdateSubjectivePageState createState() => _UpdateSubjectivePageState(); + _UpdateSubjectivePageVidaPlusState createState() => _UpdateSubjectivePageVidaPlusState(); } -class _UpdateSubjectivePageState extends State implements SubjectiveCallBack { +class _UpdateSubjectivePageVidaPlusState extends State implements SubjectiveCallBack { bool isChiefExpand = false; bool isHistoryExpand = false; bool isAllergiesExpand = false; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index d088f8d4..bbdb1a6f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_hi import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -92,7 +93,7 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ - UpdateSubjectivePage( + UpdateSubjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/previous_data_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/previous_data_item.dart new file mode 100644 index 00000000..e69de29b diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index c456d65f..71e9f2e9 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -13,11 +13,13 @@ class TranslationBase { return Localizations.of(context, TranslationBase)!; } - String get dashboardScreenToolbarTitle => localizedValues['dashboardScreenToolbarTitle']![locale.languageCode]!; + String get dashboardScreenToolbarTitle => + localizedValues['dashboardScreenToolbarTitle']![locale.languageCode]!; String get settings => localizedValues['settings']![locale.languageCode]!; - String get areYouSureYouWantTo => localizedValues['areYouSureYouWantTo']![locale.languageCode]!; + String get areYouSureYouWantTo => + localizedValues['areYouSureYouWantTo']![locale.languageCode]!; String get language => localizedValues['language']![locale.languageCode]!; @@ -35,39 +37,52 @@ class TranslationBase { String get mobileNo => localizedValues['mobileNo']![locale.languageCode]!; - String get replySuccessfully => localizedValues['replySuccessfully']![locale.languageCode]!; + String get replySuccessfully => + localizedValues['replySuccessfully']![locale.languageCode]!; - String get messagesScreenToolbarTitle => localizedValues['messagesScreenToolbarTitle']![locale.languageCode]!; + String get messagesScreenToolbarTitle => + localizedValues['messagesScreenToolbarTitle']![locale.languageCode]!; String get mySchedule => localizedValues['mySchedule']![locale.languageCode]!; - String get errorNoSchedule => localizedValues['errorNoSchedule']![locale.languageCode]!; + String get errorNoSchedule => + localizedValues['errorNoSchedule']![locale.languageCode]!; String get verify => localizedValues['verify']![locale.languageCode]!; - String get referralDoctor => localizedValues['referralDoctor']![locale.languageCode]!; + String get referralDoctor => + localizedValues['referralDoctor']![locale.languageCode]!; - String get referringClinic => localizedValues['referringClinic']![locale.languageCode]!; + String get referringClinic => + localizedValues['referringClinic']![locale.languageCode]!; String get frequency => localizedValues['frequency']![locale.languageCode]!; String get priority => localizedValues['priority']![locale.languageCode]!; - String get maxResponseTime => localizedValues['maxResponseTime']![locale.languageCode]!; + String get maxResponseTime => + localizedValues['maxResponseTime']![locale.languageCode]!; - String get clinicDetailsandRemarks => localizedValues['clinicDetailsandRemarks']![locale.languageCode]!; + String get clinicDetailsandRemarks => + localizedValues['clinicDetailsandRemarks']![locale.languageCode]!; - String get answerSuggestions => localizedValues['answerSuggestions']![locale.languageCode]!; + String get answerSuggestions => + localizedValues['answerSuggestions']![locale.languageCode]!; - String get outPatients => localizedValues['outPatients']![locale.languageCode]!; + String get outPatients => + localizedValues['outPatients']![locale.languageCode]!; - String get searchPatient => localizedValues['searchPatient']![locale.languageCode]!; + String get searchPatient => + localizedValues['searchPatient']![locale.languageCode]!; - String get searchPatientDashBoard => localizedValues['searchPatientDashBoard']![locale.languageCode]!; + String get searchPatientDashBoard => + localizedValues['searchPatientDashBoard']![locale.languageCode]!; - String get searchPatientName => localizedValues['searchPatient-name']![locale.languageCode]!; + String get searchPatientName => + localizedValues['searchPatient-name']![locale.languageCode]!; - String get searchAbout => localizedValues['searchAbout']![locale.languageCode]!; + String get searchAbout => + localizedValues['searchAbout']![locale.languageCode]!; String get patient => localizedValues['patient']![locale.languageCode]!; @@ -75,9 +90,11 @@ class TranslationBase { String get labResult => localizedValues['labResult']![locale.languageCode]!; - String get todayStatistics => localizedValues['todayStatistics']![locale.languageCode]!; + String get todayStatistics => + localizedValues['todayStatistics']![locale.languageCode]!; - String get familyMedicine => localizedValues['familyMedicine']![locale.languageCode]!; + String get familyMedicine => + localizedValues['familyMedicine']![locale.languageCode]!; String get arrived => localizedValues['arrived']![locale.languageCode]!; @@ -95,71 +112,92 @@ class TranslationBase { String get inPatient => localizedValues['inPatient']![locale.languageCode]!; - String get myInPatient => localizedValues['myInPatient']![locale.languageCode]!; + String get myInPatient => + localizedValues['myInPatient']![locale.languageCode]!; - String get myInPatientTitle => localizedValues['myInPatientTitle']![locale.languageCode]!; + String get myInPatientTitle => + localizedValues['myInPatientTitle']![locale.languageCode]!; - String get inPatientLabel => localizedValues['inPatientLabel']![locale.languageCode]!; + String get inPatientLabel => + localizedValues['inPatientLabel']![locale.languageCode]!; - String get inPatientAll => localizedValues['inPatientAll']![locale.languageCode]!; + String get inPatientAll => + localizedValues['inPatientAll']![locale.languageCode]!; String get operations => localizedValues['operations']![locale.languageCode]!; - String get patientServices => localizedValues['patientServices']![locale.languageCode]!; + String get patientServices => + localizedValues['patientServices']![locale.languageCode]!; - String get searchMedicine => localizedValues['searchMedicine']![locale.languageCode]!; + String get searchMedicine => + localizedValues['searchMedicine']![locale.languageCode]!; - String get searchMedicineDashboard => localizedValues['searchMedicineDashboard']![locale.languageCode]!; + String get searchMedicineDashboard => + localizedValues['searchMedicineDashboard']![locale.languageCode]!; - String get myReferralPatient => localizedValues['myReferralPatient']![locale.languageCode]!; + String get myReferralPatient => + localizedValues['myReferralPatient']![locale.languageCode]!; - String get referPatient => localizedValues['referPatient']![locale.languageCode]!; + String get referPatient => + localizedValues['referPatient']![locale.languageCode]!; String get myReferral => localizedValues['myReferral']![locale.languageCode]!; - String get myReferredPatient => localizedValues['myReferredPatient']![locale.languageCode]!; + String get myReferredPatient => + localizedValues['myReferredPatient']![locale.languageCode]!; - String get referredPatient => localizedValues['referredPatient']![locale.languageCode]!; + String get referredPatient => + localizedValues['referredPatient']![locale.languageCode]!; String get referredOn => localizedValues['referredOn']![locale.languageCode]!; String get firstName => localizedValues['firstName']![locale.languageCode]!; - String get firstNameInAr => localizedValues['firstNameInAr']![locale.languageCode]!; + String get firstNameInAr => + localizedValues['firstNameInAr']![locale.languageCode]!; String get middleName => localizedValues['middleName']![locale.languageCode]!; - String get middleNameInAr => localizedValues['middleNameInAr']![locale.languageCode]!; + String get middleNameInAr => + localizedValues['middleNameInAr']![locale.languageCode]!; String get lastName => localizedValues['lastName']![locale.languageCode]!; - String get lastNameInAr => localizedValues['lastNameInAr']![locale.languageCode]!; + String get lastNameInAr => + localizedValues['lastNameInAr']![locale.languageCode]!; - String get phoneNumber => localizedValues['phoneNumber']![locale.languageCode]!; + String get phoneNumber => + localizedValues['phoneNumber']![locale.languageCode]!; String get patientID => localizedValues['patientID']![locale.languageCode]!; - String get patientFile => localizedValues['patientFile']![locale.languageCode]!; + String get patientFile => + localizedValues['patientFile']![locale.languageCode]!; String get search => localizedValues['search']![locale.languageCode]!; - String get onlyArrivedPatient => localizedValues['onlyArrivedPatient']![locale.languageCode]!; + String get onlyArrivedPatient => + localizedValues['onlyArrivedPatient']![locale.languageCode]!; - String get searchMedicineNameHere => localizedValues['searchMedicineNameHere']![locale.languageCode]!; + String get searchMedicineNameHere => + localizedValues['searchMedicineNameHere']![locale.languageCode]!; String get youCanFind => localizedValues['youCanFind']![locale.languageCode]!; - String get medicineSearchResult => localizedValues['medicineSearchResult']![locale.languageCode]!; + String get medicineSearchResult => + localizedValues['medicineSearchResult']![locale.languageCode]!; String get qr => localizedValues['qr']![locale.languageCode]!; String get reader => localizedValues['reader']![locale.languageCode]!; - String get startScanning => localizedValues['startScanning']![locale.languageCode]!; + String get startScanning => + localizedValues['startScanning']![locale.languageCode]!; String get scanQrCode => localizedValues['scanQrCode']![locale.languageCode]!; - String get scanERQrCode => localizedValues['scanERQrCode']![locale.languageCode]!; + String get scanERQrCode => + localizedValues['scanERQrCode']![locale.languageCode]!; String get scanQr => localizedValues['scanQr']![locale.languageCode]!; @@ -169,17 +207,21 @@ class TranslationBase { String get clinic => localizedValues['clinic']![locale.languageCode]!; - String get clinicSelect => localizedValues['clinicSelect']![locale.languageCode]!; + String get clinicSelect => + localizedValues['clinicSelect']![locale.languageCode]!; - String get doctorSelect => localizedValues['doctorSelect']![locale.languageCode]!; + String get doctorSelect => + localizedValues['doctorSelect']![locale.languageCode]!; String get hospital => localizedValues['hospital']![locale.languageCode]!; String get speciality => localizedValues['speciality']![locale.languageCode]!; - String get errorMessage => localizedValues['errorMessage']![locale.languageCode]!; + String get errorMessage => + localizedValues['errorMessage']![locale.languageCode]!; - String get patientProfile => localizedValues['patientProfile']![locale.languageCode]!; + String get patientProfile => + localizedValues['patientProfile']![locale.languageCode]!; String get vitalSign => localizedValues['vitalSign']![locale.languageCode]!; @@ -195,43 +237,56 @@ class TranslationBase { String get medicines => localizedValues['medicines']![locale.languageCode]!; - String get prescription => localizedValues['prescription']![locale.languageCode]!; + String get prescription => + localizedValues['prescription']![locale.languageCode]!; - String get insuranceApprovals => localizedValues['insuranceApprovals']![locale.languageCode]!; + String get insuranceApprovals => + localizedValues['insuranceApprovals']![locale.languageCode]!; String get insurance => localizedValues['insurance']![locale.languageCode]!; String get approvals => localizedValues['approvals']![locale.languageCode]!; - String get bodyMeasurements => localizedValues['bodyMeasurements']![locale.languageCode]!; + String get bodyMeasurements => + localizedValues['bodyMeasurements']![locale.languageCode]!; - String get temperature => localizedValues['temperature']![locale.languageCode]!; + String get temperature => + localizedValues['temperature']![locale.languageCode]!; String get pulse => localizedValues['pulse']![locale.languageCode]!; - String get respiration => localizedValues['respiration']![locale.languageCode]!; + String get respiration => + localizedValues['respiration']![locale.languageCode]!; - String get bloodPressure => localizedValues['bloodPressure']![locale.languageCode]!; + String get bloodPressure => + localizedValues['bloodPressure']![locale.languageCode]!; - String get oxygenation => localizedValues['oxygenation']![locale.languageCode]!; + String get oxygenation => + localizedValues['oxygenation']![locale.languageCode]!; String get painScale => localizedValues['painScale']![locale.languageCode]!; - String get errorNoVitalSign => localizedValues['errorNoVitalSign']![locale.languageCode]!; + String get errorNoVitalSign => + localizedValues['errorNoVitalSign']![locale.languageCode]!; String get labOrders => localizedValues['labOrders']![locale.languageCode]!; - String get errorNoLabOrders => localizedValues['errorNoLabOrders']![locale.languageCode]!; + String get errorNoLabOrders => + localizedValues['errorNoLabOrders']![locale.languageCode]!; - String get answerThePatient => localizedValues['answerThePatient']![locale.languageCode]!; + String get answerThePatient => + localizedValues['answerThePatient']![locale.languageCode]!; - String get pleaseEnterAnswer => localizedValues['pleaseEnterAnswer']![locale.languageCode]!; + String get pleaseEnterAnswer => + localizedValues['pleaseEnterAnswer']![locale.languageCode]!; String get replay => localizedValues['replay']![locale.languageCode]!; - String get progressNote => localizedValues['progressNote']![locale.languageCode]!; + String get progressNote => + localizedValues['progressNote']![locale.languageCode]!; - String get operationReports => localizedValues['operationReports']![locale.languageCode]!; + String get operationReports => + localizedValues['operationReports']![locale.languageCode]!; String get reports => localizedValues['reports']![locale.languageCode]!; @@ -243,15 +298,18 @@ class TranslationBase { String get searchNote => localizedValues['searchNote']![locale.languageCode]!; - String get errorNoProgressNote => localizedValues['errorNoProgressNote']![locale.languageCode]!; + String get errorNoProgressNote => + localizedValues['errorNoProgressNote']![locale.languageCode]!; String get invoiceNo => localizedValues['invoiceNo:']![locale.languageCode]!; String get orderNo => localizedValues['orderNo']![locale.languageCode]!; - String get generalResult => localizedValues['generalResult']![locale.languageCode]!; + String get generalResult => + localizedValues['generalResult']![locale.languageCode]!; - String get description => localizedValues['description']![locale.languageCode]!; + String get description => + localizedValues['description']![locale.languageCode]!; String get value => localizedValues['value']![locale.languageCode]!; @@ -259,23 +317,30 @@ class TranslationBase { String get enterId => localizedValues['enterId']![locale.languageCode]!; - String get pleaseEnterYourID => localizedValues['pleaseEnterYourID']![locale.languageCode]!; + String get pleaseEnterYourID => + localizedValues['pleaseEnterYourID']![locale.languageCode]!; - String get enterPassword => localizedValues['enterPassword']![locale.languageCode]!; + String get enterPassword => + localizedValues['enterPassword']![locale.languageCode]!; - String get pleaseEnterPassword => localizedValues['pleaseEnterPassword']![locale.languageCode]!; + String get pleaseEnterPassword => + localizedValues['pleaseEnterPassword']![locale.languageCode]!; - String get selectYourProject => localizedValues['selectYourProject']![locale.languageCode]!; + String get selectYourProject => + localizedValues['selectYourProject']![locale.languageCode]!; - String get pleaseEnterYourProject => localizedValues['pleaseEnterYourProject']![locale.languageCode]!; + String get pleaseEnterYourProject => + localizedValues['pleaseEnterYourProject']![locale.languageCode]!; String get login => localizedValues['login']![locale.languageCode]!; - String get drSulaimanAlHabib => localizedValues['drSulaimanAlHabib']![locale.languageCode]!; + String get drSulaimanAlHabib => + localizedValues['drSulaimanAlHabib']![locale.languageCode]!; String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!; - String get welcomeBackTo => localizedValues['welcomeBackTo']![locale.languageCode]!; + String get welcomeBackTo => + localizedValues['welcomeBackTo']![locale.languageCode]!; String get home => localizedValues['home']![locale.languageCode]!; @@ -283,7 +348,8 @@ class TranslationBase { String get sms => localizedValues['sms']![locale.languageCode]!; - String get fingerprint => localizedValues['fingerprint']![locale.languageCode]!; + String get fingerprint => + localizedValues['fingerprint']![locale.languageCode]!; String get faceId => localizedValues['faceId']![locale.languageCode]!; @@ -291,41 +357,51 @@ class TranslationBase { String get whatsAppBy => localizedValues['whatsAppBy']![locale.languageCode]!; - String get pleaseChoose => localizedValues['pleaseChoose']![locale.languageCode]!; + String get pleaseChoose => + localizedValues['pleaseChoose']![locale.languageCode]!; String get choose => localizedValues['choose']![locale.languageCode]!; - String get verification => localizedValues['verification']![locale.languageCode]!; + String get verification => + localizedValues['verification']![locale.languageCode]!; String get firstStep => localizedValues['firstStep']![locale.languageCode]!; - String get yourAccount => localizedValues['yourAccount!']![locale.languageCode]!; + String get yourAccount => + localizedValues['yourAccount!']![locale.languageCode]!; String get verify1 => localizedValues['verify1']![locale.languageCode]!; - String get youWillReceiveA => localizedValues['youWillReceiveA']![locale.languageCode]!; + String get youWillReceiveA => + localizedValues['youWillReceiveA']![locale.languageCode]!; String get loginCode => localizedValues['loginCode']![locale.languageCode]!; String get smsBy => localizedValues['smsBy']![locale.languageCode]!; - String get pleaseEnterTheCode => localizedValues['pleaseEnterTheCode']![locale.languageCode]!; + String get pleaseEnterTheCode => + localizedValues['pleaseEnterTheCode']![locale.languageCode]!; - String get youDontHaveAnyPatient => localizedValues['youDontHaveAnyPatient']![locale.languageCode]!; + String get youDontHaveAnyPatient => + localizedValues['youDontHaveAnyPatient']![locale.languageCode]!; - String get youDoNotHaveAnyItem => localizedValues['youDoNotHaveAnyItem']![locale.languageCode]!; + String get youDoNotHaveAnyItem => + localizedValues['youDoNotHaveAnyItem']![locale.languageCode]!; String get age => localizedValues['age']![locale.languageCode]!; - String get nationality => localizedValues['nationality']![locale.languageCode]!; + String get nationality => + localizedValues['nationality']![locale.languageCode]!; String get occupation => localizedValues['occupation']![locale.languageCode]!; String get healthID => localizedValues['healthID']![locale.languageCode]!; - String get identityNumber => localizedValues['identityNumber']![locale.languageCode]!; + String get identityNumber => + localizedValues['identityNumber']![locale.languageCode]!; - String get maritalStatus => localizedValues['maritalStatus']![locale.languageCode]!; + String get maritalStatus => + localizedValues['maritalStatus']![locale.languageCode]!; String get today => localizedValues['today']![locale.languageCode]!; @@ -337,15 +413,18 @@ class TranslationBase { String get yesterday => localizedValues['yesterday']![locale.languageCode]!; - String get errorNoInsuranceApprovals => localizedValues['errorNoInsuranceApprovals']![locale.languageCode]!; + String get errorNoInsuranceApprovals => + localizedValues['errorNoInsuranceApprovals']![locale.languageCode]!; - String get searchInsuranceApprovals => localizedValues['searchInsuranceApprovals']![locale.languageCode]!; + String get searchInsuranceApprovals => + localizedValues['searchInsuranceApprovals']![locale.languageCode]!; String get status => localizedValues['status']![locale.languageCode]!; String get expiryDate => localizedValues['expiryDate']![locale.languageCode]!; - String get producerName => localizedValues['producerName']![locale.languageCode]!; + String get producerName => + localizedValues['producerName']![locale.languageCode]!; String get receiptOn => localizedValues['receiptOn']![locale.languageCode]!; @@ -363,11 +442,14 @@ class TranslationBase { String get send => localizedValues['send']![locale.languageCode]!; - String get referralFrequency => localizedValues['referralFrequency']![locale.languageCode]!; + String get referralFrequency => + localizedValues['referralFrequency']![locale.languageCode]!; - String get selectReferralFrequency => localizedValues['selectReferralFrequency']![locale.languageCode]!; + String get selectReferralFrequency => + localizedValues['selectReferralFrequency']![locale.languageCode]!; - String get clinicalDetailsAndRemarks => localizedValues['clinicalDetailsAndRemarks']![locale.languageCode]!; + String get clinicalDetailsAndRemarks => + localizedValues['clinicalDetailsAndRemarks']![locale.languageCode]!; String get remarks => localizedValues['remarks']![locale.languageCode]!; @@ -375,33 +457,43 @@ class TranslationBase { String get replay2 => localizedValues['replay2']![locale.languageCode]!; - String get outPatient => localizedValues['outPatients']![locale.languageCode]!; + String get outPatient => + localizedValues['outPatients']![locale.languageCode]!; - String get myOutPatient => localizedValues['myOutPatient']![locale.languageCode]!; + String get myOutPatient => + localizedValues['myOutPatient']![locale.languageCode]!; - String get myOutPatient_2lines => localizedValues['myOutPatient_2lines']![locale.languageCode]!; + String get myOutPatient_2lines => + localizedValues['myOutPatient_2lines']![locale.languageCode]!; String get logout => localizedValues['logout']![locale.languageCode]!; - String get pharmaciesList => localizedValues['pharmaciesList']![locale.languageCode]!; + String get pharmaciesList => + localizedValues['pharmaciesList']![locale.languageCode]!; String get price => localizedValues['price']![locale.languageCode]!; - String get youCanFindItIn => localizedValues['youCanFindItIn']![locale.languageCode]!; + String get youCanFindItIn => + localizedValues['youCanFindItIn']![locale.languageCode]!; - String get radiologyReport => localizedValues['radiologyReport']![locale.languageCode]!; + String get radiologyReport => + localizedValues['radiologyReport']![locale.languageCode]!; String get orders => localizedValues['orders']![locale.languageCode]!; String get list => localizedValues['list']![locale.languageCode]!; - String get searchOrders => localizedValues['searchOrders']![locale.languageCode]!; + String get searchOrders => + localizedValues['searchOrders']![locale.languageCode]!; - String get prescriptionDetails => localizedValues['prescriptionDetails']![locale.languageCode]!; + String get prescriptionDetails => + localizedValues['prescriptionDetails']![locale.languageCode]!; - String get prescriptionInfo => localizedValues['prescriptionInfo']![locale.languageCode]!; + String get prescriptionInfo => + localizedValues['prescriptionInfo']![locale.languageCode]!; - String get errorNoOrders => localizedValues['errorNoOrders']![locale.languageCode]!; + String get errorNoOrders => + localizedValues['errorNoOrders']![locale.languageCode]!; String get livecare => localizedValues['livecare']![locale.languageCode]!; @@ -415,17 +507,20 @@ class TranslationBase { String get done => localizedValues['done']![locale.languageCode]!; - String get searchMedicineImageCaption => localizedValues['searchMedicineImageCaption']![locale.languageCode]!; + String get searchMedicineImageCaption => + localizedValues['searchMedicineImageCaption']![locale.languageCode]!; String get type => localizedValues['type']![locale.languageCode]!; String get resumecall => localizedValues['resumecall']![locale.languageCode]!; - String get endcallwithcharge => localizedValues['endcallwithcharge']![locale.languageCode]!; + String get endcallwithcharge => + localizedValues['endcallwithcharge']![locale.languageCode]!; String get endcall => localizedValues['endcall']![locale.languageCode]!; - String get transfertoadmin => localizedValues['transfertoadmin']![locale.languageCode]!; + String get transfertoadmin => + localizedValues['transfertoadmin']![locale.languageCode]!; String get fromDate => localizedValues['fromDate']![locale.languageCode]!; @@ -435,15 +530,19 @@ class TranslationBase { String get toTime => localizedValues['toTime']![locale.languageCode]!; - String get searchPatientImageCaptionTitle => localizedValues['searchPatientImageCaptionTitle']![locale.languageCode]!; + String get searchPatientImageCaptionTitle => + localizedValues['searchPatientImageCaptionTitle']![locale.languageCode]!; - String get searchPatientImageCaptionBody => localizedValues['searchPatientImageCaptionBody']![locale.languageCode]!; + String get searchPatientImageCaptionBody => + localizedValues['searchPatientImageCaptionBody']![locale.languageCode]!; String get welcome => localizedValues['welcome']![locale.languageCode]!; - String get typeMedicineName => localizedValues['typeMedicineName']![locale.languageCode]!; + String get typeMedicineName => + localizedValues['typeMedicineName']![locale.languageCode]!; - String get moreThan3Letter => localizedValues['moreThan3Letter']![locale.languageCode]!; + String get moreThan3Letter => + localizedValues['moreThan3Letter']![locale.languageCode]!; String get gender2 => localizedValues['gender2']![locale.languageCode]!; @@ -451,7 +550,8 @@ class TranslationBase { String get sickleave => localizedValues['sick-leaves']![locale.languageCode]!; - String get patientSick => localizedValues['patient-sick']![locale.languageCode]!; + String get patientSick => + localizedValues['patient-sick']![locale.languageCode]!; String get leave => localizedValues['leave']![locale.languageCode]!; @@ -461,17 +561,21 @@ class TranslationBase { String get clinicName => localizedValues['clinicname']![locale.languageCode]!; - String get sickLeaveDate => localizedValues['sick-leave-date']![locale.languageCode]!; + String get sickLeaveDate => + localizedValues['sick-leave-date']![locale.languageCode]!; - String get sickLeaveDays => localizedValues['sick-leave-days']![locale.languageCode]!; + String get sickLeaveDays => + localizedValues['sick-leave-days']![locale.languageCode]!; - String get admissionDetail => localizedValues['admissionDetail']![locale.languageCode]!; + String get admissionDetail => + localizedValues['admissionDetail']![locale.languageCode]!; String get dateTime => localizedValues['dateTime']![locale.languageCode]!; String get date => localizedValues['date']![locale.languageCode]!; - String get admissionNo => localizedValues['admissionNo']![locale.languageCode]!; + String get admissionNo => + localizedValues['admissionNo']![locale.languageCode]!; String get losNo => localizedValues['losNo']![locale.languageCode]!; @@ -481,21 +585,27 @@ class TranslationBase { String get bed => localizedValues['bed']![locale.languageCode]!; - String get previousSickLeaveIssue => localizedValues['prevoius-sickleave-issed']![locale.languageCode]!; + String get previousSickLeaveIssue => + localizedValues['prevoius-sickleave-issed']![locale.languageCode]!; - String get noSickLeaveApplied => localizedValues['no-sickleve-applied']![locale.languageCode]!; + String get noSickLeaveApplied => + localizedValues['no-sickleve-applied']![locale.languageCode]!; String get applyNow => localizedValues['applynow']![locale.languageCode]!; - String get addSickLeave => localizedValues['add-sickleave']![locale.languageCode]!; + String get addSickLeave => + localizedValues['add-sickleave']![locale.languageCode]!; - String get pharmacyIntervention => localizedValues['pharmacy-intervention']![locale.languageCode]!; + String get pharmacyIntervention => + localizedValues['pharmacy-intervention']![locale.languageCode]!; String get add => localizedValues['add']![locale.languageCode]!; - String get addSickLeaverequest => localizedValues['addSickLeaveRequest']![locale.languageCode]!; + String get addSickLeaverequest => + localizedValues['addSickLeaveRequest']![locale.languageCode]!; - String get extendSickLeaverequest => localizedValues['extendSickLeaveRequest']![locale.languageCode]!; + String get extendSickLeaverequest => + localizedValues['extendSickLeaveRequest']![locale.languageCode]!; String get approved => localizedValues['approved']![locale.languageCode]!; @@ -503,17 +613,22 @@ class TranslationBase { String get pending => localizedValues['pending']![locale.languageCode]!; - String get leaveStartDate => localizedValues['leave-start-date']![locale.languageCode]!; + String get leaveStartDate => + localizedValues['leave-start-date']![locale.languageCode]!; - String get daysSickleave => localizedValues['days-sick-leave']![locale.languageCode]!; + String get daysSickleave => + localizedValues['days-sick-leave']![locale.languageCode]!; String get extend => localizedValues['extend']![locale.languageCode]!; - String get extendSickLeave => localizedValues['extend-sickleave']![locale.languageCode]!; + String get extendSickLeave => + localizedValues['extend-sickleave']![locale.languageCode]!; - String get targetPatient => localizedValues['patient-target']![locale.languageCode]!; + String get targetPatient => + localizedValues['patient-target']![locale.languageCode]!; - String get noPrescription => localizedValues['no-priscription-listed']![locale.languageCode]!; + String get noPrescription => + localizedValues['no-priscription-listed']![locale.languageCode]!; String get next => localizedValues['next']![locale.languageCode]!; @@ -521,23 +636,29 @@ class TranslationBase { String get previous => localizedValues['previous']![locale.languageCode]!; - String get emptyMessage => localizedValues['empty-message']![locale.languageCode]!; + String get emptyMessage => + localizedValues['empty-message']![locale.languageCode]!; - String get healthRecordInformation => localizedValues['healthRecordInformation']![locale.languageCode]!; + String get healthRecordInformation => + localizedValues['healthRecordInformation']![locale.languageCode]!; - String get chiefComplaintLength => localizedValues['chiefComplaintLength']![locale.languageCode]!; + String get chiefComplaintLength => + localizedValues['chiefComplaintLength']![locale.languageCode]!; String get referTo => localizedValues['referTo']![locale.languageCode]!; - String get referredFrom => localizedValues['referredFrom']![locale.languageCode]!; + String get referredFrom => + localizedValues['referredFrom']![locale.languageCode]!; String get refClinic => localizedValues['refClinic']![locale.languageCode]!; String get branch => localizedValues['branch']![locale.languageCode]!; - String get chooseAppointment => localizedValues['chooseAppointment']![locale.languageCode]!; + String get chooseAppointment => + localizedValues['chooseAppointment']![locale.languageCode]!; - String get appointmentNo => localizedValues['appointmentNo']![locale.languageCode]!; + String get appointmentNo => + localizedValues['appointmentNo']![locale.languageCode]!; String get refer => localizedValues['refer']![locale.languageCode]!; @@ -545,23 +666,29 @@ class TranslationBase { String get sameBranch => localizedValues['sameBranch']![locale.languageCode]!; - String get otherBranch => localizedValues['otherBranch']![locale.languageCode]!; + String get otherBranch => + localizedValues['otherBranch']![locale.languageCode]!; String get dr => localizedValues['dr']![locale.languageCode]!; - String get previewHealth => localizedValues['previewHealth']![locale.languageCode]!; + String get previewHealth => + localizedValues['previewHealth']![locale.languageCode]!; - String get summaryReport => localizedValues['summaryReport']![locale.languageCode]!; + String get summaryReport => + localizedValues['summaryReport']![locale.languageCode]!; String get accept => localizedValues['accept']![locale.languageCode]!; String get reject => localizedValues['reject']![locale.languageCode]!; - String get noAppointmentsErrorMsg => localizedValues['noAppointmentsErrorMsg']![locale.languageCode]!; + String get noAppointmentsErrorMsg => + localizedValues['noAppointmentsErrorMsg']![locale.languageCode]!; - String get referralPatient => localizedValues['referralPatient']![locale.languageCode]!; + String get referralPatient => + localizedValues['referralPatient']![locale.languageCode]!; - String get noPrescriptionListed => localizedValues['noPrescriptionListed']![locale.languageCode]!; + String get noPrescriptionListed => + localizedValues['noPrescriptionListed']![locale.languageCode]!; String get addNow => localizedValues['addNow']![locale.languageCode]!; @@ -575,19 +702,24 @@ class TranslationBase { String get duration => localizedValues['duration']![locale.languageCode]!; - String get instruction => localizedValues['instruction']![locale.languageCode]!; + String get instruction => + localizedValues['instruction']![locale.languageCode]!; - String get rescheduleLeaves => localizedValues['reschedule-leave']![locale.languageCode]!; + String get rescheduleLeaves => + localizedValues['reschedule-leave']![locale.languageCode]!; - String get applyOrRescheduleLeave => localizedValues['applyOrRescheduleLeave']![locale.languageCode]!; + String get applyOrRescheduleLeave => + localizedValues['applyOrRescheduleLeave']![locale.languageCode]!; String get myQRCode => localizedValues['myQRCode']![locale.languageCode]!; - String get addMedication => localizedValues['addMedication']![locale.languageCode]!; + String get addMedication => + localizedValues['addMedication']![locale.languageCode]!; String get route => localizedValues['route']![locale.languageCode]!; - String get noReScheduleLeave => localizedValues['no-reschedule-leave']![locale.languageCode]!; + String get noReScheduleLeave => + localizedValues['no-reschedule-leave']![locale.languageCode]!; String get weight => localizedValues['weight']![locale.languageCode]!; @@ -597,7 +729,8 @@ class TranslationBase { String get cm => localizedValues['cm']![locale.languageCode]!; - String get idealBodyWeight => localizedValues['idealBodyWeight']![locale.languageCode]!; + String get idealBodyWeight => + localizedValues['idealBodyWeight']![locale.languageCode]!; String get waistSize => localizedValues['waistSize']![locale.languageCode]!; @@ -605,21 +738,27 @@ class TranslationBase { String get headCircum => localizedValues['headCircum']![locale.languageCode]!; - String get leanBodyWeight => localizedValues['leanBodyWeight']![locale.languageCode]!; + String get leanBodyWeight => + localizedValues['leanBodyWeight']![locale.languageCode]!; - String get bodyMassIndex => localizedValues['bodyMassIndex']![locale.languageCode]!; + String get bodyMassIndex => + localizedValues['bodyMassIndex']![locale.languageCode]!; - String get yourBodyMassIndex => localizedValues['yourBodyMassIndex']![locale.languageCode]!; + String get yourBodyMassIndex => + localizedValues['yourBodyMassIndex']![locale.languageCode]!; - String get bmiUnderWeight => localizedValues['bmiUnderWeight']![locale.languageCode]!; + String get bmiUnderWeight => + localizedValues['bmiUnderWeight']![locale.languageCode]!; String get bmiHealthy => localizedValues['bmiHealthy']![locale.languageCode]!; - String get bmiOverWeight => localizedValues['bmiOverWeight']![locale.languageCode]!; + String get bmiOverWeight => + localizedValues['bmiOverWeight']![locale.languageCode]!; String get bmiObese => localizedValues['bmiObese']![locale.languageCode]!; - String get bmiObeseExtreme => localizedValues['bmiObeseExtreme']![locale.languageCode]!; + String get bmiObeseExtreme => + localizedValues['bmiObeseExtreme']![locale.languageCode]!; String get method => localizedValues['method']![locale.languageCode]!; @@ -629,35 +768,45 @@ class TranslationBase { String get respBeats => localizedValues['respBeats']![locale.languageCode]!; - String get patternOfRespiration => localizedValues['patternOfRespiration']![locale.languageCode]!; + String get patternOfRespiration => + localizedValues['patternOfRespiration']![locale.languageCode]!; - String get bloodPressureDiastoleAndSystole => localizedValues['bloodPressureDiastoleAndSystole']![locale.languageCode]!; + String get bloodPressureDiastoleAndSystole => + localizedValues['bloodPressureDiastoleAndSystole']![locale.languageCode]!; - String get cuffLocation => localizedValues['cuffLocation']![locale.languageCode]!; + String get cuffLocation => + localizedValues['cuffLocation']![locale.languageCode]!; String get cuffSize => localizedValues['cuffSize']![locale.languageCode]!; - String get patientPosition => localizedValues['patientPosition']![locale.languageCode]!; + String get patientPosition => + localizedValues['patientPosition']![locale.languageCode]!; String get fio2 => localizedValues['fio2']![locale.languageCode]!; String get sao2 => localizedValues['sao2']![locale.languageCode]!; - String get painManagement => localizedValues['painManagement']![locale.languageCode]!; + String get painManagement => + localizedValues['painManagement']![locale.languageCode]!; String get holiday => localizedValues['holiday']![locale.languageCode]!; String get to => localizedValues['to']![locale.languageCode]!; - String get coveringDoctor => localizedValues['coveringDoctor']![locale.languageCode]!; + String get coveringDoctor => + localizedValues['coveringDoctor']![locale.languageCode]!; - String get requestLeave => localizedValues['requestLeave']![locale.languageCode]!; + String get requestLeave => + localizedValues['requestLeave']![locale.languageCode]!; - String get pleaseEnterDate => localizedValues['pleaseEnterDate']![locale.languageCode]!; + String get pleaseEnterDate => + localizedValues['pleaseEnterDate']![locale.languageCode]!; - String get pleaseEnterNoOfDays => localizedValues['pleaseEnterNoOfDays']![locale.languageCode]!; + String get pleaseEnterNoOfDays => + localizedValues['pleaseEnterNoOfDays']![locale.languageCode]!; - String get pleaseEnterRemarks => localizedValues['pleaseEnterRemarks']![locale.languageCode]!; + String get pleaseEnterRemarks => + localizedValues['pleaseEnterRemarks']![locale.languageCode]!; String get update => localizedValues['update']![locale.languageCode]!; @@ -665,69 +814,94 @@ class TranslationBase { String get request => localizedValues['request']![locale.languageCode]!; - String get admissionRequest => localizedValues['admissionRequest']![locale.languageCode]!; + String get admissionRequest => + localizedValues['admissionRequest']![locale.languageCode]!; - String get patientDetails => localizedValues['patientDetails']![locale.languageCode]!; + String get patientDetails => + localizedValues['patientDetails']![locale.languageCode]!; - String get specialityAndDoctorDetail => localizedValues['specialityAndDoctorDetail']![locale.languageCode]!; + String get specialityAndDoctorDetail => + localizedValues['specialityAndDoctorDetail']![locale.languageCode]!; - String get referringDate => localizedValues['referringDate']![locale.languageCode]!; + String get referringDate => + localizedValues['referringDate']![locale.languageCode]!; - String get referringDoctor => localizedValues['referringDoctor']![locale.languageCode]!; + String get referringDoctor => + localizedValues['referringDoctor']![locale.languageCode]!; - String get otherInformation => localizedValues['otherInformation']![locale.languageCode]!; + String get otherInformation => + localizedValues['otherInformation']![locale.languageCode]!; - String get expectedDays => localizedValues['expectedDays']![locale.languageCode]!; + String get expectedDays => + localizedValues['expectedDays']![locale.languageCode]!; - String get expectedAdmissionDate => localizedValues['expectedAdmissionDate']![locale.languageCode]!; + String get expectedAdmissionDate => + localizedValues['expectedAdmissionDate']![locale.languageCode]!; - String get emergencyAdmission => localizedValues['emergencyAdmission']![locale.languageCode]!; + String get emergencyAdmission => + localizedValues['emergencyAdmission']![locale.languageCode]!; - String get isSickLeaveRequired => localizedValues['isSickLeaveRequired']![locale.languageCode]!; + String get isSickLeaveRequired => + localizedValues['isSickLeaveRequired']![locale.languageCode]!; - String get patientPregnant => localizedValues['patientPregnant']![locale.languageCode]!; + String get patientPregnant => + localizedValues['patientPregnant']![locale.languageCode]!; - String get treatmentLine => localizedValues['treatmentLine']![locale.languageCode]!; + String get treatmentLine => + localizedValues['treatmentLine']![locale.languageCode]!; String get ward => localizedValues['ward']![locale.languageCode]!; - String get preAnesthesiaReferred => localizedValues['preAnesthesiaReferred']![locale.languageCode]!; + String get preAnesthesiaReferred => + localizedValues['preAnesthesiaReferred']![locale.languageCode]!; - String get admissionType => localizedValues['admissionType']![locale.languageCode]!; + String get admissionType => + localizedValues['admissionType']![locale.languageCode]!; String get diagnosis => localizedValues['diagnosis']![locale.languageCode]!; String get allergies => localizedValues['allergies']![locale.languageCode]!; - String get preOperativeOrders => localizedValues['preOperativeOrders']![locale.languageCode]!; + String get preOperativeOrders => + localizedValues['preOperativeOrders']![locale.languageCode]!; - String get elementForImprovement => localizedValues['elementForImprovement']![locale.languageCode]!; + String get elementForImprovement => + localizedValues['elementForImprovement']![locale.languageCode]!; - String get dischargeDate => localizedValues['dischargeDate']![locale.languageCode]!; + String get dischargeDate => + localizedValues['dischargeDate']![locale.languageCode]!; String get dietType => localizedValues['dietType']![locale.languageCode]!; - String get dietTypeRemarks => localizedValues['dietTypeRemarks']![locale.languageCode]!; + String get dietTypeRemarks => + localizedValues['dietTypeRemarks']![locale.languageCode]!; String get save => localizedValues['save']![locale.languageCode]!; - String get postPlansEstimatedCost => localizedValues['postPlansEstimatedCost']![locale.languageCode]!; + String get postPlansEstimatedCost => + localizedValues['postPlansEstimatedCost']![locale.languageCode]!; String get postPlans => localizedValues['postPlans']![locale.languageCode]!; String get ucaf => localizedValues['ucaf']![locale.languageCode]!; - String get emergencyCase => localizedValues['emergencyCase']![locale.languageCode]!; + String get emergencyCase => + localizedValues['emergencyCase']![locale.languageCode]!; - String get durationOfIllness => localizedValues['durationOfIllness']![locale.languageCode]!; + String get durationOfIllness => + localizedValues['durationOfIllness']![locale.languageCode]!; - String get chiefComplaintsAndSymptoms => localizedValues['chiefComplaintsAndSymptoms']![locale.languageCode]!; + String get chiefComplaintsAndSymptoms => + localizedValues['chiefComplaintsAndSymptoms']![locale.languageCode]!; - String get patientFeelsPainInHisBackAndCough => localizedValues['patientFeelsPainInHisBackAndCough']![locale.languageCode]!; + String get patientFeelsPainInHisBackAndCough => localizedValues[ + 'patientFeelsPainInHisBackAndCough']![locale.languageCode]!; - String get additionalTextComplaints => localizedValues['additionalTextComplaints']![locale.languageCode]!; + String get additionalTextComplaints => + localizedValues['additionalTextComplaints']![locale.languageCode]!; - String get otherConditions => localizedValues['otherConditions']![locale.languageCode]!; + String get otherConditions => + localizedValues['otherConditions']![locale.languageCode]!; String get other => localizedValues['other']![locale.languageCode]!; @@ -737,11 +911,14 @@ class TranslationBase { String get where => localizedValues['where']![locale.languageCode]!; - String get specifyPossibleLineManagement => localizedValues['specifyPossibleLineManagement']![locale.languageCode]!; + String get specifyPossibleLineManagement => + localizedValues['specifyPossibleLineManagement']![locale.languageCode]!; - String get significantSigns => localizedValues['significantSigns']![locale.languageCode]!; + String get significantSigns => + localizedValues['significantSigns']![locale.languageCode]!; - String get backAbdomen => localizedValues['backAbdomen']![locale.languageCode]!; + String get backAbdomen => + localizedValues['backAbdomen']![locale.languageCode]!; String get reasons => localizedValues['reasons']![locale.languageCode]!; @@ -749,53 +926,72 @@ class TranslationBase { String get episode => localizedValues['episode']![locale.languageCode]!; - String get medications => localizedValues['medications']![locale.languageCode]!; + String get medications => + localizedValues['medications']![locale.languageCode]!; String get medication => localizedValues['medication']![locale.languageCode]!; - String get doctorComments => localizedValues['doctorComments']![locale.languageCode]!; + String get doctorComments => + localizedValues['doctorComments']![locale.languageCode]!; - String get statusDescription => localizedValues['statusDescription']![locale.languageCode]!; + String get statusDescription => + localizedValues['statusDescription']![locale.languageCode]!; - String get createdByName => localizedValues['createdByName']![locale.languageCode]!; + String get createdByName => + localizedValues['createdByName']![locale.languageCode]!; String get procedures => localizedValues['procedures']![locale.languageCode]!; - String get chiefComplaints => localizedValues['chiefComplaints']![locale.languageCode]!; + String get chiefComplaints => + localizedValues['chiefComplaints']![locale.languageCode]!; String get histories => localizedValues['histories']![locale.languageCode]!; - String get allergiesSoap => localizedValues['allergiesSoap']![locale.languageCode]!; + String get allergiesSoap => + localizedValues['allergiesSoap']![locale.languageCode]!; - String get addChiefComplaints => localizedValues['addChiefComplaints']![locale.languageCode]!; + String get addChiefComplaints => + localizedValues['addChiefComplaints']![locale.languageCode]!; - String get historyOfPresentIllness => localizedValues['historyOfPresentIllness']![locale.languageCode]!; + String get historyOfPresentIllness => + localizedValues['historyOfPresentIllness']![locale.languageCode]!; - String get requiredMsg => localizedValues['requiredMsg']![locale.languageCode]!; + String get requiredMsg => + localizedValues['requiredMsg']![locale.languageCode]!; String get addHistory => localizedValues['addHistory']![locale.languageCode]!; - String get searchHistory => localizedValues['searchHistory']![locale.languageCode]!; + String get searchHistory => + localizedValues['searchHistory']![locale.languageCode]!; - String get addSelectedHistories => localizedValues['addSelectedHistories']![locale.languageCode]!; + String get addSelectedHistories => + localizedValues['addSelectedHistories']![locale.languageCode]!; - String get addAllergies => localizedValues['addAllergies']![locale.languageCode]!; + String get addAllergies => + localizedValues['addAllergies']![locale.languageCode]!; String get itemExist => localizedValues['itemExist']![locale.languageCode]!; - String get selectAllergy => localizedValues['selectAllergy']![locale.languageCode]!; + String get selectAllergy => + localizedValues['selectAllergy']![locale.languageCode]!; - String get selectSeverity => localizedValues['selectSeverity']![locale.languageCode]!; + String get selectSeverity => + localizedValues['selectSeverity']![locale.languageCode]!; - String get leaveCreated => localizedValues['leaveCreated']![locale.languageCode]!; + String get leaveCreated => + localizedValues['leaveCreated']![locale.languageCode]!; - String get vitalSignEmptyMsg => localizedValues['vitalSignEmptyMsg']![locale.languageCode]!; + String get vitalSignEmptyMsg => + localizedValues['vitalSignEmptyMsg']![locale.languageCode]!; - String get referralEmptyMsg => localizedValues['referralEmptyMsg']![locale.languageCode]!; + String get referralEmptyMsg => + localizedValues['referralEmptyMsg']![locale.languageCode]!; - String get referralSuccessMsg => localizedValues['referralSuccessMsg']![locale.languageCode]!; + String get referralSuccessMsg => + localizedValues['referralSuccessMsg']![locale.languageCode]!; - String get diagnoseType => localizedValues['diagnoseType']![locale.languageCode]!; + String get diagnoseType => + localizedValues['diagnoseType']![locale.languageCode]!; String get condition => localizedValues['condition']![locale.languageCode]!; @@ -809,53 +1005,76 @@ class TranslationBase { String get covered => localizedValues['covered']![locale.languageCode]!; - String get approvalRequired => localizedValues['approvalRequired']![locale.languageCode]!; + String get approvalRequired => + localizedValues['approvalRequired']![locale.languageCode]!; - String get uncoveredByDoctor => localizedValues['uncoveredByDoctor']![locale.languageCode]!; + String get uncoveredByDoctor => + localizedValues['uncoveredByDoctor']![locale.languageCode]!; - String get chiefComplaintEmptyMsg => localizedValues['chiefComplaintEmptyMsg']![locale.languageCode]!; + String get chiefComplaintEmptyMsg => + localizedValues['chiefComplaintEmptyMsg']![locale.languageCode]!; - String get moreVerification => localizedValues['more-verify']![locale.languageCode]!; + String get moreVerification => + localizedValues['more-verify']![locale.languageCode]!; - String get welcomeBack => localizedValues['welcome-back']![locale.languageCode]!; + String get welcomeBack => + localizedValues['welcome-back']![locale.languageCode]!; - String get accountInfo => localizedValues['account-info']![locale.languageCode]!; + String get accountInfo => + localizedValues['account-info']![locale.languageCode]!; - String get useAnotherAccount => localizedValues['another-acc']![locale.languageCode]!; + String get useAnotherAccount => + localizedValues['another-acc']![locale.languageCode]!; - String get verifyLoginWith => localizedValues['verify-login-with']![locale.languageCode]!; + String get verifyLoginWith => + localizedValues['verify-login-with']![locale.languageCode]!; - String get register => localizedValues['register-user']![locale.languageCode]!; + String get register => + localizedValues['register-user']![locale.languageCode]!; - String get verifyFingerprint => localizedValues['verify-with-fingerprint']![locale.languageCode]!; + String get verifyFingerprint => + localizedValues['verify-with-fingerprint']![locale.languageCode]!; - String get verifyFaceID => localizedValues['verify-with-faceid']![locale.languageCode]!; + String get verifyFaceID => + localizedValues['verify-with-faceid']![locale.languageCode]!; - String get verifySMS => localizedValues['verify-with-sms']![locale.languageCode]!; + String get verifySMS => + localizedValues['verify-with-sms']![locale.languageCode]!; - String get verifyWith => localizedValues['verify-with']![locale.languageCode]!; + String get verifyWith => + localizedValues['verify-with']![locale.languageCode]!; - String get verifyWhatsApp => localizedValues['verify-with-whatsapp']![locale.languageCode]!; + String get verifyWhatsApp => + localizedValues['verify-with-whatsapp']![locale.languageCode]!; - String get lastLoginAt => localizedValues['last-login']![locale.languageCode]!; + String get lastLoginAt => + localizedValues['last-login']![locale.languageCode]!; - String get lastLoginWith => localizedValues['last-login-with']![locale.languageCode]!; + String get lastLoginWith => + localizedValues['last-login-with']![locale.languageCode]!; - String get verifyFingerprint2 => localizedValues['verify-fingerprint']![locale.languageCode]!; + String get verifyFingerprint2 => + localizedValues['verify-fingerprint']![locale.languageCode]!; - String get verificationMessage => localizedValues['verification_message']![locale.languageCode]!; + String get verificationMessage => + localizedValues['verification_message']![locale.languageCode]!; - String get validationMessage => localizedValues['validation_message']![locale.languageCode]!; + String get validationMessage => + localizedValues['validation_message']![locale.languageCode]!; - String get addAssessment => localizedValues['addAssessment']![locale.languageCode]!; + String get addAssessment => + localizedValues['addAssessment']![locale.languageCode]!; String get assessment => localizedValues['assessment']![locale.languageCode]!; - String get physicalSystemExamination => localizedValues['physicalSystemExamination']![locale.languageCode]!; + String get physicalSystemExamination => + localizedValues['physicalSystemExamination']![locale.languageCode]!; - String get searchExamination => localizedValues['searchExamination']![locale.languageCode]!; + String get searchExamination => + localizedValues['searchExamination']![locale.languageCode]!; - String get addExamination => localizedValues['addExamination']![locale.languageCode]!; + String get addExamination => + localizedValues['addExamination']![locale.languageCode]!; String get doc => localizedValues['doc']![locale.languageCode]!; @@ -863,15 +1082,19 @@ class TranslationBase { String get normal => localizedValues['normal']![locale.languageCode]!; - String get notExamined => localizedValues['notExamined']![locale.languageCode]!; + String get notExamined => + localizedValues['notExamined']![locale.languageCode]!; String get abnormal => localizedValues['abnormal']![locale.languageCode]!; - String get patientNoDetailErrMsg => localizedValues['patientNoDetailErrMsg']![locale.languageCode]!; + String get patientNoDetailErrMsg => + localizedValues['patientNoDetailErrMsg']![locale.languageCode]!; - String get systolicLng => localizedValues['systolic-lng']![locale.languageCode]!; + String get systolicLng => + localizedValues['systolic-lng']![locale.languageCode]!; - String get diastolicLng => localizedValues['diastolic-lng']![locale.languageCode]!; + String get diastolicLng => + localizedValues['diastolic-lng']![locale.languageCode]!; String get mass => localizedValues['mass']![locale.languageCode]!; @@ -879,65 +1102,85 @@ class TranslationBase { String get bpm => localizedValues['bpm']![locale.languageCode]!; - String get respirationSigns => localizedValues['respiration-signs']![locale.languageCode]!; + String get respirationSigns => + localizedValues['respiration-signs']![locale.languageCode]!; String get sysDias => localizedValues['sys-dias']![locale.languageCode]!; String get body => localizedValues['body']![locale.languageCode]!; - String get respirationRate => localizedValues['respirationRate']![locale.languageCode]!; + String get respirationRate => + localizedValues['respirationRate']![locale.languageCode]!; String get heart => localizedValues['heart']![locale.languageCode]!; - String get medicalReport => localizedValues['medicalReport']![locale.languageCode]!; + String get medicalReport => + localizedValues['medicalReport']![locale.languageCode]!; String get visitDate => localizedValues['visitDate']![locale.languageCode]!; String get test => localizedValues['test']![locale.languageCode]!; - String get addMoreProcedure => localizedValues['addMoreProcedure']![locale.languageCode]!; + String get addMoreProcedure => + localizedValues['addMoreProcedure']![locale.languageCode]!; String get regular => localizedValues['regular']![locale.languageCode]!; - String get searchProcedures => localizedValues['searchProcedures']![locale.languageCode]!; + String get searchProcedures => + localizedValues['searchProcedures']![locale.languageCode]!; - String get procedureCategorise => localizedValues['procedureCategorise']![locale.languageCode]!; + String get procedureCategorise => + localizedValues['procedureCategorise']![locale.languageCode]!; - String get selectProcedures => localizedValues['selectProcedures']![locale.languageCode]!; + String get selectProcedures => + localizedValues['selectProcedures']![locale.languageCode]!; - String get addSelectedProcedures => localizedValues['addSelectedProcedures']![locale.languageCode]!; + String get addSelectedProcedures => + localizedValues['addSelectedProcedures']![locale.languageCode]!; - String get addProcedures => localizedValues['addProcedures']![locale.languageCode]!; + String get addProcedures => + localizedValues['addProcedures']![locale.languageCode]!; - String get updateProcedure => localizedValues['updateProcedure']![locale.languageCode]!; + String get updateProcedure => + localizedValues['updateProcedure']![locale.languageCode]!; - String get orderProcedure => localizedValues['orderProcedure']![locale.languageCode]!; + String get orderProcedure => + localizedValues['orderProcedure']![locale.languageCode]!; String get nameOrICD => localizedValues['nameOrICD']![locale.languageCode]!; String get dType => localizedValues['dType']![locale.languageCode]!; - String get addAssessmentDetails => localizedValues['addAssessmentDetails']![locale.languageCode]!; + String get addAssessmentDetails => + localizedValues['addAssessmentDetails']![locale.languageCode]!; - String get progressNoteSOAP => localizedValues['progressNoteSOAP']![locale.languageCode]!; + String get progressNoteSOAP => + localizedValues['progressNoteSOAP']![locale.languageCode]!; - String get addProgressNote => localizedValues['addProgressNote']![locale.languageCode]!; + String get addProgressNote => + localizedValues['addProgressNote']![locale.languageCode]!; String get createdBy => localizedValues['createdBy']![locale.languageCode]!; + String get createdOn => localizedValues['createdOn']![locale.languageCode]!; + String get riskScore => localizedValues['riskScore']![locale.languageCode]!; String get editedBy => localizedValues['editedBy']![locale.languageCode]!; - String get currentMedications => localizedValues['currentMedications']![locale.languageCode]!; + String get currentMedications => + localizedValues['currentMedications']![locale.languageCode]!; String get noItem => localizedValues['noItem']![locale.languageCode]!; - String get postUcafSuccessMsg => localizedValues['postUcafSuccessMsg']![locale.languageCode]!; + String get postUcafSuccessMsg => + localizedValues['postUcafSuccessMsg']![locale.languageCode]!; - String get vitalSignDetailEmpty => localizedValues['vitalSignDetailEmpty']![locale.languageCode]!; + String get vitalSignDetailEmpty => + localizedValues['vitalSignDetailEmpty']![locale.languageCode]!; - String get onlyOfftimeHoliday => localizedValues['onlyOfftimeHoliday']![locale.languageCode]!; + String get onlyOfftimeHoliday => + localizedValues['onlyOfftimeHoliday']![locale.languageCode]!; String get active => localizedValues['active']![locale.languageCode]!; @@ -945,19 +1188,25 @@ class TranslationBase { String get loading => localizedValues['loading']![locale.languageCode]!; - String get assessmentErrorMsg => localizedValues['assessmentErrorMsg']![locale.languageCode]!; + String get assessmentErrorMsg => + localizedValues['assessmentErrorMsg']![locale.languageCode]!; - String get examinationErrorMsg => localizedValues['examinationErrorMsg']![locale.languageCode]!; + String get examinationErrorMsg => + localizedValues['examinationErrorMsg']![locale.languageCode]!; - String get progressNoteErrorMsg => localizedValues['progressNoteErrorMsg']![locale.languageCode]!; + String get progressNoteErrorMsg => + localizedValues['progressNoteErrorMsg']![locale.languageCode]!; - String get chiefComplaintErrorMsg => localizedValues['chiefComplaintErrorMsg']![locale.languageCode]!; + String get chiefComplaintErrorMsg => + localizedValues['chiefComplaintErrorMsg']![locale.languageCode]!; String get ICDName => localizedValues['ICDName']![locale.languageCode]!; - String get referralStatus => localizedValues['referralStatus']![locale.languageCode]!; + String get referralStatus => + localizedValues['referralStatus']![locale.languageCode]!; - String get referralRemark => localizedValues['referralRemark']![locale.languageCode]!; + String get referralRemark => + localizedValues['referralRemark']![locale.languageCode]!; String get offTime => localizedValues['offTime']![locale.languageCode]!; @@ -973,71 +1222,101 @@ class TranslationBase { String get years => localizedValues['years']![locale.languageCode]!; - String get referralStatusHold => localizedValues['referralStatusHold']![locale.languageCode]!; + String get referralStatusHold => + localizedValues['referralStatusHold']![locale.languageCode]!; - String get referralStatusActive => localizedValues['referralStatusActive']![locale.languageCode]!; + String get referralStatusActive => + localizedValues['referralStatusActive']![locale.languageCode]!; - String get referralStatusCancelled => localizedValues['referralStatusCancelled']![locale.languageCode]!; + String get referralStatusCancelled => + localizedValues['referralStatusCancelled']![locale.languageCode]!; - String get referralStatusCompleted => localizedValues['referralStatusCompleted']![locale.languageCode]!; + String get referralStatusCompleted => + localizedValues['referralStatusCompleted']![locale.languageCode]!; - String get referralStatusNotSeen => localizedValues['referralStatusNotSeen']![locale.languageCode]!; + String get referralStatusNotSeen => + localizedValues['referralStatusNotSeen']![locale.languageCode]!; - String get clinicSearch => localizedValues['clinicSearch']![locale.languageCode]!; + String get clinicSearch => + localizedValues['clinicSearch']![locale.languageCode]!; - String get doctorSearch => localizedValues['doctorSearch']![locale.languageCode]!; + String get doctorSearch => + localizedValues['doctorSearch']![locale.languageCode]!; - String get referralResponse => localizedValues['referralResponse']![locale.languageCode]!; + String get referralResponse => + localizedValues['referralResponse']![locale.languageCode]!; - String get estimatedCost => localizedValues['estimatedCost']![locale.languageCode]!; + String get estimatedCost => + localizedValues['estimatedCost']![locale.languageCode]!; - String get diagnosisDetail => localizedValues['diagnosisDetail']![locale.languageCode]!; + String get diagnosisDetail => + localizedValues['diagnosisDetail']![locale.languageCode]!; - String get referralSuccessMsgAccept => localizedValues['referralSuccessMsgAccept']![locale.languageCode]!; + String get referralSuccessMsgAccept => + localizedValues['referralSuccessMsgAccept']![locale.languageCode]!; - String get referralSuccessMsgReject => localizedValues['referralSuccessMsgReject']![locale.languageCode]!; + String get referralSuccessMsgReject => + localizedValues['referralSuccessMsgReject']![locale.languageCode]!; - String get patientName => localizedValues['patient-name']![locale.languageCode]!; + String get patientName => + localizedValues['patient-name']![locale.languageCode]!; - String get appointmentNumber => localizedValues['appointmentNumber']![locale.languageCode]!; + String get appointmentNumber => + localizedValues['appointmentNumber']![locale.languageCode]!; - String get sickLeaveComments => localizedValues['sickLeaveComments']![locale.languageCode]!; + String get sickLeaveComments => + localizedValues['sickLeaveComments']![locale.languageCode]!; - String get pastMedicalHistory => localizedValues['pastMedicalHistory']![locale.languageCode]!; + String get pastMedicalHistory => + localizedValues['pastMedicalHistory']![locale.languageCode]!; - String get pastSurgicalHistory => localizedValues['pastSurgicalHistory']![locale.languageCode]!; + String get pastSurgicalHistory => + localizedValues['pastSurgicalHistory']![locale.languageCode]!; - String get complications => localizedValues['complications']![locale.languageCode]!; + String get complications => + localizedValues['complications']![locale.languageCode]!; String get floor => localizedValues['floor']![locale.languageCode]!; - String get roomCategory => localizedValues['roomCategory']![locale.languageCode]!; + String get roomCategory => + localizedValues['roomCategory']![locale.languageCode]!; - String get otherDepartmentsInterventions => localizedValues['otherDepartmentsInterventions']![locale.languageCode]!; + String get otherDepartmentsInterventions => + localizedValues['otherDepartmentsInterventions']![locale.languageCode]!; - String get otherProcedure => localizedValues['otherProcedure']![locale.languageCode]!; + String get otherProcedure => + localizedValues['otherProcedure']![locale.languageCode]!; - String get admissionRequestSuccessMsg => localizedValues['admissionRequestSuccessMsg']![locale.languageCode]!; + String get admissionRequestSuccessMsg => + localizedValues['admissionRequestSuccessMsg']![locale.languageCode]!; String get infoStatus => localizedValues['infoStatus']![locale.languageCode]!; - String get doctorResponse => localizedValues['doctorResponse']![locale.languageCode]!; + String get doctorResponse => + localizedValues['doctorResponse']![locale.languageCode]!; - String get sickleaveonhold => localizedValues['sickleaveonhold']![locale.languageCode]!; + String get sickleaveonhold => + localizedValues['sickleaveonhold']![locale.languageCode]!; String get noClinic => localizedValues['no-clinic']![locale.languageCode]!; - String get otherStatistic => localizedValues['otherStatistic']![locale.languageCode]!; + String get otherStatistic => + localizedValues['otherStatistic']![locale.languageCode]!; - String get patientsreferral => localizedValues['ptientsreferral']![locale.languageCode]!; + String get patientsreferral => + localizedValues['ptientsreferral']![locale.languageCode]!; - String get myPatientsReferral => localizedValues['myPatientsReferral']![locale.languageCode]!; + String get myPatientsReferral => + localizedValues['myPatientsReferral']![locale.languageCode]!; - String get arrivalpatient => localizedValues['arrivalpatient']![locale.languageCode]!; + String get arrivalpatient => + localizedValues['arrivalpatient']![locale.languageCode]!; - String get searchmedicinepatient => localizedValues['searchmedicinepatient']![locale.languageCode]!; + String get searchmedicinepatient => + localizedValues['searchmedicinepatient']![locale.languageCode]!; - String get appointmentDate => localizedValues['appointmentDate']![locale.languageCode]!; + String get appointmentDate => + localizedValues['appointmentDate']![locale.languageCode]!; String get arrivedP => localizedValues['arrived_p']![locale.languageCode]!; @@ -1045,7 +1324,8 @@ class TranslationBase { String get liveCare => localizedValues['liveCare']![locale.languageCode]!; - String get outpatient => localizedValues['out-patient']![locale.languageCode]!; + String get outpatient => + localizedValues['out-patient']![locale.languageCode]!; String get billNo => localizedValues['BillNo']![locale.languageCode]!; @@ -1053,15 +1333,19 @@ class TranslationBase { String get sendSuc => localizedValues['sendSuc']![locale.languageCode]!; - String get specialResult => localizedValues['SpecialResult']![locale.languageCode]!; + String get specialResult => + localizedValues['SpecialResult']![locale.languageCode]!; - String get noDataAvailable => localizedValues['noDataAvailable']![locale.languageCode]!; + String get noDataAvailable => + localizedValues['noDataAvailable']![locale.languageCode]!; - String get showMoreBtn => localizedValues['show-more-btn']![locale.languageCode]!; + String get showMoreBtn => + localizedValues['show-more-btn']![locale.languageCode]!; String get showDetail => localizedValues['showDetail']![locale.languageCode]!; - String get viewProfile => localizedValues['viewProfile']![locale.languageCode]!; + String get viewProfile => + localizedValues['viewProfile']![locale.languageCode]!; String get fileNumber => localizedValues['fileNumber']![locale.languageCode]!; @@ -1071,37 +1355,49 @@ class TranslationBase { String get openRad => localizedValues['open-rad']![locale.languageCode]!; - String get totalApproval => localizedValues['totalApproval']![locale.languageCode]!; + String get totalApproval => + localizedValues['totalApproval']![locale.languageCode]!; - String get procedureStatus => localizedValues['procedureStatus']![locale.languageCode]!; + String get procedureStatus => + localizedValues['procedureStatus']![locale.languageCode]!; - String get unusedCount => localizedValues['unusedCount']![locale.languageCode]!; + String get unusedCount => + localizedValues['unusedCount']![locale.languageCode]!; - String get companyName => localizedValues['companyName']![locale.languageCode]!; + String get companyName => + localizedValues['companyName']![locale.languageCode]!; - String get procedureName => localizedValues['procedureName']![locale.languageCode]!; + String get procedureName => + localizedValues['procedureName']![locale.languageCode]!; - String get usageStatus => localizedValues['usageStatus']![locale.languageCode]!; + String get usageStatus => + localizedValues['usageStatus']![locale.languageCode]!; - String get prescriptions => localizedValues['prescriptions']![locale.languageCode]!; + String get prescriptions => + localizedValues['prescriptions']![locale.languageCode]!; String get notes => localizedValues['notes']![locale.languageCode]!; String get dailyDoses => localizedValues['dailyDoses']![locale.languageCode]!; - String get searchWithOther => localizedValues['searchWithOther']![locale.languageCode]!; + String get searchWithOther => + localizedValues['searchWithOther']![locale.languageCode]!; - String get hideOtherCriteria => localizedValues['hideOtherCriteria']![locale.languageCode]!; + String get hideOtherCriteria => + localizedValues['hideOtherCriteria']![locale.languageCode]!; - String get applyForReschedule => localizedValues['applyForReschedule']![locale.languageCode]!; + String get applyForReschedule => + localizedValues['applyForReschedule']![locale.languageCode]!; String get startDate => localizedValues['startDate']![locale.languageCode]!; String get endDate => localizedValues['endDate']![locale.languageCode]!; - String get addReschedule => localizedValues['add-reschedule']![locale.languageCode]!; + String get addReschedule => + localizedValues['add-reschedule']![locale.languageCode]!; - String get updateReschedule => localizedValues['update-reschedule']![locale.languageCode]!; + String get updateReschedule => + localizedValues['update-reschedule']![locale.languageCode]!; String get sickLeave => localizedValues['sick_leave']![locale.languageCode]!; @@ -1113,7 +1409,8 @@ class TranslationBase { String get replied => localizedValues['replied']![locale.languageCode]!; - String get typeHereToReply => localizedValues['typeHereToReply']![locale.languageCode]!; + String get typeHereToReply => + localizedValues['typeHereToReply']![locale.languageCode]!; String get searchHere => localizedValues['searchHere']![locale.languageCode]!; @@ -1127,45 +1424,60 @@ class TranslationBase { String get step => localizedValues['step']![locale.languageCode]!; - String get fieldRequired => localizedValues['fieldRequired']![locale.languageCode]!; + String get fieldRequired => + localizedValues['fieldRequired']![locale.languageCode]!; - String get noSickLeave => localizedValues['no-sickleve']![locale.languageCode]!; + String get noSickLeave => + localizedValues['no-sickleve']![locale.languageCode]!; - String get changeOfSchedule => localizedValues['changeOfSchedule']![locale.languageCode]!; + String get changeOfSchedule => + localizedValues['changeOfSchedule']![locale.languageCode]!; - String get newSchedule => localizedValues['newSchedule']![locale.languageCode]!; + String get newSchedule => + localizedValues['newSchedule']![locale.languageCode]!; - String get enterCredentials => localizedValues['enter_credentials']![locale.languageCode]!; + String get enterCredentials => + localizedValues['enter_credentials']![locale.languageCode]!; - String get patpatientIDMobilenationalientID => localizedValues['patientIDMobilenational']![locale.languageCode]!; + String get patpatientIDMobilenationalientID => + localizedValues['patientIDMobilenational']![locale.languageCode]!; String get updateNow => localizedValues['updateNow']![locale.languageCode]!; - String get updateTheApp => localizedValues['updateTheApp']![locale.languageCode]!; + String get updateTheApp => + localizedValues['updateTheApp']![locale.languageCode]!; - String get admissionDate => localizedValues['admission-date']![locale.languageCode]!; + String get admissionDate => + localizedValues['admission-date']![locale.languageCode]!; String get noOfDays => localizedValues['noOfDays']![locale.languageCode]!; String get numOfDays => localizedValues['numOfDays']![locale.languageCode]!; - String get replayBefore => localizedValues['replayBefore']![locale.languageCode]!; + String get replayBefore => + localizedValues['replayBefore']![locale.languageCode]!; String get trySaying => localizedValues["try-saying"]![locale.languageCode]!; - String get acknowledged => localizedValues['acknowledged']![locale.languageCode]!; + String get acknowledged => + localizedValues['acknowledged']![locale.languageCode]!; String get didntCatch => localizedValues["didntCatch"]![locale.languageCode]!; - String get pleaseEnterProcedure => localizedValues["pleaseEnterProcedure"]![locale.languageCode]!; + String get pleaseEnterProcedure => + localizedValues["pleaseEnterProcedure"]![locale.languageCode]!; - String get fillTheMandatoryProcedureDetails => localizedValues["fillTheMandatoryProcedureDetails"]![locale.languageCode]!; + String get fillTheMandatoryProcedureDetails => localizedValues[ + "fillTheMandatoryProcedureDetails"]![locale.languageCode]!; - String get atLeastThreeCharacters => localizedValues["atLeastThreeCharacters"]![locale.languageCode]!; + String get atLeastThreeCharacters => + localizedValues["atLeastThreeCharacters"]![locale.languageCode]!; - String get searchProcedureHere => localizedValues["searchProcedureHere"]![locale.languageCode]!; + String get searchProcedureHere => + localizedValues["searchProcedureHere"]![locale.languageCode]!; - String get noInsuranceApprovalFound => localizedValues["noInsuranceApprovalFound"]![locale.languageCode]!; + String get noInsuranceApprovalFound => + localizedValues["noInsuranceApprovalFound"]![locale.languageCode]!; String get procedure => localizedValues["procedure"]![locale.languageCode]!; @@ -1177,31 +1489,43 @@ class TranslationBase { String get refill => localizedValues["refill"]![locale.languageCode]!; - String get medicationHasBeenAdded => localizedValues["medicationHasBeenAdded"]![locale.languageCode]!; + String get medicationHasBeenAdded => + localizedValues["medicationHasBeenAdded"]![locale.languageCode]!; - String get newPrescriptionOrder => localizedValues["newPrescriptionOrder"]![locale.languageCode]!; + String get newPrescriptionOrder => + localizedValues["newPrescriptionOrder"]![locale.languageCode]!; - String get pleaseFillAllFields => localizedValues["pleaseFillAllFields"]![locale.languageCode]!; + String get pleaseFillAllFields => + localizedValues["pleaseFillAllFields"]![locale.languageCode]!; - String get narcoticMedicineCanOnlyBePrescribedFromVida => localizedValues["narcoticMedicineCanOnlyBePrescribedFromVida"]![locale.languageCode]!; + String get narcoticMedicineCanOnlyBePrescribedFromVida => localizedValues[ + "narcoticMedicineCanOnlyBePrescribedFromVida"]![locale.languageCode]!; - String get only5DigitsAllowedForStrength => localizedValues["only5DigitsAllowedForStrength"]![locale.languageCode]!; + String get only5DigitsAllowedForStrength => + localizedValues["only5DigitsAllowedForStrength"]![locale.languageCode]!; String get unit => localizedValues["unit"]![locale.languageCode]!; - String get boxQuantity => localizedValues["boxQuantity"]![locale.languageCode]!; + String get boxQuantity => + localizedValues["boxQuantity"]![locale.languageCode]!; - String get orderTestOr => localizedValues["orderTestOr"]![locale.languageCode]!; + String get orderTestOr => + localizedValues["orderTestOr"]![locale.languageCode]!; - String get applyForRadiologyOrder => localizedValues["applyForRadiologyOrder"]![locale.languageCode]!; + String get applyForRadiologyOrder => + localizedValues["applyForRadiologyOrder"]![locale.languageCode]!; - String get applyForNewLabOrder => localizedValues["applyForNewLabOrder"]![locale.languageCode]!; + String get applyForNewLabOrder => + localizedValues["applyForNewLabOrder"]![locale.languageCode]!; - String get addLabOrder => localizedValues["addLabOrder"]![locale.languageCode]!; + String get addLabOrder => + localizedValues["addLabOrder"]![locale.languageCode]!; - String get addRadiologyOrder => localizedValues["addRadiologyOrder"]![locale.languageCode]!; + String get addRadiologyOrder => + localizedValues["addRadiologyOrder"]![locale.languageCode]!; - String get newRadiologyOrder => localizedValues["newRadiologyOrder"]![locale.languageCode]!; + String get newRadiologyOrder => + localizedValues["newRadiologyOrder"]![locale.languageCode]!; String get orderDate => localizedValues["orderDate"]![locale.languageCode]!; @@ -1211,35 +1535,47 @@ class TranslationBase { String get summary => localizedValues["summary"]![locale.languageCode]!; - String get applyForNewPrescriptionsOrder => localizedValues["applyForNewPrescriptionsOrder"]![locale.languageCode]!; + String get applyForNewPrescriptionsOrder => + localizedValues["applyForNewPrescriptionsOrder"]![locale.languageCode]!; - String get noPrescriptionsFound => localizedValues["noPrescriptionsFound"]![locale.languageCode]!; + String get noPrescriptionsFound => + localizedValues["noPrescriptionsFound"]![locale.languageCode]!; - String get noMedicalFileFound => localizedValues["noMedicalFileFound"]![locale.languageCode]!; + String get noMedicalFileFound => + localizedValues["noMedicalFileFound"]![locale.languageCode]!; - String get insurance22 => localizedValues["insurance22"]![locale.languageCode]!; + String get insurance22 => + localizedValues["insurance22"]![locale.languageCode]!; - String get approvals22 => localizedValues["approvals22"]![locale.languageCode]!; + String get approvals22 => + localizedValues["approvals22"]![locale.languageCode]!; String get severe => localizedValues["severe"]![locale.languageCode]!; - String get graphDetails => localizedValues["graphDetails"]![locale.languageCode]!; + String get graphDetails => + localizedValues["graphDetails"]![locale.languageCode]!; String get discharged => localizedValues["discharged"]![locale.languageCode]!; - String get addNewOrderSheet => localizedValues["addNewOrderSheet"]![locale.languageCode]!; + String get addNewOrderSheet => + localizedValues["addNewOrderSheet"]![locale.languageCode]!; - String get addNewProgressNote => localizedValues["addNewProgressNote"]![locale.languageCode]!; + String get addNewProgressNote => + localizedValues["addNewProgressNote"]![locale.languageCode]!; - String get notePending => localizedValues["notePending"]![locale.languageCode]!; + String get notePending => + localizedValues["notePending"]![locale.languageCode]!; - String get noteCanceled => localizedValues["noteCanceled"]![locale.languageCode]!; + String get noteCanceled => + localizedValues["noteCanceled"]![locale.languageCode]!; - String get noteVerified => localizedValues["noteVerified"]![locale.languageCode]!; + String get noteVerified => + localizedValues["noteVerified"]![locale.languageCode]!; String get noteVerify => localizedValues["noteVerify"]![locale.languageCode]!; - String get noteConfirm => localizedValues["noteConfirm"]![locale.languageCode]!; + String get noteConfirm => + localizedValues["noteConfirm"]![locale.languageCode]!; String get noteAdd => localizedValues["noteAdd"]![locale.languageCode]!; @@ -1259,17 +1595,21 @@ class TranslationBase { String get none => localizedValues["none"]![locale.languageCode]!; - String get notRepliedYet => localizedValues["notRepliedYet"]![locale.languageCode]!; + String get notRepliedYet => + localizedValues["notRepliedYet"]![locale.languageCode]!; String get clearText => localizedValues["clearText"]![locale.languageCode]!; - String get medicalReportAdd => localizedValues['medicalReportAdd']![locale.languageCode]!; + String get medicalReportAdd => + localizedValues['medicalReportAdd']![locale.languageCode]!; - String get medicalReportVerify => localizedValues['medicalReportVerify']![locale.languageCode]!; + String get medicalReportVerify => + localizedValues['medicalReportVerify']![locale.languageCode]!; String get comments => localizedValues['comments']![locale.languageCode]!; - String get initiateCall => localizedValues['initiateCall']![locale.languageCode]!; + String get initiateCall => + localizedValues['initiateCall']![locale.languageCode]!; String get endCall => localizedValues['endCall']![locale.languageCode]!; @@ -1277,115 +1617,153 @@ class TranslationBase { String get admin => localizedValues['admin']![locale.languageCode]!; - String get instructions => localizedValues['instructions']![locale.languageCode]!; + String get instructions => + localizedValues['instructions']![locale.languageCode]!; String get sendLC => localizedValues['sendLC']![locale.languageCode]!; String get endLC => localizedValues['endLC']![locale.languageCode]!; - String get consultation => localizedValues['consultation']![locale.languageCode]!; + String get consultation => + localizedValues['consultation']![locale.languageCode]!; String get resume => localizedValues['resume']![locale.languageCode]!; String get theCall => localizedValues['theCall']![locale.languageCode]!; - String get createNewMedicalReport => localizedValues['createNewMedicalReport']![locale.languageCode]!; + String get createNewMedicalReport => + localizedValues['createNewMedicalReport']![locale.languageCode]!; - String get historyPhysicalFinding => localizedValues['historyPhysicalFinding']![locale.languageCode]!; + String get historyPhysicalFinding => + localizedValues['historyPhysicalFinding']![locale.languageCode]!; - String get laboratoryPhysicalData => localizedValues['laboratoryPhysicalData']![locale.languageCode]!; + String get laboratoryPhysicalData => + localizedValues['laboratoryPhysicalData']![locale.languageCode]!; - String get impressionRecommendation => localizedValues['impressionRecommendation']![locale.languageCode]!; + String get impressionRecommendation => + localizedValues['impressionRecommendation']![locale.languageCode]!; String get onHold => localizedValues['onHold']![locale.languageCode]!; String get verified => localizedValues['verified']![locale.languageCode]!; - String get favoriteTemplates => localizedValues['favoriteTemplates']![locale.languageCode]!; + String get favoriteTemplates => + localizedValues['favoriteTemplates']![locale.languageCode]!; - String get allProcedures => localizedValues['allProcedures']![locale.languageCode]!; + String get allProcedures => + localizedValues['allProcedures']![locale.languageCode]!; - String get allRadiology => localizedValues['allRadiology']![locale.languageCode]!; + String get allRadiology => + localizedValues['allRadiology']![locale.languageCode]!; String get allLab => localizedValues['allLab']![locale.languageCode]!; - String get allPrescription => localizedValues['allPrescription']![locale.languageCode]!; + String get allPrescription => + localizedValues['allPrescription']![locale.languageCode]!; - String get addPrescription => localizedValues['addPrescription']![locale.languageCode]!; + String get addPrescription => + localizedValues['addPrescription']![locale.languageCode]!; String get edit => localizedValues['edit']![locale.languageCode]!; - String get summeryReply => localizedValues['summeryReply']![locale.languageCode]!; + String get summeryReply => + localizedValues['summeryReply']![locale.languageCode]!; - String get severityValidationError => localizedValues['severityValidationError']![locale.languageCode]!; + String get severityValidationError => + localizedValues['severityValidationError']![locale.languageCode]!; - String get textCopiedSuccessfully => localizedValues['textCopiedSuccessfully']![locale.languageCode]!; + String get textCopiedSuccessfully => + localizedValues['textCopiedSuccessfully']![locale.languageCode]!; String get roomNo => localizedValues['roomNo']![locale.languageCode]!; String get seeMore => localizedValues['seeMore']![locale.languageCode]!; - String get replayCallStatus => localizedValues['replayCallStatus']![locale.languageCode]!; + String get replayCallStatus => + localizedValues['replayCallStatus']![locale.languageCode]!; - String get patientArrived => localizedValues['patientArrived']![locale.languageCode]!; + String get patientArrived => + localizedValues['patientArrived']![locale.languageCode]!; - String get calledAndNoResponse => localizedValues['calledAndNoResponse']![locale.languageCode]!; + String get calledAndNoResponse => + localizedValues['calledAndNoResponse']![locale.languageCode]!; - String get underProcess => localizedValues['underProcess']![locale.languageCode]!; + String get underProcess => + localizedValues['underProcess']![locale.languageCode]!; - String get textResponse => localizedValues['textResponse']![locale.languageCode]!; + String get textResponse => + localizedValues['textResponse']![locale.languageCode]!; String get special => localizedValues['special']![locale.languageCode]!; - String get requestType => localizedValues['requestType']![locale.languageCode]!; + String get requestType => + localizedValues['requestType']![locale.languageCode]!; String get allClinic => localizedValues['allClinic']![locale.languageCode]!; String get notReplied => localizedValues['notReplied']![locale.languageCode]!; - String get registerNewPatient => localizedValues['registerNewPatient']![locale.languageCode]!; + String get registerNewPatient => + localizedValues['registerNewPatient']![locale.languageCode]!; - String get registeraPatient => localizedValues['registeraPatient']![locale.languageCode]!; + String get registeraPatient => + localizedValues['registeraPatient']![locale.languageCode]!; - String get operationTimeStart => localizedValues['operationTimeStart']![locale.languageCode]!; + String get operationTimeStart => + localizedValues['operationTimeStart']![locale.languageCode]!; - String get operationDate => localizedValues['operationDate']![locale.languageCode]!; + String get operationDate => + localizedValues['operationDate']![locale.languageCode]!; - String get reservation => localizedValues['reservation']![locale.languageCode]!; + String get reservation => + localizedValues['reservation']![locale.languageCode]!; - String get anesthetist => localizedValues['anesthetist']![locale.languageCode]!; + String get anesthetist => + localizedValues['anesthetist']![locale.languageCode]!; - String get bloodTransfusedDetail => localizedValues['bloodTransfusedDetail']![locale.languageCode]!; + String get bloodTransfusedDetail => + localizedValues['bloodTransfusedDetail']![locale.languageCode]!; - String get circulatingNurse => localizedValues['circulatingNurse']![locale.languageCode]!; + String get circulatingNurse => + localizedValues['circulatingNurse']![locale.languageCode]!; String get scrubNurse => localizedValues['scrubNurse']![locale.languageCode]!; - String get otherSpecimen => localizedValues['otherSpecimen']![locale.languageCode]!; + String get otherSpecimen => + localizedValues['otherSpecimen']![locale.languageCode]!; - String get microbiologySpecimen => localizedValues['microbiologySpecimen']![locale.languageCode]!; + String get microbiologySpecimen => + localizedValues['microbiologySpecimen']![locale.languageCode]!; - String get histopathSpecimen => localizedValues['histopathSpecimen']![locale.languageCode]!; + String get histopathSpecimen => + localizedValues['histopathSpecimen']![locale.languageCode]!; - String get bloodLossDetail => localizedValues['bloodLossDetail']![locale.languageCode]!; + String get bloodLossDetail => + localizedValues['bloodLossDetail']![locale.languageCode]!; - String get complicationDetails1 => localizedValues['complicationDetails1']![locale.languageCode]!; + String get complicationDetails1 => + localizedValues['complicationDetails1']![locale.languageCode]!; - String get postOperationInstruction => localizedValues['postOperationInstruction']![locale.languageCode]!; + String get postOperationInstruction => + localizedValues['postOperationInstruction']![locale.languageCode]!; - String get surgeryProcedure => localizedValues['surgeryProcedure']![locale.languageCode]!; + String get surgeryProcedure => + localizedValues['surgeryProcedure']![locale.languageCode]!; String get finding => localizedValues['finding']![locale.languageCode]!; - String get preOperationDiagnosis => localizedValues['preOperationDiagnosis']![locale.languageCode]!; + String get preOperationDiagnosis => + localizedValues['preOperationDiagnosis']![locale.languageCode]!; - String get postOperationDiagnosis => localizedValues['postOperationDiagnosis']![locale.languageCode]!; + String get postOperationDiagnosis => + localizedValues['postOperationDiagnosis']![locale.languageCode]!; String get surgeon => localizedValues['surgeon']![locale.languageCode]!; String get assistant => localizedValues['assistant']![locale.languageCode]!; - String get askForIdentification => localizedValues['askForIdentification']![locale.languageCode]!; + String get askForIdentification => + localizedValues['askForIdentification']![locale.languageCode]!; String get iDNumber => localizedValues['iDNumber']![locale.languageCode]!; @@ -1399,73 +1777,126 @@ class TranslationBase { String get activation => localizedValues['activation']![locale.languageCode]!; - String get confirmation => localizedValues['confirmation']![locale.languageCode]!; + String get confirmation => + localizedValues['confirmation']![locale.languageCode]!; String get diabetic => localizedValues['diabetic']![locale.languageCode]!; String get pharmacy => localizedValues['pharmacy']![locale.languageCode]!; - String get intervention => localizedValues['intervention']![locale.languageCode]!; + String get intervention => + localizedValues['intervention']![locale.languageCode]!; String get chart => localizedValues['chart']![locale.languageCode]!; - String get investigation => localizedValues['investigation']![locale.languageCode]!; + String get investigation => + localizedValues['investigation']![locale.languageCode]!; - String get conditionOnDischarge => localizedValues['conditionOnDischarge']![locale.languageCode]!; + String get conditionOnDischarge => + localizedValues['conditionOnDischarge']![locale.languageCode]!; - String get planedProcedure => localizedValues['planedProcedure']![locale.languageCode]!; + String get planedProcedure => + localizedValues['planedProcedure']![locale.languageCode]!; - String get moreDetails => localizedValues['moreDetails']![locale.languageCode]!; + String get moreDetails => + localizedValues['moreDetails']![locale.languageCode]!; String get VTE_Type => localizedValues['VTE_Type']![locale.languageCode]!; - String get pharmacology => localizedValues['pharmacology']![locale.languageCode]!; + String get pharmacology => + localizedValues['pharmacology']![locale.languageCode]!; - String get reasonsThrombo => localizedValues['reasonsThrombo']![locale.languageCode]!; + String get reasonsThrombo => + localizedValues['reasonsThrombo']![locale.languageCode]!; - String get youDoNotHaveFavoriteTemplate => localizedValues['youDoNotHaveFavoriteTemplate']![locale.languageCode]!; + String get youDoNotHaveFavoriteTemplate => + localizedValues['youDoNotHaveFavoriteTemplate']![locale.languageCode]!; - String get pleaseSelectItem => localizedValues['pleaseSelectItem']![locale.languageCode]!; + String get pleaseSelectItem => + localizedValues['pleaseSelectItem']![locale.languageCode]!; - String get searchFavoriteTemplate => localizedValues['searchFavoriteTemplate']![locale.languageCode]!; + String get searchFavoriteTemplate => + localizedValues['searchFavoriteTemplate']![locale.languageCode]!; - String get sorryNoMatch => localizedValues['sorryNoMatch']![locale.languageCode]!; + String get sorryNoMatch => + localizedValues['sorryNoMatch']![locale.languageCode]!; - String get thousandIsTheMAXForTheStrength => localizedValues['thousandIsTheMAXForTheStrength']![locale.languageCode]!; + String get thousandIsTheMAXForTheStrength => + localizedValues['thousandIsTheMAXForTheStrength']![locale.languageCode]!; - String get strengthCanNotBeZero => localizedValues['strengthCanNotBeZero']![locale.languageCode]!; + String get strengthCanNotBeZero => + localizedValues['strengthCanNotBeZero']![locale.languageCode]!; String get old => localizedValues['old']![locale.languageCode]!; - String get orderTypeDescription => localizedValues['orderTypeDescription']![locale.languageCode]!; + String get orderTypeDescription => + localizedValues['orderTypeDescription']![locale.languageCode]!; - String get doseDetails => localizedValues['doseDetails']![locale.languageCode]!; + String get doseDetails => + localizedValues['doseDetails']![locale.languageCode]!; - String get selectCondition => localizedValues['selectCondition']![locale.languageCode]!; + String get selectCondition => + localizedValues['selectCondition']![locale.languageCode]!; - String get yourOrderAddedSuccessfully => localizedValues['yourOrderAddedSuccessfully']![locale.languageCode]!; + String get yourOrderAddedSuccessfully => + localizedValues['yourOrderAddedSuccessfully']![locale.languageCode]!; - String get youCannotAddOnlySpaces => localizedValues['youCannotAddOnlySpaces']![locale.languageCode]!; + String get youCannotAddOnlySpaces => + localizedValues['youCannotAddOnlySpaces']![locale.languageCode]!; - String get conditionDescription => localizedValues['conditionDescription']![locale.languageCode]!; + String get conditionDescription => + localizedValues['conditionDescription']![locale.languageCode]!; - String get doctorSchedule => localizedValues['doctorSchedule']![locale.languageCode]!; + String get doctorSchedule => + localizedValues['doctorSchedule']![locale.languageCode]!; String get doctorRota => localizedValues['doctorRota']![locale.languageCode]!; String get dateFrom => localizedValues['dateFrom']![locale.languageCode]!; - String get searchFindSchedule => localizedValues['searchFindSchedule']![locale.languageCode]!; - String get onePrimaryDiagnosis => localizedValues['onePrimaryDiagnosis']![locale.languageCode]!; - String get principalDiagnosisCannot => localizedValues['principalDiagnosisCannot']![locale.languageCode]!; - String get afterOrderCreation => localizedValues['afterOrderCreation']![locale.languageCode]!; - String get principalCoveredOrNot => localizedValues['principalCoveredOrNot']![locale.languageCode]!; - String get complexDiagnosis => localizedValues['complexDiagnosis']![locale.languageCode]!; + String get searchFindSchedule => + localizedValues['searchFindSchedule']![locale.languageCode]!; + + String get onePrimaryDiagnosis => + localizedValues['onePrimaryDiagnosis']![locale.languageCode]!; + + String get principalDiagnosisCannot => + localizedValues['principalDiagnosisCannot']![locale.languageCode]!; + + String get afterOrderCreation => + localizedValues['afterOrderCreation']![locale.languageCode]!; + + String get principalCoveredOrNot => + localizedValues['principalCoveredOrNot']![locale.languageCode]!; + + String get complexDiagnosis => + localizedValues['complexDiagnosis']![locale.languageCode]!; + String get updateAssessmentDetails => localizedValues['updateAssessmentDetails']![locale.languageCode]!; String get noComplaintsFound => localizedValues['noComplaintsFound']![locale.languageCode]!; + + String get addChiefComplaint => + localizedValues['addChiefComplaint']![locale.languageCode]!; + + String get generalList => + localizedValues['generalList']![locale.languageCode]!; + + String get specialList => + localizedValues['specialList']![locale.languageCode]!; + + String get enterChiefCompliants => + localizedValues['enterChiefCompliants']![locale.languageCode]!; + + String get previousChiefCompaints => + localizedValues['previousChiefCompaints']![locale.languageCode]!; + + String get listOfActiveEpisodes => + localizedValues['listOfActiveEpisodes']![locale.languageCode]!; + + String get select => localizedValues['select']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index ab8bc62a..e026f689 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,7 +15,7 @@ import maps_launcher import path_provider_foundation import shared_preferences_foundation import speech_to_text_macos -import sqflite +import sqflite_darwin import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { From 63c1bc4cae34a6374e613808b88343d124ec7c03 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 4 Nov 2024 09:33:14 +0300 Subject: [PATCH 23/76] WD: History of present illness --- lib/config/localized_values.dart | 4 + .../widgets/ComplaintSelection.dart | 4 + .../update_present_illness.dart | 200 ++++++++++++++++++ .../update_subjective_page_vida_plus.dart | 5 +- .../update_soap_index_vida_plus.dart | 1 - .../translations_delegate_base_utils.dart | 4 + 6 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index e964dc05..c59b691b 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1173,5 +1173,9 @@ const Map> localizedValues = { "previousChiefCompaints": {"en": "Previous Chief Compaints", "ar":"رئيس الرسامين السابق"}, "listOfActiveEpisodes": {"en": "List of active episodes , select one to procedd", "ar":"قائمة الحلقات النشطة ، حدد واحدة لتقديمها"}, "select": {"en": "Select", "ar":"اختار"}, + "historyOfIllness": {"en": "History of Present Illness*", "ar":"تاريخ المرض الحالي*"}, + "historyTakenFrom": {"en": "History taken from", "ar":"التاريخ مأخوذ من"}, + "familySpecify": {"en": "Family, Specify", "ar":"العائلة، حدد"}, + "otherSpecify": {"en": "Other, Specify", "ar":"أخرى، حدد"}, }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index 03ddd396..fd83e263 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -112,6 +112,7 @@ class _ComplaintSelectionState extends State { child: CheckboxListTile( value: true, enabled: false, + checkColor: Colors.white, activeColor: Color(0xFFD02127), side: MaterialStateBorderSide.resolveWith( (Set states) { @@ -140,6 +141,8 @@ class _ComplaintSelectionState extends State { child: CheckboxListTile( value: true, activeColor: Color(0xFFD02127), + checkColor: Colors.white, + controlAffinity: ListTileControlAffinity.leading, side: MaterialStateBorderSide.resolveWith( (Set states) { @@ -166,6 +169,7 @@ class _ComplaintSelectionState extends State { horizontalTitleGap: 0, child: CheckboxListTile( activeColor: Color(0xFFD02127), + checkColor: Colors.white, contentPadding: EdgeInsets.zero, side: MaterialStateBorderSide.resolveWith( (Set states) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart new file mode 100644 index 00000000..c40ec72b --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart @@ -0,0 +1,200 @@ +import 'package:flutter/material.dart'; + +import '../../../../../../utils/translations_delegate_base_utils.dart'; +import '../../../../../../widgets/shared/app_texts_widget.dart'; +import '../../../../../../widgets/shared/text_fields/app-textfield-custom.dart'; + +class UpdatePresentIllness extends StatefulWidget { + @override + State createState() => _UpdatePresentIllnessState(); +} + +class _UpdatePresentIllnessState extends State { + bool isPatientSelected = false; + bool isFamilySelected = false; + bool isOtherSelected = false; + + final TextEditingController familyController = TextEditingController(); + final TextEditingController otherController = TextEditingController(); + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, + ), + AppText( + TranslationBase.of(context).historyTakenFrom, + fontSize: 14, + fontWeight: FontWeight.w600, + textAlign: TextAlign.start, + color: Colors.black, + ), + + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + value: isPatientSelected, + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + controlAffinity: ListTileControlAffinity.leading, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + onChanged: (bool? value) { + setState(() { + isPatientSelected = value ?? false; + }); + }, + title: AppText( + TranslationBase.of(context).patient, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + contentPadding: EdgeInsets.zero), + ), + + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + value: isFamilySelected, + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + controlAffinity: ListTileControlAffinity.leading, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + onChanged: (bool? value) { + setState(() { + isFamilySelected = value ?? false; + }); + }, + title: AppText( + TranslationBase.of(context).familySpecify, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + contentPadding: EdgeInsets.zero), + ), + Visibility( + visible: isFamilySelected, + child: Column(children: [ + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: familyController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 3, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + ])), + + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + value: isOtherSelected, + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + controlAffinity: ListTileControlAffinity.leading, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + onChanged: (bool? value) { + setState(() { + isOtherSelected = value ?? false; + }); + }, + title: AppText( + TranslationBase.of(context).otherSpecify, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + contentPadding: EdgeInsets.zero), + ), + Visibility( + visible: isOtherSelected, + child: Column( + children: [ + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: otherController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 3, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + ], + ), + ), + + Divider(), + SizedBox( + height: 8, + ), + AppText( + TranslationBase.of(context).historyOfIllness, + fontSize: 14, + fontWeight: FontWeight.w600, + textAlign: TextAlign.start, + color: Colors.black, + ), + SizedBox( + height: 8, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: otherController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 3, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 8, + ), + AppText( + 'Last saved: 22-10-2024 08:07 am [3 hours ago]', + fontSize: 10, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Color(0XFF575757), + ), + ], + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index 4c332c11..1f208e5c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_s import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -176,7 +177,7 @@ class _UpdateSubjectivePageVidaPlusState extends State localizedValues['select']![locale.languageCode]!; String get noKnownAllergies => localizedValues['noKnownAllergies']![locale.languageCode]!; + String get historyTakenFrom => localizedValues['historyTakenFrom']![locale.languageCode]!; + String get familySpecify => localizedValues['familySpecify']![locale.languageCode]!; + String get otherSpecify => localizedValues['otherSpecify']![locale.languageCode]!; + String get historyOfIllness => localizedValues['historyOfIllness']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { From d44f6f8eb0ba24bb484ef0305e171ac5dfbe4786 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Mon, 4 Nov 2024 11:59:01 +0300 Subject: [PATCH 24/76] allergies work in progress --- .metadata | 39 +- lib/config/config.dart | 3 + .../allergy/get_allergies_list_vida_plus.dart | 107 + .../soap/SOAP_service.dart | 19 +- lib/core/viewModel/SOAP_view_model.dart | 34 + .../allergies/update_allergies_widget.dart | 262 +-- .../subjective/update_subjective_page.dart | 4 +- .../subjective/allergies/add_allergies.dart | 140 +- ..._key_checkbox_search_allergies_widget.dart | 123 +- .../allergies/reactions_selection.dart | 165 ++ .../allergies/update_allergies_widget.dart | 266 ++- .../widgets/add_chief_complaint.dart | 3 + lib/widgets/auth/sms-popup.dart | 1 + .../custom_bottom_sheet_container.dart | 8 +- .../shared/buttons/app_buttons_widget.dart | 4 +- pubspec.lock | 1775 +++++++++++++++++ 16 files changed, 2547 insertions(+), 406 deletions(-) create mode 100644 lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart diff --git a/.metadata b/.metadata index 01d2dcb9..d2765fcb 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,42 @@ # This file should be version controlled and should not be manually edited. version: - revision: 0b8abb4724aa590dd0f429683339b1e045a1594d - channel: stable + revision: "54e66469a933b60ddf175f858f82eaeb97e48c8d" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: android + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: ios + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: linux + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: macos + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: web + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: windows + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/lib/config/config.dart b/lib/config/config.dart index d49cb1bc..f6eb8511 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -290,6 +290,9 @@ const ACKNOWLEDGE_RADIOLOGY_CRITICAL_FINDINGS = "Services/DoctorApplication.svc/ const PATIENT_ALLERGIES = 'Services/DoctorApplication.svc/REST/PatientAllergies'; +const SEARCH_ALLERGIES = 'Services/DoctorApplication.svc/REST/SearchAllergies'; + + var selectedPatientType = 1; //*********change value to decode json from Dropdown ************ diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart new file mode 100644 index 00000000..7618d57e --- /dev/null +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -0,0 +1,107 @@ +class AllergiesListVidaPlus { + int? allergyID; + String? allergyName; + List? allergyReactionDTOs; + int? allergyRevisionID; + String? allergyTypeCode; + int? allergyTypeID; + String? allergyTypeName; + int? hospitalGroupID; + int? hospitalID; + bool? isActive; + bool? isSnowMedAllergy; + String? snowMedCode; + + AllergiesListVidaPlus( + {this.allergyID, + this.allergyName, + this.allergyReactionDTOs, + this.allergyRevisionID, + this.allergyTypeCode, + this.allergyTypeID, + this.allergyTypeName, + this.hospitalGroupID, + this.hospitalID, + this.isActive, + this.isSnowMedAllergy, + this.snowMedCode}); + + AllergiesListVidaPlus.fromJson(Map json) { + allergyID = json['allergyID']; + allergyName = json['allergyName']; + if (json['allergyReactionDTOs'] != null) { + allergyReactionDTOs = []; + json['allergyReactionDTOs'].forEach((v) { + allergyReactionDTOs!.add(new AllergyReactionDTOs.fromJson(v)); + }); + } + allergyRevisionID = json['allergyRevisionID']; + allergyTypeCode = json['allergyTypeCode']; + allergyTypeID = json['allergyTypeID']; + allergyTypeName = json['allergyTypeName']; + hospitalGroupID = json['hospitalGroupID']; + hospitalID = json['hospitalID']; + isActive = json['isActive']; + isSnowMedAllergy = json['isSnowMedAllergy']; + snowMedCode = json['snowMedCode']; + } + + Map toJson() { + final Map data = new Map(); + data['allergyID'] = this.allergyID; + data['allergyName'] = this.allergyName; + if (this.allergyReactionDTOs != null) { + data['allergyReactionDTOs'] = + this.allergyReactionDTOs!.map((v) => v.toJson()).toList(); + } + data['allergyRevisionID'] = this.allergyRevisionID; + data['allergyTypeCode'] = this.allergyTypeCode; + data['allergyTypeID'] = this.allergyTypeID; + data['allergyTypeName'] = this.allergyTypeName; + data['hospitalGroupID'] = this.hospitalGroupID; + data['hospitalID'] = this.hospitalID; + data['isActive'] = this.isActive; + data['isSnowMedAllergy'] = this.isSnowMedAllergy; + data['snowMedCode'] = this.snowMedCode; + return data; + } +} + +class AllergyReactionDTOs { + int? allergyReactionID; + String? allergyReactionName; + int? allergyReactionRevisionID; + int? hospitalGroupID; + int? hospitalID; + bool? isActive; + int? reactionSelection =1; + AllergyReactionDTOs( + {this.allergyReactionID, + this.allergyReactionName, + this.allergyReactionRevisionID, + this.hospitalGroupID, + this.hospitalID, + this.isActive, + this.reactionSelection + }); + + AllergyReactionDTOs.fromJson(Map json) { + allergyReactionID = json['allergyReactionID']; + allergyReactionName = json['allergyReactionName']; + allergyReactionRevisionID = json['allergyReactionRevisionID']; + hospitalGroupID = json['hospitalGroupID']; + hospitalID = json['hospitalID']; + isActive = json['isActive']; + } + + Map toJson() { + final Map data = new Map(); + data['allergyReactionID'] = this.allergyReactionID; + data['allergyReactionName'] = this.allergyReactionName; + data['allergyReactionRevisionID'] = this.allergyReactionRevisionID; + data['hospitalGroupID'] = this.hospitalGroupID; + data['hospitalID'] = this.hospitalID; + data['isActive'] = this.isActive; + return data; + } +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 87d2bc57..95f7e7e9 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; @@ -32,7 +33,7 @@ class SOAPService extends LookupService { List patientPhysicalExamList = []; List patientProgressNoteList = []; List patientAssessmentList = []; - + List searchAllergiesList =[]; int? episodeID; bool isPrescriptionOrder =false; Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { @@ -355,4 +356,20 @@ class SOAPService extends LookupService { }, body: generalGetReqForSOAP.toJson()); } + Future searchAllergies(String searchKey) async { + hasError = false; + + await baseAppClient.post(SEARCH_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + searchAllergiesList.clear(); + + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: {"AllergyName": searchKey}); + } } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 90efa658..0c0f9ef4 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart'; @@ -78,6 +79,12 @@ class SOAPViewModel extends BaseViewModel { List get patientAssessmentList => _SOAPService.patientAssessmentList; + + List get searchAllergiesVidaPlus => _SOAPService.searchAllergiesList; + + + + int? get episodeID => _SOAPService.episodeID; bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; bool isAddProgress = true; @@ -730,4 +737,31 @@ class SOAPViewModel extends BaseViewModel { return postAllergyRequestModel; } + + /*vida plus */ + + getAllergiesVidaPlus(PatiantInformtion patientInfo) async{ + + GeneralGetReqForSOAP generalGetReqForSOAP = + GeneralGetReqForSOAP(patientMRN: patientInfo.patientMRN, episodeId: patientInfo.episodeNo, appointmentNo: int.parse(patientInfo.appointmentNo.toString()), doctorID: '', editedBy: ''); + + setState(ViewState.BusyLocal); + await _SOAPService.patientAllergies(generalGetReqForSOAP); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + + searchAllergies(String searchKey) async{ + setState(ViewState.BusyLocal); + await _SOAPService.searchAllergies(searchKey); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } } diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart index e5ed2a53..0fe34d67 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart @@ -10,14 +10,15 @@ import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dar import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../../../../core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import '../../shared_soap_widgets/SOAP_open_items.dart'; import 'add_allergies.dart'; // ignore: must_be_immutable class UpdateAllergiesWidget extends StatefulWidget { - List? myAllergiesList; + // AllergiesListVidaPlus? selectedAllergy; - UpdateAllergiesWidget({Key? key, this.myAllergiesList}); + UpdateAllergiesWidget({Key? key}); @override _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); @@ -29,7 +30,7 @@ class _UpdateAllergiesWidgetState extends State { ProjectViewModel projectViewModel = Provider.of(context); changeAllState() { setState(() { - print(widget.myAllergiesList); + // print(widget.myAllergiesList); }); } @@ -44,94 +45,97 @@ class _UpdateAllergiesWidgetState extends State { SizedBox( height: 20, ), - Container( - margin: EdgeInsets.only(left: 15, right: 15, top: 15), - child: Column( - children: widget.myAllergiesList!.map((selectedAllergy) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), - textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - bold: true, - color: Color(0xFF2B353E), - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - // fontHeight:0.18 , - ), - AppText( - projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), - textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - color: Color(0xFFCC9B14), - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - ), - ], - ), - width: MediaQuery.of(context).size.width * 0.5, - ), - if (selectedAllergy.isChecked) - RemoveButton( - onTap: () => removeAllergy(selectedAllergy), - ) - ], - ), - Padding( - padding: const EdgeInsets.symmetric(vertical: 8), - child: Row( - children: [ - RemarkText( - remark: selectedAllergy.remark ?? "", - ), - ], - ), - ), - DividerWithSpacesAround() - ], - ), - SizedBox( - height: 10, - ), - ], - ); - }).toList()), - ) - ], + // Container( + // margin: EdgeInsets.only(left: 15, right: 15, top: 15), + // child: Column( + // children: widget.myAllergiesList!.map((selectedAllergy) { + // return Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Container( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // AppText( + // projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), + // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + // bold: true, + // color: Color(0xFF2B353E), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, + // fontWeight: FontWeight.w700, + // letterSpacing: -0.48, + // // fontHeight:0.18 , + // ), + // AppText( + // projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), + // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + // color: Color(0xFFCC9B14), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + // fontWeight: FontWeight.w700, + // letterSpacing: -0.48, + // ), + // ], + // ), + // width: MediaQuery.of(context).size.width * 0.5, + // ), + // if (selectedAllergy.isChecked) + // RemoveButton( + // onTap: () => removeAllergy(selectedAllergy), + // ) + // ], + // ), + // Padding( + // padding: const EdgeInsets.symmetric(vertical: 8), + // child: Row( + // children: [ + // RemarkText( + // remark: selectedAllergy.remark ?? "", + // ), + // ], + // ), + // ), + // DividerWithSpacesAround() + // ], + // ), + // SizedBox( + // height: 10, + // ), + // ], + // ); + // }).toList()), + ], ); } removeAllergy(MySelectedAllergy mySelectedAllergy) { - List allergy = - // ignore: missing_return - widget.myAllergiesList! - .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) - .toList(); + // List allergy = + // // ignore: missing_return + // widget.myAllergiesList! + // .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) + // .toList(); + // + // if (allergy.length > 0) { + // if (allergy.first.isLocal) { + // setState(() { + // widget.myAllergiesList!.remove(allergy.first); + // }); + // } + // setState(() { + // allergy[0].isChecked = false; + // }); + // } + } + + openReaction(){ - if (allergy.length > 0) { - if (allergy.first.isLocal) { - setState(() { - widget.myAllergiesList!.remove(allergy.first); - }); - } - setState(() { - allergy[0].isChecked = false; - }); - } } openAllergiesList(BuildContext context, Function changeParentState, removeAllergy) { @@ -142,51 +146,53 @@ class _UpdateAllergiesWidgetState extends State { context: context, builder: (context) { return AddAllergies( - myAllergiesList: widget.myAllergiesList, - addAllergiesFun: (List mySelectedAllergy) { - bool isAllDataFilled = true; - mySelectedAllergy.forEach((element) { - if (element.selectedAllergySeverity == null) { - element.hasValidationError = true; - isAllDataFilled = false; - } - }); - if (isAllDataFilled) { - mySelectedAllergy.forEach((element) { - if ( - widget.myAllergiesList!.singleWhere( - (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - orElse: () => MySelectedAllergy(), - ).selectedAllergySeverity - == - null) { - widget.myAllergiesList!.add(element); - } - }); + addAllergiesFun: (AllergiesListVidaPlus selectedAllergy) { - /// remove items. - List removedList = []; - widget.myAllergiesList!.forEach((element) { - if ( - mySelectedAllergy.singleWhere( - (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - orElse: () => MySelectedAllergy(), - ) - .selectedAllergySeverity == - null) { - removedList.add(element); - } - }); + openReaction(); - removedList.forEach((element) { - removeAllergy(element); - }); - changeParentState(); + // bool isAllDataFilled = true; + // mySelectedAllergy.forEach((element) { + // if (element.selectedAllergySeverity == null) { + // element.hasValidationError = true; + // isAllDataFilled = false; + // } + // }); + // if (isAllDataFilled) { + // mySelectedAllergy.forEach((element) { + // if ( + // widget.myAllergiesList!.singleWhere( + // (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + // orElse: () => MySelectedAllergy(), + // ).selectedAllergySeverity + // == + // null) { + // widget.myAllergiesList!.add(element); + // } + // }); + // + // /// remove items. + // List removedList = []; + // widget.myAllergiesList!.forEach((element) { + // if ( + // mySelectedAllergy.singleWhere( + // (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + // orElse: () => MySelectedAllergy(), + // ) + // .selectedAllergySeverity == + // null) { + // removedList.add(element); + // } + // }); + // + // removedList.forEach((element) { + // removeAllergy(element); + // }); + // changeParentState(); - Navigator.of(context).pop(); - } else { - Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - } + // Navigator.of(context).pop(); + // } else { + // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + // } }); }); } diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart index 1bb8c2b7..20279db9 100644 --- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart @@ -206,9 +206,7 @@ class _UpdateSubjectivePageState extends State implements }, child: Column( children: [ - UpdateAllergiesWidget( - myAllergiesList: myAllergiesList, - ), + UpdateAllergiesWidget(), SizedBox( height: 30, ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index bc17b2e4..1e24a2d8 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -1,4 +1,5 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -14,7 +15,7 @@ import 'master_key_checkbox_search_allergies_widget.dart'; class AddAllergies extends StatefulWidget { final Function? addAllergiesFun; - final List? myAllergiesList; + final AllergiesListVidaPlus? myAllergiesList; const AddAllergies({Key? key, this.addAllergiesFun, this.myAllergiesList}) : super(key: key); @@ -23,17 +24,18 @@ class AddAllergies extends StatefulWidget { } class _AddAllergiesState extends State { - List allergiesList = []; - List allergySeverityList = []; - List myAllergiesListLocal = []; + // List allergiesList = []; + // List allergySeverityList = []; + // + // myAllergiesListLocal = []; @override initState() { super.initState(); - myAllergiesListLocal = [...?widget.myAllergiesList]; + // myAllergiesListLocal = [...?widget.myAllergiesList]; } - GlobalKey key = new GlobalKey>(); + // GlobalKey key = new GlobalKey>(); bool isFormSubmitted = false; @override @@ -62,23 +64,23 @@ class _AddAllergiesState extends State { onModelReady: (model) async {}, builder: (_, model, w) { return MasterKeyCheckboxSearchAllergiesWidget( - model: model, - masterList: model.allergiesList, - removeAllergy: (master) { - // setState(() { - // removeAllergyFromLocalList(master); - // }); + model: model, + // masterList: model.allergiesList, + // removeAllergy: (master) { + // // setState(() { + // // removeAllergyFromLocalList(master); + // // }); + // }, + addAllergy: (AllergiesListVidaPlus mySelectedAllergy) { + widget.addAllergiesFun!(mySelectedAllergy); }, - addAllergy: (MySelectedAllergy mySelectedAllergy) { - addAllergyLocally(mySelectedAllergy); - }, - addSelectedAllergy: () { - setState(() { - widget.addAllergiesFun!(myAllergiesListLocal); - }); - }, - isServiceSelected: (master) => isServiceSelected(master), - getServiceSelectedAllergy: (master) => getSelectedAllergy(master), + // addSelectedAllergy: () { + // setState(() { + // widget.addAllergiesFun!(myAllergiesListLocal); + // }); + // }, + // isServiceSelected: (master) => isServiceSelected(master), + // getServiceSelectedAllergy: (master) => getSelectedAllergy(master), ); }), ), @@ -99,56 +101,56 @@ class _AddAllergiesState extends State { // ) // : CustomBottomSheetContainer( - label: TranslationBase.of(context).addAllergies, + buttonColor: Color(0xffEAEAEA), + fontColor: Colors.black, + label: TranslationBase.of(context).cancel, onTap: () { - setState(() { - widget.addAllergiesFun!(myAllergiesListLocal); - }); + Navigator.of(context).pop(); }, ), ); } - - isServiceSelected(MasterKeyModel masterKey) { - Iterable allergy = - myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); - if (allergy.length > 0) { - return true; - } - return false; - } - - removeAllergyFromLocalList(MasterKeyModel masterKey) { - myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); - } - - MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { - Iterable allergy = - myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); - if (allergy.length > 0) { - return allergy.first; - } - return MySelectedAllergy(); - } - - addAllergyLocally(MySelectedAllergy mySelectedAllergy) { - if (mySelectedAllergy.selectedAllergy == null) { - Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - } else { - setState(() { - List allergy = - // ignore: missing_return - myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); - - if (allergy.isEmpty) { - myAllergiesListLocal.add(mySelectedAllergy); - } else { - allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; - allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; - allergy.first.remark = mySelectedAllergy.remark; - allergy.first.isChecked = mySelectedAllergy.isChecked; - } - }); - } - } + // + // isServiceSelected(MasterKeyModel masterKey) { + // Iterable allergy = + // myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); + // if (allergy.length > 0) { + // return true; + // } + // return false; + // } + // + // removeAllergyFromLocalList(MasterKeyModel masterKey) { + // myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); + // } + // + // MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { + // Iterable allergy = + // myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); + // if (allergy.length > 0) { + // return allergy.first; + // } + // return MySelectedAllergy(); + // } + // + // addAllergyLocally(AllergiesListVidaPlus mySelectedAllergy) { + // if (mySelectedAllergy.selectedAllergy == null) { + // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + // } else { + // setState(() { + // List allergy = + // // ignore: missing_return + // myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); + // + // if (allergy.isEmpty) { + // myAllergiesListLocal.add(mySelectedAllergy); + // } else { + // allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; + // allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; + // allergy.first.remark = mySelectedAllergy.remark; + // allergy.first.isChecked = mySelectedAllergy.isChecked; + // } + // }); + // } + // } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index 1f1ef378..de7aa4a4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -1,39 +1,44 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'allergies_item.dart'; class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { final SOAPViewModel model; - final Function() addSelectedAllergy; - final Function(MasterKeyModel) removeAllergy; - final Function(MySelectedAllergy mySelectedAllergy) addAllergy; - final bool Function(MasterKeyModel) isServiceSelected; - final MySelectedAllergy Function(MasterKeyModel) getServiceSelectedAllergy; + // final Function() addSelectedAllergy; + // final Function(MasterKeyModel) removeAllergy; + final Function(AllergiesListVidaPlus mySelectedAllergy) addAllergy; + // final bool Function(MasterKeyModel) isServiceSelected; + // final MySelectedAllergy Function(MasterKeyModel) getServiceSelectedAllergy; - final List masterList; + // final List masterList; final String? buttonName; final String? hintSearchText; MasterKeyCheckboxSearchAllergiesWidget( {Key? key, required this.model, - required this.addSelectedAllergy, - required this.removeAllergy, - required this.masterList, + // required this.addSelectedAllergy, + // required this.removeAllergy, + // required this.masterList, required this.addAllergy, - required this.isServiceSelected, + // required this.isServiceSelected, this.buttonName, this.hintSearchText, - required this.getServiceSelectedAllergy}) + // required this.getServiceSelectedAllergy + }) : super(key: key); @override @@ -41,13 +46,13 @@ class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { } class _MasterKeyCheckboxSearchAllergiesWidgetState extends State { - List items = []; - + // List items = []; +bool loading =false; TextEditingController filteredSearchController = TextEditingController(); @override void initState() { - items.addAll(widget.masterList); + // items.addAll(widget.masterList); super.initState(); } @@ -65,9 +70,10 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState extends State(Color(0xffD02127)), ), onPressed: (){ + widget.addAllergy(widget.model.searchAllergiesVidaPlus[index]); + + }, label: AppText(TranslationBase.of(context).add, fontSize:12, color:Color(0xffD02127) ,), + ), ); + + + + // return AddAllergiesItem( + // item: widget.model.allergiesList[index], + // model: widget.model, + // removeAllergy: widget.removeAllergy, + // addAllergy: widget.addAllergy, + // isServiceSelected: widget.isServiceSelected, + // getServiceSelectedAllergy: widget.getServiceSelectedAllergy, + // ); }, ) - : widget.model.state == ViewState.Busy - ? Center(child: CircularProgressIndicator()) - : Container(), + : loading ? Center(child: CircularProgressIndicator()) :SizedBox() + ), ), ), @@ -139,27 +156,27 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState extends State dummySearchList = []; - dummySearchList.addAll(widget.masterList); - if (query.isNotEmpty) { - List dummyListData = []; - dummySearchList.forEach((items) { - if (items.nameAr!.toLowerCase().contains(query.toLowerCase()) || items.nameEn!.toLowerCase().contains(query.toLowerCase())) { - dummyListData.add(items); - } - }); - setState(() { - items.clear(); - items.addAll(dummyListData); - }); - return; - } else { - setState(() { - items.clear(); - items.addAll(widget.masterList); - }); - } - } + // + // void filterSearchResults(String query) { + // List dummySearchList = []; + // dummySearchList.addAll(widget.masterList); + // if (query.isNotEmpty) { + // List dummyListData = []; + // dummySearchList.forEach((items) { + // if (items.nameAr!.toLowerCase().contains(query.toLowerCase()) || items.nameEn!.toLowerCase().contains(query.toLowerCase())) { + // dummyListData.add(items); + // } + // }); + // setState(() { + // items.clear(); + // items.addAll(dummyListData); + // }); + // return; + // } else { + // setState(() { + // items.clear(); + // items.addAll(widget.masterList); + // }); + // } + // } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart new file mode 100644 index 00000000..c1746e35 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -0,0 +1,165 @@ +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +import '../../../../../../widgets/shared/app_scaffold_widget.dart'; +import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; + +class ReactionsSelectionAllergiesWidget extends StatefulWidget { + final SOAPViewModel? model; + final AllergiesListVidaPlus mySelectedAllergy; + final Function(AllergiesListVidaPlus mySelectedAllergy) addReactionFun; + + final String? buttonName; + + ReactionsSelectionAllergiesWidget({ + Key? key, + required this.model, + required this.addReactionFun, + required this.mySelectedAllergy, + this.buttonName, + }) : super(key: key); + + @override + _ReactionsSelectionAllergiesWidgetState createState() => + _ReactionsSelectionAllergiesWidgetState(); +} + +class _ReactionsSelectionAllergiesWidgetState + extends State { + // List items = []; + bool loading = false; + + // TextEditingController filteredSearchController = TextEditingController(); + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return AppScaffold( + // baseViewModel: model, + isShowAppBar: true, + appBar: BottomSheetTitle( + title: "Reactive" // TranslationBase.of(context).reac, + ), + backgroundColor: Color(0xffbacF7F7F7), + body: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: RoundedContainer( + + margin: EdgeInsets.all(15), + child: ListView.builder( + + itemCount: + widget.mySelectedAllergy.allergyReactionDTOs!.length, + itemBuilder: (context, index) { + loading = false; + return Column(children: [ ExpansionTile( + dense: false, + enableFeedback: false, + showTrailingIcon: false, + leading: Checkbox(value: false, onChanged: (bool) {}), + title: AppText(widget.mySelectedAllergy + .allergyReactionDTOs![index].allergyReactionName!), + children: [ + Row( + + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: ListTile( + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .allergyReactionID, + onChanged: (value) { + print(value); + }, + ), + AppText('Mild', fontSize: 10,), + ], + ))), + Expanded( + child: ListTile( + title: Row( + + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .allergyReactionID, + onChanged: (value) { + print(value); + }, + ), + AppText('Moderate', fontSize: 10,), + ], + ))), + Expanded( + child: ListTile( + title: Row( + + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .allergyReactionID, + onChanged: (value) { + print(value); + }, + ), + AppText('Severe', fontSize: 10,), + ], + ))) + ], + ) + ], + ), + Divider(), + ]); + }, + ))) + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 762401bf..3939071a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -1,19 +1,14 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remark_text.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; - -import '../../../soap_update/shared_soap_widgets/SOAP_open_items.dart'; import '../chief_complaint/widgets/add_chief_complaint.dart'; import 'add_allergies.dart'; - +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; // ignore: must_be_immutable class UpdateAllergiesWidgetVidaPlus extends StatefulWidget { List? myAllergiesList; @@ -25,6 +20,7 @@ class UpdateAllergiesWidgetVidaPlus extends StatefulWidget { } bool noKnownAllergies = false; class _UpdateAllergiesWidgetState extends State { + SOAPViewModel? model; @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -42,7 +38,7 @@ class _UpdateAllergiesWidgetState extends State { AddSoapItem( title: "${TranslationBase.of(context).addAllergies}", onAddSoapItemClicked: (){ - openAllergiesList(context, changeAllState, removeAllergy); + openAllergiesList(context, changeAllState); }, ), @@ -69,97 +65,97 @@ class _UpdateAllergiesWidgetState extends State { ), - Container( - margin: EdgeInsets.only(left: 15, right: 15, top: 15), - child: Column( - children: widget.myAllergiesList!.map((selectedAllergy) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), - textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - bold: true, - color: Color(0xFF2B353E), - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - // fontHeight:0.18 , - ), - AppText( - projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), - textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - color: Color(0xFFCC9B14), - fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, - fontWeight: FontWeight.w700, - letterSpacing: -0.48, - ), - ], - ), - width: MediaQuery.of(context).size.width * 0.5, - ), - if (selectedAllergy.isChecked) - RemoveButton( - onTap: () => removeAllergy(selectedAllergy), - ) - ], - ), - Padding( - padding: const EdgeInsets.symmetric(vertical: 8), - child: Row( - children: [ - RemarkText( - remark: selectedAllergy.remark ?? "", - ), - ], - ), - ), - DividerWithSpacesAround() - ], - ), - SizedBox( - height: 10, - ), - ], - ); - }).toList()), - ) + // Container( + // margin: EdgeInsets.only(left: 15, right: 15, top: 15), + // child: Column( + // children: widget.myAllergiesList!.map((selectedAllergy) { + // return Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Container( + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // AppText( + // projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), + // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + // bold: true, + // color: Color(0xFF2B353E), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, + // fontWeight: FontWeight.w700, + // letterSpacing: -0.48, + // // fontHeight:0.18 , + // ), + // AppText( + // projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), + // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + // color: Color(0xFFCC9B14), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + // fontWeight: FontWeight.w700, + // letterSpacing: -0.48, + // ), + // ], + // ), + // width: MediaQuery.of(context).size.width * 0.5, + // ), + // if (selectedAllergy.isChecked) + // RemoveButton( + // onTap: () => removeAllergy(selectedAllergy), + // ) + // ], + // ), + // Padding( + // padding: const EdgeInsets.symmetric(vertical: 8), + // child: Row( + // children: [ + // RemarkText( + // remark: selectedAllergy.remark ?? "", + // ), + // ], + // ), + // ), + // DividerWithSpacesAround() + // ], + // ), + // SizedBox( + // height: 10, + // ), + // ], + // ); + // }).toList()), + // ) ], ); } - - removeAllergy(MySelectedAllergy mySelectedAllergy) { - List allergy = - // ignore: missing_return - widget.myAllergiesList! - .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) - .toList(); - - if (allergy.length > 0) { - if (allergy.first.isLocal) { - setState(() { - widget.myAllergiesList!.remove(allergy.first); - }); - } - setState(() { - allergy[0].isChecked = false; - }); - } - } - - openAllergiesList(BuildContext context, Function changeParentState, removeAllergy) { + // + // removeAllergy(MySelectedAllergy mySelectedAllergy) { + // List allergy = + // // ignore: missing_return + // widget.myAllergiesList! + // .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) + // .toList(); + // + // if (allergy.length > 0) { + // if (allergy.first.isLocal) { + // setState(() { + // widget.myAllergiesList!.remove(allergy.first); + // }); + // } + // setState(() { + // allergy[0].isChecked = false; + // }); + // } + // } + + openAllergiesList(BuildContext context, Function changeParentState) { showModalBottomSheet( backgroundColor: Colors.white, isScrollControlled: true, @@ -167,56 +163,34 @@ class _UpdateAllergiesWidgetState extends State { context: context, builder: (context) { return AddAllergies( - myAllergiesList: widget.myAllergiesList, - addAllergiesFun: (List mySelectedAllergy) { - bool isAllDataFilled = true; - mySelectedAllergy.forEach((element) { - if (element.selectedAllergySeverity == null) { - element.hasValidationError = true; - isAllDataFilled = false; - } - }); - if (isAllDataFilled) { - mySelectedAllergy.forEach((element) { - if ( - widget.myAllergiesList!.singleWhere( - (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - orElse: () => MySelectedAllergy(), - ).selectedAllergySeverity - == - null) { - widget.myAllergiesList!.add(element); - } - }); - - /// remove items. - List removedList = []; - widget.myAllergiesList!.forEach((element) { - if ( - mySelectedAllergy.singleWhere( - (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - orElse: () => MySelectedAllergy(), - ) - .selectedAllergySeverity == - null) { - removedList.add(element); - } - }); - - removedList.forEach((element) { - removeAllergy(element); - }); - changeParentState(); - - Navigator.of(context).pop(); - } else { - Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - } + addAllergiesFun: (AllergiesListVidaPlus mySelectedAllergy) { + Navigator.of(context).pop(); + openReactionScreen(mySelectedAllergy); + print(mySelectedAllergy); + + // } else { + // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + // } }); }); } - - loadPatientAllergies(){ - - } +openReactionScreen(AllergiesListVidaPlus mySelectedAllergy){ + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + isDismissible: false, + context: context, + builder: (context) { + return ReactionsSelectionAllergiesWidget( + model:model, + mySelectedAllergy: mySelectedAllergy, + addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { + + Navigator.of(context).pop(); + // } else { + // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + // } + }); + }); +} } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart index e8f2104e..ea0cacb9 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart @@ -14,6 +14,9 @@ class AddSoapItem extends StatelessWidget{ children: [ Expanded( child: AppButton( + + elevation:0, + icon: SvgPicture.asset('assets/images/svgs/add-square.svg'), title:this.title, color: Color(0xffEAEAEA), diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index ea39e17c..049cc26e 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -274,6 +274,7 @@ class SMSOTP { onTokenReceived: (token) { setState(() { print("Cloudflare token: $token"); + //todo pass this token to checkActivcationCode _token = token; checkValue(); }); diff --git a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart index 2f5e7c62..0330f08d 100644 --- a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart +++ b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart @@ -8,10 +8,11 @@ import '../../config/config.dart'; class CustomBottomSheetContainer extends StatelessWidget { final Function() onTap; final String label; - + final Color? buttonColor; + final Color? fontColor; double headerHeight = SizeConfig.heightMultiplier! * 12; - CustomBottomSheetContainer({Key? key, required this.onTap, required this.label}) : super(key: key); + CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white }) : super(key: key); @override Widget build(BuildContext context) { @@ -33,8 +34,9 @@ class CustomBottomSheetContainer extends StatelessWidget { widthFactor: .80, child: Center( child: AppButton( + fontColor: fontColor!, title: label, - color: AppGlobal.appGreenColor, + color: this.buttonColor , onPressed: onTap, ), ), diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index a30f0193..0ab825f8 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -22,7 +22,7 @@ class AppButton extends StatefulWidget { final double vPadding; final double hPadding; final double height; - + final double elevation; AppButton({ required this.onPressed, this.title = '', @@ -41,6 +41,7 @@ class AppButton extends StatefulWidget { this.hasBorder = false, this.borderColor = Colors.white, this.height = 50, + this.elevation =2.0 }); _AppButtonState createState() => _AppButtonState(); @@ -69,6 +70,7 @@ class _AppButtonState extends State { child: IgnorePointer( ignoring: widget.loading || widget.disabled, child: RawMaterialButton( + elevation: widget.elevation, fillColor: widget.disabled ? Colors.grey : widget.color != null diff --git a/pubspec.lock b/pubspec.lock index e69de29b..685eba41 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -0,0 +1,1775 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + url: "https://pub.dev" + source: hosted + version: "64.0.0" + _flutterfire_internals: + dependency: transitive + description: + name: _flutterfire_internals + sha256: "4eec93681221723a686ad580c2e7d960e1017cf1a4e0a263c2573c2c6b0bf5cd" + url: "https://pub.dev" + source: hosted + version: "1.3.25" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" + args: + dependency: transitive + description: + name: args + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + url: "https://pub.dev" + source: hosted + version: "2.5.0" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + autocomplete_textfield: + dependency: "direct main" + description: + name: autocomplete_textfield + sha256: "8170e66d381c21623f1cfbb957ab9c6b5a45d9c50a6daac7fc57dbc3ba94abb4" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + badges: + dependency: "direct main" + description: + name: badges + sha256: a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + barcode_scan2: + dependency: "direct main" + description: + name: barcode_scan2 + sha256: a2ab566027cd57b2795ea42aa26835dbaa8fe70bcc1aff54942a14d3705dff97 + url: "https://pub.dev" + source: hosted + version: "4.3.3" + bazel_worker: + dependency: transitive + description: + name: bazel_worker + sha256: "4eef19cc486c289e4b06c69d0f6f3192e85cc93c25d4d15d02afb205e388d2f0" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1" + url: "https://pub.dev" + source: hosted + version: "4.0.1" + build_modules: + dependency: transitive + description: + name: build_modules + sha256: "9987d67a29081872e730468295fc565e9a2b377ca3673337c1d4e41d57c6cd7c" + url: "https://pub.dev" + source: hosted + version: "5.0.8" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22" + url: "https://pub.dev" + source: hosted + version: "2.4.9" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799" + url: "https://pub.dev" + source: hosted + version: "7.3.0" + build_web_compilers: + dependency: "direct dev" + description: + name: build_web_compilers + sha256: "9071a94aa67787cebdd9e76837c9d2af61fb5242db541244f6a0b6249afafb46" + url: "https://pub.dev" + source: hosted + version: "4.0.10" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb + url: "https://pub.dev" + source: hosted + version: "8.9.2" + cached_network_image: + dependency: "direct main" + description: + name: cached_network_image + sha256: "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f" + url: "https://pub.dev" + source: hosted + version: "3.3.1" + cached_network_image_platform_interface: + dependency: transitive + description: + name: cached_network_image_platform_interface + sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + cached_network_image_web: + dependency: transitive + description: + name: cached_network_image_web + sha256: "205d6a9f1862de34b93184f22b9d2d94586b2f05c581d546695e3d8f6a805cd7" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + charts_common: + dependency: transitive + description: + name: charts_common + sha256: "7b8922f9b0d9b134122756a787dab1c3946ae4f3fc5022ff323ba0014998ea02" + url: "https://pub.dev" + source: hosted + version: "0.12.0" + charts_flutter: + dependency: "direct main" + description: + name: charts_flutter + sha256: "4172c3f4b85322fdffe1896ffbed79ae4689ae72cb6fe6690dcaaea620a9c558" + url: "https://pub.dev" + source: hosted + version: "0.12.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + clock: + dependency: transitive + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + cloud_firestore: + dependency: "direct main" + description: + name: cloud_firestore + sha256: "31cfa4d65d6e9ea837234fffe121304034c30c9214c06207b4a35867e3757900" + url: "https://pub.dev" + source: hosted + version: "4.15.8" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + sha256: a0097a26569b015faf8142e159e855241609ea9a1738b5fd1c40bfe8411b41a0 + url: "https://pub.dev" + source: hosted + version: "6.1.9" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + sha256: ed680ece29a5750985119c09cdc276b460c3a2fa80e8c12f9b7241f6b4a7ca16 + url: "https://pub.dev" + source: hosted + version: "3.10.8" + cloudflare_turnstile: + dependency: "direct main" + description: + name: cloudflare_turnstile + sha256: "3f11c0e7336b266e4eb4e594e7603972902832e10ace004a2c710e93abb81bfe" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37 + url: "https://pub.dev" + source: hosted + version: "4.10.0" + collection: + dependency: transitive + description: + name: collection + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" + source: hosted + version: "1.18.0" + connectivity: + dependency: "direct main" + description: + name: connectivity + sha256: a8e91263cf3e25fb5cc95e19dfde4999e32a648ac3b9e8a558a28165731678f8 + url: "https://pub.dev" + source: hosted + version: "3.0.6" + connectivity_for_web: + dependency: transitive + description: + name: connectivity_for_web + sha256: "01a390c1d5adc2ed1fa1f52d120c07fe9fd01166a93f965a832fd6cfc0ea6482" + url: "https://pub.dev" + source: hosted + version: "0.4.0+1" + connectivity_macos: + dependency: transitive + description: + name: connectivity_macos + sha256: "51ae08d5162eca9669b9d8951ed83ce19c5355a81149f94e4dee2740beb93628" + url: "https://pub.dev" + source: hosted + version: "0.2.1+2" + connectivity_platform_interface: + dependency: transitive + description: + name: connectivity_platform_interface + sha256: "2d82e942df9d49f29a24bb07fb5ce085d4a53e47818c62364d2b6deb9e0d7a8e" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" + url: "https://pub.dev" + source: hosted + version: "0.3.4+2" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + csslib: + dependency: transitive + description: + name: csslib + sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + url: "https://pub.dev" + source: hosted + version: "0.17.3" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 + url: "https://pub.dev" + source: hosted + version: "1.0.8" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9" + url: "https://pub.dev" + source: hosted + version: "2.3.6" + date_time_picker: + dependency: "direct main" + description: + name: date_time_picker + sha256: "6923c568bcb67a66ab7e083708d0adbcae8214b41bb84d49febc17e89e06fc4a" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + device_info: + dependency: "direct main" + description: + name: device_info + sha256: f4a8156cb7b7480d969cb734907d18b333c8f0bc0b1ad0b342cdcecf30d62c48 + url: "https://pub.dev" + source: hosted + version: "2.0.3" + device_info_platform_interface: + dependency: transitive + description: + name: device_info_platform_interface + sha256: b148e0bf9640145d09a4f8dea96614076f889e7f7f8b5ecab1c7e5c2dbc73c1b + url: "https://pub.dev" + source: hosted + version: "2.0.1" + dropdown_search: + dependency: "direct main" + description: + name: dropdown_search + sha256: "55106e8290acaa97ed15bea1fdad82c3cf0c248dd410e651f5a8ac6870f783ab" + url: "https://pub.dev" + source: hosted + version: "5.0.6" + equatable: + dependency: transitive + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" + eva_icons_flutter: + dependency: "direct main" + description: + name: eva_icons_flutter + sha256: "6d48a10b93590ab83eb092bee5adacdeb14f3d83f527a4b9e4092c363d56e2a8" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + expandable: + dependency: "direct main" + description: + name: expandable + sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2" + url: "https://pub.dev" + source: hosted + version: "5.0.1" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + file: + dependency: transitive + description: + name: file + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: aac85f20436608e01a6ffd1fdd4e746a7f33c93a2c83752e626bdfaea139b877 + url: "https://pub.dev" + source: hosted + version: "8.1.3" + firebase_analytics: + dependency: "direct main" + description: + name: firebase_analytics + sha256: b13cbf1ee78744ca5e6b762e9218db3bd3967a0edfed75f58339907892a2ccb9 + url: "https://pub.dev" + source: hosted + version: "10.8.9" + firebase_analytics_platform_interface: + dependency: transitive + description: + name: firebase_analytics_platform_interface + sha256: "416b33d62033db5ecd2df719fcb657ad04e9995fa0fc392ffdab4ca0e76cb679" + url: "https://pub.dev" + source: hosted + version: "3.9.9" + firebase_analytics_web: + dependency: transitive + description: + name: firebase_analytics_web + sha256: "9dca9d8d468172444ef18cabb73fe99f7aae24733bfad67115bd36bffd2d65c1" + url: "https://pub.dev" + source: hosted + version: "0.5.5+21" + firebase_core: + dependency: transitive + description: + name: firebase_core + sha256: "53316975310c8af75a96e365f9fccb67d1c544ef0acdbf0d88bbe30eedd1c4f9" + url: "https://pub.dev" + source: hosted + version: "2.27.0" + firebase_core_platform_interface: + dependency: transitive + description: + name: firebase_core_platform_interface + sha256: f7d7180c7f99babd4b4c517754d41a09a4943a0f7a69b65c894ca5c68ba66315 + url: "https://pub.dev" + source: hosted + version: "5.2.1" + firebase_core_web: + dependency: transitive + description: + name: firebase_core_web + sha256: f4ee170441ca141c5f9ee5ad8737daba3ee9c8e7efb6902aee90b4fbd178ce25 + url: "https://pub.dev" + source: hosted + version: "2.18.0" + firebase_messaging: + dependency: "direct main" + description: + name: firebase_messaging + sha256: "980259425fa5e2afc03e533f33723335731d21a56fd255611083bceebf4373a8" + url: "https://pub.dev" + source: hosted + version: "14.7.10" + firebase_messaging_platform_interface: + dependency: transitive + description: + name: firebase_messaging_platform_interface + sha256: f7a9d74ff7fc588a924f6b2eaeaa148b0db521b13a9db55f6ad45864fa98c06e + url: "https://pub.dev" + source: hosted + version: "4.5.27" + firebase_messaging_web: + dependency: transitive + description: + name: firebase_messaging_web + sha256: "90dc7ed885e90a24bb0e56d661d4d2b5f84429697fd2cbb9e5890a0ca370e6f4" + url: "https://pub.dev" + source: hosted + version: "3.5.18" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + fl_chart: + dependency: "direct main" + description: + name: fl_chart + sha256: "5a74434cc83bf64346efb562f1a06eefaf1bcb530dc3d96a104f631a1eff8d79" + url: "https://pub.dev" + source: hosted + version: "0.65.0" + flex_color_picker: + dependency: transitive + description: + name: flex_color_picker + sha256: "5c846437069fb7afdd7ade6bf37e628a71d2ab0787095ddcb1253bf9345d5f3a" + url: "https://pub.dev" + source: hosted + version: "3.4.1" + flex_seed_scheme: + dependency: transitive + description: + name: flex_seed_scheme + sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01" + url: "https://pub.dev" + source: hosted + version: "1.5.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_cache_manager: + dependency: transitive + description: + name: flutter_cache_manager + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + url: "https://pub.dev" + source: hosted + version: "3.3.1" + flutter_colorpicker: + dependency: "direct main" + description: + name: flutter_colorpicker + sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter_datetime_picker_plus: + dependency: "direct main" + description: + name: flutter_datetime_picker_plus + sha256: "7d82da02c4e070bb28a9107de119ad195e2319b45c786fecc13482a9ffcc51da" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + flutter_device_type: + dependency: "direct main" + description: + name: flutter_device_type + sha256: "8f41f2271733f615957924dd1dcd10ef90848bb86b603ae20578f91591b900f3" + url: "https://pub.dev" + source: hosted + version: "0.4.0" + flutter_html: + dependency: "direct main" + description: + name: flutter_html + sha256: "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee" + url: "https://pub.dev" + source: hosted + version: "3.0.0-beta.2" + flutter_inappwebview: + dependency: transitive + description: + name: flutter_inappwebview + sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + flutter_inappwebview_android: + dependency: transitive + description: + name: flutter_inappwebview_android + sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter_inappwebview_ios: + dependency: transitive + description: + name: flutter_inappwebview_ios + sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_macos: + dependency: transitive + description: + name: flutter_inappwebview_macos + sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_platform_interface: + dependency: transitive + description: + name: flutter_inappwebview_platform_interface + sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 + url: "https://pub.dev" + source: hosted + version: "1.3.0+1" + flutter_inappwebview_web: + dependency: transitive + description: + name: flutter_inappwebview_web + sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + flutter_keyboard_visibility: + dependency: transitive + description: + name: flutter_keyboard_visibility + sha256: "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8" + url: "https://pub.dev" + source: hosted + version: "6.0.0" + flutter_keyboard_visibility_linux: + dependency: transitive + description: + name: flutter_keyboard_visibility_linux + sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_keyboard_visibility_macos: + dependency: transitive + description: + name: flutter_keyboard_visibility_macos + sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086 + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_keyboard_visibility_platform_interface: + dependency: transitive + description: + name: flutter_keyboard_visibility_platform_interface + sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 + url: "https://pub.dev" + source: hosted + version: "2.0.0" + flutter_keyboard_visibility_web: + dependency: transitive + description: + name: flutter_keyboard_visibility_web + sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 + url: "https://pub.dev" + source: hosted + version: "2.0.0" + flutter_keyboard_visibility_windows: + dependency: transitive + description: + name: flutter_keyboard_visibility_windows + sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73 + url: "https://pub.dev" + source: hosted + version: "1.0.0" + flutter_localizations: + dependency: "direct overridden" + description: flutter + source: sdk + version: "0.0.0" + flutter_math_fork: + dependency: "direct main" + description: + name: flutter_math_fork + sha256: "94bee4642892a94939af0748c6a7de0ff8318feee588379dcdfea7dc5cba06c8" + url: "https://pub.dev" + source: hosted + version: "0.7.2" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" + url: "https://pub.dev" + source: hosted + version: "2.0.19" + flutter_staggered_grid_view: + dependency: "direct main" + description: + name: flutter_staggered_grid_view + sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395" + url: "https://pub.dev" + source: hosted + version: "0.7.0" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + url: "https://pub.dev" + source: hosted + version: "2.0.10+1" + flutter_swiper_view: + dependency: "direct main" + description: + name: flutter_swiper_view + sha256: "2a165b259e8a4c49d4da5626b967ed42a73dac2d075bd9e266ad8d23b9f01879" + url: "https://pub.dev" + source: hosted + version: "1.1.8" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + fluttertoast: + dependency: "direct main" + description: + name: fluttertoast + sha256: "81b68579e23fcbcada2db3d50302813d2371664afe6165bc78148050ab94bf66" + url: "https://pub.dev" + source: hosted + version: "8.2.5" + font_awesome_flutter: + dependency: "direct main" + description: + name: font_awesome_flutter + sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" + url: "https://pub.dev" + source: hosted + version: "10.7.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694 + url: "https://pub.dev" + source: hosted + version: "4.0.0" + get_it: + dependency: "direct main" + description: + name: get_it + sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7 + url: "https://pub.dev" + source: hosted + version: "7.6.7" + gif: + dependency: "direct main" + description: + name: gif + sha256: ade95694f1471da737922806818ffade2814d1d7f8d10af38ebcf36ace012bc0 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + hexcolor: + dependency: "direct main" + description: + name: hexcolor + sha256: c07f4bbb9095df87eeca87e7c69e8c3d60f70c66102d7b8d61c4af0453add3f6 + url: "https://pub.dev" + source: hosted + version: "3.0.1" + hijri: + dependency: transitive + description: + name: hijri + sha256: "203eb7341e32789af6429877e88411b1526ef44c5d157ce4d3b930dd32c37ef1" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + hijri_picker: + dependency: "direct main" + description: + name: hijri_picker + sha256: "15dd1716f3bd0b72122a71740b3ec9bc623463b11e0c907602d2b7598f851984" + url: "https://pub.dev" + source: hosted + version: "3.0.0" + html: + dependency: "direct main" + description: + name: html + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" + source: hosted + version: "0.15.4" + html_editor_enhanced: + dependency: "direct main" + description: + name: html_editor_enhanced + sha256: "5ae6cd965cca77f7186efccc47ca353799e831b31bd71438687a56131bbcd3a5" + url: "https://pub.dev" + source: hosted + version: "2.6.0" + http: + dependency: "direct main" + description: + name: http + sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + url: "https://pub.dev" + source: hosted + version: "1.2.2" + http_interceptor: + dependency: "direct main" + description: + name: http_interceptor + sha256: fc7eedc62433c17612bf65237a8aa2615553cc9130f1e4d75f7e5fa364d5232e + url: "https://pub.dev" + source: hosted + version: "2.0.0-beta.8" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + infinite_listview: + dependency: transitive + description: + name: infinite_listview + sha256: f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6 + url: "https://pub.dev" + source: hosted + version: "1.1.0" + intl: + dependency: "direct overridden" + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + jhijri: + dependency: "direct main" + description: + name: jhijri + sha256: c2a28e803b1d07513a29953c6685b933235511a1f57966fd5bf66bfdae131f70 + url: "https://pub.dev" + source: hosted + version: "1.0.0" + jhijri_picker: + dependency: "direct main" + description: + name: jhijri_picker + sha256: "55e3cdc03a20284fea179658c102b8eed802a5cc0e1fd949265285b1d352da8a" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" + url: "https://pub.dev" + source: hosted + version: "4.9.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" + lints: + dependency: transitive + description: + name: lints + sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + list_counter: + dependency: transitive + description: + name: list_counter + sha256: c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237 + url: "https://pub.dev" + source: hosted + version: "1.0.2" + local_auth: + dependency: "direct main" + description: + name: local_auth + sha256: "27679ed8e0d7daab2357db6bb7076359e083a56b295c0c59723845301da6aed9" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + local_auth_android: + dependency: transitive + description: + name: local_auth_android + sha256: e0e5b1ea247c5a0951c13a7ee13dc1beae69750e6a2e1910d1ed6a3cd4d56943 + url: "https://pub.dev" + source: hosted + version: "1.0.38" + local_auth_ios: + dependency: transitive + description: + name: local_auth_ios + sha256: eb283b530029b334698918f1e282d4483737cbca972ff21b9193be3d6de8e2b8 + url: "https://pub.dev" + source: hosted + version: "1.1.6" + local_auth_platform_interface: + dependency: transitive + description: + name: local_auth_platform_interface + sha256: "1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a" + url: "https://pub.dev" + source: hosted + version: "1.0.10" + local_auth_windows: + dependency: transitive + description: + name: local_auth_windows + sha256: bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5 + url: "https://pub.dev" + source: hosted + version: "1.0.11" + localization: + dependency: "direct main" + description: + name: localization + sha256: "9fa21644b75ca3fe844f8f115d03cd6fdc675054dd9aab6c5de5861145ea57b5" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + logging: + dependency: transitive + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + maps_launcher: + dependency: "direct main" + description: + name: maps_launcher + sha256: "57ba3c31db96e30f58c23fcb22a1fac6accc5683535b2cf344c534bbb9f8f910" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" + source: hosted + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" + source: hosted + version: "0.11.1" + meta: + dependency: transitive + description: + name: meta + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev" + source: hosted + version: "1.15.0" + mime: + dependency: transitive + description: + name: mime + sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" + url: "https://pub.dev" + source: hosted + version: "1.0.6" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + numberpicker: + dependency: "direct main" + description: + name: numberpicker + sha256: "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + octo_image: + dependency: transitive + description: + name: octo_image + sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: transitive + description: + name: path + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" + source: hosted + version: "1.9.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + url: "https://pub.dev" + source: hosted + version: "2.1.4" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d + url: "https://pub.dev" + source: hosted + version: "2.2.4" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + pedantic: + dependency: transitive + description: + name: pedantic + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + percent_indicator: + dependency: "direct main" + description: + name: percent_indicator + sha256: c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c + url: "https://pub.dev" + source: hosted + version: "4.2.3" + permission_handler: + dependency: "direct main" + description: + name: permission_handler + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" + url: "https://pub.dev" + source: hosted + version: "11.3.1" + permission_handler_android: + dependency: transitive + description: + name: permission_handler_android + sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa" + url: "https://pub.dev" + source: hosted + version: "12.0.12" + permission_handler_apple: + dependency: transitive + description: + name: permission_handler_apple + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 + url: "https://pub.dev" + source: hosted + version: "9.4.5" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d" + url: "https://pub.dev" + source: hosted + version: "0.1.1" + permission_handler_platform_interface: + dependency: transitive + description: + name: permission_handler_platform_interface + sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea + url: "https://pub.dev" + source: hosted + version: "4.2.2" + permission_handler_windows: + dependency: transitive + description: + name: permission_handler_windows + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" + url: "https://pub.dev" + source: hosted + version: "0.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + url: "https://pub.dev" + source: hosted + version: "6.0.2" + platform: + dependency: transitive + description: + name: platform + sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + url: "https://pub.dev" + source: hosted + version: "3.1.5" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + pointer_interceptor: + dependency: transitive + description: + name: pointer_interceptor + sha256: "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523" + url: "https://pub.dev" + source: hosted + version: "0.10.1+2" + pointer_interceptor_ios: + dependency: transitive + description: + name: pointer_interceptor_ios + sha256: a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917 + url: "https://pub.dev" + source: hosted + version: "0.10.1" + pointer_interceptor_platform_interface: + dependency: transitive + description: + name: pointer_interceptor_platform_interface + sha256: "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506" + url: "https://pub.dev" + source: hosted + version: "0.10.0+1" + pointer_interceptor_web: + dependency: transitive + description: + name: pointer_interceptor_web + sha256: "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044" + url: "https://pub.dev" + source: hosted + version: "0.10.2+1" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + protobuf: + dependency: transitive + description: + name: protobuf + sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + provider: + dependency: "direct main" + description: + name: provider + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c + url: "https://pub.dev" + source: hosted + version: "6.1.2" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + quiver: + dependency: "direct main" + description: + name: quiver + sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 + url: "https://pub.dev" + source: hosted + version: "3.2.2" + rxdart: + dependency: transitive + description: + name: rxdart + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" + source: hosted + version: "0.27.7" + scratch_space: + dependency: transitive + description: + name: scratch_space + sha256: "8510fbff458d733a58fc427057d1ac86303b376d609d6e1bc43f240aad9aa445" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" + url: "https://pub.dev" + source: hosted + version: "2.3.5" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "2ba0510d3017f91655b7543e9ee46d48619de2a2af38e5c790423f7007c7ccc1" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "398084b47b7f92110683cac45c6dc4aae853db47e470e5ddcd52cab7f7196ab2" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_maps: + dependency: transitive + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + speech_to_text: + dependency: "direct main" + description: + name: speech_to_text + sha256: "57fef1d41bdebe298e84842c89bb4ac91f31cdbec7830c8cb1fc6b91d03abd42" + url: "https://pub.dev" + source: hosted + version: "6.6.0" + speech_to_text_macos: + dependency: transitive + description: + name: speech_to_text_macos + sha256: e685750f7542fcaa087a5396ee471e727ec648bf681f4da83c84d086322173f6 + url: "https://pub.dev" + source: hosted + version: "1.1.0" + speech_to_text_platform_interface: + dependency: transitive + description: + name: speech_to_text_platform_interface + sha256: a0df1a907091ea09880077dc25aae02af9f79811264e6e97ddb08639b7f771c2 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" + sqflite: + dependency: transitive + description: + name: sqflite + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 + url: "https://pub.dev" + source: hosted + version: "2.3.2" + sqflite_common: + dependency: transitive + description: + name: sqflite_common + sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" + url: "https://pub.dev" + source: hosted + version: "2.5.3" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" + source: hosted + version: "1.11.1" + sticky_headers: + dependency: "direct main" + description: + name: sticky_headers + sha256: "9b3dd2cb0fd6a7038170af3261f855660cbb241cb56c501452cb8deed7023ede" + url: "https://pub.dev" + source: hosted + version: "0.3.0+2" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" + source: hosted + version: "2.1.2" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + url: "https://pub.dev" + source: hosted + version: "3.1.0+1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + url: "https://pub.dev" + source: hosted + version: "0.7.2" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + tuple: + dependency: transitive + description: + name: tuple + sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151 + url: "https://pub.dev" + source: hosted + version: "2.0.2" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" + url: "https://pub.dev" + source: hosted + version: "6.3.2" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + url: "https://pub.dev" + source: hosted + version: "6.2.4" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 + url: "https://pub.dev" + source: hosted + version: "3.1.1" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" + url: "https://pub.dev" + source: hosted + version: "2.3.3" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" + url: "https://pub.dev" + source: hosted + version: "3.1.2" + uuid: + dependency: transitive + description: + name: uuid + sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + url: "https://pub.dev" + source: hosted + version: "4.5.0" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + url: "https://pub.dev" + source: hosted + version: "1.1.11+1" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + visibility_detector: + dependency: transitive + description: + name: visibility_detector + sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420 + url: "https://pub.dev" + source: hosted + version: "0.4.0+2" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + url: "https://pub.dev" + source: hosted + version: "14.2.4" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + win32: + dependency: transitive + description: + name: win32 + sha256: e1d0cc62e65dc2561f5071fcbccecf58ff20c344f8f3dc7d4922df372a11df1f + url: "https://pub.dev" + source: hosted + version: "5.7.1" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d + url: "https://pub.dev" + source: hosted + version: "1.0.4" + xml: + dependency: transitive + description: + name: xml + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 + url: "https://pub.dev" + source: hosted + version: "6.5.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.5.0 <3.6.0" + flutter: ">=3.24.0" From fc567213ed34522dbe9422839b0ed7942508a48b Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Mon, 4 Nov 2024 15:39:56 +0300 Subject: [PATCH 25/76] allergies work inprogress --- .../allergy/get_allergies_list_vida_plus.dart | 2 +- .../subjective/allergies/add_allergies.dart | 15 +----- .../allergies/reactions_selection.dart | 48 ++++++++++--------- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart index 7618d57e..1e006cf8 100644 --- a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -74,7 +74,7 @@ class AllergyReactionDTOs { int? hospitalGroupID; int? hospitalID; bool? isActive; - int? reactionSelection =1; + String? reactionSelection =""; AllergyReactionDTOs( {this.allergyReactionID, this.allergyReactionName, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index 1e24a2d8..a0eda071 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -65,22 +65,11 @@ class _AddAllergiesState extends State { builder: (_, model, w) { return MasterKeyCheckboxSearchAllergiesWidget( model: model, - // masterList: model.allergiesList, - // removeAllergy: (master) { - // // setState(() { - // // removeAllergyFromLocalList(master); - // // }); - // }, + addAllergy: (AllergiesListVidaPlus mySelectedAllergy) { widget.addAllergiesFun!(mySelectedAllergy); }, - // addSelectedAllergy: () { - // setState(() { - // widget.addAllergiesFun!(myAllergiesListLocal); - // }); - // }, - // isServiceSelected: (master) => isServiceSelected(master), - // getServiceSelectedAllergy: (master) => getSelectedAllergy(master), + ); }), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index c1746e35..2b8c5887 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -49,7 +49,7 @@ class _ReactionsSelectionAllergiesWidgetState // baseViewModel: model, isShowAppBar: true, appBar: BottomSheetTitle( - title: "Reactive" // TranslationBase.of(context).reac, + title: "Select Reactions" // TranslationBase.of(context).reac, ), backgroundColor: Color(0xffbacF7F7F7), body: Column( @@ -87,16 +87,17 @@ class _ReactionsSelectionAllergiesWidgetState activeColor: Color(0xffD02127), materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: widget - .mySelectedAllergy - .allergyReactionDTOs![index] - .reactionSelection, + value: "Mild", groupValue: widget .mySelectedAllergy - .allergyReactionDTOs![index] - .allergyReactionID, + .allergyReactionDTOs![index].reactionSelection, onChanged: (value) { - print(value); + widget + .mySelectedAllergy + .allergyReactionDTOs![index].reactionSelection =value; + setState(() { + + }); }, ), AppText('Mild', fontSize: 10,), @@ -111,16 +112,18 @@ class _ReactionsSelectionAllergiesWidgetState activeColor: Color(0xffD02127), materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: widget - .mySelectedAllergy - .allergyReactionDTOs![index] - .reactionSelection, + value: "moderate", groupValue: widget .mySelectedAllergy - .allergyReactionDTOs![index] - .allergyReactionID, + + .allergyReactionDTOs![index].reactionSelection, onChanged: (value) { - print(value); + widget + .mySelectedAllergy + .allergyReactionDTOs![index].reactionSelection =value; + setState(() { + + }); }, ), AppText('Moderate', fontSize: 10,), @@ -135,16 +138,17 @@ class _ReactionsSelectionAllergiesWidgetState activeColor: Color(0xffD02127), materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: widget - .mySelectedAllergy - .allergyReactionDTOs![index] - .reactionSelection, + value: "severe", groupValue: widget .mySelectedAllergy - .allergyReactionDTOs![index] - .allergyReactionID, + .allergyReactionDTOs![index].reactionSelection, onChanged: (value) { - print(value); + widget + .mySelectedAllergy + .allergyReactionDTOs![index].reactionSelection =value; + setState(() { + + }); }, ), AppText('Severe', fontSize: 10,), From 074bee8c4ca5d7b35eba8f59cc98ae47e01089b1 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 6 Nov 2024 15:56:02 +0300 Subject: [PATCH 26/76] WD: plan and physical examination completed. --- assets/images/svgs/audit.svg | 4 + assets/images/svgs/delete.svg | 5 + assets/images/svgs/edit.svg | 4 + assets/images/svgs/resolve.svg | 4 + assets/images/svgs/save_as_draft.svg | 6 + lib/config/localized_values.dart | 15 + .../add_details_to_examination_vida_plus.dart | 233 +++++++++ .../add_examination_page_vida_plus.dart | 154 ++++++ .../add_examination_vida_plus_widget.dart | 318 ++++++++++++ ...inations_list_search_vida_plus_widget.dart | 129 +++++ .../objective/list_of_examination.dart | 59 +++ .../update_objective_page_vida_plus.dart | 389 +++++++++++++++ .../objective/widget/EmptyExamination.dart | 26 + .../objective/widget/examination_items.dart | 247 ++++++++++ .../plan/update_plan_page_vida_plus.dart | 457 ++++++++++++++++++ .../plan/widget/ProgressNoteItem.dart | 86 ++++ .../plan/widget/add_progress_note.dart | 65 +++ .../widget/add_progress_note_details.dart | 296 ++++++++++++ .../plan/widget/empty_progress_note.dart | 26 + .../plan/widget/list_of_notes.dart | 19 + .../allergies/update_allergies_widget.dart | 2 +- .../chief_complaint/chief_complaints.dart | 2 +- ...hief_complaint.dart => add_soap_item.dart} | 0 .../update_soap_index_vida_plus.dart | 26 +- .../widgets/SoapDetailItem.dart | 194 ++++++++ .../translations_delegate_base_utils.dart | 15 + .../text_fields/app-textfield-custom.dart | 73 ++- 27 files changed, 2828 insertions(+), 26 deletions(-) create mode 100644 assets/images/svgs/audit.svg create mode 100644 assets/images/svgs/delete.svg create mode 100644 assets/images/svgs/edit.svg create mode 100644 assets/images/svgs/resolve.svg create mode 100644 assets/images/svgs/save_as_draft.svg create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart rename lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/{add_chief_complaint.dart => add_soap_item.dart} (100%) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart diff --git a/assets/images/svgs/audit.svg b/assets/images/svgs/audit.svg new file mode 100644 index 00000000..7d46a569 --- /dev/null +++ b/assets/images/svgs/audit.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svgs/delete.svg b/assets/images/svgs/delete.svg new file mode 100644 index 00000000..7cdd0f32 --- /dev/null +++ b/assets/images/svgs/delete.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/svgs/edit.svg b/assets/images/svgs/edit.svg new file mode 100644 index 00000000..586202aa --- /dev/null +++ b/assets/images/svgs/edit.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svgs/resolve.svg b/assets/images/svgs/resolve.svg new file mode 100644 index 00000000..0685e4a1 --- /dev/null +++ b/assets/images/svgs/resolve.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svgs/save_as_draft.svg b/assets/images/svgs/save_as_draft.svg new file mode 100644 index 00000000..a06e6b69 --- /dev/null +++ b/assets/images/svgs/save_as_draft.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index c59b691b..17fac19a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -254,6 +254,7 @@ const Map> localizedValues = { "beingBad": {"en": "being bad", "ar": "سيء"}, "beingGreat": {"en": "being great", "ar": "رائع"}, "cancel": {"en": "CANCEL", "ar": "الغاء"}, + "cancelSmall": {"en": "Cancel", "ar": "الغاء"}, "ok": {"en": "OK", "ar": "موافق"}, "done": {"en": "DONE", "ar": "تأكيد"}, "resumecall": {"en": "Resume call", "ar": "استئناف المكالمة"}, @@ -1173,9 +1174,23 @@ const Map> localizedValues = { "previousChiefCompaints": {"en": "Previous Chief Compaints", "ar":"رئيس الرسامين السابق"}, "listOfActiveEpisodes": {"en": "List of active episodes , select one to procedd", "ar":"قائمة الحلقات النشطة ، حدد واحدة لتقديمها"}, "select": {"en": "Select", "ar":"اختار"}, + "resolve": {"en": "Resolve", "ar":"حسم"}, + "audit": {"en": "Audit", "ar":"مراجعه الحسابات"}, + "delete": {"en": "Delete", "ar":"حذف"}, + "progressNoteType": {"en": "Progress Note Type", "ar":"نوع ملاحظة التقدم"}, + "doctorProgressNote": {"en": "Doctor Progress Note", "ar":"مذكرة تقدم الطبيب"}, + "addYourNote": {"en": "Add Your Note", "ar":"أضف ملاحظتك"}, + "saveAsDraft": {"en": "Save As Draft", "ar":"حفظ كمسودة"}, + "nurseNote": {"en": "Nurse Note", "ar":"ملاحظة الممرضة"}, + "patientCondition": {"en": "Patient Condition", "ar":"حالة المريض"}, + "examinationPart": {"en": "Examination Part", "ar":"جزء الامتحان"}, "historyOfIllness": {"en": "History of Present Illness*", "ar":"تاريخ المرض الحالي*"}, "historyTakenFrom": {"en": "History taken from", "ar":"التاريخ مأخوذ من"}, "familySpecify": {"en": "Family, Specify", "ar":"العائلة، حدد"}, "otherSpecify": {"en": "Other, Specify", "ar":"أخرى، حدد"}, + "physicalExamination": {"en": "Physical Examination", "ar":"الفحص البدني"}, + "addPhysicalExamination": {"en": "Add Physical Examination", "ar":"إضافة الفحص البدني"}, + "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, + "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart new file mode 100644 index 00000000..c310ddc7 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -0,0 +1,233 @@ +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../../../core/viewModel/project_view_model.dart'; + +class AddDetailsToExaminationVidaPlus extends StatefulWidget { + final List? mySelectedExamination; + + const AddDetailsToExaminationVidaPlus({super.key, this.mySelectedExamination}); + + @override + State createState() => + _AddDetailsToExaminationVidaPlusState(); +} + +class _AddDetailsToExaminationVidaPlusState extends State { + bool isSysExaminationExpand = false; + + @override + Widget build(BuildContext context) { + print('the widget is build'); + ProjectViewModel projectViewModel = Provider.of(context); + return BaseView( + onModelReady: (model) async {}, + builder: (_, model, w) => AppScaffold( + baseViewModel: model, + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).examinationPart), + backgroundColor: Colors.white, + body: Padding( + padding: const EdgeInsets.all(20.0), + child: Column( + children: [ + Expanded( + child: ListView.separated( + itemBuilder: (context, index) { + return ExpandableSOAPWidget( + headerTitle: + projectViewModel.isArabic + ? widget.mySelectedExamination![index].selectedExamination!.nameAr != null && widget.mySelectedExamination![index].selectedExamination!.nameAr != "" + ? widget.mySelectedExamination![index].selectedExamination!.nameAr! + : widget.mySelectedExamination![index].selectedExamination!.nameEn! + : widget.mySelectedExamination![index].selectedExamination!.nameEn!, + onTap: () { + setState(() { + isSysExaminationExpand = !isSysExaminationExpand; + }); + }, + child: ExaminationItems(examination:widget.mySelectedExamination![index]), + isExpanded: isSysExaminationExpand, + ); + + }, + separatorBuilder: (context, index) { + return SizedBox(height: 8,); + }, + itemCount: widget?.mySelectedExamination?.length ?? 0), + ), + ], + ), + ))); + } +} + + + + + +/* Container( + padding: EdgeInsets.symmetric(horizontal: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(bottom: 8), + child: AppText( + TranslationBase.of(context).status, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 1; + }); + examination.isNormal = true; + examination.isAbnormal = false; + examination.notExamined = false; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).normal, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 2; + }); + examination.isNormal = false; + examination.isAbnormal = true; + examination.notExamined = false; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 2 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).abnormal, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + if (!examination.isLocal) + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 3; + }); + examination.isNormal = false; + examination.isAbnormal = false; + examination.notExamined = true; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 3 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + Expanded( + child: AppText( + TranslationBase.of(context).notExamined, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ), + ], + ), + )), + ], + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) { + examination.remark = value; + }, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + ], + ), + );*/ \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart new file mode 100644 index 00000000..9b2c73a2 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart @@ -0,0 +1,154 @@ +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/material.dart'; + +import 'examinations_list_search_vida_plus_widget.dart'; + +class AddExaminationPageVidaPlus extends StatefulWidget { + final List? mySelectedExamination; + final Function(List) addSelectedExamination; + final Function(MasterKeyModel) removeExamination; + + AddExaminationPageVidaPlus( + {this.mySelectedExamination, + required this.addSelectedExamination, + required this.removeExamination}); + + @override + _AddExaminationPageVidaPlusState createState() => + _AddExaminationPageVidaPlusState(); +} + +class _AddExaminationPageVidaPlusState + extends State { + List mySelectedExaminationLocal = []; + + @override + initState() { + super.initState(); + mySelectedExaminationLocal = widget.mySelectedExamination!; + } + + @override + Widget build(BuildContext context) { + return BaseView( + onModelReady: (model) async { + if (model.physicalExaminationList.length == 0) { + WidgetsBinding.instance.addPostFrameCallback((_) async { + await model.getMasterLookup( + MasterKeysService.PhysicalExamination, + ); + }); + } + }, + builder: (_, model, w) => AppScaffold( + baseViewModel: model, + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).examinationPart), + backgroundColor: Colors.white, + body: Column( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + ExaminationsListSearchVidaPlusWidget( + mySelectedExamination: widget.mySelectedExamination, + masterList: model.physicalExaminationList, + isServiceSelected: (master) => + isServiceSelected(master), + removeExamination: (selectedExamination) { + setState(() { + mySelectedExaminationLocal + .remove(selectedExamination); + }); + }, + addExamination: (selectedExamination) { + mySelectedExaminationLocal.insert( + 0, selectedExamination); + //setState(() {}); + }, + ), + ], + ), + ), + ), + ), + ), + ), + ], + ), + bottomNavigationBar: Material( + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).cancelSmall, + color: Color(0xffEAEAEA), + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () async { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 10, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).next, + color: Color(0xffD02127), + fontColor: Colors.white, + fontWeight: FontWeight.w600, + onPressed: () async { + Navigator.pop(context); + widget.addSelectedExamination(mySelectedExaminationLocal); + + + }, + ), + ), + ], + ))), + ), + ); + } + + isServiceSelected(MasterKeyModel masterKey) { + Iterable exam = mySelectedExaminationLocal.where( + (element) => + masterKey.id == element.selectedExamination!.id && + masterKey.typeId == element.selectedExamination!.typeId); + if (exam.length > 0) { + return true; + } + return false; + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart new file mode 100644 index 00000000..a4510410 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart @@ -0,0 +1,318 @@ +// ignore: must_be_immutable +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; + +// ignore: must_be_immutable +class AddExaminationVidaPlusWidget extends StatefulWidget { + MasterKeyModel? item; + final Function(MySelectedExamination) removeExamination; + final Function(MySelectedExamination) addExamination; + final bool Function(MasterKeyModel) isServiceSelected; + bool isExpand; + + final Function() expandClick; + final List? mySelectedExamination; + + AddExaminationVidaPlusWidget({ + this.item, + required this.removeExamination, + required this.addExamination, + required this.isServiceSelected, + this.isExpand = false, + required this.expandClick, + this.mySelectedExamination, + }); + + @override + _AddExaminationVidaPlusWidgetState createState() => _AddExaminationVidaPlusWidgetState(); +} + +class _AddExaminationVidaPlusWidgetState extends State { + int status = 1; + TextEditingController remarksController = TextEditingController(); + MySelectedExamination examination = MySelectedExamination(); + + @override + void initState() { + if (getSelectedExam(widget.item!) != null) { + examination = getSelectedExam(widget.item!)!; + status = examination.isNormal + ? 1 + : examination.isAbnormal + ? 2 + : 3; + remarksController.text = examination.remark!; + } else { + examination.selectedExamination = widget.item; + } + super.initState(); + } + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + InkWell( + onTap: () { + onExamTap(); + }, + child: Row( + children: [ + Checkbox( + value: widget.isServiceSelected(widget.item!), + activeColor: Colors.red[800], + onChanged: (bool? newValue) { + onExamTap(); + }), + Container( + child: AppText( + projectViewModel.isArabic + ? widget.item!.nameAr != null && widget.item!.nameAr != "" + ? widget.item!.nameAr! + : widget.item!.nameEn! + : widget.item!.nameEn!, + color: Color(0xFF575757), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3 : 3.8), + letterSpacing: -0.56, + ), + ), + ], + ), + ), + ], + ); + // return Container( + // child: HeaderBodyExpandableNotifier( + // headerWidget: Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // InkWell( + // onTap: () { + // onExamTap(); + // }, + // child: Row( + // children: [ + // Checkbox( + // value: widget.isServiceSelected(widget.item!), + // activeColor: Colors.red[800], + // onChanged: (bool? newValue) { + // onExamTap(); + // }), + // Container( + // child: AppText( + // projectViewModel.isArabic + // ? widget.item!.nameAr != null && widget.item!.nameAr != "" + // ? widget.item!.nameAr! + // : widget.item!.nameEn! + // : widget.item!.nameEn!, + // color: Color(0xFF575757), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3 : 3.8), + // letterSpacing: -0.56, + // ), + // ), + // ], + // ), + // ), + // Container( + // margin: EdgeInsets.symmetric(horizontal: 8), + // child: InkWell( + // onTap: widget.expandClick, + // child: Icon(widget.isExpand ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down), + // ), + // ), + // ], + // ), + // bodyWidget: Container( + // padding: EdgeInsets.symmetric(horizontal: 12), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Container( + // margin: EdgeInsets.only(bottom: 8), + // child: AppText( + // TranslationBase.of(context).status, + // fontWeight: FontWeight.bold, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ), + // Row( + // children: [ + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = 1; + // }); + // examination.isNormal = true; + // examination.isAbnormal = false; + // examination.notExamined = false; + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 1 ? HexColor("#D02127") : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).normal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = 2; + // }); + // examination.isNormal = false; + // examination.isAbnormal = true; + // examination.notExamined = false; + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 2 ? HexColor("#D02127") : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).abnormal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // if (!examination.isLocal) + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = 3; + // }); + // examination.isNormal = false; + // examination.isAbnormal = false; + // examination.notExamined = true; + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 3 ? HexColor("#D02127") : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // Expanded( + // child: AppText( + // TranslationBase.of(context).notExamined, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ), + // ], + // ), + // )), + // ], + // ), + // Container( + // margin: EdgeInsets.only(top: 8), + // child: AppTextFieldCustom( + // hintText: TranslationBase.of(context).remarks, + // controller: remarksController, + // minLines: 2, + // maxLines: 4, + // inputType: TextInputType.multiline, + // onChanged: (value) { + // examination.remark = value; + // }, + // onClick: () {}, + // onFieldSubmitted: () {}, + // ), + // ), + // ], + // ), + // ), + // isExpand: widget.isExpand, + // ), + // ); + } + + onExamTap() { + setState(() { + if (widget.isServiceSelected(widget.item!)) { + if (examination.isLocal) widget.removeExamination(examination); + widget.expandClick(); + } else { + examination.isNormal = status == 1; + examination.isAbnormal = status == 2; + examination.notExamined = status == 3; + examination.remark = remarksController.text; + widget.addExamination(examination); + widget.expandClick(); + } + }); + } + + MySelectedExamination? getSelectedExam(MasterKeyModel masterKey) { + Iterable exam = widget.mySelectedExamination!.where((element) => masterKey.id == element.selectedExamination!.id && masterKey.typeId == element.selectedExamination!.typeId); + if (exam.length > 0) { + return exam.first; + } + return null; + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart new file mode 100644 index 00000000..954f6cf2 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart @@ -0,0 +1,129 @@ +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; + + +class ExaminationsListSearchVidaPlusWidget extends StatefulWidget { + final Function(MySelectedExamination) removeExamination; + final Function(MySelectedExamination) addExamination; + final bool Function(MasterKeyModel) isServiceSelected; + final List? masterList; + final List? mySelectedExamination; + + ExaminationsListSearchVidaPlusWidget({required this.removeExamination, required this.addExamination, required this.isServiceSelected, this.masterList, this.mySelectedExamination}); + + @override + _ExaminationsListSearchVidaPlusWidgetState createState() => _ExaminationsListSearchVidaPlusWidgetState(); +} + +class _ExaminationsListSearchVidaPlusWidgetState extends State { + int expandedIndex = -1; + List? items = []; + TextEditingController filteredSearchController = TextEditingController(); + + @override + void initState() { + items!.addAll(widget.masterList!); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Column( + children: [ + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white,child: Padding( + padding: const EdgeInsets.all(8.0), + child: AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + hintText: TranslationBase.of(context).searchExamination, + isTextFieldHasSuffix: false, + hasBorder: false, + controller: filteredSearchController, + onChanged: (value) { + if (value != null) filterSearchResults(value); + }, + suffixWidget: InkWell( + child: Icon( + Icons.search, + color: Colors.black, + ), + onTap: () {}, + ), + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + ), + ...items!.mapIndexed((index, item) { + return Column( + children: [ + AddExaminationVidaPlusWidget( + item: item, + addExamination: widget.addExamination, + removeExamination: widget.removeExamination, + mySelectedExamination: widget.mySelectedExamination, + isServiceSelected: widget.isServiceSelected, + isExpand: index == expandedIndex, + expandClick: () { + setState(() { + if (expandedIndex == index) { + expandedIndex = -1; + } else { + expandedIndex = index; + } + }); + }, + ), + Divider() + ], + ); + }).toList(), + ], + ); + } + + void filterSearchResults(String query) { + List dummySearchList = []; + dummySearchList.addAll(widget.masterList as Iterable); + if (query.isNotEmpty) { + List dummyListData = []; + dummySearchList.forEach((item) { + if (item.nameAr!.toLowerCase().contains(query.toLowerCase()) || item.nameEn!.toLowerCase().contains(query.toLowerCase())) { + dummyListData.add(item); + } + }); + setState(() { + items!.clear(); + items!.addAll(dummyListData); + }); + return; + } else { + setState(() { + items!.clear(); + items!.addAll(widget.masterList as Iterable); + }); + } + } +} + +extension FicListExtension on List { + /// Maps each element of the list. + /// The [map] function gets both the original [item] and its [index]. + Iterable mapIndexed(E Function(int index, T item) map) sync* { + for (var index = 0; index < length; index++) { + yield map(index, this[index]); + } + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart new file mode 100644 index 00000000..a9b246e2 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -0,0 +1,59 @@ +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../../../utils/translations_delegate_base_utils.dart'; + +class ListOfExamination extends StatelessWidget { + final List listOfSelection; + + const ListOfExamination({super.key, required this.listOfSelection}); + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Flexible( + child: ListView.separated( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (_, index) => SoapDetailItem( + title: projectViewModel.isArabic + ? listOfSelection[index] + .selectedExamination! + .nameAr != + null && + listOfSelection[index] + .selectedExamination! + .nameAr != + "" + ? listOfSelection[index] + .selectedExamination! + .nameAr! + : listOfSelection[index] + .selectedExamination! + .nameEn! + : listOfSelection[index] + .selectedExamination! + .nameEn!, + condition: getCondition(listOfSelection[index], context)??TranslationBase.of(context).notExamined, + remarks: listOfSelection[index].remark??'', + onSoapDetailActionClicked: (action) { + ///todo handle the event as per the actiion + /// the action is [SoapDetailItemActions] + }, + status: 'active', + ), + separatorBuilder: (_, __) => Divider(), + itemCount: listOfSelection.length), + ); + } + + String? getCondition(MySelectedExamination examination, BuildContext context) => examination.isNormal + ? TranslationBase.of(context).normal + : examination.isAbnormal + ? TranslationBase.of(context).abnormal + : TranslationBase.of(context).notExamined; +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart new file mode 100644 index 00000000..a8a4ddfe --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -0,0 +1,389 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/objective/add_examination_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; +import 'package:flutter/material.dart'; + +import '../../soap_update/objective/examination_item_card.dart'; +import '../../soap_update/objective/objective_call_back.dart'; +import '../../soap_update/shared_soap_widgets/SOAP_open_items.dart'; +import 'add_details_to_examination_vida_plus.dart'; + +class UpdateObjectivePageVidaPlus extends StatefulWidget { + final Function changePageViewIndex; + final Function changeLoadingState; + final int currentIndex; + final PatiantInformtion patientInfo; + + UpdateObjectivePageVidaPlus( + {Key? key, + required this.changePageViewIndex, + required this.patientInfo, + required this.changeLoadingState, + required this.currentIndex}); + + @override + _UpdateObjectivePageVidaPlusState createState() => + _UpdateObjectivePageVidaPlusState(); +} + +class _UpdateObjectivePageVidaPlusState + extends State implements ObjectiveCallBack { + bool isSysExaminationExpand = false; + List mySelectedExamination = []; + + BoxDecoration containerBorderDecoration( + Color containerColor, Color borderColor) { + return BoxDecoration( + color: containerColor, + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all(Radius.circular(6)), + border: Border.fromBorderSide(BorderSide( + color: borderColor, + width: 0.5, + )), + ); + } + + @override + Widget build(BuildContext context) { + + return BaseView( + onModelReady: (model) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { + model.setObjectiveCallBack(this); + mySelectedExamination.clear(); + model.isAddExamInProgress = true; + await model.getPatientPhysicalExam(widget.patientInfo); + if (model.patientPhysicalExamList.isNotEmpty) { + if (model.physicalExaminationList.length == 0) { + await model.getMasterLookup(MasterKeysService.PhysicalExamination); + } + model.patientPhysicalExamList.forEach((element) { + MasterKeyModel? examMaster = model.getOneMasterKey( + masterKeys: MasterKeysService.PhysicalExamination, + id: element.examId, + ); + MySelectedExamination tempEam = + SoapUtils.generateMySelectedExamination( + examination: examMaster, + remark: element.remarks, + isNormal: element.isNormal, + createdBy: element.createdBy, + createdOn: element.createdOn, + editedOn: element.editedOn, + notExamined: element.notExamined, + isNew: element.isNew, + isLocal: false, + isAbnormal: element.isAbnormal, + ); + mySelectedExamination.add(tempEam); + }); + } + widget.changeLoadingState(false);}); + }, + builder: (_, model, w) => AppScaffold( + isShowAppBar: false, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SOAPStepHeader( + currentIndex: widget.currentIndex, + changePageViewIndex: widget.changePageViewIndex, + patientInfo: widget.patientInfo, + ), + ExpandableSOAPWidget( + headerTitle: + TranslationBase.of(context).physicalExamination, + onTap: () { + setState(() { + isSysExaminationExpand = !isSysExaminationExpand; + }); + }, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox(height: 10,), + AddSoapItem( + title: + TranslationBase.of(context).physicalExamination, + onAddSoapItemClicked: () { + openExaminationList(context); + }), + SizedBox(height: 16,), + + if (mySelectedExamination.isEmpty) ...{ + + Center( + child: Padding( + padding: const EdgeInsets.all(65), + child: EmptyExamination(), + ), + ), + + } else ...{ + Divider(), + ListOfExamination( + listOfSelection: mySelectedExamination + ) + } + + // if (mySelectedExamination.isNotEmpty && mySelectedExamination.first.isLocal) + // Row( + // children: [ + // AppText( + // "New", + // fontWeight: FontWeight.w600, + // fontFamily: 'Poppins', + // color: Color(0xFFCC9B14), + // ), + // ], + // ), + // Column( + // children: mySelectedExamination + // .sublist(0, model.getFirstIndexForOldExamination(mySelectedExamination) == -1 ? 0 : model.getFirstIndexForOldExamination(mySelectedExamination)) + // .map((examination) { + // return ExaminationItemCard(examination, () { + // removeExamination(examination.selectedExamination!); + // }); + // }).toList(), + // ), + // if (mySelectedExamination.isNotEmpty && model.getFirstIndexForOldExamination(mySelectedExamination) > -1) + // Row( + // children: [ + // AppText( + // "Verified", + // fontWeight: FontWeight.w600, + // fontFamily: 'Poppins', + // color: AppGlobal.appGreenColor, + // ), + // ], + // ), + // Column( + // children: mySelectedExamination + // .sublist(model.getFirstIndexForOldExamination(mySelectedExamination) == -1 ? 0 : model.getFirstIndexForOldExamination(mySelectedExamination)) + // .map((examination) { + // return ExaminationItemCard(examination, () { + // removeExamination(examination.selectedExamination!); + // }); + // }).toList(), + // ) + ], + ), + isExpanded: isSysExaminationExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 14 : 12), + ) + ], + ), + ), + ), + ), + ), + ); + } + + submitUpdateObjectivePage(SOAPViewModel model) async { + if (mySelectedExamination.isNotEmpty) { + if (!model.isAddExamInProgress && + widget.patientInfo.admissionNo != null && + widget.patientInfo.admissionNo!.isNotEmpty) { + Navigator.of(context).pop(); + } else { + widget.changeLoadingState(true); + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + PostPhysicalExamRequestModel postPhysicalExamRequestModel = + new PostPhysicalExamRequestModel(); + mySelectedExamination.forEach((exam) { + if (postPhysicalExamRequestModel + .listHisProgNotePhysicalExaminationVM == + null) + postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM = + []; + ListHisProgNotePhysicalExaminationVM + listHisProgNotePhysicalExaminationVM = + ListHisProgNotePhysicalExaminationVM( + patientMRN: widget.patientInfo.patientMRN, + episodeId: widget.patientInfo.episodeNo == null + ? 0 + : widget.patientInfo.episodeNo, + appointmentNo: widget.patientInfo.appointmentNo == null + ? 0 + : widget.patientInfo.appointmentNo, + remarks: exam.remark ?? '', + createdBy: exam.createdBy ?? doctorProfile.doctorID, + createdOn: exam.createdOn ?? DateTime.now().toIso8601String(), + editedBy: doctorProfile.doctorID, + editedOn: DateTime.now().toIso8601String(), + examId: exam.selectedExamination!.id, + examType: exam.selectedExamination!.typeId, + isAbnormal: exam.isAbnormal, + isNormal: exam.isNormal, + notExamined: exam.notExamined, + examinationType: exam.isNormal + ? 1 + : exam.isAbnormal + ? 2 + : 3, + examinationTypeName: exam.isNormal + ? "Normal" + : exam.isAbnormal + ? 'AbNormal' + : "Not Examined", + isNew: exam.isNew, + ); + if (widget.patientInfo.admissionNo != null && + widget.patientInfo.admissionNo!.isNotEmpty) { + listHisProgNotePhysicalExaminationVM.admissionNo = + int.parse(widget.patientInfo.admissionNo!); + } else { + listHisProgNotePhysicalExaminationVM.admissionNo = 0; + } + postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM! + .add(listHisProgNotePhysicalExaminationVM); + }); + + if (model.patientPhysicalExamList.isEmpty) { + await model.postPhysicalExam(postPhysicalExamRequestModel); + } else { + await model.patchPhysicalExam(postPhysicalExamRequestModel); + } + + if (model.state == ViewState.ErrorLocal) { + widget.changeLoadingState(false); + Utils.showErrorToast(model.error); + if (widget.patientInfo.admissionNo != null && + widget.patientInfo.admissionNo!.isNotEmpty) { + // Navigator.of(context).pop(); + model.isAddExamInProgress = false; + } + } else { + if (widget.patientInfo.admissionNo != null && + widget.patientInfo.admissionNo!.isNotEmpty) { + // Navigator.of(context).pop(); + widget.changeLoadingState(false); + model.isAddExamInProgress = false; + } else { + widget.changeLoadingState(true); + widget.changePageViewIndex(2); + } + } + } + } else { + Utils.showErrorToast(TranslationBase.of(context).examinationErrorMsg); + } + } + + removeExamination(MasterKeyModel masterKey) { + Iterable history = mySelectedExamination.where( + (element) => + masterKey.id == element.selectedExamination!.id && + masterKey.typeId == element.selectedExamination!.typeId); + + if (history.length > 0) { + setState(() { + if (history.first.isLocal) { + mySelectedExamination.remove(history.first); + } else { + history.first.notExamined = true; + history.first.isNormal = false; + history.first.isAbnormal = false; + } + }); + } + } + + openExaminationList(BuildContext context) { + Navigator.push( + context, + FadePage( + page: AddExaminationPageVidaPlus( + mySelectedExamination: mySelectedExamination, + addSelectedExamination: + (List mySelectedExaminationLocal) { + + pushAddExamination(mySelectedExaminationLocal); + + + // mySelectedExaminationLocal.forEach((element) { + // if (mySelectedExamination.singleWhere( + // (it) => + // it.selectedExamination!.id == + // element.selectedExamination!.id, + // orElse: () => MySelectedExamination()) == + // MySelectedExamination()) { + // mySelectedExamination.insert(0, element); + // } + // }); + + /// remove items. + // List removedList = []; + // mySelectedExamination.forEach((element) { + // if (mySelectedExaminationLocal.singleWhere( + // (it) => + // it.selectedExamination!.id == + // element.selectedExamination!.id, + // orElse: () => MySelectedExamination()) == + // MySelectedExamination()) { + // removedList.add(element); + // } + // }); + + // removedList.forEach((element) { + // removeExamination(element.selectedExamination!); + // }); + // Navigator.of(context).pop(); + // setState(() {}); + }, + removeExamination: (masterKey) => removeExamination(masterKey)), + ), + ); + } + + @override + nextFunction(model) async { + await submitUpdateObjectivePage(model); + } + + void pushAddExamination(List mySelectedExaminationLocal) { + Navigator.push( + context, + FadePage( + page: AddDetailsToExaminationVidaPlus( + mySelectedExamination: mySelectedExamination,), + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart new file mode 100644 index 00000000..c552848f --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart @@ -0,0 +1,26 @@ +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +import '../../../../../../../utils/translations_delegate_base_utils.dart'; + +class EmptyExamination extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment : MainAxisAlignment.center, + children: [ + SvgPicture.asset('assets/images/svgs/unavailable.svg'), + SizedBox(height: 10,), + AppText( + TranslationBase.of(context).noPhysicalExamination, + fontSize: 12, + fontWeight: FontWeight.w400, + textAlign: TextAlign.center, + color: Color(0xFFADADAD), + ) + ], + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart new file mode 100644 index 00000000..cc097d2f --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart @@ -0,0 +1,247 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; + +class ExaminationItems extends StatefulWidget { + final MySelectedExamination? examination; + + const ExaminationItems({super.key, this.examination}); + + @override + State createState() => _ExaminationItemsState(); +} + +class _ExaminationItemsState extends State { + bool isExpanded = false; + + int status = 1; + + TextEditingController remarksController = TextEditingController(); + + @override + void initState() { + // TODO: implement initState + super.initState(); + remarksController.text = widget.examination?.remark ?? ""; + } + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return Column( + children: [ + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + contentPadding: EdgeInsets.zero, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)), + value: isExpanded, + controlAffinity: ListTileControlAffinity.leading, + onChanged: (bool? value) { + setState(() { + isExpanded = value ?? false; + }); + }, + title: AppText( + projectViewModel.isArabic + ? widget.examination!.selectedExamination!.nameAr != null && + widget.examination!.selectedExamination!.nameAr != "" + ? widget.examination!.selectedExamination!.nameAr! + : widget.examination!.selectedExamination!.nameEn! + : widget.examination!.selectedExamination!.nameEn!, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + ), + ), + (isExpanded) + ? Container( + padding: EdgeInsets.symmetric(horizontal: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(bottom: 8), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 1; + }); + widget.examination!.isNormal = true; + widget.examination!.isAbnormal = false; + widget.examination!.notExamined = false; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: + Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).normal, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 2; + }); + widget.examination!.isNormal = false; + widget.examination!.isAbnormal = true; + widget.examination!.notExamined = false; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: + Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 2 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).abnormal, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + if (widget.examination?.isLocal == false) + Expanded( + child: InkWell( + onTap: () { + setState(() { + status = 3; + }); + widget.examination!.isNormal = false; + widget.examination!.isAbnormal = false; + widget.examination!.notExamined = true; + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 3 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + Expanded( + child: AppText( + TranslationBase.of(context).notExamined, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ), + ], + ), + )), + ], + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) { + widget.examination!.remark = value; + }, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + ], + ), + ) + : SizedBox.shrink(), + SizedBox( + height: 8, + ), + Divider() + ], + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart new file mode 100644 index 00000000..a3aefa8b --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -0,0 +1,457 @@ +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/plan/plan_call_back.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/date-utils.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; +import 'package:flutter/material.dart'; + +class UpdatePlanPageVidaPlus extends StatefulWidget { + final Function changePageViewIndex; + final PatiantInformtion patientInfo; + final Function changeLoadingState; + final Function changeStateFun; + final SOAPViewModel sOAPViewModel; + + final int currentIndex; + + UpdatePlanPageVidaPlus( + {Key? key, + required this.changePageViewIndex, + required this.patientInfo, + required this.changeLoadingState, + required this.currentIndex, + required this.sOAPViewModel, + required this.changeStateFun}); + + @override + _UpdatePlanPageVidaPlusState createState() => _UpdatePlanPageVidaPlusState(); +} + +class _UpdatePlanPageVidaPlusState extends State + implements PlanCallBack { + bool isAddProgress = true; + bool isProgressExpanded = true; + List listOfProgressNote = [GetPatientProgressNoteResModel()]; + GetPatientProgressNoteResModel patientProgressNote = + GetPatientProgressNoteResModel(); + + TextEditingController progressNoteController = + TextEditingController(text: null); + + BoxDecoration containerBorderDecoration( + Color containerColor, Color borderColor) { + return BoxDecoration( + color: containerColor, + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all(Radius.circular(6)), + border: Border.fromBorderSide(BorderSide( + color: borderColor, + width: 0.5, + )), + ); + } + + @override + void initState() { + super.initState(); + if (patientProgressNote.planNote != null) { + setState(() { + isAddProgress = false; + }); + } + } + + getPatientProgressNote(SOAPViewModel model, + {bool isAddProgress = false}) async { + GetProgressNoteReqModel getGetProgressNoteReqModel = + GetProgressNoteReqModel( + appointmentNo: + int.parse(widget.patientInfo.appointmentNo.toString()), + patientMRN: widget.patientInfo.patientMRN, + episodeID: widget.patientInfo.episodeNo.toString(), + editedBy: '', + doctorID: ''); + await widget.sOAPViewModel + .getPatientProgressNote(getGetProgressNoteReqModel); + + ///TODO set progressNote in model; + if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { + progressNoteController.text = Utils.parseHtmlString( + widget.sOAPViewModel.patientProgressNoteList[0].planNote!); + patientProgressNote.planNote = progressNoteController.text; + + patientProgressNote.createdByName = + widget.sOAPViewModel.patientProgressNoteList[0].createdByName; + patientProgressNote.createdOn = + widget.sOAPViewModel.patientProgressNoteList[0].createdOn; + patientProgressNote.editedOn = + widget.sOAPViewModel.patientProgressNoteList[0].editedOn; + patientProgressNote.editedByName = + widget.sOAPViewModel.patientProgressNoteList[0].editedByName; + patientProgressNote.appointmentNo = + widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; + setState(() { + isAddProgress = isAddProgress; + widget.sOAPViewModel.isAddProgress = isAddProgress; + widget.sOAPViewModel.progressNoteText = progressNoteController.text; + }); + } + } + + @override + Widget build(BuildContext context) { + return BaseView( + onModelReady: (model) async { + widget.sOAPViewModel.setPlanCallBack(this); + GetProgressNoteReqModel getGetProgressNoteReqModel = + GetProgressNoteReqModel( + appointmentNo: + int.parse(widget.patientInfo.appointmentNo.toString()), + patientMRN: widget.patientInfo.patientMRN, + episodeID: widget.patientInfo.episodeNo.toString(), + editedBy: '', + doctorID: ''); + await widget.sOAPViewModel + .getPatientProgressNote(getGetProgressNoteReqModel); + + if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { + progressNoteController.text = Utils.parseHtmlString( + widget.sOAPViewModel.patientProgressNoteList[0].planNote!); + patientProgressNote.planNote = progressNoteController.text; + patientProgressNote.createdByName = + widget.sOAPViewModel.patientProgressNoteList[0].createdByName; + patientProgressNote.createdOn = + widget.sOAPViewModel.patientProgressNoteList[0].createdOn; + patientProgressNote.editedOn = + widget.sOAPViewModel.patientProgressNoteList[0].editedOn; + patientProgressNote.editedByName = + widget.sOAPViewModel.patientProgressNoteList[0].editedByName; + patientProgressNote.appointmentNo = + widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; + widget.sOAPViewModel.progressNoteText = progressNoteController.text; + + setState(() { + isAddProgress = false; + widget.sOAPViewModel.isAddProgress = false; + }); + } + widget.changeLoadingState(false); + }, + builder: (_, model, w) => AppScaffold( + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + isShowAppBar: false, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Center( + child: FractionallySizedBox( + widthFactor: 0.90, + child: Column( + + children: [ + SOAPStepHeader( + currentIndex: widget.currentIndex, + changePageViewIndex: widget.changePageViewIndex, + patientInfo: widget.patientInfo, + ), + SizedBox( + height: 10, + ), + ExpandableSOAPWidget( + headerTitle: TranslationBase.of(context).progressNote, + onTap: () { + setState(() { + isProgressExpanded = !isProgressExpanded; + }); + }, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox( + height: 10, + ), + AddSoapItem( + title: TranslationBase.of(context) + .addProgressNote, + onAddSoapItemClicked: () { + navigateToAddPlan(); + }), + SizedBox( + height: 16, + ), + + if (listOfProgressNote.isEmpty) ...{ + Center( + child: Padding( + padding: const EdgeInsets.all(65), + child: EmptyProgressNote(), + ), + ), + } else ...{ + Divider(), + ListOfNotes( + notes: listOfProgressNote + ) + } + + // if (mySelectedExamination.isEmpty) ...{ + // + // Center( + // child: Padding( + // padding: const EdgeInsets.all(65), + // child: EmptyExamination(), + // ), + // ), + // + // } else ...{ + // Divider(), + // ListOfExamination( + // listOfSelection: mySelectedExamination + // ) + // } + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // if (isAddProgress) + // Container( + // margin: EdgeInsets.only(left: 10, right: 10, top: 15), + // child: AppTextFieldCustom( + // hintText: TranslationBase.of(context).progressNote, + // controller: progressNoteController, + // minLines: 2, + // maxLines: 4, + // inputType: TextInputType.multiline, + // onChanged: (value) { + // setState(() { + // patientProgressNote.planNote = value; + // model.progressNoteText = value!; + // widget.changeStateFun(); + // }); + // }, + // onFieldSubmitted: () {}, + // ), + // ), + // SizedBox( + // height: 9, + // ), + // if (patientProgressNote.planNote != null && !isAddProgress) + // Container( + // margin: EdgeInsets.only( + // left: 5, + // right: 5, + // ), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // children: [ + // AppText( + // 'Appointment No: ', + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + // letterSpacing: -0.4, + // color: Color(0xFF575757), + // ), + // AppText( + // patientProgressNote.appointmentNo != null ? patientProgressNote.appointmentNo.toString() : '', + // fontWeight: FontWeight.w600, + // letterSpacing: -0.48, + // color: Color(0xFF2B353E), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6, + // ), + // ], + // ), + // AppText( + // patientProgressNote.createdOn != null + // ? AppDateUtils.getDayMonthYearDateFormatted(DateTime.parse(patientProgressNote.createdOn!)) + // : AppDateUtils.getDayMonthYearDateFormatted(DateTime.now()), + // fontWeight: FontWeight.w600, + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6, + // ) + // ], + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.end, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // // Row( + // // children: [ + // // AppText( + // // 'Condition: ', + // // fontSize: 12, + // // ), + // // AppText( + // // patientProgressNote.mName ?? + // // '', + // // fontWeight: FontWeight.w600), + // // ], + // // ), + // AppText( + // patientProgressNote.createdOn != null ? AppDateUtils.getHour(DateTime.parse(patientProgressNote.createdOn!)) : AppDateUtils.getHour(DateTime.now()), + // fontWeight: FontWeight.w600, + // color: Color(0xFF575757), + // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.6, + // ) + // ], + // ), + // SizedBox( + // height: 8, + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // Expanded( + // child: AppText( + // progressNoteController.text, + // fontSize: 10, + // ), + // ), + // InkWell( + // onTap: () { + // setState(() { + // isAddProgress = true; + // widget.sOAPViewModel.isAddProgress = true; + // }); + // }, + // child: Icon( + // DoctorApp.edit, + // size: 18, + // )) + // ], + // ), + // ], + // ), + // ) + // ], + // ), + ], + ), + isExpanded: isProgressExpanded, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 20 : 10), + ), + ], + ), + ), + ), + ), + )); + } + + submitPlan(SOAPViewModel model) async { + if (progressNoteController.text.isNotEmpty) { + widget.changeLoadingState(true); + PostProgressNoteRequestModel postProgressNoteRequestModel = + new PostProgressNoteRequestModel( + patientMRN: widget.patientInfo.patientMRN, + episodeId: widget.patientInfo.episodeNo, + appointmentNo: widget.patientInfo.appointmentNo, + planNote: patientProgressNote.planNote, + doctorID: widget.patientInfo.doctorId, + createdBy: widget.patientInfo.doctorId, + createdByName: widget.patientInfo.doctorName, + editedBy: ''); + + if (widget.sOAPViewModel.patientProgressNoteList.isEmpty) { + await widget.sOAPViewModel + .postProgressNote(postProgressNoteRequestModel); + } else { + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + postProgressNoteRequestModel.editedBy = doctorProfile.doctorID; + await widget.sOAPViewModel + .patchProgressNote(postProgressNoteRequestModel); + } + + if (widget.sOAPViewModel.state == ViewState.ErrorLocal) { + Utils.showErrorToast(widget.sOAPViewModel.error); + } else { + GetProgressNoteReqModel getGetProgressNoteReqModel = + GetProgressNoteReqModel( + appointmentNo: + int.parse(widget.patientInfo.appointmentNo.toString()), + patientMRN: widget.patientInfo.patientMRN, + episodeID: widget.patientInfo.episodeNo.toString(), + editedBy: '', + doctorID: ''); + await widget.sOAPViewModel + .getPatientProgressNote(getGetProgressNoteReqModel); + if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { + progressNoteController.text = Utils.parseHtmlString( + widget.sOAPViewModel.patientProgressNoteList[0].planNote!); + patientProgressNote.planNote = progressNoteController.text; + patientProgressNote.createdByName = + widget.sOAPViewModel.patientProgressNoteList[0].createdByName; + patientProgressNote.createdOn = + widget.sOAPViewModel.patientProgressNoteList[0].createdOn; + patientProgressNote.editedOn = + widget.sOAPViewModel.patientProgressNoteList[0].editedOn; + patientProgressNote.editedByName = + widget.sOAPViewModel.patientProgressNoteList[0].editedByName; + patientProgressNote.appointmentNo = + widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; + + setState(() { + isAddProgress = false; + widget.sOAPViewModel.isAddProgress = false; + }); + } + + Navigator.of(context).pop(); + Utils.showErrorToast("Episode Created Successfully"); + } + widget.changeLoadingState(false); + } else { + Utils.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); + } + } + + @override + nextFunction(model) { + if (progressNoteController.text.isNotEmpty) { + if (isAddProgress) { + submitPlan(model); + } else { + Navigator.of(context).pop(); + } + } else { + Utils.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); + } + } + + void navigateToAddPlan() { + Navigator.push( + context, + FadePage( + page: AddProgressNote ( + + ), + )); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart new file mode 100644 index 00000000..09e6d6a3 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart @@ -0,0 +1,86 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; + +class ProgressNoteItem extends StatelessWidget { + final String type; + final String speciality; + final String Notes; + final String status; + + const ProgressNoteItem( + {super.key, + required this.type, + required this.speciality, + required this.Notes, + required this.status}); + + @override + Widget build(BuildContext context) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Stack( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + AppText( + "${TranslationBase.of(context).type}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + type, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + SizedBox( + height: 8, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).speciality}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + speciality, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + ], + ), + Align( + alignment: Alignment.topRight, child: Status(status: status)) + ], + ), + SizedBox( + height: 8, + ), + AppText( + Notes, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.w600, + ), + ], + ); +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart new file mode 100644 index 00000000..b60845bb --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart @@ -0,0 +1,65 @@ +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/material.dart'; + +class AddProgressNote extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return BaseView( + builder: (_, model, w) => AppScaffold( + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).progressNote + ), + body: Padding( + padding: const EdgeInsets.all(20.0), + child: SingleChildScrollView( + child: AddProgressNoteDetails(), + ), + ), + bottomNavigationBar: Material( + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).cancelSmall, + color: Color(0xffEAEAEA), + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () async { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 10, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).save, + color: Color(0xff359846), + fontColor: Colors.white, + fontWeight: FontWeight.w600, + onPressed: () async { + Navigator.pop(context); + + + + }, + ), + ), + ], + ))), + ), + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart new file mode 100644 index 00000000..d8e699f5 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart @@ -0,0 +1,296 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hexcolor/hexcolor.dart'; + +List patientState = ["","Stable", "Not Stable", "Not Defined"]; + +class AddProgressNoteDetails extends StatefulWidget { + @override + State createState() => _AddProgressNoteDetailsState(); +} + +class _AddProgressNoteDetailsState extends State { + String selectedItem = "Stable"; + int status = 1; + final TextEditingController noteController = TextEditingController(); + + + @override + Widget build(BuildContext context) { + return Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addProgressNote, + fontSize: 16, + fontWeight: FontWeight.w600, + textAlign: TextAlign.start, + color: Colors.black, + ), + SizedBox( + height: 16, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).patientCondition, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem, + iconSize: 25, + elevation: 16, + + onChanged: (newValue) async { + setState(() { + selectedItem = newValue ?? ""; + }); + }, + items: patientState.map((item) { + return DropdownMenuItem( + child: AppText( + item, + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + SizedBox( + height: 16, + ), + AppText( + TranslationBase.of(context).progressNoteType, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + SizedBox( + height: 8, + ), + Row( + children: [ + Flexible( + child: InkWell( + onTap: () { + setState(() { + status = 1; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).doctorProgressNote, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + fontSize: 12, + ), + ], + ), + )), + Flexible( + child: InkWell( + onTap: () { + setState(() { + status = 2; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 2 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).nurseNote, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + fontSize: 12, + ), + ], + ), + ), + ), + ], + ), + SizedBox( + height: 24, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).speciality, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem, + iconSize: 25, + elevation: 16, + + onChanged: (newValue) async { + setState(() { + selectedItem = newValue ?? ""; + }); + }, + items: patientState.map((item) { + return DropdownMenuItem( + child: AppText( + "item", + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).addYourNote, + controller: noteController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 4, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 16, + ), + Row( + children: [ + SvgPicture.asset('assets/images/svgs/save_as_draft.svg'), + SizedBox( + width: 4, + ), + AppText( + TranslationBase.of(context).saveAsDraft, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ) + ], + ), + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart new file mode 100644 index 00000000..590fe54c --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart @@ -0,0 +1,26 @@ +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +import '../../../../../../../utils/translations_delegate_base_utils.dart'; + +class EmptyProgressNote extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment : MainAxisAlignment.center, + children: [ + SvgPicture.asset('assets/images/svgs/unavailable.svg'), + SizedBox(height: 10,), + AppText( + TranslationBase.of(context).noProgressNote, + fontSize: 12, + fontWeight: FontWeight.w400, + textAlign: TextAlign.center, + color: Color(0xFFADADAD), + ) + ], + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart new file mode 100644 index 00000000..4929ca0e --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart @@ -0,0 +1,19 @@ +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart'; +import 'package:flutter/material.dart'; + +class ListOfNotes extends StatelessWidget{ + final List notes; + + const ListOfNotes({super.key, required this.notes}); + @override + Widget build(BuildContext context) => Flexible( + child: ListView.separated( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (_, index) =>ProgressNoteItem(type: 'Doctor Note', speciality: "Internal Medicine", Notes: "Some lines of note for the progress ", status: "stable"), + separatorBuilder: (_, __) => Divider(), + itemCount: notes.length), + ); + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 762401bf..4f940880 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -11,7 +11,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../soap_update/shared_soap_widgets/SOAP_open_items.dart'; -import '../chief_complaint/widgets/add_chief_complaint.dart'; +import '../chief_complaint/widgets/add_soap_item.dart'; import 'add_allergies.dart'; // ignore: must_be_immutable diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index a33ddae8..dc1d7e29 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart similarity index 100% rename from lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_chief_complaint.dart rename to lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 33b4fd94..9627e06f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -5,6 +5,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_al import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart'; @@ -14,20 +16,21 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; - class UpdateSoapIndexVidaPlus extends StatefulWidget { final bool isUpdate; - const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) : super(key: key); + const UpdateSoapIndexVidaPlus({Key? key, this.isUpdate = false}) + : super(key: key); @override - _UpdateSoapIndexVidaPlusState createState() => _UpdateSoapIndexVidaPlusState(); + _UpdateSoapIndexVidaPlusState createState() => + _UpdateSoapIndexVidaPlusState(); } class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex = 0; + int _currentIndex = 3; List myAllergiesList = []; List myHistoryList = []; @@ -92,11 +95,24 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ + UpdatePlanPageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState, + sOAPViewModel: model, + changeStateFun: changeStateFun, + ), + UpdateObjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), UpdateSubjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, - changeLoadingState: changeLoadingState) + changeLoadingState: changeLoadingState), ], ), ) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart new file mode 100644 index 00000000..2750b32a --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -0,0 +1,194 @@ +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; + +typedef OnSoapDetailActionClicked = Function(SoapDetailItemActions); + +class SoapDetailItem extends StatelessWidget { + final String title; + final String condition; + final String status; + final String remarks; + final OnSoapDetailActionClicked onSoapDetailActionClicked; + + const SoapDetailItem( + {super.key, + required this.title, + required this.condition, + required this.remarks, + required this.onSoapDetailActionClicked, + required this.status}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Stack( + children: [ + Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + title, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.bold, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).condition}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + condition, + color: Color(0xffD02127), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + Visibility( + visible: remarks.isNotEmpty, + child: Column( + children: [ + SizedBox( + height: 8, + ), + AppText( + remarks, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w400, + ), + ], + )) + ], + ), + Align( + alignment: Alignment.topRight, child: Status(status: status)) + ], + ), + SizedBox( + height: 16, + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.EDIT), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/edit.svg', + fontColor: Color(0XFF2B353E), + text: TranslationBase.of(context).edit, + ), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/resolve.svg', + fontColor: Color(0XFF359846), + text: TranslationBase.of(context).resolve, + ), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.AUDIT), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/audit.svg', + fontColor: Color(0XFF359846), + text: TranslationBase.of(context).audit, + ), + ), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.REMOVE), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/delete.svg', + fontColor: Color(0XFFD02127), + text: TranslationBase.of(context).delete, + ), + ), + ], + ) + ], + ), + ); + } +} + +class SoapDetailItemActionsView extends StatelessWidget { + final String icon; + final String text; + final Color fontColor; + + const SoapDetailItemActionsView( + {super.key, + required this.icon, + required this.text, + required this.fontColor}); + + @override + Widget build(BuildContext context) => Row( + children: [ + SvgPicture.asset(icon), + SizedBox( + width: 8, + ), + AppText( + text, + color: fontColor, + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ); +} + +class Status extends StatelessWidget { + final String status; + + const Status({super.key, required this.status}); + + @override + Widget build(BuildContext context) { + return Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(3), + ), + // color: Color(0xFF359846), + color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + ? Color(0xFFD8E8DB) + : Color(0x98d02127), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), + child: AppText( + status, + color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + ? Color(0xFF359846) + : Colors.white, + fontSize: 8, + fontWeight: FontWeight.w600, + ), + )); + } +} + +enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE } diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 83e57d30..c9e22c24 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -502,6 +502,7 @@ class TranslationBase { String get beingGreat => localizedValues['beingGreat']![locale.languageCode]!; String get cancel => localizedValues['cancel']![locale.languageCode]!; + String get cancelSmall => localizedValues['cancelSmall']![locale.languageCode]!; String get ok => localizedValues['ok']![locale.languageCode]!; @@ -1903,6 +1904,20 @@ class TranslationBase { String get familySpecify => localizedValues['familySpecify']![locale.languageCode]!; String get otherSpecify => localizedValues['otherSpecify']![locale.languageCode]!; String get historyOfIllness => localizedValues['historyOfIllness']![locale.languageCode]!; + String get physicalExamination => localizedValues['physicalExamination']![locale.languageCode]!; + String get addPhysicalExamination => localizedValues['addPhysicalExamination']![locale.languageCode]!; + String get noPhysicalExamination => localizedValues['noPhysicalExamination']![locale.languageCode]!; + String get examinationPart => localizedValues['examinationPart']![locale.languageCode]!; + String get resolve => localizedValues['resolve']![locale.languageCode]!; + String get audit => localizedValues['audit']![locale.languageCode]!; + String get delete => localizedValues['delete']![locale.languageCode]!; + String get noProgressNote => localizedValues['noProgressNote']![locale.languageCode]!; + String get patientCondition => localizedValues['patientCondition']![locale.languageCode]!; + String get doctorProgressNote => localizedValues['doctorProgressNote']![locale.languageCode]!; + String get nurseNote => localizedValues['nurseNote']![locale.languageCode]!; + String get progressNoteType => localizedValues['progressNoteType']![locale.languageCode]!; + String get addYourNote => localizedValues['addYourNote']![locale.languageCode]!; + String get saveAsDraft => localizedValues['saveAsDraft']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index a15a585f..3d386a27 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -18,6 +18,7 @@ class AppTextFieldCustom extends StatefulWidget { final bool hasBorder; final String? dropDownText; final IconButton? suffixIcon; + final Widget? suffixWidget; final Color? dropDownColor; final bool enabled; final TextInputType? inputType; @@ -42,6 +43,7 @@ class AppTextFieldCustom extends StatefulWidget { this.isTextFieldHasSuffix = false, this.dropDownText, this.suffixIcon, + this.suffixWidget, this.dropDownColor, this.enabled = true, this.inputType, @@ -84,26 +86,32 @@ class _AppTextFieldCustomState extends State { @override void dispose() { - // _focusNode.dispose(); + // _focusNode.dispose(); super.dispose(); } @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - TextInputType localKeyboardType = widget.inputType ?? (widget.maxLines == 1 ? TextInputType.text : TextInputType.multiline); + TextInputType localKeyboardType = widget.inputType ?? + (widget.maxLines == 1 ? TextInputType.text : TextInputType.multiline); return Column( children: [ Container( - height: widget.height != 0 && widget.maxLines == 1 ? widget.height + 8 : null, //MediaQuery.of(context).size.height * 0.098, + height: widget.height != 0 && widget.maxLines == 1 + ? widget.height + 8 + : null, //MediaQuery.of(context).size.height * 0.098, decoration: widget.hasBorder ? TextFieldsUtils.containerBorderDecoration( Color(0Xffffffff), - widget.validationError == null ? Color(0xFFEFEFEF) : Colors.red.shade700, + widget.validationError == null + ? Color(0xFFEFEFEF) + : Colors.red.shade700, ) : null, - padding: EdgeInsets.only(top: 4.0, bottom: 0.0, left: 8.0, right: 8.0), + padding: + EdgeInsets.only(top: 4.0, bottom: 0.0, left: 8.0, right: 8.0), child: InkWell( onTap: widget.onClick, child: Row( @@ -130,25 +138,40 @@ class _AppTextFieldCustomState extends State { ), widget.dropDownText == null ? Container( - height: widget.height != 0 && widget.maxLines == 1 ? widget.height - 22 : null, + height: + widget.height != 0 && widget.maxLines == 1 + ? widget.height - 22 + : null, child: RawKeyboardListener( focusNode: FocusNode(), autofocus: false, onKey: (rawKeyEvent) { - final isFormSkippedEnterEvent = rawKeyEvent is RawKeyDownEvent && rawKeyEvent.isKeyPressed(LogicalKeyboardKey.enter); + final isFormSkippedEnterEvent = + rawKeyEvent is RawKeyDownEvent && + rawKeyEvent.isKeyPressed( + LogicalKeyboardKey.enter); - final needToInsertNewLine = isFormSkippedEnterEvent && localKeyboardType == TextInputType.multiline; + final needToInsertNewLine = + isFormSkippedEnterEvent && + localKeyboardType == + TextInputType.multiline; if (needToInsertNewLine) { - TextEditingControllerHelper.insertText(widget.controller!, '\n'); + TextEditingControllerHelper.insertText( + widget.controller!, '\n'); } }, child: TextFormField( - textAlign: projectViewModel.isArabic ? TextAlign.right : TextAlign.left, + textAlign: projectViewModel.isArabic + ? TextAlign.right + : TextAlign.left, focusNode: _focusNode, textAlignVertical: TextAlignVertical.top, - decoration: TextFieldsUtils.textFieldSelectorDecoration(widget.hintText!, "", true), + decoration: TextFieldsUtils + .textFieldSelectorDecoration( + widget.hintText!, "", true), style: TextStyle( - fontSize: SizeConfig.textMultiplier! * 1.7, + fontSize: + SizeConfig.textMultiplier! * 1.7, fontFamily: 'Poppins', color: Color(0xFF575757), fontWeight: FontWeight.w400, @@ -159,14 +182,18 @@ class _AppTextFieldCustomState extends State { enabled: widget.enabled, minLines: widget.minLines, maxLines: widget.maxLines, - inputFormatters: widget.inputFormatters != null ? widget.inputFormatters : [], + inputFormatters: + widget.inputFormatters != null + ? widget.inputFormatters + : [], onChanged: (value) { if (widget.onChanged != null) { widget.onChanged(value); } setState(() {}); }, - onFieldSubmitted: widget.onFieldSubmitted(), + onFieldSubmitted: + widget.onFieldSubmitted(), obscureText: widget.isSecure), ), ) @@ -185,7 +212,8 @@ class _AppTextFieldCustomState extends State { ? Container( margin: EdgeInsets.only( bottom: widget.isSearchTextField - ? (widget.controller!.text.isEmpty || widget.controller == null) + ? (widget.controller!.text.isEmpty || + widget.controller == null) ? 10 : 25 : 0), @@ -193,16 +221,22 @@ class _AppTextFieldCustomState extends State { : InkWell( child: Icon( Icons.keyboard_arrow_down, - color: widget.dropDownColor != null ? widget.dropDownColor : Color(0xff2E303A), + color: widget.dropDownColor != null + ? widget.dropDownColor + : Color(0xff2E303A), size: 12.0, ), ) - : Container(), + : widget.suffixWidget != null + ? widget.suffixWidget ?? SizedBox.shrink() + : Container(), ], ), ), ), - if (widget.validationError != null && widget.validationError!.isNotEmpty) TextFieldsError(error: widget.validationError!), + if (widget.validationError != null && + widget.validationError!.isNotEmpty) + TextFieldsError(error: widget.validationError!), ], ); } @@ -218,7 +252,8 @@ class TextEditingControllerHelper { } final text = controller.text; - final newText = text.replaceRange(selection.start, selection.end, textToInsert); + final newText = + text.replaceRange(selection.start, selection.end, textToInsert); controller.value = controller.value.copyWith( text: newText, selection: TextSelection.collapsed( From 5517d81fef4e616a6adaaa8081957211fe91e771 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Wed, 6 Nov 2024 16:29:38 +0300 Subject: [PATCH 27/76] allergy inprogress --- assets/images/svgs/edit-icon.svg | 4 + assets/images/svgs/resolve.svg | 4 + .../allergy/get_allergies_list_vida_plus.dart | 4 +- .../get_patient_allergies_list_vida_plus.dart | 124 +++++++ .../soap/SOAP_service.dart | 8 +- lib/core/viewModel/SOAP_view_model.dart | 3 +- .../patient_search/patient_search_header.dart | 1 + .../bottom_sheet_title.dart | 5 +- .../allergies/update_allergies_widget.dart | 262 +++++++-------- .../subjective/allergies/add_allergies.dart | 170 ++++------ ..._key_checkbox_search_allergies_widget.dart | 109 ++---- .../allergies/reactions_selection.dart | 311 +++++++++++------- .../allergies/update_allergies_widget.dart | 282 ++++++++-------- .../update_subjective_page_vida_plus.dart | 290 +++++++++------- 14 files changed, 881 insertions(+), 696 deletions(-) create mode 100644 assets/images/svgs/edit-icon.svg create mode 100644 assets/images/svgs/resolve.svg create mode 100644 lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart diff --git a/assets/images/svgs/edit-icon.svg b/assets/images/svgs/edit-icon.svg new file mode 100644 index 00000000..8fdc3cba --- /dev/null +++ b/assets/images/svgs/edit-icon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/svgs/resolve.svg b/assets/images/svgs/resolve.svg new file mode 100644 index 00000000..51d064f3 --- /dev/null +++ b/assets/images/svgs/resolve.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart index 1e006cf8..d0beffa0 100644 --- a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -75,6 +75,7 @@ class AllergyReactionDTOs { int? hospitalID; bool? isActive; String? reactionSelection =""; + bool? isSelected =false; AllergyReactionDTOs( {this.allergyReactionID, this.allergyReactionName, @@ -82,7 +83,8 @@ class AllergyReactionDTOs { this.hospitalGroupID, this.hospitalID, this.isActive, - this.reactionSelection + this.reactionSelection, + this.isSelected, }); AllergyReactionDTOs.fromJson(Map json) { diff --git a/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart new file mode 100644 index 00000000..2da8fa58 --- /dev/null +++ b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart @@ -0,0 +1,124 @@ +class PatientAllergiesVidaPlus { + int? allergyID; + String? allergyName; + int? allergyTypeID; + String? allergyTypeName; + int? hospitalGroupID; + int? hospitalID; + bool? isActivePatientsAllergy; + int? patientID; + List? patientsAllergyReactionsDTOs; + int? patientsAllergyRevisionID; + int? pomrID; + String? remark; + + PatientAllergiesVidaPlus( + {this.allergyID, + this.allergyName, + this.allergyTypeID, + this.allergyTypeName, + this.hospitalGroupID, + this.hospitalID, + this.isActivePatientsAllergy, + this.patientID, + this.patientsAllergyReactionsDTOs, + this.patientsAllergyRevisionID, + this.pomrID, + this.remark}); + + PatientAllergiesVidaPlus.fromJson(Map json) { + allergyID = json['allergyID']; + allergyName = json['allergyName']; + allergyTypeID = json['allergyTypeID']; + allergyTypeName = json['allergyTypeName']; + hospitalGroupID = json['hospitalGroupID']; + hospitalID = json['hospitalID']; + isActivePatientsAllergy = json['isActivePatientsAllergy']; + patientID = json['patientID']; + if (json['patientsAllergyReactionsDTOs'] != null) { + patientsAllergyReactionsDTOs = []; + json['patientsAllergyReactionsDTOs'].forEach((v) { + patientsAllergyReactionsDTOs! + .add(new PatientsAllergyReactionsDTOs.fromJson(v)); + }); + } + patientsAllergyRevisionID = json['patientsAllergyRevisionID']; + pomrID = json['pomrID']; + remark = json['remark']; + } + + Map toJson() { + final Map data = new Map(); + data['allergyID'] = this.allergyID; + data['allergyName'] = this.allergyName; + data['allergyTypeID'] = this.allergyTypeID; + data['allergyTypeName'] = this.allergyTypeName; + data['hospitalGroupID'] = this.hospitalGroupID; + data['hospitalID'] = this.hospitalID; + data['isActivePatientsAllergy'] = this.isActivePatientsAllergy; + data['patientID'] = this.patientID; + if (this.patientsAllergyReactionsDTOs != null) { + data['patientsAllergyReactionsDTOs'] = + this.patientsAllergyReactionsDTOs!.map((v) => v.toJson()).toList(); + } + data['patientsAllergyRevisionID'] = this.patientsAllergyRevisionID; + data['pomrID'] = this.pomrID; + data['remark'] = this.remark; + return data; + } +} + +class PatientsAllergyReactionsDTOs { + int? allergyReactionID; + int? allergyReactionMappingID; + String? allergyReactionName; + int? hospitalGroupID; + int? hospitalID; + bool? isActive; + int? patientID; + int? patientsAllergyReactionRevisionID; + int? pomrId; + int? severity; + + PatientsAllergyReactionsDTOs( + {this.allergyReactionID, + this.allergyReactionMappingID, + this.allergyReactionName, + this.hospitalGroupID, + this.hospitalID, + this.isActive, + this.patientID, + this.patientsAllergyReactionRevisionID, + this.pomrId, + this.severity}); + + PatientsAllergyReactionsDTOs.fromJson(Map json) { + allergyReactionID = json['allergyReactionID']; + allergyReactionMappingID = json['allergyReactionMappingID']; + allergyReactionName = json['allergyReactionName']; + hospitalGroupID = json['hospitalGroupID']; + hospitalID = json['hospitalID']; + isActive = json['isActive']; + patientID = json['patientID']; + patientsAllergyReactionRevisionID = + json['patientsAllergyReactionRevisionID']; + pomrId = json['pomrId']; + severity = json['severity']; + } + + Map toJson() { + final Map data = new Map(); + data['allergyReactionID'] = this.allergyReactionID; + data['allergyReactionMappingID'] = this.allergyReactionMappingID; + data['allergyReactionName'] = this.allergyReactionName; + data['hospitalGroupID'] = this.hospitalGroupID; + data['hospitalID'] = this.hospitalID; + data['isActive'] = this.isActive; + data['patientID'] = this.patientID; + data['patientsAllergyReactionRevisionID'] = + this.patientsAllergyReactionRevisionID; + data['pomrId'] = this.pomrId; + data['severity'] = this.severity; + return data; + } +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 95f7e7e9..362a8273 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; @@ -34,6 +35,7 @@ class SOAPService extends LookupService { List patientProgressNoteList = []; List patientAssessmentList = []; List searchAllergiesList =[]; + List patientAllergiesVidaPlus =[]; int? episodeID; bool isPrescriptionOrder =false; Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { @@ -345,10 +347,10 @@ class SOAPService extends LookupService { await baseAppClient.post(PATIENT_ALLERGIES, onSuccess: (dynamic response, int statusCode) { print("Success"); - patientAllergiesList.clear(); + patientAllergiesVidaPlus.clear(); - response['List_Allergies']['entityList'].forEach((v) { - patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); + response['List_PatientAllergies']['resultData'].forEach((v) { + patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); }); }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 0c0f9ef4..16002dfe 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -36,6 +36,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/plan/pla import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; import '../../locator.dart'; +import '../model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import '../model/SOAP/assessment/patch_assessment_req_model.dart'; import 'base_view_model.dart'; @@ -82,7 +83,7 @@ class SOAPViewModel extends BaseViewModel { List get searchAllergiesVidaPlus => _SOAPService.searchAllergiesList; - + List get patientAllergiesVidaPlus => _SOAPService.patientAllergiesVidaPlus; int? get episodeID => _SOAPService.episodeID; diff --git a/lib/screens/patients/patient_search/patient_search_header.dart b/lib/screens/patients/patient_search/patient_search_header.dart index d10a163b..b4276dab 100644 --- a/lib/screens/patients/patient_search/patient_search_header.dart +++ b/lib/screens/patients/patient_search/patient_search_header.dart @@ -9,6 +9,7 @@ class PatientSearchHeader extends StatelessWidget implements PreferredSizeWidget @override Widget build(BuildContext context) { return Container( + height: 120, padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5), decoration: BoxDecoration( color: Colors.white, diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart index fb4201c5..93f3e824 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart @@ -6,8 +6,9 @@ class BottomSheetTitle extends StatelessWidget implements PreferredSizeWidget { BottomSheetTitle({ Key? key, this.title = '', + this.isClose =true }) : super(key: key); - + bool isClose; final String title; double headerHeight = SizeConfig.heightMultiplier! * 15; @@ -41,7 +42,7 @@ class BottomSheetTitle extends StatelessWidget implements PreferredSizeWidget { onTap: () { Navigator.pop(context); }, - child: Icon(DoctorApp.close_1, size: SizeConfig.getTextMultiplierBasedOnWidth() * 5, color: Color(0xFF2B353E))) + child: isClose ? Icon(DoctorApp.close_1, size: SizeConfig.getTextMultiplierBasedOnWidth() * 5, color: Color(0xFF2B353E)) :SizedBox()) ], ), ], diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart index 0fe34d67..e5ed2a53 100644 --- a/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart @@ -10,15 +10,14 @@ import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dar import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../../../core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import '../../shared_soap_widgets/SOAP_open_items.dart'; import 'add_allergies.dart'; // ignore: must_be_immutable class UpdateAllergiesWidget extends StatefulWidget { - // AllergiesListVidaPlus? selectedAllergy; + List? myAllergiesList; - UpdateAllergiesWidget({Key? key}); + UpdateAllergiesWidget({Key? key, this.myAllergiesList}); @override _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); @@ -30,7 +29,7 @@ class _UpdateAllergiesWidgetState extends State { ProjectViewModel projectViewModel = Provider.of(context); changeAllState() { setState(() { - // print(widget.myAllergiesList); + print(widget.myAllergiesList); }); } @@ -45,97 +44,94 @@ class _UpdateAllergiesWidgetState extends State { SizedBox( height: 20, ), - // Container( - // margin: EdgeInsets.only(left: 15, right: 15, top: 15), - // child: Column( - // children: widget.myAllergiesList!.map((selectedAllergy) { - // return Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // mainAxisAlignment: MainAxisAlignment.start, - // children: [ - // Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Container( - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), - // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - // bold: true, - // color: Color(0xFF2B353E), - // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, - // fontWeight: FontWeight.w700, - // letterSpacing: -0.48, - // // fontHeight:0.18 , - // ), - // AppText( - // projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), - // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - // color: Color(0xFFCC9B14), - // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, - // fontWeight: FontWeight.w700, - // letterSpacing: -0.48, - // ), - // ], - // ), - // width: MediaQuery.of(context).size.width * 0.5, - // ), - // if (selectedAllergy.isChecked) - // RemoveButton( - // onTap: () => removeAllergy(selectedAllergy), - // ) - // ], - // ), - // Padding( - // padding: const EdgeInsets.symmetric(vertical: 8), - // child: Row( - // children: [ - // RemarkText( - // remark: selectedAllergy.remark ?? "", - // ), - // ], - // ), - // ), - // DividerWithSpacesAround() - // ], - // ), - // SizedBox( - // height: 10, - // ), - // ], - // ); - // }).toList()), - ], + Container( + margin: EdgeInsets.only(left: 15, right: 15, top: 15), + child: Column( + children: widget.myAllergiesList!.map((selectedAllergy) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), + textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + bold: true, + color: Color(0xFF2B353E), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + // fontHeight:0.18 , + ), + AppText( + projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), + textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, + color: Color(0xFFCC9B14), + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, + fontWeight: FontWeight.w700, + letterSpacing: -0.48, + ), + ], + ), + width: MediaQuery.of(context).size.width * 0.5, + ), + if (selectedAllergy.isChecked) + RemoveButton( + onTap: () => removeAllergy(selectedAllergy), + ) + ], + ), + Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Row( + children: [ + RemarkText( + remark: selectedAllergy.remark ?? "", + ), + ], + ), + ), + DividerWithSpacesAround() + ], + ), + SizedBox( + height: 10, + ), + ], + ); + }).toList()), + ) + ], ); } removeAllergy(MySelectedAllergy mySelectedAllergy) { - // List allergy = - // // ignore: missing_return - // widget.myAllergiesList! - // .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) - // .toList(); - // - // if (allergy.length > 0) { - // if (allergy.first.isLocal) { - // setState(() { - // widget.myAllergiesList!.remove(allergy.first); - // }); - // } - // setState(() { - // allergy[0].isChecked = false; - // }); - // } - } - - openReaction(){ + List allergy = + // ignore: missing_return + widget.myAllergiesList! + .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) + .toList(); + if (allergy.length > 0) { + if (allergy.first.isLocal) { + setState(() { + widget.myAllergiesList!.remove(allergy.first); + }); + } + setState(() { + allergy[0].isChecked = false; + }); + } } openAllergiesList(BuildContext context, Function changeParentState, removeAllergy) { @@ -146,53 +142,51 @@ class _UpdateAllergiesWidgetState extends State { context: context, builder: (context) { return AddAllergies( - addAllergiesFun: (AllergiesListVidaPlus selectedAllergy) { + myAllergiesList: widget.myAllergiesList, + addAllergiesFun: (List mySelectedAllergy) { + bool isAllDataFilled = true; + mySelectedAllergy.forEach((element) { + if (element.selectedAllergySeverity == null) { + element.hasValidationError = true; + isAllDataFilled = false; + } + }); + if (isAllDataFilled) { + mySelectedAllergy.forEach((element) { + if ( + widget.myAllergiesList!.singleWhere( + (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + orElse: () => MySelectedAllergy(), + ).selectedAllergySeverity + == + null) { + widget.myAllergiesList!.add(element); + } + }); - openReaction(); + /// remove items. + List removedList = []; + widget.myAllergiesList!.forEach((element) { + if ( + mySelectedAllergy.singleWhere( + (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, + orElse: () => MySelectedAllergy(), + ) + .selectedAllergySeverity == + null) { + removedList.add(element); + } + }); - // bool isAllDataFilled = true; - // mySelectedAllergy.forEach((element) { - // if (element.selectedAllergySeverity == null) { - // element.hasValidationError = true; - // isAllDataFilled = false; - // } - // }); - // if (isAllDataFilled) { - // mySelectedAllergy.forEach((element) { - // if ( - // widget.myAllergiesList!.singleWhere( - // (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - // orElse: () => MySelectedAllergy(), - // ).selectedAllergySeverity - // == - // null) { - // widget.myAllergiesList!.add(element); - // } - // }); - // - // /// remove items. - // List removedList = []; - // widget.myAllergiesList!.forEach((element) { - // if ( - // mySelectedAllergy.singleWhere( - // (it) => it.selectedAllergy!.id == element.selectedAllergy!.id, - // orElse: () => MySelectedAllergy(), - // ) - // .selectedAllergySeverity == - // null) { - // removedList.add(element); - // } - // }); - // - // removedList.forEach((element) { - // removeAllergy(element); - // }); - // changeParentState(); + removedList.forEach((element) { + removeAllergy(element); + }); + changeParentState(); - // Navigator.of(context).pop(); - // } else { - // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - // } + Navigator.of(context).pop(); + } else { + Utils.showErrorToast(TranslationBase.of(context).requiredMsg); + } }); }); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index a0eda071..67f50b15 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -8,8 +8,10 @@ import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import '../../../../patient_search/patient_search_header.dart'; import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'master_key_checkbox_search_allergies_widget.dart'; @@ -17,7 +19,8 @@ class AddAllergies extends StatefulWidget { final Function? addAllergiesFun; final AllergiesListVidaPlus? myAllergiesList; - const AddAllergies({Key? key, this.addAllergiesFun, this.myAllergiesList}) : super(key: key); + const AddAllergies({Key? key, this.addAllergiesFun, this.myAllergiesList}) + : super(key: key); @override _AddAllergiesState createState() => _AddAllergiesState(); @@ -26,8 +29,8 @@ class AddAllergies extends StatefulWidget { class _AddAllergiesState extends State { // List allergiesList = []; // List allergySeverityList = []; - // - // myAllergiesListLocal = []; + // + // myAllergiesListLocal = []; @override initState() { @@ -40,106 +43,71 @@ class _AddAllergiesState extends State { @override Widget build(BuildContext context) { - return AppScaffold( - // baseViewModel: model, - isShowAppBar: true, - appBar: BottomSheetTitle( - title: TranslationBase.of(context).addAllergies, - ), - body: Center( - child: Container( - child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: 10, - ), - SizedBox( - height: 16, - ), - Expanded( - child: Center( - child: FractionallySizedBox( - widthFactor: 0.9, - child: Center( - child: BaseView( - onModelReady: (model) async {}, - builder: (_, model, w) { - return MasterKeyCheckboxSearchAllergiesWidget( - model: model, + return BaseView( + builder: (_, model, w) => AppScaffold( + + isShowAppBar: true, - addAllergy: (AllergiesListVidaPlus mySelectedAllergy) { - widget.addAllergiesFun!(mySelectedAllergy); - }, + appBar: PatientSearchHeader( - ); - }), - ), - ), + title: TranslationBase.of(context).addAllergies), + body: MasterKeyCheckboxSearchAllergiesWidget( + model: model, + // addAllergy: (AllergiesListVidaPlus mySelectedAllergy) { + // widget.addAllergiesFun!(mySelectedAllergy); + // }, ), - ), - SizedBox( - height: MediaQuery.of(context).size.height * 0.11, - ), - ]), - ), - ), - bottomSheet: - // model.state != ViewState.Idle - // ? - // Container( - // height: 0, - // ) - // : - CustomBottomSheetContainer( - buttonColor: Color(0xffEAEAEA), - fontColor: Colors.black, - label: TranslationBase.of(context).cancel, - onTap: () { - Navigator.of(context).pop(); - }, - ), - ); + bottomSheet: CustomBottomSheetContainer( + buttonColor: Color(0xffEAEAEA), + fontColor: Colors.black, + label: TranslationBase.of(context).cancel, + onTap: () { + Navigator.of(context).pop(); + }, + ), + )); } - // - // isServiceSelected(MasterKeyModel masterKey) { - // Iterable allergy = - // myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); - // if (allergy.length > 0) { - // return true; - // } - // return false; - // } - // - // removeAllergyFromLocalList(MasterKeyModel masterKey) { - // myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); - // } - // - // MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { - // Iterable allergy = - // myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); - // if (allergy.length > 0) { - // return allergy.first; - // } - // return MySelectedAllergy(); - // } - // - // addAllergyLocally(AllergiesListVidaPlus mySelectedAllergy) { - // if (mySelectedAllergy.selectedAllergy == null) { - // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - // } else { - // setState(() { - // List allergy = - // // ignore: missing_return - // myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); - // - // if (allergy.isEmpty) { - // myAllergiesListLocal.add(mySelectedAllergy); - // } else { - // allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; - // allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; - // allergy.first.remark = mySelectedAllergy.remark; - // allergy.first.isChecked = mySelectedAllergy.isChecked; - // } - // }); - // } - // } +// +// isServiceSelected(MasterKeyModel masterKey) { +// Iterable allergy = +// myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); +// if (allergy.length > 0) { +// return true; +// } +// return false; +// } +// +// removeAllergyFromLocalList(MasterKeyModel masterKey) { +// myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); +// } +// +// MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { +// Iterable allergy = +// myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); +// if (allergy.length > 0) { +// return allergy.first; +// } +// return MySelectedAllergy(); +// } +// +// addAllergyLocally(AllergiesListVidaPlus mySelectedAllergy) { +// if (mySelectedAllergy.selectedAllergy == null) { +// Utils.showErrorToast(TranslationBase.of(context).requiredMsg); +// } else { +// setState(() { +// List allergy = +// // ignore: missing_return +// myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); +// +// if (allergy.isEmpty) { +// myAllergiesListLocal.add(mySelectedAllergy); +// } else { +// allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; +// allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; +// allergy.first.remark = mySelectedAllergy.remark; +// allergy.first.isChecked = mySelectedAllergy.isChecked; +// } +// }); +// } +// } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index de7aa4a4..da1177aa 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -1,43 +1,32 @@ -import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; +import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'allergies_item.dart'; +import '../../../../../../widgets/transitions/fade_page.dart'; + class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { final SOAPViewModel model; - // final Function() addSelectedAllergy; - // final Function(MasterKeyModel) removeAllergy; - final Function(AllergiesListVidaPlus mySelectedAllergy) addAllergy; - // final bool Function(MasterKeyModel) isServiceSelected; - // final MySelectedAllergy Function(MasterKeyModel) getServiceSelectedAllergy; - - // final List masterList; final String? buttonName; final String? hintSearchText; MasterKeyCheckboxSearchAllergiesWidget( {Key? key, required this.model, - // required this.addSelectedAllergy, - // required this.removeAllergy, - // required this.masterList, - required this.addAllergy, - // required this.isServiceSelected, + + // required this.addAllergy, + this.buttonName, this.hintSearchText, - // required this.getServiceSelectedAllergy + }) : super(key: key); @@ -58,15 +47,17 @@ bool loading =false; @override Widget build(BuildContext context) { - return Container( - child: Column( + return Column( children: [ + Expanded( child: Container( + + margin: EdgeInsets.all(20), height: Utils.getTextFieldHeight(), child: Center( child: Container( - decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white), + decoration: BoxDecoration(borderRadius: BorderRadius.circular(12)), child: Column( children: [ AppTextFieldCustom( @@ -80,17 +71,8 @@ bool loading =false; }, onFieldSubmitted: () { - // widget.model.getMasterLookup( - // MasterKeysService.Allergies, - // searchKey: filteredSearchController.text); - // widget.model.getMasterLookup( - // MasterKeysService.AllergySeverity, - // searchKey: ""); }, - // onFieldSubmitted: (value) { - // widget.model.getMasterLookup(MasterKeysService.Allergies!, searchKey: filteredSearchController.text!); - // widget.model.getMasterLookup(MasterKeysService.AllergySeverity, searchKey: ""); - // }, + suffixIcon: IconButton( icon: Icon( Icons.search, @@ -110,9 +92,8 @@ bool loading =false; height: 10, ), Expanded( - child: FractionallySizedBox( - widthFactor: 0.9, - child: Container( + child: RoundedContainer( + width:MediaQuery.of(context).size.width , height: MediaQuery.of(context).size.height * 0.60, child: widget.model.state == ViewState.Idle ? ListView.builder( @@ -120,27 +101,17 @@ bool loading =false; itemBuilder: (context, index) { loading =false; return ListTile(title: AppText(widget.model.searchAllergiesVidaPlus[index].allergyName!), trailing: TextButton.icon(icon: SvgPicture.asset("assets/images/svgs/add-square.svg", color: Color(0xffD02127),), style: ButtonStyle(iconColor: WidgetStateProperty.all(Color(0xffD02127)), ), onPressed: (){ - widget.addAllergy(widget.model.searchAllergiesVidaPlus[index]); + openReaction(widget.model, widget.model.searchAllergiesVidaPlus[index]); }, label: AppText(TranslationBase.of(context).add, fontSize:12, color:Color(0xffD02127) ,), ), ); - - - // return AddAllergiesItem( - // item: widget.model.allergiesList[index], - // model: widget.model, - // removeAllergy: widget.removeAllergy, - // addAllergy: widget.addAllergy, - // isServiceSelected: widget.isServiceSelected, - // getServiceSelectedAllergy: widget.getServiceSelectedAllergy, - // ); }, ) : loading ? Center(child: CircularProgressIndicator()) :SizedBox() - ), + ), ), ], @@ -149,34 +120,24 @@ bool loading =false; ), ), ), - SizedBox( - height: 10, - ), + ], - ), + ); } - // - // void filterSearchResults(String query) { - // List dummySearchList = []; - // dummySearchList.addAll(widget.masterList); - // if (query.isNotEmpty) { - // List dummyListData = []; - // dummySearchList.forEach((items) { - // if (items.nameAr!.toLowerCase().contains(query.toLowerCase()) || items.nameEn!.toLowerCase().contains(query.toLowerCase())) { - // dummyListData.add(items); - // } - // }); - // setState(() { - // items.clear(); - // items.addAll(dummyListData); - // }); - // return; - // } else { - // setState(() { - // items.clear(); - // items.addAll(widget.masterList); - // }); - // } - // } +openReaction(model, AllergiesListVidaPlus mySelectedAllergy){ + Navigator.push( + context, + FadePage( + page:ReactionsSelectionAllergiesWidget( + model:model, + mySelectedAllergy: mySelectedAllergy, + addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { + Navigator.of(context).pop(); + + }) + )); + + } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 2b8c5887..11e0cbde 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -8,7 +8,11 @@ import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart' import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import '../../../../../../config/config.dart'; +import '../../../../../../widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import '../../../../../../widgets/shared/app_scaffold_widget.dart'; +import '../../../../../../widgets/shared/buttons/app_buttons_widget.dart'; +import '../../../../patient_search/patient_search_header.dart'; import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; class ReactionsSelectionAllergiesWidget extends StatefulWidget { @@ -46,124 +50,207 @@ class _ReactionsSelectionAllergiesWidgetState @override Widget build(BuildContext context) { return AppScaffold( - // baseViewModel: model, - isShowAppBar: true, - appBar: BottomSheetTitle( - title: "Select Reactions" // TranslationBase.of(context).reac, - ), - backgroundColor: Color(0xffbacF7F7F7), - body: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: RoundedContainer( - - margin: EdgeInsets.all(15), - child: ListView.builder( - - itemCount: - widget.mySelectedAllergy.allergyReactionDTOs!.length, - itemBuilder: (context, index) { - loading = false; - return Column(children: [ ExpansionTile( - dense: false, - enableFeedback: false, - showTrailingIcon: false, - leading: Checkbox(value: false, onChanged: (bool) {}), - title: AppText(widget.mySelectedAllergy - .allergyReactionDTOs![index].allergyReactionName!), - children: [ - Row( + // isShowAppBar: true, + appBar: PatientSearchHeader( + title: "Select Reaction" + ), + body: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: RoundedContainer( + margin: EdgeInsets.all(15), + child: ListView.builder( + itemCount: + widget.mySelectedAllergy.allergyReactionDTOs!.length, + itemBuilder: (context, index) { + loading = false; + return Column(children: [ + ExpansionTile( + key: Key(index.toString()), + dense: false, + enableFeedback: false, + showTrailingIcon: false, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: ListTile( - title: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Radio( + initiallyExpanded: widget + .mySelectedAllergy + .allergyReactionDTOs![index].isSelected!, + leading: + Checkbox( activeColor: Color(0xffD02127), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: "Mild", - groupValue: widget - .mySelectedAllergy - .allergyReactionDTOs![index].reactionSelection, - onChanged: (value) { - widget - .mySelectedAllergy - .allergyReactionDTOs![index].reactionSelection =value; - setState(() { - - }); - }, - ), - AppText('Mild', fontSize: 10,), - ], - ))), - Expanded( - child: ListTile( - title: Row( + value: widget + .mySelectedAllergy + .allergyReactionDTOs![index].isSelected!, onChanged: (value) { - children: [ - Radio( - activeColor: Color(0xffD02127), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: "moderate", - groupValue: widget - .mySelectedAllergy + widget + .mySelectedAllergy + .allergyReactionDTOs![index].isSelected = value; + setState(() { - .allergyReactionDTOs![index].reactionSelection, - onChanged: (value) { - widget - .mySelectedAllergy - .allergyReactionDTOs![index].reactionSelection =value; - setState(() { + }); - }); - }, - ), - AppText('Moderate', fontSize: 10,), - ], - ))), - Expanded( - child: ListTile( - title: Row( + }), + title: AppText(widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .allergyReactionName!), + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: ListTile( + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: "Mild", + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + onChanged: (value) { + widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection = value; + setState(() {}); + }, + ), + AppText( + 'Mild', + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: "moderate", + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + onChanged: (value) { + widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection = value; + setState(() {}); + }, + ), + AppText( + 'Moderate', + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: "severe", + groupValue: widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection, + onChanged: (value) { + widget + .mySelectedAllergy + .allergyReactionDTOs![index] + .reactionSelection = value; + setState(() {}); + }, + ), + AppText( + 'Severe', + fontSize: 10, + ), + ], + ))) + ], + ) + ], + ), + Divider(), + ]); + }, + ))) + ], + ), + bottomSheet: Container( + height: 90, + color: Colors.white, + margin: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + child: Container( + child: AppButton( + title: TranslationBase.of(context).cancel, + vPadding: 8, + hPadding: 8, + color: Color(0xffEAEAEA), + fontColor: Colors.black, + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ), + ), + SizedBox( + width: 8, + ), + Expanded( + child: Container( + child: AppButton( + title: TranslationBase.of(context).save, + vPadding: 8, + hPadding: 8, + color: AppGlobal.appGreenColor, + fontColor: Colors.white, + onPressed: () { + widget.addReactionFun(widget + .mySelectedAllergy + ); + }, + ), + ), + ), + ], + )) - children: [ - Radio( - activeColor: Color(0xffD02127), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: "severe", - groupValue: widget - .mySelectedAllergy - .allergyReactionDTOs![index].reactionSelection, - onChanged: (value) { - widget - .mySelectedAllergy - .allergyReactionDTOs![index].reactionSelection =value; - setState(() { + // CustomBottomSheetContainer( + // buttonColor: Color(0xff359846), + // fontColor: Colors.white, + // label: TranslationBase.of(context).next, + // onTap: () { + // widget.addReactionFun(widget + // .mySelectedAllergy + // ); + // }, + // ) - }); - }, - ), - AppText('Severe', fontSize: 10,), - ], - ))) - ], - ) - ], - ), - Divider(), - ]); - }, - ))) - ], - ), - ); + ); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 3939071a..08e8dc72 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -1,32 +1,37 @@ -import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; + +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; +import '../../../../../../widgets/transitions/fade_page.dart'; import '../chief_complaint/widgets/add_chief_complaint.dart'; import 'add_allergies.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; -// ignore: must_be_immutable + class UpdateAllergiesWidgetVidaPlus extends StatefulWidget { - List? myAllergiesList; + List? myAllergiesList; UpdateAllergiesWidgetVidaPlus({Key? key, this.myAllergiesList}); @override _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); } -bool noKnownAllergies = false; + +bool noKnownAllergies = false; +enum Severity {mild,moderate,severe } + class _UpdateAllergiesWidgetState extends State { SOAPViewModel? model; + @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); changeAllState() { setState(() { - print(widget.myAllergiesList); + print(widget.myAllergiesList); }); } @@ -37,160 +42,135 @@ class _UpdateAllergiesWidgetState extends State { ), AddSoapItem( title: "${TranslationBase.of(context).addAllergies}", - onAddSoapItemClicked: (){ - openAllergiesList(context, changeAllState); + onAddSoapItemClicked: () { + Navigator.push( + context, + FadePage( + page: AddAllergies(), + ), + ); }, - ), SizedBox( height: 20, ), + widget.myAllergiesList!.isEmpty + ? Row( + mainAxisSize: MainAxisSize.max, + children: [ + Checkbox( + value: noKnownAllergies, + checkColor: Colors.white, + activeColor: Colors.red, + onChanged: (value) { + noKnownAllergies = value!; + setState(() {}); + }, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: + VisualDensity.compact, // Minimizes size further + ), + AppText(TranslationBase.of(context).noKnownAllergies) + ], + ) + : Divider( + thickness: 1, + color: Color(0xffEFEFEF), + ), + ListView( + padding: EdgeInsets.all(10), + shrinkWrap: true, + children: widget.myAllergiesList!.map((selectedAllergy) { + return Column( - Row( - mainAxisSize: MainAxisSize.max, - children: [ - Checkbox( - value: noKnownAllergies, - checkColor: Colors.white, - activeColor: Colors.red, - onChanged: (value) { - noKnownAllergies = value!; - setState(() {}); - }, - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, // Minimizes size further - ), - AppText(TranslationBase.of(context).noKnownAllergies) - ], - ), + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + selectedAllergy.allergyName!, + fontSize: 12, + fontWeight: FontWeight.w800, + letterSpacing: -0.48, + ), + selectedAllergy.patientsAllergyReactionsDTOs!.isNotEmpty ? ListView( + shrinkWrap: true, + children: selectedAllergy.patientsAllergyReactionsDTOs!.map((PatientsAllergyReactionsDTOs reaction) => Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ - // Container( - // margin: EdgeInsets.only(left: 15, right: 15, top: 15), - // child: Column( - // children: widget.myAllergiesList!.map((selectedAllergy) { - // return Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // mainAxisAlignment: MainAxisAlignment.start, - // children: [ - // Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Container( - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // AppText( - // projectViewModel.isArabic ? selectedAllergy.selectedAllergy!.nameAr! : selectedAllergy.selectedAllergy!.nameEn!.toUpperCase(), - // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - // bold: true, - // color: Color(0xFF2B353E), - // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, - // fontWeight: FontWeight.w700, - // letterSpacing: -0.48, - // // fontHeight:0.18 , - // ), - // AppText( - // projectViewModel.isArabic ? selectedAllergy.selectedAllergySeverity!.nameAr! : selectedAllergy.selectedAllergySeverity!.nameEn ?? ""!.toUpperCase(), - // textDecoration: selectedAllergy.isChecked! ? TextDecoration.none : TextDecoration.lineThrough, - // color: Color(0xFFCC9B14), - // fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3, - // fontWeight: FontWeight.w700, - // letterSpacing: -0.48, - // ), - // ], - // ), - // width: MediaQuery.of(context).size.width * 0.5, - // ), - // if (selectedAllergy.isChecked) - // RemoveButton( - // onTap: () => removeAllergy(selectedAllergy), - // ) - // ], - // ), - // Padding( - // padding: const EdgeInsets.symmetric(vertical: 8), - // child: Row( - // children: [ - // RemarkText( - // remark: selectedAllergy.remark ?? "", - // ), - // ], - // ), - // ), - // DividerWithSpacesAround() - // ], - // ), - // SizedBox( - // height: 10, - // ), - // ], - // ); - // }).toList()), - // ) - ], - ); - } - // - // removeAllergy(MySelectedAllergy mySelectedAllergy) { - // List allergy = - // // ignore: missing_return - // widget.myAllergiesList! - // .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) - // .toList(); - // - // if (allergy.length > 0) { - // if (allergy.first.isLocal) { - // setState(() { - // widget.myAllergiesList!.remove(allergy.first); - // }); - // } - // setState(() { - // allergy[0].isChecked = false; - // }); - // } - // } - openAllergiesList(BuildContext context, Function changeParentState) { - showModalBottomSheet( - backgroundColor: Colors.white, - isScrollControlled: true, - isDismissible: false, - context: context, - builder: (context) { - return AddAllergies( - addAllergiesFun: (AllergiesListVidaPlus mySelectedAllergy) { - Navigator.of(context).pop(); - openReactionScreen(mySelectedAllergy); - print(mySelectedAllergy); + AppText(reaction.allergyReactionName!), + AppText( + Severity.values[reaction.severity! -1].name, + color: Color(0xFFCC9B14), + fontSize: 10, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ) + ],)).toList()) : AppText("----", color: Color(0xFFCC9B14)), - // } else { - // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - // } - }); - }); + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 10, + ), + TextButton.icon( + onPressed: () {}, + icon: SvgPicture.asset( + "assets/images/svgs/edit-icon.svg", + height: 16, + ), + label: AppText( + "Edit", + fontSize: 12, + ), + ), + TextButton.icon( + onPressed: () {}, + icon: SvgPicture.asset( + "assets/images/svgs/resolve.svg", + height: 18, + ), + label: AppText("Resolve", + fontSize: 12, color: Color(0xff359846))) + ], + ) + ], + ); + }).toList()), + ], + ); } -openReactionScreen(AllergiesListVidaPlus mySelectedAllergy){ - showModalBottomSheet( - backgroundColor: Colors.white, - isScrollControlled: true, - isDismissible: false, - context: context, - builder: (context) { - return ReactionsSelectionAllergiesWidget( - model:model, - mySelectedAllergy: mySelectedAllergy, - addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { +// +// removeAllergy(MySelectedAllergy mySelectedAllergy) { +// List allergy = +// // ignore: missing_return +// widget.myAllergiesList! +// .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) +// .toList(); +// +// if (allergy.length > 0) { +// if (allergy.first.isLocal) { +// setState(() { +// widget.myAllergiesList!.remove(allergy.first); +// }); +// } +// setState(() { +// allergy[0].isChecked = false; +// }); +// } +// } - Navigator.of(context).pop(); - // } else { - // Utils.showErrorToast(TranslationBase.of(context).requiredMsg); - // } - }); - }); -} +// openAllergiesList(BuildContext context, Function changeParentState) { +// showModalBottomSheet( +// backgroundColor: Colors.white, +// isScrollControlled: true, +// isDismissible: false, +// context: context, +// builder: (context) { +// return AddAllergies(); +// }); +// } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index 1f208e5c..396c08ea 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -17,24 +17,28 @@ import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; +import '../../../../../core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'allergies/update_allergies_widget.dart'; import 'chief_complaint/chief_complaints.dart'; - class UpdateSubjectivePageVidaPlus extends StatefulWidget { final Function changePageViewIndex; final Function changeLoadingState; final PatiantInformtion patientInfo; final int currentIndex; - UpdateSubjectivePageVidaPlus({Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); + UpdateSubjectivePageVidaPlus( + {Key? key, required this.changePageViewIndex, required this.patientInfo, required this.changeLoadingState, required this.currentIndex}); @override - _UpdateSubjectivePageVidaPlusState createState() => _UpdateSubjectivePageVidaPlusState(); + _UpdateSubjectivePageVidaPlusState createState() => + _UpdateSubjectivePageVidaPlusState(); } -class _UpdateSubjectivePageVidaPlusState extends State implements SubjectiveCallBack { +class _UpdateSubjectivePageVidaPlusState + extends State + implements SubjectiveCallBack { bool isChiefExpand = false; bool isHistoryExpand = false; bool isAllergiesExpand = false; @@ -43,50 +47,70 @@ class _UpdateSubjectivePageVidaPlusState extends State(); - List myAllergiesList = []; + List myAllergiesList = []; List myHistoryList = []; getHistory(SOAPViewModel model) async { widget.changeLoadingState(true); if (model.patientHistoryList.isNotEmpty) { model.patientHistoryList.forEach((element) { - if (element.historyType == MasterKeysService.HistoryFamily.getMasterKeyService()) { + if (element.historyType == + MasterKeysService.HistoryFamily.getMasterKeyService()) { MasterKeyModel? history = model.getOneMasterKey( masterKeys: MasterKeysService.HistoryFamily, id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + MySelectedHistory mySelectedHistory = SoapUtils + .generateMySelectedHistory(history: history, + isChecked: element.isChecked, + remark: element.remarks, + isLocal: false); myHistoryList.add(mySelectedHistory); } } - if (element.historyType == MasterKeysService.HistoryMedical.getMasterKeyService()) { + if (element.historyType == + MasterKeysService.HistoryMedical.getMasterKeyService()) { MasterKeyModel? history = model.getOneMasterKey( masterKeys: MasterKeysService.HistoryMedical, id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + MySelectedHistory mySelectedHistory = SoapUtils + .generateMySelectedHistory(history: history, + isChecked: element.isChecked, + remark: element.remarks, + isLocal: false); myHistoryList.add(mySelectedHistory); } } - if (element.historyType == MasterKeysService.HistorySports.getMasterKeyService()) { + if (element.historyType == + MasterKeysService.HistorySports.getMasterKeyService()) { MasterKeyModel? history = model.getOneMasterKey( masterKeys: MasterKeysService.HistorySports, id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + MySelectedHistory mySelectedHistory = SoapUtils + .generateMySelectedHistory(history: history, + isChecked: element.isChecked, + remark: element.remarks, + isLocal: false); myHistoryList.add(mySelectedHistory); } } - if (element.historyType == MasterKeysService.HistorySurgical.getMasterKeyService()) { + if (element.historyType == + MasterKeysService.HistorySurgical.getMasterKeyService()) { MasterKeyModel? history = model.getOneMasterKey( masterKeys: MasterKeysService.HistorySurgical, id: element.historyId, ); if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils.generateMySelectedHistory(history: history, isChecked: element.isChecked, remark: element.remarks, isLocal: false); + MySelectedHistory mySelectedHistory = SoapUtils + .generateMySelectedHistory(history: history, + isChecked: element.isChecked, + remark: element.remarks, + isLocal: false); myHistoryList.add(mySelectedHistory); } } @@ -95,25 +119,27 @@ class _UpdateSubjectivePageVidaPlusState extends State AppScaffold( - isShowAppBar: false, - backgroundColor: Theme.of(context).scaffoldBackgroundColor, - body: SingleChildScrollView( - physics: ScrollPhysics(), - child: Center( - child: FractionallySizedBox( - widthFactor: 0.9, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SOAPStepHeader( - currentIndex: widget.currentIndex, - changePageViewIndex: widget.changePageViewIndex, - patientInfo: widget.patientInfo, - ), - ExpandableSOAPWidget( - headerTitle: TranslationBase.of(context).chiefComplaints, - onTap: () { - setState(() { - isChiefExpand = !isChiefExpand; - }); - }, - child: UpdateChiefComplaints( - complaints: [], - ), - isExpanded: isChiefExpand, - ), - SizedBox( - height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 4 : 2), - ), - if (widget.patientInfo.admissionNo == null) - ExpandableSOAPWidget( - headerTitle: TranslationBase.of(context).historyOfIllness, - isRequired: false, - onTap: () { - setState(() { - isHistoryExpand = !isHistoryExpand; - }); - }, - child: Column( - children: [UpdatePresentIllness()], + builder: (_, model, w) => + AppScaffold( + isShowAppBar: false, + backgroundColor: Theme + .of(context) + .scaffoldBackgroundColor, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SOAPStepHeader( + currentIndex: widget.currentIndex, + changePageViewIndex: widget.changePageViewIndex, + patientInfo: widget.patientInfo, ), - isExpanded: isHistoryExpand, - ), - SizedBox( - height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 4 : 2), - ), - if (widget.patientInfo.admissionNo == null) - ExpandableSOAPWidget( - headerTitle: TranslationBase.of(context).allergiesSoap, - isRequired: false, - onTap: () { - setState(() { - isAllergiesExpand = !isAllergiesExpand; - }); - }, - child: Column( - children: [ - UpdateAllergiesWidgetVidaPlus( - myAllergiesList: myAllergiesList, + ExpandableSOAPWidget( + headerTitle: TranslationBase + .of(context) + .chiefComplaints, + onTap: () { + setState(() { + isChiefExpand = !isChiefExpand; + }); + }, + child: UpdateChiefComplaints( + complaints: [], + ), + isExpanded: isChiefExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + if (widget.patientInfo.admissionNo == null) + ExpandableSOAPWidget( + headerTitle: TranslationBase + .of(context) + .historyOfIllness, + isRequired: false, + onTap: () { + setState(() { + isHistoryExpand = !isHistoryExpand; + }); + }, + child: Column( + children: [UpdatePresentIllness()], ), - SizedBox( - height: 30, + isExpanded: isHistoryExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + if (widget.patientInfo.admissionNo == null) + ExpandableSOAPWidget( + headerTitle: TranslationBase + .of(context) + .allergiesSoap, + isRequired: false, + onTap: () { + setState(() { + isAllergiesExpand = !isAllergiesExpand; + }); + }, + child: Column( + children: [ + UpdateAllergiesWidgetVidaPlus( + myAllergiesList: myAllergiesList, + ), + SizedBox( + height: 30, + ), + ], ), - ], + isExpanded: isAllergiesExpand, + ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 20 : 10), ), - isExpanded: isAllergiesExpand, - ), - SizedBox( - height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 20 : 10), + ], ), - ], + ), ), ), ), - ), - ), ); } - addSubjectiveInfo({required SOAPViewModel model, required List myAllergiesList, required List myHistoryList}) async { - if (FocusScope.of(context).hasFocus) FocusScope.of(context).unfocus(); + addSubjectiveInfo({required SOAPViewModel model, required List< + MySelectedAllergy> myAllergiesList, required List< + MySelectedHistory> myHistoryList}) async { + if (FocusScope + .of(context) + .hasFocus) FocusScope.of(context).unfocus(); widget.changeLoadingState(true); formKey.currentState!.save(); formKey.currentState!.validate(); @@ -234,7 +279,8 @@ class _UpdateSubjectivePageVidaPlusState extends State i.isChecked).toList(), myHistoryList: myHistoryList); + // addSubjectiveInfo(model: model, + // // myAllergiesList: myAllergiesList.where((i) => i.isChecked).toList(), + // myHistoryList: myHistoryList); return () {}; } } From c8654d84f3d073f2f600ddb59cdcb4167f32563a Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 7 Nov 2024 12:14:45 +0300 Subject: [PATCH 28/76] WD: diagnosis added --- assets/images/svgs/favorite.svg | 3 + assets/images/svgs/information.svg | 5 + lib/config/localized_values.dart | 11 + .../assessment/add_diagnosis.dart | 77 +++++ .../assessment/update_assessment_page.dart | 254 +++++++++++++++ .../assessment/widget/current_diagnosis.dart | 61 ++++ .../assessment/widget/empty_diagnosis.dart | 25 ++ .../assessment/widget/enter_diagnosis.dart | 293 ++++++++++++++++++ .../assessment/widget/previous_diagnosis.dart | 43 +++ .../widget/previous_diagnosis_item.dart | 120 +++++++ .../plan/update_plan_page_vida_plus.dart | 3 +- .../allergies/update_allergies_widget.dart | 1 + .../update_soap_index_vida_plus.dart | 10 +- .../widgets/SoapDetailItem.dart | 2 +- .../translations_delegate_base_utils.dart | 11 + 15 files changed, 916 insertions(+), 3 deletions(-) create mode 100644 assets/images/svgs/favorite.svg create mode 100644 assets/images/svgs/information.svg create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart diff --git a/assets/images/svgs/favorite.svg b/assets/images/svgs/favorite.svg new file mode 100644 index 00000000..c9ff828d --- /dev/null +++ b/assets/images/svgs/favorite.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/svgs/information.svg b/assets/images/svgs/information.svg new file mode 100644 index 00000000..5ec862f2 --- /dev/null +++ b/assets/images/svgs/information.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 17fac19a..500b4baa 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1177,6 +1177,16 @@ const Map> localizedValues = { "resolve": {"en": "Resolve", "ar":"حسم"}, "audit": {"en": "Audit", "ar":"مراجعه الحسابات"}, "delete": {"en": "Delete", "ar":"حذف"}, + "acute": {"en": "Acute", "ar":"شديد"}, + "chronic": {"en": "Acute", "ar":"مزمن"}, + "subAcute": {"en": "sub-acute", "ar":"شبه الحاد"}, + "addDiagnosis": {"en": "Add Diagnosis", "ar":"إضافة تشخيص"}, + "showAllDiagnosis": {"en": "Show all diagnosis", "ar":"عرض جميع التشخيصات"}, + "makeCurrentDiagnosis": {"en": "Make Current Diagnosis", "ar":"جعل التشخيص الحالي"}, + "mappedDiagnosis": {"en": "Mapped Diagnosis", "ar":"التشخيص المعين"}, + "previousDiagnosis": {"en": "Previous Diagnosis", "ar":"التشخيص السابق"}, + "addNewDiagnosis": {"en": "Add New Diagnosis", "ar":"إضافة تشخيص جديد"}, + "currentDiagnosis": {"en": "Current Diagnosis", "ar":"التشخيص الحالي"}, "progressNoteType": {"en": "Progress Note Type", "ar":"نوع ملاحظة التقدم"}, "doctorProgressNote": {"en": "Doctor Progress Note", "ar":"مذكرة تقدم الطبيب"}, "addYourNote": {"en": "Add Your Note", "ar":"أضف ملاحظتك"}, @@ -1192,5 +1202,6 @@ const Map> localizedValues = { "addPhysicalExamination": {"en": "Add Physical Examination", "ar":"إضافة الفحص البدني"}, "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, + "noDiagnosisFound": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart new file mode 100644 index 00000000..e9e5d933 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart @@ -0,0 +1,77 @@ +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; + +class AddDiagnosis extends StatefulWidget { + @override + State createState() => _AddDiagnosisState(); +} + +class _AddDiagnosisState extends State + with SingleTickerProviderStateMixin { + TabController? _tabController; + + @override + void initState() { + _tabController = new TabController(length: 2, vsync: this); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return BaseView( + builder: (_, model, w) => AppScaffold( + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).addDiagnosis), + backgroundColor: Colors.white, + body: Column( + children: [ + SizedBox( + height: 56, + child: TabBar( + indicatorColor: Color(0xFFD02127), + unselectedLabelColor: Color(0xFF6D6D6D), + labelColor: Color(0xFF2B353E), + controller: _tabController, + tabs: [ + Tab( + child: AppText( + TranslationBase.of(context).mappedDiagnosis, + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56, + ), + ), + Tab( + child: AppText( + TranslationBase.of(context).mappedDiagnosis, + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56, + ), + ), + ], + ), + ), + Expanded( + child: TabBarView( + controller: _tabController, + children: [ + EnterDiagnosis(), + EnterDiagnosis(), + ], + ), + ), + ], + ), + )); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart new file mode 100644 index 00000000..a320ce92 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -0,0 +1,254 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_assement.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/assessment/assessment_call_back.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/remark_text.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; +import 'package:doctor_app_flutter/utils/date-utils.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../soap_update/assessment/add_assessment_details.dart'; + +import 'widget/current_diagnosis.dart'; +import 'widget/previous_diagnosis.dart'; + +// ignore: must_be_immutable +class UpdateAssessmentPage extends StatefulWidget { + final Function changePageViewIndex; + final PatiantInformtion patientInfo; + final Function changeLoadingState; + final int currentIndex; + + UpdateAssessmentPage( + {Key? key, + required this.changePageViewIndex, + required this.patientInfo, + required this.changeLoadingState, + required this.currentIndex}); + + @override + _UpdateAssessmentPageState createState() => _UpdateAssessmentPageState(); +} + +class _UpdateAssessmentPageState extends State + with SingleTickerProviderStateMixin + implements AssessmentCallBack { + bool isAssessmentExpand = false; + List mySelectedAssessmentList = []; + bool isPrescriptionOrder = false; + TabController? _tabController; + + @override + void initState() { + _tabController = new TabController(length: 2, vsync: this); + super.initState(); + } + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + + return BaseView( + onModelReady: (model) async { + model.setAssessmentCallBack(this); + mySelectedAssessmentList.clear(); + WidgetsBinding.instance.addPostFrameCallback((_) async { + await model.isPrescriptionOrderCreated(widget.patientInfo); + await model.onUpdateAssessmentStepStart(widget.patientInfo); + + if (model.patientAssessmentList.isNotEmpty) { + model.patientAssessmentList.forEach((element) { + MasterKeyModel? diagnosisType = model.getOneMasterKey( + masterKeys: MasterKeysService.DiagnosisType, + id: element.diagnosisTypeID, + ); + MasterKeyModel? selectedICD = model.getOneMasterKey( + masterKeys: MasterKeysService.ICD10, + id: element.icdCode10ID, + ); + MasterKeyModel? diagnosisCondition = model.getOneMasterKey( + masterKeys: MasterKeysService.DiagnosisCondition, + id: element.conditionID!, + ); + if (diagnosisCondition != null && + diagnosisType != null && + diagnosisCondition != null) { + MySelectedAssessment temMySelectedAssessment = + SoapUtils.generateMySelectedAssessment( + appointmentNo: element.appointmentNo, + remark: element.remarks, + diagnosisType: diagnosisType, + diagnosisCondition: diagnosisCondition, + selectedICD: selectedICD, + doctorID: element.doctorID, + doctorName: element.doctorName, + createdBy: element.createdBy, + createdOn: element.createdOn, + icdCode10ID: element.icdCode10ID); + + mySelectedAssessmentList.add(temMySelectedAssessment); + } + }); + } + + widget.changeLoadingState(false); + }); + }, + builder: (_, model, w) => AppScaffold( + isShowAppBar: false, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, + body: SingleChildScrollView( + physics: ScrollPhysics(), + child: Container( + color: Theme.of(context).scaffoldBackgroundColor, + child: Center( + child: FractionallySizedBox( + widthFactor: 0.9, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SOAPStepHeader( + currentIndex: widget.currentIndex, + changePageViewIndex: widget.changePageViewIndex, + patientInfo: widget.patientInfo, + ), + ExpandableSOAPWidget( + headerTitle: TranslationBase.of(context).assessment, + onTap: () { + setState(() { + isAssessmentExpand = !isAssessmentExpand; + }); + }, + child: Column(children: [ + SizedBox( + height: 20, + ), + + SizedBox( + height: 56, + child: TabBar( + indicatorColor: Color(0xFFD02127), + unselectedLabelColor: Color(0xFF6D6D6D), + labelColor: Color(0xFF2B353E), + tabs: [ + Tab( + child: AppText( + TranslationBase.of(context) + .currentDiagnosis, + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56, + ), + ), + Tab( + child: AppText( + TranslationBase.of(context) + .currentDiagnosis, + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56, + ), + ) + ], + controller: _tabController, + ), + ), + SizedBox( + height: 300, + child: TabBarView( + controller: _tabController, + children: [ + CurrentDiagnosis( + currentDiagnosisItems: [''], + ), + PreviousDiagnosis( + diagnosisItems: [''], + ) + ], + ), + ) + ]), + isExpanded: isAssessmentExpand, + ), + SizedBox( + height: 130, + ), + ], + ), + ), + ), + ), + ), + ), + ); + } + + openAssessmentDialog(BuildContext context, + {MySelectedAssessment? assessment, + bool isUpdate = false, + required SOAPViewModel model}) { + if (assessment == null) { + assessment = SoapUtils.generateMySelectedAssessment( + remark: '', appointmentNo: widget.patientInfo.appointmentNo); + } + showModalBottomSheet( + backgroundColor: Colors.white, + isScrollControlled: true, + context: context, + builder: (context) { + return AddAssessmentDetails( + mySelectedAssessment: assessment!, + patientInfo: widget.patientInfo, + isUpdate: isUpdate, + mySelectedAssessmentList: mySelectedAssessmentList, + addSelectedAssessment: (MySelectedAssessment mySelectedAssessment, + bool isUpdate) async { + setState(() { + if (!isUpdate) + mySelectedAssessmentList.add(mySelectedAssessment); + }); + }); + }); + } + + @override + nextFunction(model) { + if (mySelectedAssessmentList.isEmpty) { + Utils.showErrorToast(TranslationBase.of(context).assessmentErrorMsg); + } else if (!checkPrimaryDiagnosis()) { + Utils.showErrorToast(TranslationBase.of(context).onePrimaryDiagnosis); + } else { + widget.changeLoadingState(true); + widget.changePageViewIndex(3); + } + } + + bool checkPrimaryDiagnosis() { + ProjectViewModel projectViewModel = + Provider.of(context, listen: false); + bool isVidaPlus = Utils.isVidaPlusProject( + projectViewModel, widget.patientInfo.projectId!); + List type = mySelectedAssessmentList + .where((element) => + (element.selectedDiagnosisType!.id == 2 && isVidaPlus == false) || + (element.selectedDiagnosisType!.code == '3' && isVidaPlus == true)) + .toList(); + return type.isEmpty ? false : true; + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart new file mode 100644 index 00000000..8d64deee --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -0,0 +1,61 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; +import 'package:flutter/material.dart'; + +class CurrentDiagnosis extends StatelessWidget { + final List currentDiagnosisItems; + + const CurrentDiagnosis({super.key, required this.currentDiagnosisItems}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + SizedBox( + height: 10, + ), + AddSoapItem( + title: TranslationBase.of(context).addNewDiagnosis, + onAddSoapItemClicked: () { + Navigator.push(context, FadePage(page: AddDiagnosis())); + }), + SizedBox( + height: 16, + ), + Divider(), + SizedBox( + height: 16, + ), + if (currentDiagnosisItems.isEmpty) ...{ + Center( + child: EmptyDiagnosis(), + ), + } else ...{ + Flexible( + + child: + ListView.separated( + itemBuilder: (_, index) { + return SoapDetailItem( + title: 'lorem ipsum', + status: 'active', + condition: 'acute', + remarks: 'initial', + onSoapDetailActionClicked: (action) {}, + ); + }, + separatorBuilder: (_, index) => Divider(), + itemCount: currentDiagnosisItems.length)) + } + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart new file mode 100644 index 00000000..704b41c2 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart @@ -0,0 +1,25 @@ +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; + +class EmptyDiagnosis extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment : MainAxisAlignment.center, + children: [ + SvgPicture.asset('assets/images/svgs/unavailable.svg'), + SizedBox(height: 10,), + AppText( + TranslationBase.of(context).noDiagnosisFound, + fontSize: 12, + fontWeight: FontWeight.w400, + textAlign: TextAlign.center, + color: Color(0xFFADADAD), + ) + ], + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart new file mode 100644 index 00000000..8e34b682 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -0,0 +1,293 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hexcolor/hexcolor.dart'; +List patientState = ["","Stable", "Not Stable", "Not Defined"]; + +class EnterDiagnosis extends StatefulWidget { + @override + State createState() => _EnterDiagnosisState(); +} + +class _EnterDiagnosisState extends State { + final TextEditingController filteredSearchController = + TextEditingController(); + bool showAllDiagnosis = true; + bool status = true; + String selectedItem = "Stable"; + TextEditingController remarksController = TextEditingController(); + + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, + ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).selectAllergy, + isTextFieldHasSuffix: true, + hasBorder: true, + controller: filteredSearchController, + onChanged: (value) {}, + onFieldSubmitted: () {}, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Color(0xff2B353E), + size: 30, + ), + onPressed: () {}, + ), + ), + SizedBox( + height: 8, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Switch( + value: showAllDiagnosis, + activeColor: Colors.red, + onChanged: (bool value) { + setState(() { + showAllDiagnosis = value; + }); + }, + ), + SizedBox( + width: 8, + ), + AppText( + TranslationBase.of(context).showAllDiagnosis, + fontWeight: FontWeight.w500, + color: Color(0xFF2E303A), + fontSize: 11, + ), + ], + ), + SvgPicture.asset('assets/images/svgs/information.svg'), + ], + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + ), + Row( + children: [ + Expanded( + child: InkWell( + onTap: () {}, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).acute, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + Expanded( + child: InkWell( + onTap: () {}, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: + status == 2 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).subAcute, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + ), + ), + Expanded( + child: InkWell( + onTap: () {}, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: + status == 3 ? HexColor("#D02127") : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).chronic, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + ), + ), + ], + ), + SizedBox(height: 8,), + + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).patientCondition, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem, + iconSize: 25, + elevation: 16, + + onChanged: (newValue) async { + setState(() { + selectedItem = newValue ?? ""; + }); + }, + items: patientState.map((item) { + return DropdownMenuItem( + child: AppText( + item, + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + SizedBox( + height: 16, + ), + Row( + children: [ + SvgPicture.asset('assets/images/svgs/save_as_draft.svg'), + SizedBox( + width: 4, + ), + AppText( + TranslationBase.of(context).saveAsDraft, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ) + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart new file mode 100644 index 00000000..48dc1189 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -0,0 +1,43 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:flutter/material.dart'; + +class PreviousDiagnosis extends StatelessWidget { + final List diagnosisItems; + + const PreviousDiagnosis({super.key, required this.diagnosisItems}); + + @override + Widget build(BuildContext context) { + if (diagnosisItems.isEmpty) + return Center( + child: EmptyDiagnosis(), + ); + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return PreviousDiagnosisItem( + title: 'lorem ipsum', + status: 'active', + condition: 'acute', + remarks: 'initial', + onSoapDetailActionClicked: (action) {}, + ); + }, + separatorBuilder: (_, index) => Divider(), + itemCount: diagnosisItems.length), + ) + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart new file mode 100644 index 00000000..8cb6c800 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart @@ -0,0 +1,120 @@ +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; + +typedef OnSoapDetailActionClicked = Function(SoapDetailItemActions); + +class PreviousDiagnosisItem extends StatelessWidget { + final String title; + final String condition; + final String status; + final String remarks; + final OnSoapDetailActionClicked onSoapDetailActionClicked; + + const PreviousDiagnosisItem( + {super.key, + required this.title, + required this.condition, + required this.remarks, + required this.onSoapDetailActionClicked, + required this.status}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Stack( + children: [ + Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + title, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.bold, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).condition}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + condition, + color: Color(0xffD02127), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + Visibility( + visible: remarks.isNotEmpty, + child: Column( + children: [ + SizedBox( + height: 8, + ), + AppText( + remarks, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w400, + ), + ], + )) + ], + ), + Align( + alignment: Alignment.topRight, child: Status(status: status)) + ], + ), + SizedBox( + height: 16, + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.AUDIT), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/audit.svg', + fontColor: Color(0XFF2B353E), + text: TranslationBase.of(context).audit, + ), + ), + SizedBox( + width: 16, + ), + SizedBox( + width: 187, + child: AppButton( + onPressed: () { + onSoapDetailActionClicked( + SoapDetailItemActions.CHANGE_STATUS); + }, + title: TranslationBase.of(context).makeCurrentDiagnosis, + ), + ) + ], + ) + ], + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index a3aefa8b..0921a8a0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -132,8 +132,9 @@ class _UpdatePlanPageVidaPlusState extends State episodeID: widget.patientInfo.episodeNo.toString(), editedBy: '', doctorID: ''); + WidgetsBinding.instance.addPostFrameCallback((_) async { await widget.sOAPViewModel - .getPatientProgressNote(getGetProgressNoteReqModel); + .getPatientProgressNote(getGetProgressNoteReqModel);}); if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { progressNoteController.text = Utils.parseHtmlString( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index a212d977..d12c2aa0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vi import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 9627e06f..41596f92 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -16,6 +16,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; +import 'assessment/update_assessment_page.dart'; + class UpdateSoapIndexVidaPlus extends StatefulWidget { final bool isUpdate; @@ -30,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex = 3; + int _currentIndex = 2; List myAllergiesList = []; List myHistoryList = []; @@ -95,6 +97,12 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ + UpdateAssessmentPage( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState, + ), UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index 2750b32a..034c2976 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -191,4 +191,4 @@ class Status extends StatelessWidget { } } -enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE } +enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE,CHANGE_STATUS } diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index c9e22c24..fbd8bb9f 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1918,6 +1918,17 @@ class TranslationBase { String get progressNoteType => localizedValues['progressNoteType']![locale.languageCode]!; String get addYourNote => localizedValues['addYourNote']![locale.languageCode]!; String get saveAsDraft => localizedValues['saveAsDraft']![locale.languageCode]!; + String get currentDiagnosis => localizedValues['currentDiagnosis']![locale.languageCode]!; + String get addNewDiagnosis => localizedValues['addNewDiagnosis']![locale.languageCode]!; + String get noDiagnosisFound => localizedValues['noDiagnosisFound']![locale.languageCode]!; + String get makeCurrentDiagnosis => localizedValues['makeCurrentDiagnosis']![locale.languageCode]!; + String get mappedDiagnosis => localizedValues['mappedDiagnosis']![locale.languageCode]!; + String get previousDiagnosis => localizedValues['previousDiagnosis']![locale.languageCode]!; + String get addDiagnosis => localizedValues['addDiagnosis']![locale.languageCode]!; + String get showAllDiagnosis => localizedValues['showAllDiagnosis']![locale.languageCode]!; + String get acute => localizedValues['acute']![locale.languageCode]!; + String get subAcute => localizedValues['subAcute']![locale.languageCode]!; + String get chronic => localizedValues['chronic']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { From 6f0133a68edd463076feabd0c2a83eac3acfc6e8 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 7 Nov 2024 12:44:28 +0300 Subject: [PATCH 29/76] episode update inprogress --- assets/images/svgs/resolve.svg | 4 ++++ lib/config/localized_values.dart | 3 ++- .../update_objective_page_vida_plus.dart | 2 +- .../objective/widget/EmptyExamination.dart | 10 ++++++++-- .../subjective/allergies/add_allergies.dart | 5 +++-- ..._key_checkbox_search_allergies_widget.dart | 4 ++-- .../allergies/reactions_selection.dart | 12 +++++------ .../allergies/update_allergies_widget.dart | 20 ++++++++++--------- .../update_soap_index_vida_plus.dart | 2 +- .../translations_delegate_base_utils.dart | 2 ++ .../custom_bottom_sheet_container.dart | 5 +++-- 11 files changed, 43 insertions(+), 26 deletions(-) create mode 100644 assets/images/svgs/resolve.svg diff --git a/assets/images/svgs/resolve.svg b/assets/images/svgs/resolve.svg new file mode 100644 index 00000000..51d064f3 --- /dev/null +++ b/assets/images/svgs/resolve.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 17fac19a..bb4b956f 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1192,5 +1192,6 @@ const Map> localizedValues = { "addPhysicalExamination": {"en": "Add Physical Examination", "ar":"إضافة الفحص البدني"}, "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, - + "mild": {"en": "Mild", "ar":"خفيف"}, + "moderate": {"en": "Moderate", "ar":"معتدل"}, }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart index a8a4ddfe..fc8e53d7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -145,7 +145,7 @@ class _UpdateObjectivePageVidaPlusState Center( child: Padding( padding: const EdgeInsets.all(65), - child: EmptyExamination(), + child: EmptyWidget(TranslationBase.of(context).noPhysicalExamination), ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart index c552848f..2d9094f4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart @@ -4,7 +4,12 @@ import 'package:flutter_svg/flutter_svg.dart'; import '../../../../../../../utils/translations_delegate_base_utils.dart'; -class EmptyExamination extends StatelessWidget{ +class EmptyWidget extends StatelessWidget{ + + String message = ""; + + + EmptyWidget(this.message); @override Widget build(BuildContext context) { return Column( @@ -13,7 +18,8 @@ class EmptyExamination extends StatelessWidget{ SvgPicture.asset('assets/images/svgs/unavailable.svg'), SizedBox(height: 10,), AppText( - TranslationBase.of(context).noPhysicalExamination, + this.message, + //TranslationBase.of(context).noPhysicalExamination, fontSize: 12, fontWeight: FontWeight.w400, textAlign: TextAlign.center, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index 67f50b15..6eadd40a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -58,14 +58,15 @@ class _AddAllergiesState extends State { // }, ), bottomSheet: CustomBottomSheetContainer( + widthFactor: .9, buttonColor: Color(0xffEAEAEA), fontColor: Colors.black, label: TranslationBase.of(context).cancel, onTap: () { Navigator.of(context).pop(); }, - ), - )); + )), + ); } // // isServiceSelected(MasterKeyModel masterKey) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index da1177aa..fd42e837 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -11,6 +11,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../../../../../../widgets/transitions/fade_page.dart'; +import '../../objective/widget/EmptyExamination.dart'; class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { @@ -109,8 +110,7 @@ bool loading =false; }, ) - : loading ? Center(child: CircularProgressIndicator()) :SizedBox() - + : widget.model.state == ViewState.BusyLocal ? Center(child: CircularProgressIndicator()) :Center(child: EmptyWidget(TranslationBase.of(context).noDataAvailable)) ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 11e0cbde..48cb4f6c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -111,7 +111,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "Mild", + value: TranslationBase.of(context).mild, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -125,7 +125,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Mild', + TranslationBase.of(context).mild, fontSize: 10, ), ], @@ -140,7 +140,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "moderate", + value: TranslationBase.of(context).moderate, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -154,7 +154,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Moderate', + TranslationBase.of(context).moderate, fontSize: 10, ), ], @@ -169,7 +169,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "severe", + value: TranslationBase.of(context).severe, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -183,7 +183,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Severe', + TranslationBase.of(context).severe, fontSize: 10, ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 6d0b12df..a04cc041 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -99,16 +99,18 @@ class _UpdateAllergiesWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ +Row(children: [ AppText(reaction.allergyReactionName!, fontSize: 10,), + AppText(" - "), + AppText( + Severity.values[reaction.severity! -1].name, - AppText(reaction.allergyReactionName!), - AppText( - Severity.values[reaction.severity! -1].name, - color: Color(0xFFCC9B14), - fontSize: 10, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - ) - ],)).toList()) : AppText("----", color: Color(0xFFCC9B14)), + color: Color(0xFFCC9B14), + fontSize: 10, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + )],) + + ],)).toList()) : AppText("----"), Row( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 9627e06f..75f453ed 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -144,7 +144,7 @@ class _UpdateSoapIndexVidaPlusState extends State ), Container( child: FractionallySizedBox( - widthFactor: .80, + widthFactor: .9, child: getBottomSheet(model, patient)), ), SizedBox( diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index c9e22c24..1c1acd50 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1918,6 +1918,8 @@ class TranslationBase { String get progressNoteType => localizedValues['progressNoteType']![locale.languageCode]!; String get addYourNote => localizedValues['addYourNote']![locale.languageCode]!; String get saveAsDraft => localizedValues['saveAsDraft']![locale.languageCode]!; + String get mild => localizedValues['mild']![locale.languageCode]!; + String get moderate => localizedValues['moderate']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart index 0330f08d..52e2a1d7 100644 --- a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart +++ b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart @@ -10,9 +10,10 @@ class CustomBottomSheetContainer extends StatelessWidget { final String label; final Color? buttonColor; final Color? fontColor; + final double? widthFactor; double headerHeight = SizeConfig.heightMultiplier! * 12; - CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white }) : super(key: key); + CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key); @override Widget build(BuildContext context) { @@ -31,7 +32,7 @@ class CustomBottomSheetContainer extends StatelessWidget { Container( margin: EdgeInsets.only(top: headerHeight * (SizeConfig.isWidthLarge ? 0.3 : 0.2)), child: FractionallySizedBox( - widthFactor: .80, + widthFactor: widthFactor, child: Center( child: AppButton( fontColor: fontColor!, From f3876e9ef1a25564eeb12a7553778e3d033cfdf6 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Sun, 17 Nov 2024 09:48:00 +0300 Subject: [PATCH 30/76] soap vida plus inprogress --- lib/config/config.dart | 16 + .../allergy/get_allergies_list_vida_plus.dart | 29 +- .../get_patient_allergies_list_vida_plus.dart | 10 +- .../get_chief_complaint_vida_plus.dart | 68 +++ .../search_chief_complaint_vidaplus.dart | 40 ++ lib/core/model/SOAP/get_hopi_details.dart | 60 +++ .../model/patient/patiant_info_model.dart | 9 +- .../soap/SOAP_service.dart | 331 ++++++++++-- lib/core/viewModel/SOAP_view_model.dart | 489 +++++++++++++----- .../subjective/allergies/add_allergies.dart | 21 +- ..._key_checkbox_search_allergies_widget.dart | 25 +- .../allergies/reactions_selection.dart | 244 +++++++-- .../allergies/update_allergies_widget.dart | 318 ++++++------ .../chief_complaint/AddChiefComplaints.dart | 23 +- .../chief_complaint/chief_complaints.dart | 47 +- .../widgets/ComplaintSelection.dart | 107 +++- .../widgets/complaint_items.dart | 51 +- .../update_present_illness.dart | 99 +++- .../update_subjective_page_vida_plus.dart | 13 +- .../update_soap_index_vida_plus.dart | 25 +- lib/widgets/auth/sms-popup.dart | 2 +- 21 files changed, 1536 insertions(+), 491 deletions(-) create mode 100644 lib/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart create mode 100644 lib/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart create mode 100644 lib/core/model/SOAP/get_hopi_details.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index f6eb8511..ad086d11 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -292,6 +292,22 @@ const PATIENT_ALLERGIES = 'Services/DoctorApplication.svc/REST/PatientAllergies' const SEARCH_ALLERGIES = 'Services/DoctorApplication.svc/REST/SearchAllergies'; +const POST_ALLERGIES = 'Services/DoctorApplication.svc/REST/PostAllergies'; + +const CREATE_HOPI = 'Services/DoctorApplication.svc/REST/CreateHOPI'; + +const HOPI_DETAILS = 'Services/DoctorApplication.svc/REST/DetailHOPI'; + +const POST_CHIEF_COMPLAINT_VP = 'Services/DoctorApplication.svc/REST/PostChiefcomplaint'; + +const SEARCH_CHIEF_COMPLAINT_VP = 'Services/DoctorApplication.svc/REST/SearchChiefcomplaint'; + +const RESOLVE_ALLERGIES = 'Services/DoctorApplication.svc/REST/ResolveAllergy'; + +const UPDATE_ALLERGIES = 'Services/DoctorApplication.svc/REST/UpdateAllergy'; + +const GET_CHIEF_COMPLAINT_VP = 'Services/DoctorApplication.svc/REST/ChiefComplaintDetails'; + var selectedPatientType = 1; diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart index d0beffa0..5a7fedd2 100644 --- a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -11,7 +11,7 @@ class AllergiesListVidaPlus { bool? isActive; bool? isSnowMedAllergy; String? snowMedCode; - + String? remark; AllergiesListVidaPlus( {this.allergyID, this.allergyName, @@ -24,7 +24,9 @@ class AllergiesListVidaPlus { this.hospitalID, this.isActive, this.isSnowMedAllergy, - this.snowMedCode}); + this.snowMedCode, + this.remark + }); AllergiesListVidaPlus.fromJson(Map json) { allergyID = json['allergyID']; @@ -74,8 +76,12 @@ class AllergyReactionDTOs { int? hospitalGroupID; int? hospitalID; bool? isActive; - String? reactionSelection =""; bool? isSelected =false; + int? dbCRUDOperation =1; + int? pomrid; + int? patientID; + int? allergyReactionMappingID = 0; + int? severity =1; AllergyReactionDTOs( {this.allergyReactionID, this.allergyReactionName, @@ -83,8 +89,12 @@ class AllergyReactionDTOs { this.hospitalGroupID, this.hospitalID, this.isActive, - this.reactionSelection, this.isSelected, + this.dbCRUDOperation, + this.pomrid, + this.patientID, + this.allergyReactionMappingID, + this.severity }); AllergyReactionDTOs.fromJson(Map json) { @@ -94,6 +104,12 @@ class AllergyReactionDTOs { hospitalGroupID = json['hospitalGroupID']; hospitalID = json['hospitalID']; isActive = json['isActive']; + dbCRUDOperation = json["DbCRUDOperation"]; + pomrid = json['pomrid']; + patientID = json['patientID']; + allergyReactionMappingID = json['allergyReactionMappingID']; + severity = json['severity']; + } Map toJson() { @@ -104,6 +120,11 @@ class AllergyReactionDTOs { data['hospitalGroupID'] = this.hospitalGroupID; data['hospitalID'] = this.hospitalID; data['isActive'] = this.isActive; + data["DbCRUDOperation"] = this.dbCRUDOperation; + data['pomrid'] = this.pomrid; + data['patientID'] = patientID; + data['allergyReactionMappingID'] = this.allergyReactionMappingID; + data['severity'] = this.severity; return data; } } diff --git a/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart index 2da8fa58..d2e30e4e 100644 --- a/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart @@ -78,8 +78,9 @@ class PatientsAllergyReactionsDTOs { int? patientID; int? patientsAllergyReactionRevisionID; int? pomrId; - int? severity; - + int? severity =1; + bool? isSelected =true; + String? reactionSelection =""; PatientsAllergyReactionsDTOs( {this.allergyReactionID, this.allergyReactionMappingID, @@ -90,7 +91,10 @@ class PatientsAllergyReactionsDTOs { this.patientID, this.patientsAllergyReactionRevisionID, this.pomrId, - this.severity}); + this.severity, + this.isSelected, + this.reactionSelection + }); PatientsAllergyReactionsDTOs.fromJson(Map json) { allergyReactionID = json['allergyReactionID']; diff --git a/lib/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart new file mode 100644 index 00000000..cf2c5f7b --- /dev/null +++ b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart @@ -0,0 +1,68 @@ +class GetChiefComplaintVidaPlus { + int? appointmentId; + String? chiefComplain; + int? chiefComplainId; + int? chiefComplainTemplateId; + int? clinicGroupId; + int? clinicId; + int? doctorId; + String? doctorName; + int? episodeId; + int? hospitalGroupId; + int? hospitalId; + String? loginUserId; + int? patientId; + int? patientPomrId; + + GetChiefComplaintVidaPlus( + {this.appointmentId, + this.chiefComplain, + this.chiefComplainId, + this.chiefComplainTemplateId, + this.clinicGroupId, + this.clinicId, + this.doctorId, + this.doctorName, + this.episodeId, + this.hospitalGroupId, + this.hospitalId, + this.loginUserId, + this.patientId, + this.patientPomrId}); + + GetChiefComplaintVidaPlus.fromJson(Map json) { + appointmentId = json['appointmentId']; + chiefComplain = json['chiefComplain']; + chiefComplainId = json['chiefComplainId']; + chiefComplainTemplateId = json['chiefComplainTemplateId']; + clinicGroupId = json['clinicGroupId']; + clinicId = json['clinicId']; + doctorId = json['doctorId']; + doctorName = json['doctorName']; + episodeId = json['episodeId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + loginUserId = json['loginUserId']; + patientId = json['patientId']; + patientPomrId = json['patientPomrId']; + } + + Map toJson() { + final Map data = new Map(); + data['appointmentId'] = this.appointmentId; + data['chiefComplain'] = this.chiefComplain; + data['chiefComplainId'] = this.chiefComplainId; + data['chiefComplainTemplateId'] = this.chiefComplainTemplateId; + data['clinicGroupId'] = this.clinicGroupId; + data['clinicId'] = this.clinicId; + data['doctorId'] = this.doctorId; + data['doctorName'] = this.doctorName; + data['episodeId'] = this.episodeId; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['loginUserId'] = this.loginUserId; + data['patientId'] = this.patientId; + data['patientPomrId'] = this.patientPomrId; + return data; + } +} diff --git a/lib/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart b/lib/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart new file mode 100644 index 00000000..389cd99f --- /dev/null +++ b/lib/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart @@ -0,0 +1,40 @@ +class SearchChiefComplaint { + String? chiefComplain; + String? chiefComplainCode; + int? chiefComplainId; + String? clinic; + int? hospitalGroupId; + int? hospitalId; + String? nursingGroup; + + SearchChiefComplaint( + {this.chiefComplain, + this.chiefComplainCode, + this.chiefComplainId, + this.clinic, + this.hospitalGroupId, + this.hospitalId, + this.nursingGroup}); + + SearchChiefComplaint.fromJson(Map json) { + chiefComplain = json['chiefComplain']; + chiefComplainCode = json['chiefComplainCode']; + chiefComplainId = json['chiefComplainId']; + clinic = json['clinic']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + nursingGroup = json['nursingGroup']; + } + + Map toJson() { + final Map data = new Map(); + data['chiefComplain'] = this.chiefComplain; + data['chiefComplainCode'] = this.chiefComplainCode; + data['chiefComplainId'] = this.chiefComplainId; + data['clinic'] = this.clinic; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['nursingGroup'] = this.nursingGroup; + return data; + } +} diff --git a/lib/core/model/SOAP/get_hopi_details.dart b/lib/core/model/SOAP/get_hopi_details.dart new file mode 100644 index 00000000..4783587e --- /dev/null +++ b/lib/core/model/SOAP/get_hopi_details.dart @@ -0,0 +1,60 @@ +class GetHopiDetails { + int? clinicId; + int? doctorId; + int? hospitalGroupId; + int? hospitalId; + String? hpi; + int? hpiId; + bool? isHpiTakenFamily; + bool? isHpiTakenOther; + bool? isHpiTakenPatient; + String? loginUserId; + int? patientId; + int? patientPomrId; + + GetHopiDetails( + {this.clinicId, + this.doctorId, + this.hospitalGroupId, + this.hospitalId, + this.hpi, + this.hpiId, + this.isHpiTakenFamily, + this.isHpiTakenOther, + this.isHpiTakenPatient, + this.loginUserId, + this.patientId, + this.patientPomrId}); + + GetHopiDetails.fromJson(Map json) { + clinicId = json['clinicId']; + doctorId = json['doctorId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + hpi = json['hpi']; + hpiId = json['hpiId']; + isHpiTakenFamily = json['isHpiTakenFamily']; + isHpiTakenOther = json['isHpiTakenOther']; + isHpiTakenPatient = json['isHpiTakenPatient']; + loginUserId = json['loginUserId']; + patientId = json['patientId']; + patientPomrId = json['patientPomrId']; + } + + Map toJson() { + final Map data = new Map(); + data['clinicId'] = this.clinicId; + data['doctorId'] = this.doctorId; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['hpi'] = this.hpi; + data['hpiId'] = this.hpiId; + data['isHpiTakenFamily'] = this.isHpiTakenFamily; + data['isHpiTakenOther'] = this.isHpiTakenOther; + data['isHpiTakenPatient'] = this.isHpiTakenPatient; + data['loginUserId'] = this.loginUserId; + data['patientId'] = this.patientId; + data['patientPomrId'] = this.patientPomrId; + return data; + } +} diff --git a/lib/core/model/patient/patiant_info_model.dart b/lib/core/model/patient/patiant_info_model.dart index af04e752..4fb49f80 100644 --- a/lib/core/model/patient/patiant_info_model.dart +++ b/lib/core/model/patient/patiant_info_model.dart @@ -79,7 +79,7 @@ class PatiantInformtion { int? status; int? vcId; String? voipToken; - + String? pomrId; PatiantInformtion( {this.patientDetails, this.projectId, @@ -155,7 +155,9 @@ class PatiantInformtion { this.vcId, this.voipToken, this.admissionDateWithDateTimeForm, - this.appointmentDateWithDateTimeForm}); + this.appointmentDateWithDateTimeForm, + this.pomrId + }); PatiantInformtion.fromJson(Map json) { { @@ -262,6 +264,7 @@ class PatiantInformtion { consultationNotes = json['ConsultationNotes']; patientStatus = json['PatientStatus']; voipToken = json['VoipToken']; + pomrId = json['pomrId']; admissionDateWithDateTimeForm = json["AdmissionDate"] != null ? AppDateUtils.convertStringToDate(json["AdmissionDate"]) : json["admissionDate"] != null @@ -340,7 +343,7 @@ class PatiantInformtion { data['ProjectID'] = this.projectId; data['VC_ID'] = this.vcId; data['VoipToken'] = this.voipToken; - + data['pomrId'] = this.pomrId; data["DateofBirth"] = this.dateofBirth; data["dob"] = this.dateofBirth; data['DateOfBirth'] = this.dateofBirth; diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 362a8273..e6321cd3 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -3,8 +3,11 @@ import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_mod import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; @@ -22,7 +25,13 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_e import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; - +import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:http/http.dart'; +import '../../../../config/shared_pref_kay.dart'; +import '../../../../utils/date-utils.dart'; import '../../../model/SOAP/assessment/patch_assessment_req_model.dart'; import '../../../model/patient/patiant_info_model.dart'; import '../../base/lookup-service.dart'; @@ -34,10 +43,15 @@ class SOAPService extends LookupService { List patientPhysicalExamList = []; List patientProgressNoteList = []; List patientAssessmentList = []; - List searchAllergiesList =[]; - List patientAllergiesVidaPlus =[]; + List searchAllergiesList = []; + List patientAllergiesVidaPlus = []; + List hopiDetails = []; + List patientChiefComplaintListVidaPlus = []; + List searchChiefComplaintListVidaPlus = []; + int? episodeID; - bool isPrescriptionOrder =false; + bool isPrescriptionOrder = false; + Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { hasError = false; @@ -321,41 +335,45 @@ class SOAPService extends LookupService { super.error = error; }, body: getEpisodeForInpatientReqModel.toJson()); } - Future isPrescriptionOrderCreated( - PatiantInformtion patientInfo) async { + + Future isPrescriptionOrderCreated(PatiantInformtion patientInfo) async { hasError = false; await baseAppClient.post(IS_PRESCRIPTION_ORDER_CREATED, onSuccess: (dynamic response, int statusCode) { - print("Success"); + print("Success"); - isPrescriptionOrder = response['IsPrescriptionCreated']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "PatientMRN":patientInfo.patientMRN, - "EncounterNo":patientInfo.appointmentNo, - "EncounterType":patientInfo.appointmentTypeId, - "DoctorID":patientInfo.doctorId, - }); + isPrescriptionOrder = response['IsPrescriptionCreated']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "PatientMRN": patientInfo.patientMRN, + "EncounterNo": patientInfo.appointmentNo, + "EncounterType": patientInfo.appointmentTypeId, + "DoctorID": patientInfo.doctorId, + }); } + /* vida plus API allergies */ - Future patientAllergies(GeneralGetReqForSOAP generalGetReqForSOAP) async { + Future patientAllergies(PatiantInformtion patientInfo) async { + Map request = { + "patientId": patientInfo.patientMRN, + "ProjectID": patientInfo.projectId + }; hasError = false; - await baseAppClient.post(PATIENT_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesVidaPlus.clear(); + print("Success"); + patientAllergiesVidaPlus.clear(); - response['List_PatientAllergies']['resultData'].forEach((v) { - patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: generalGetReqForSOAP.toJson()); + response['List_PatientAllergies']['resultData'].forEach((v) { + patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } Future searchAllergies(String searchKey) async { @@ -363,15 +381,254 @@ class SOAPService extends LookupService { await baseAppClient.post(SEARCH_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - searchAllergiesList.clear(); + print("Success"); + searchAllergiesList.clear(); + + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: {"AllergyName": searchKey}); + } + + Future addAllergies( + AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { + allergy.allergyReactionDTOs!.forEach((value) { + value.patientID = patientInfo.patientMRN; + value.pomrid = int.parse(patientInfo.pomrId!); + value.allergyReactionMappingID = 1; + }); + + var request = { + "patientsAllergyRevisionID": allergy.allergyRevisionID, + "patientMRN": patientInfo.patientMRN, + "allergyDiseaseType": 0, + "allergyTypeName": allergy.allergyTypeName, + "episodeId": patientInfo.episodeNo, + "isUpdatedByNurse": false, + "remarks": allergy.remark, + "createdBy": patientInfo.doctorId, + "createdOn": AppDateUtils.convertDateToFormat( + DateTime.now(), "yyyy-MM-dd kk:mm:ss"), + "assessmentId": 0, + "isActive": allergy.isActive, + "isActivePatientsAllergy": true, + "patientsAllergyReactionsDTOs": allergy.allergyReactionDTOs, + "dbCRUDOperation": 1, + "allergyID": allergy.allergyID, + "allergyName": allergy.allergyName, + "allergyTypeID": allergy.allergyTypeID + }; + + hasError = false; + + await baseAppClient.post(POST_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); + } + + Future resolveAllergies( + PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { + + /*changed request parameters based on the vida plus requested */ + + + var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); + List? reaction = + allergy.patientsAllergyReactionsDTOs!; + List? reactionRequest = []; + reaction.forEach((value) { + reactionRequest.add(AllergyReactionDTOs( + patientID: patientInfo.patientMRN, + pomrid: int.parse(patientInfo.pomrId!), + hospitalGroupID: value.hospitalGroupID, + allergyReactionMappingID: 0, + hospitalID: value.hospitalID, + isActive: value.isActive, + allergyReactionID: value.allergyReactionID, + allergyReactionName: value.allergyReactionName, + severity: value.severity)); + }); + + var request = { + "pomrId": patientInfo.pomrId, + "patientMRN": patientInfo.patientMRN, + "allergyTypeName": allergy.allergyTypeName, + "assessmentId": 0, + "isActive": allergy.isActivePatientsAllergy, + "patientsAllergyReactionsDTOs":reactionRequest, + "dbCRUDOperation": 2, + "allergyID": allergy.allergyID, + "allergyName": allergy.allergyName, + "allergyTypeID": allergy.allergyTypeID, + "remarks": allergy.remark, + "projectId": patientInfo.projectId, + "editedBy": doctorProfile['List_MemberInformation'][0]['MemberID'], + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) + }; + hasError = false; + await baseAppClient.post(RESOLVE_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast("Resolved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); + } + + Future updateAllergies( + AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { + allergy.allergyReactionDTOs!.forEach((value) { + value.patientID = patientInfo.patientMRN; + value.pomrid = patientInfo.episodeNo; + value.allergyReactionMappingID = 1; + }); + + var request = { + "patientsAllergyRevisionID": allergy.allergyRevisionID, + "patientMRN": patientInfo.patientMRN, + "allergyDiseaseType": 0, + "allergyTypeName": allergy.allergyTypeName, + "episodeId": patientInfo.episodeNo, + "isUpdatedByNurse": false, + "remarks": allergy.remark, + "createdBy": patientInfo.doctorId, + "createdOn": AppDateUtils.convertDateToFormat( + DateTime.now(), "yyyy-MM-dd kk:mm:ss"), + "assessmentId": 0, + "isActive": allergy.isActive, + "isActivePatientsAllergy": true, + "patientsAllergyReactionsDTOs": allergy.allergyReactionDTOs, + "dbCRUDOperation": 1, + "allergyID": allergy.allergyID, + "allergyName": allergy.allergyName, + "allergyTypeID": allergy.allergyTypeID + }; + + hasError = false; + + await baseAppClient.post(UPDATE_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); + } + + saveHopi(Map req, PatiantInformtion patient) async { + var request = { + "clinicGroupId": patient.clinicGroupId, // patient.clinicGroupId + "clinicId": patient.clinicId, + "doctorId": patient.doctorId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), //setup + "hospitalId": patient.projectId, //projectid + "patientId": patient.patientMRN, + "patientPomrId": patient.pomrId, + }; + Map finalRequest = {} + ..addAll(request) + ..addAll(req); + hasError = false; + await baseAppClient.post(CREATE_HOPI, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast("History Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: finalRequest); + } - response['List_SearchAllergies']['resultData'].forEach((v) { - searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: {"AllergyName": searchKey}); + getHopi(PatiantInformtion patient) async { + Map request = { + "patientId": patient.patientMRN, + "pomrId": patient.pomrId, + }; + hasError = false; + await baseAppClient.post(HOPI_DETAILS, + onSuccess: (dynamic response, int statusCode) { + hopiDetails.clear(); + + response['DetailHOPI']['resultData'].forEach((v) { + hopiDetails.add(GetHopiDetails.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + getChiefComplaint(PatiantInformtion patient) async { + Map request = { + "ProjectID": patient.projectId, + "pomrId": patient.pomrId, + }; + hasError = false; + await baseAppClient.post(GET_CHIEF_COMPLAINT_VP, + onSuccess: (dynamic response, int statusCode) { + patientChiefComplaintListVidaPlus.clear(); + + response['ListChiefComplaintDetails']['resultData'].forEach((v) { + patientChiefComplaintListVidaPlus.add(GetChiefComplaintVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + postChiefComplaintVidaPlus( + PatiantInformtion patient, String cheifComplaint) async { + Map request = { + "ListCreateChiefComplaint": [ + { + "appointmentNo": patient.appointmentNo, + "pomrId": patient.pomrId, + "patientMRN": patient.patientMRN, + "chiefComplaint": cheifComplaint + } + ] + }; + hasError = false; + await baseAppClient.post(POST_CHIEF_COMPLAINT_VP, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + searchChiefComplaintVidaPlus(PatiantInformtion patient, String CC) async { + Map request = { + "doctorId": patient.doctorId, + "searchParam": CC, + }; + hasError = false; + searchChiefComplaintListVidaPlus.clear(); + await baseAppClient.post(SEARCH_CHIEF_COMPLAINT_VP, + onSuccess: (dynamic response, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + // + response['List_SearchChiefComplaint']['resultData'].forEach((v) { + searchChiefComplaintListVidaPlus.add(SearchChiefComplaint.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 16002dfe..be098f49 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -8,8 +8,11 @@ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_re import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; @@ -42,52 +45,75 @@ import 'base_view_model.dart'; class SOAPViewModel extends BaseViewModel { SOAPService _SOAPService = locator(); + PrescriptionService _prescriptionService = locator(); List get allergiesList => _SOAPService.allergiesList; - List get allergySeverityList => _SOAPService.allergySeverityList; + List get allergySeverityList => + _SOAPService.allergySeverityList; List get historyFamilyList => _SOAPService.historyFamilyList; - List get historyMedicalList => _SOAPService.historyMedicalList; + List get historyMedicalList => + _SOAPService.historyMedicalList; List get historySportList => _SOAPService.historySportList; List get historySocialList => _SOAPService.historySocialList; - List get historySurgicalList => _SOAPService.historySurgicalList; + List get historySurgicalList => + _SOAPService.historySurgicalList; - List get mergeHistorySurgicalWithHistorySportList => [...historySurgicalList, ...historySportList]; + List get mergeHistorySurgicalWithHistorySportList => + [...historySurgicalList, ...historySportList]; - List get physicalExaminationList => _SOAPService.physicalExaminationList; + List get physicalExaminationList => + _SOAPService.physicalExaminationList; - List get listOfDiagnosisType => _SOAPService.listOfDiagnosisType; + List get listOfDiagnosisType => + _SOAPService.listOfDiagnosisType; - List get listOfDiagnosisCondition => _SOAPService.listOfDiagnosisCondition; + List get listOfDiagnosisCondition => + _SOAPService.listOfDiagnosisCondition; List get listOfICD10 => _SOAPService.listOfICD10; - List get patientChiefComplaintList => _SOAPService.patientChiefComplaintList; + List get patientChiefComplaintList => + _SOAPService.patientChiefComplaintList; + + List get patientAllergiesList => + _SOAPService.patientAllergiesList; - List get patientAllergiesList => _SOAPService.patientAllergiesList; + List get patientHistoryList => + _SOAPService.patientHistoryList; - List get patientHistoryList => _SOAPService.patientHistoryList; + List get patientPhysicalExamList => + _SOAPService.patientPhysicalExamList; - List get patientPhysicalExamList => _SOAPService.patientPhysicalExamList; + List get patientProgressNoteList => + _SOAPService.patientProgressNoteList; - List get patientProgressNoteList => _SOAPService.patientProgressNoteList; + List get patientAssessmentList => + _SOAPService.patientAssessmentList; - List get patientAssessmentList => _SOAPService.patientAssessmentList; + List get searchAllergiesVidaPlus => + _SOAPService.searchAllergiesList; + List get patientAllergiesVidaPlus => + _SOAPService.patientAllergiesVidaPlus; - List get searchAllergiesVidaPlus => _SOAPService.searchAllergiesList; + List get getHopiDetails => _SOAPService.hopiDetails; - List get patientAllergiesVidaPlus => _SOAPService.patientAllergiesVidaPlus; + List get searchChiefComplaintList => + _SOAPService.searchChiefComplaintListVidaPlus; + List get getChiefComplaintListVidaPlus => + _SOAPService.patientChiefComplaintListVidaPlus; int? get episodeID => _SOAPService.episodeID; - bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; + + bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; bool isAddProgress = true; bool isAddExamInProgress = true; String progressNoteText = ""; @@ -103,7 +129,8 @@ class SOAPViewModel extends BaseViewModel { get medicationFrequencyList => _SOAPService.medicationFrequencyListWithModel; - List? get allMedicationList => _prescriptionService.allMedicationList; + List? get allMedicationList => + _prescriptionService.allMedicationList; late SubjectiveCallBack subjectiveCallBack; @@ -145,7 +172,10 @@ class SOAPViewModel extends BaseViewModel { planCallBack.nextFunction(model); } - Future getMasterLookup(MasterKeysService masterKeys, {bool isBusyLocal = false, String searchKey = "", bool allowSetState = false}) async { + Future getMasterLookup(MasterKeysService masterKeys, + {bool isBusyLocal = false, + String searchKey = "", + bool allowSetState = false}) async { if (isBusyLocal) { setState(ViewState.Busy); } else @@ -168,9 +198,12 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postEpisodeForInPatient(PostEpisodeForInpatientRequestModel postEpisodeForInpatientRequestModel) async { + Future postEpisodeForInPatient( + PostEpisodeForInpatientRequestModel + postEpisodeForInpatientRequestModel) async { setState(ViewState.BusyLocal); - await _SOAPService.postEpisodeForInPatient(postEpisodeForInpatientRequestModel); + await _SOAPService.postEpisodeForInPatient( + postEpisodeForInpatientRequestModel); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -178,7 +211,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postPhysicalExam(PostPhysicalExamRequestModel postPhysicalExamRequestModel) async { + Future postPhysicalExam( + PostPhysicalExamRequestModel postPhysicalExamRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postPhysicalExam(postPhysicalExamRequestModel); if (_SOAPService.hasError) { @@ -188,7 +222,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postProgressNote(PostProgressNoteRequestModel postProgressNoteRequestModel) async { + Future postProgressNote( + PostProgressNoteRequestModel postProgressNoteRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postProgressNote(postProgressNoteRequestModel); if (_SOAPService.hasError) { @@ -198,7 +233,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postAssessment(PostAssessmentRequestModel postAssessmentRequestModel) async { + Future postAssessment( + PostAssessmentRequestModel postAssessmentRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postAssessment(postAssessmentRequestModel); if (_SOAPService.hasError) { @@ -208,7 +244,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchPhysicalExam(PostPhysicalExamRequestModel patchPhysicalExamRequestModel) async { + Future patchPhysicalExam( + PostPhysicalExamRequestModel patchPhysicalExamRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchPhysicalExam(patchPhysicalExamRequestModel); if (_SOAPService.hasError) { @@ -218,7 +255,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchProgressNote(PostProgressNoteRequestModel patchProgressNoteRequestModel) async { + Future patchProgressNote( + PostProgressNoteRequestModel patchProgressNoteRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchProgressNote(patchProgressNoteRequestModel); if (_SOAPService.hasError) { @@ -228,7 +266,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchAssessment(PostAssessmentRequestUpdateModel patchAssessmentRequestModel) async { + Future patchAssessment( + PostAssessmentRequestUpdateModel patchAssessmentRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchAssessment(patchAssessmentRequestModel!); if (_SOAPService.hasError) { @@ -238,7 +277,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP, {isLocalBusy = false}) async { + Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP, + {isLocalBusy = false}) async { if (isLocalBusy) { setState(ViewState.BusyLocal); } else @@ -257,8 +297,14 @@ class SOAPViewModel extends BaseViewModel { String getAllergicNames(isArabic) { String allergiesString = ''; patientAllergiesList.forEach((element) { - MasterKeyModel? selectedAllergy = getOneMasterKey(masterKeys: MasterKeysService.Allergies, id: element.allergyDiseaseId, typeId: element.allergyDiseaseType!); - if (selectedAllergy != null && element.isChecked!) allergiesString += ((isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn)! + ' , '); + MasterKeyModel? selectedAllergy = getOneMasterKey( + masterKeys: MasterKeysService.Allergies, + id: element.allergyDiseaseId, + typeId: element.allergyDiseaseType!); + if (selectedAllergy != null && element.isChecked!) + allergiesString += + ((isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn)! + + ' , '); }); return allergiesString; } @@ -266,7 +312,9 @@ class SOAPViewModel extends BaseViewModel { Future getPatientPhysicalExam(PatiantInformtion patientInfo) async { GetPhysicalExamReqModel getPhysicalExamReqModel = GetPhysicalExamReqModel( patientMRN: patientInfo.patientMRN, - episodeID: patientInfo.episodeNo == null ? "0" : patientInfo.episodeNo.toString(), + episodeID: patientInfo.episodeNo == null + ? "0" + : patientInfo.episodeNo.toString(), appointmentNo: patientInfo.appointmentNo == null ? 0 : int.parse( @@ -286,7 +334,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientProgressNote(GetProgressNoteReqModel getGetProgressNoteReqModel) async { + Future getPatientProgressNote( + GetProgressNoteReqModel getGetProgressNoteReqModel) async { setState(ViewState.Busy); await _SOAPService.getPatientProgressNote(getGetProgressNoteReqModel); if (_SOAPService.hasError) { @@ -308,7 +357,11 @@ class SOAPViewModel extends BaseViewModel { Future getEpisodeForInpatient(PatiantInformtion patient) async { setState(ViewState.BusyLocal); - GetEpisodeForInpatientReqModel getEpisodeForInpatientReqModel = GetEpisodeForInpatientReqModel(patientID: patient.patientId, admissionNo: int.parse(patient.admissionNo!), patientTypeID: 1); + GetEpisodeForInpatientReqModel getEpisodeForInpatientReqModel = + GetEpisodeForInpatientReqModel( + patientID: patient.patientId, + admissionNo: int.parse(patient.admissionNo!), + patientTypeID: 1); await _SOAPService.getEpisodeForInpatient(getEpisodeForInpatientReqModel); if (_SOAPService.hasError) { error = _SOAPService.error; @@ -320,11 +373,13 @@ class SOAPViewModel extends BaseViewModel { } // ignore: missing_return - MasterKeyModel? getOneMasterKey({required MasterKeysService masterKeys, dynamic id, int? typeId}) { + MasterKeyModel? getOneMasterKey( + {required MasterKeysService masterKeys, dynamic id, int? typeId}) { switch (masterKeys) { case MasterKeysService.Allergies: List result = allergiesList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -333,7 +388,8 @@ class SOAPViewModel extends BaseViewModel { case MasterKeysService.HistoryFamily: List result = historyFamilyList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -341,7 +397,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.HistoryMedical: List result = historyMedicalList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -349,7 +406,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.HistorySocial: List result = historySocialList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -357,7 +415,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.HistorySports: List result = historySocialList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -373,7 +432,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.PhysicalExamination: List result = physicalExaminationList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -381,7 +441,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.AllergySeverity: List result = allergySeverityList.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -389,7 +450,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.DiagnosisType: List result = listOfDiagnosisType.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -397,7 +459,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.DiagnosisCondition: List result = listOfDiagnosisCondition.where((element) { - return element.id == id && element.typeId == masterKeys.getMasterKeyService(); + return element.id == id && + element.typeId == masterKeys.getMasterKeyService(); }).toList(); if (result.isNotEmpty) { return result.first; @@ -436,8 +499,10 @@ class SOAPViewModel extends BaseViewModel { } } - int getFirstIndexForOldExamination(List mySelectedExamination) { - Iterable examList = mySelectedExamination.where((element) => !element.isLocal); + int getFirstIndexForOldExamination( + List mySelectedExamination) { + Iterable examList = + mySelectedExamination.where((element) => !element.isLocal); if (examList.length > 0) { return mySelectedExamination.indexOf(examList.first); @@ -446,25 +511,44 @@ class SOAPViewModel extends BaseViewModel { } onUpdateSubjectStepStart(PatiantInformtion patientInfo) async { - GetChiefComplaintReqModel getChiefComplaintReqModel = GetChiefComplaintReqModel( - admissionNo: patientInfo.admissionNo != null ? int.parse(patientInfo.admissionNo!) : null, - patientMRN: patientInfo.patientMRN, - appointmentNo: patientInfo.appointmentNo != null ? int.parse(patientInfo.appointmentNo.toString()) : null, - episodeId: patientInfo.episodeNo, - episodeID: patientInfo.episodeNo, - doctorID: ''); - var services = [await _SOAPService.getPatientChiefComplaint(getChiefComplaintReqModel)]; + GetChiefComplaintReqModel getChiefComplaintReqModel = + GetChiefComplaintReqModel( + admissionNo: + patientInfo + .admissionNo != + null + ? int.parse(patientInfo.admissionNo!) + : null, + patientMRN: patientInfo.patientMRN, + appointmentNo: patientInfo.appointmentNo != null + ? int.parse(patientInfo.appointmentNo.toString()) + : null, + episodeId: patientInfo.episodeNo, + episodeID: patientInfo.episodeNo, + doctorID: ''); + var services = [ + await _SOAPService.getPatientChiefComplaint(getChiefComplaintReqModel) + ]; if (patientInfo.admissionNo == null) { complaintsControllerError = ''; medicationControllerError = ''; illnessControllerError = ''; GetHistoryReqModel getHistoryReqModel = GetHistoryReqModel( - patientMRN: patientInfo.patientMRN, episodeID: patientInfo.episodeNo.toString(), appointmentNo: int.parse(patientInfo.appointmentNo.toString()), doctorID: '', editedBy: ''); - services.add(await _SOAPService.getPatientHistories(getHistoryReqModel, isFirst: true)); - - GeneralGetReqForSOAP generalGetReqForSOAP = - GeneralGetReqForSOAP(patientMRN: patientInfo.patientMRN, episodeId: patientInfo.episodeNo, appointmentNo: int.parse(patientInfo.appointmentNo.toString()), doctorID: '', editedBy: ''); + patientMRN: patientInfo.patientMRN, + episodeID: patientInfo.episodeNo.toString(), + appointmentNo: int.parse(patientInfo.appointmentNo.toString()), + doctorID: '', + editedBy: ''); + services.add(await _SOAPService.getPatientHistories(getHistoryReqModel, + isFirst: true)); + + GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP( + patientMRN: patientInfo.patientMRN, + episodeId: patientInfo.episodeNo, + appointmentNo: int.parse(patientInfo.appointmentNo.toString()), + doctorID: '', + editedBy: ''); services.add(await _SOAPService.getPatientAllergy(generalGetReqForSOAP)); } @@ -478,41 +562,61 @@ class SOAPViewModel extends BaseViewModel { if (patientHistoryList.isNotEmpty) { if (historyFamilyList.isEmpty) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.HistoryFamily)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.HistoryFamily) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.HistoryFamily)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.HistoryFamily)); } } if (historyMedicalList.isEmpty) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.HistoryMedical)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.HistoryMedical) + ]; } else - services.add(await _SOAPService.getMasterLookup(MasterKeysService.HistoryMedical)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.HistoryMedical)); } if (historySurgicalList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.HistorySurgical)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.HistorySurgical) + ]; } else - services.add(await _SOAPService.getMasterLookup(MasterKeysService.HistorySurgical)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.HistorySurgical)); } if (historySportList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.HistorySports)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.HistorySports) + ]; } else - services.add(await _SOAPService.getMasterLookup(MasterKeysService.HistorySports)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.HistorySports)); } } if (patientAllergiesList.isNotEmpty) { if (allergiesList.isEmpty) if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.Allergies)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.Allergies) + ]; } else - services.add(await _SOAPService.getMasterLookup(MasterKeysService.Allergies)); + services.add( + await _SOAPService.getMasterLookup(MasterKeysService.Allergies)); if (allergySeverityList.isEmpty) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.AllergySeverity)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.AllergySeverity) + ]; } else - services.add(await _SOAPService.getMasterLookup(MasterKeysService.AllergySeverity)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.AllergySeverity)); } } @@ -530,30 +634,45 @@ class SOAPViewModel extends BaseViewModel { List services = []; if (medicationStrengthList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.MedicationStrength)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.MedicationStrength) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.MedicationStrength)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.MedicationStrength)); } } if (medicationFrequencyList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.MedicationFrequency)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.MedicationFrequency) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.MedicationFrequency)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.MedicationFrequency)); } } if (medicationDoseTimeList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.MedicationDoseTime)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.MedicationDoseTime) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.MedicationDoseTime)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.MedicationDoseTime)); } } if (medicationRouteList.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.MedicationRoute)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.MedicationRoute) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.MedicationRoute)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.MedicationRoute)); } } if (allMedicationList!.isEmpty) { @@ -567,7 +686,8 @@ class SOAPViewModel extends BaseViewModel { final results = services; if (_SOAPService.hasError || _prescriptionService.hasError) { - error = _SOAPService.error.toString() + _prescriptionService.error.toString(); + error = + _SOAPService.error.toString() + _prescriptionService.error.toString(); setState(ViewState.ErrorLocal); } else { setState( @@ -576,28 +696,40 @@ class SOAPViewModel extends BaseViewModel { } } - callAddAssessmentLookupsServices({String searchKey = "", bool allowSetState = true}) async { + callAddAssessmentLookupsServices( + {String searchKey = "", bool allowSetState = true}) async { if (allowSetState) setState(ViewState.Busy); List services = []; if (listOfDiagnosisCondition.isEmpty) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.DiagnosisCondition)]; + services = [ + await _SOAPService.getMasterLookup( + MasterKeysService.DiagnosisCondition) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.DiagnosisCondition)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.DiagnosisCondition)); } } if (listOfDiagnosisType.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.DiagnosisType)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.DiagnosisType) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.DiagnosisType)); + services.add(await _SOAPService.getMasterLookup( + MasterKeysService.DiagnosisType)); } } if (listOfICD10.length == 0) { if (services.isEmpty) { - services = [await _SOAPService.getMasterLookup(MasterKeysService.ICD10, searchKey: searchKey)]; + services = [ + await _SOAPService.getMasterLookup(MasterKeysService.ICD10, + searchKey: searchKey) + ]; } else { - services.add(await _SOAPService.getMasterLookup(MasterKeysService.ICD10, searchKey: searchKey)); + services.add(await _SOAPService.getMasterLookup(MasterKeysService.ICD10, + searchKey: searchKey)); } } @@ -613,9 +745,15 @@ class SOAPViewModel extends BaseViewModel { onUpdateAssessmentStepStart(PatiantInformtion patientInfo) async { GetAssessmentReqModel getAssessmentReqModel = GetAssessmentReqModel( - patientMRN: patientInfo.patientMRN, episodeID: patientInfo.episodeNo.toString(), editedBy: '', doctorID: '', appointmentNo: int.parse(patientInfo.appointmentNo.toString())); + patientMRN: patientInfo.patientMRN, + episodeID: patientInfo.episodeNo.toString(), + editedBy: '', + doctorID: '', + appointmentNo: int.parse(patientInfo.appointmentNo.toString())); - var services = [await _SOAPService.getPatientAssessment(getAssessmentReqModel)]; + var services = [ + await _SOAPService.getPatientAssessment(getAssessmentReqModel) + ]; final results = services; @@ -630,8 +768,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - - Future isPrescriptionOrderCreated(PatiantInformtion patientInfo) async{ + Future isPrescriptionOrderCreated(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.isPrescriptionOrderCreated(patientInfo); if (_SOAPService.hasError) { @@ -641,32 +778,51 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - - postSubjectServices({patientInfo, String? complaintsText, String? medicationText, String? illnessText, List? myHistoryList, List? myAllergiesList}) async { + postSubjectServices( + {patientInfo, + String? complaintsText, + String? medicationText, + String? illnessText, + List? myHistoryList, + List? myAllergiesList}) async { List services = []; PostChiefComplaintRequestModel postChiefComplaintRequestModel = - createPostChiefComplaintRequestModel(patientInfo: patientInfo, illnessText: illnessText!, medicationText: medicationText!, complaintsText: complaintsText!); + createPostChiefComplaintRequestModel( + patientInfo: patientInfo, + illnessText: illnessText!, + medicationText: medicationText!, + complaintsText: complaintsText!); if (patientChiefComplaintList.isEmpty) { postChiefComplaintRequestModel.editedBy = ''; - services = [await _SOAPService.postChiefComplaint(postChiefComplaintRequestModel)]; + services = [ + await _SOAPService.postChiefComplaint(postChiefComplaintRequestModel) + ]; } else { postChiefComplaintRequestModel.editedBy = ''; - services = [await _SOAPService.patchChiefComplaint(postChiefComplaintRequestModel)]; + services = [ + await _SOAPService.patchChiefComplaint(postChiefComplaintRequestModel) + ]; } if (myHistoryList!.length != 0) { - PostHistoriesRequestModel postHistoriesRequestModel = createPostHistoriesRequestModel(patientInfo: patientInfo, myHistoryList: myHistoryList); + PostHistoriesRequestModel postHistoriesRequestModel = + createPostHistoriesRequestModel( + patientInfo: patientInfo, myHistoryList: myHistoryList); if (patientHistoryList.isEmpty) { - services.add(await _SOAPService.postHistories(postHistoriesRequestModel)); + services + .add(await _SOAPService.postHistories(postHistoriesRequestModel)); } else { - services.add(await _SOAPService.patchHistories(postHistoriesRequestModel)); + services + .add(await _SOAPService.patchHistories(postHistoriesRequestModel)); } } if (myAllergiesList!.length != 0) { - PostAllergyRequestModel postAllergyRequestModel = createPostAllergyRequestModel(myAllergiesList: myAllergiesList, patientInfo: patientInfo); + PostAllergyRequestModel postAllergyRequestModel = + createPostAllergyRequestModel( + myAllergiesList: myAllergiesList, patientInfo: patientInfo); if (patientAllergiesList.isEmpty) { services.add(await _SOAPService.postAllergy(postAllergyRequestModel)); } else { @@ -683,9 +839,15 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - PostChiefComplaintRequestModel createPostChiefComplaintRequestModel({patientInfo, String? complaintsText, String? medicationText, String? illnessText}) { + PostChiefComplaintRequestModel createPostChiefComplaintRequestModel( + {patientInfo, + String? complaintsText, + String? medicationText, + String? illnessText}) { return PostChiefComplaintRequestModel( - admissionNo: patientInfo.admissionNo != null ? int.parse(patientInfo.admissionNo) : null, + admissionNo: patientInfo.admissionNo != null + ? int.parse(patientInfo.admissionNo) + : null, patientMRN: patientInfo.patientMRN, episodeID: patientInfo.episodeNo ?? 0, appointmentNo: patientInfo.appointmentNo ?? 0, @@ -698,10 +860,13 @@ class SOAPViewModel extends BaseViewModel { numberOfWeeks: 0); } - PostHistoriesRequestModel createPostHistoriesRequestModel({patientInfo, List? myHistoryList}) { - PostHistoriesRequestModel postHistoriesRequestModel = new PostHistoriesRequestModel(doctorID: ''); + PostHistoriesRequestModel createPostHistoriesRequestModel( + {patientInfo, List? myHistoryList}) { + PostHistoriesRequestModel postHistoriesRequestModel = + new PostHistoriesRequestModel(doctorID: ''); myHistoryList!.forEach((history) { - if (postHistoriesRequestModel.listMedicalHistoryVM == null) postHistoriesRequestModel.listMedicalHistoryVM = []; + if (postHistoriesRequestModel.listMedicalHistoryVM == null) + postHistoriesRequestModel.listMedicalHistoryVM = []; postHistoriesRequestModel.listMedicalHistoryVM!.add(ListMedicalHistoryVM( patientMRN: patientInfo.patientMRN, episodeId: patientInfo.episodeNo, @@ -716,24 +881,29 @@ class SOAPViewModel extends BaseViewModel { return postHistoriesRequestModel; } - PostAllergyRequestModel createPostAllergyRequestModel({myAllergiesList, patientInfo}) { - PostAllergyRequestModel postAllergyRequestModel = new PostAllergyRequestModel(); + PostAllergyRequestModel createPostAllergyRequestModel( + {myAllergiesList, patientInfo}) { + PostAllergyRequestModel postAllergyRequestModel = + new PostAllergyRequestModel(); myAllergiesList.forEach((allergy) { - if (postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM == null) postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM = []; - postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM!.add(ListHisProgNotePatientAllergyDiseaseVM( - allergyDiseaseId: allergy.selectedAllergy.id, - allergyDiseaseType: allergy.selectedAllergy.typeId, - patientMRN: patientInfo.patientMRN, - episodeId: patientInfo.episodeNo, - appointmentNo: patientInfo.appointmentNo, - severity: allergy.selectedAllergySeverity.id, - remarks: allergy.remark, - createdBy: allergy.createdBy ?? doctorProfile!.doctorID, - createdOn: DateTime.now().toIso8601String(), - editedBy: doctorProfile!.doctorID, - editedOn: DateTime.now().toIso8601String(), - isChecked: allergy.isChecked, - isUpdatedByNurse: false)); + if (postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM == + null) + postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM = []; + postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM!.add( + ListHisProgNotePatientAllergyDiseaseVM( + allergyDiseaseId: allergy.selectedAllergy.id, + allergyDiseaseType: allergy.selectedAllergy.typeId, + patientMRN: patientInfo.patientMRN, + episodeId: patientInfo.episodeNo, + appointmentNo: patientInfo.appointmentNo, + severity: allergy.selectedAllergySeverity.id, + remarks: allergy.remark, + createdBy: allergy.createdBy ?? doctorProfile!.doctorID, + createdOn: DateTime.now().toIso8601String(), + editedBy: doctorProfile!.doctorID, + editedOn: DateTime.now().toIso8601String(), + isChecked: allergy.isChecked, + isUpdatedByNurse: false)); }); return postAllergyRequestModel; @@ -741,13 +911,61 @@ class SOAPViewModel extends BaseViewModel { /*vida plus */ - getAllergiesVidaPlus(PatiantInformtion patientInfo) async{ + getAllergiesVidaPlus(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.patientAllergies(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + searchAllergies(String searchKey) async { + setState(ViewState.BusyLocal); + await _SOAPService.searchAllergies(searchKey); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + addAllergies( + AllergiesListVidaPlus request, PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.addAllergies(request, patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + resolveAllergies( + PatientAllergiesVidaPlus request, PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.resolveAllergies(request, patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } - GeneralGetReqForSOAP generalGetReqForSOAP = - GeneralGetReqForSOAP(patientMRN: patientInfo.patientMRN, episodeId: patientInfo.episodeNo, appointmentNo: int.parse(patientInfo.appointmentNo.toString()), doctorID: '', editedBy: ''); + saveHopi(Map req, PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.saveHopi(req, patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + getHopi(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); - await _SOAPService.patientAllergies(generalGetReqForSOAP); + await _SOAPService.getHopi(patientInfo); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -755,10 +973,29 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + getChiefComplaint(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getChiefComplaint(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } - searchAllergies(String searchKey) async{ + searchChiefComplaint(PatiantInformtion patientInfo, String CC) async { setState(ViewState.BusyLocal); - await _SOAPService.searchAllergies(searchKey); + await _SOAPService.searchChiefComplaintVidaPlus(patientInfo, CC); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + saveChiefComplaint(PatiantInformtion patientInfo, String CC) async { + setState(ViewState.BusyLocal); + await _SOAPService.postChiefComplaintVidaPlus(patientInfo, CC); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index 6eadd40a..6b9f7b0b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -1,25 +1,19 @@ -import 'package:autocomplete_textfield/autocomplete_textfield.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import '../../../../../../core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import '../../../../../../core/model/patient/patiant_info_model.dart'; import '../../../../patient_search/patient_search_header.dart'; -import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'master_key_checkbox_search_allergies_widget.dart'; class AddAllergies extends StatefulWidget { - final Function? addAllergiesFun; - final AllergiesListVidaPlus? myAllergiesList; - - const AddAllergies({Key? key, this.addAllergiesFun, this.myAllergiesList}) + final PatientAllergiesVidaPlus? myAllergiesList; + final PatiantInformtion patientInfo; + const AddAllergies({Key? key, this.myAllergiesList, required this.patientInfo}) : super(key: key); @override @@ -53,9 +47,8 @@ class _AddAllergiesState extends State { title: TranslationBase.of(context).addAllergies), body: MasterKeyCheckboxSearchAllergiesWidget( model: model, - // addAllergy: (AllergiesListVidaPlus mySelectedAllergy) { - // widget.addAllergiesFun!(mySelectedAllergy); - // }, + myAllergiesList: widget.myAllergiesList, + patientInfo: widget.patientInfo ), bottomSheet: CustomBottomSheetContainer( widthFactor: .9, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index fd42e837..b0dae525 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -10,6 +10,8 @@ import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-cust import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import '../../../../../../core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import '../../../../../../core/model/patient/patiant_info_model.dart'; import '../../../../../../widgets/transitions/fade_page.dart'; import '../../objective/widget/EmptyExamination.dart'; @@ -18,13 +20,13 @@ class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { final SOAPViewModel model; final String? buttonName; final String? hintSearchText; - + final PatientAllergiesVidaPlus? myAllergiesList; + final PatiantInformtion patientInfo; MasterKeyCheckboxSearchAllergiesWidget( {Key? key, required this.model, - - // required this.addAllergy, - + this.myAllergiesList, + required this.patientInfo, this.buttonName, this.hintSearchText, @@ -42,7 +44,7 @@ bool loading =false; @override void initState() { - // items.addAll(widget.masterList); + super.initState(); } @@ -102,6 +104,7 @@ bool loading =false; itemBuilder: (context, index) { loading =false; return ListTile(title: AppText(widget.model.searchAllergiesVidaPlus[index].allergyName!), trailing: TextButton.icon(icon: SvgPicture.asset("assets/images/svgs/add-square.svg", color: Color(0xffD02127),), style: ButtonStyle(iconColor: WidgetStateProperty.all(Color(0xffD02127)), ), onPressed: (){ + openReaction(widget.model, widget.model.searchAllergiesVidaPlus[index]); }, label: AppText(TranslationBase.of(context).add, fontSize:12, color:Color(0xffD02127) ,), @@ -126,16 +129,20 @@ bool loading =false; ); } openReaction(model, AllergiesListVidaPlus mySelectedAllergy){ + Navigator.of(context).pop(); Navigator.push( context, FadePage( page:ReactionsSelectionAllergiesWidget( model:model, mySelectedAllergy: mySelectedAllergy, - addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { - Navigator.of(context).pop(); - - }) + patientInfo: widget.patientInfo + ) + // addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { + // + // Navigator.of(context).pop(); + // + // }) )); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 48cb4f6c..938f4c6a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -1,32 +1,36 @@ -import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/flutter_svg.dart'; - +import 'package:provider/provider.dart'; import '../../../../../../config/config.dart'; -import '../../../../../../widgets/bottom_sheet/custom_bottom_sheet_container.dart'; +import '../../../../../../core/model/patient/patiant_info_model.dart'; +import '../../../../../../core/viewModel/project_view_model.dart'; import '../../../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../../../widgets/shared/buttons/app_buttons_widget.dart'; +import '../../../../../base/base_view.dart'; import '../../../../patient_search/patient_search_header.dart'; -import '../../../soap_update/shared_soap_widgets/bottom_sheet_title.dart'; + class ReactionsSelectionAllergiesWidget extends StatefulWidget { final SOAPViewModel? model; - final AllergiesListVidaPlus mySelectedAllergy; - final Function(AllergiesListVidaPlus mySelectedAllergy) addReactionFun; - + final AllergiesListVidaPlus? mySelectedAllergy; + final bool isEdit; + final PatientAllergiesVidaPlus? editSelectedAllergy; + final PatiantInformtion patientInfo; final String? buttonName; ReactionsSelectionAllergiesWidget({ Key? key, required this.model, - required this.addReactionFun, - required this.mySelectedAllergy, + required this.patientInfo, + this.mySelectedAllergy, + this.editSelectedAllergy, + this.isEdit = false, + this.buttonName, }) : super(key: key); @@ -37,11 +41,8 @@ class ReactionsSelectionAllergiesWidget extends StatefulWidget { class _ReactionsSelectionAllergiesWidgetState extends State { - // List items = []; bool loading = false; - // TextEditingController filteredSearchController = TextEditingController(); - @override void initState() { super.initState(); @@ -49,21 +50,23 @@ class _ReactionsSelectionAllergiesWidgetState @override Widget build(BuildContext context) { - return AppScaffold( - // isShowAppBar: true, + + return BaseView( + builder: (_, model, w) => AppScaffold( + isLoading:loading, appBar: PatientSearchHeader( - title: "Select Reaction" + title: widget.mySelectedAllergy !=null ?widget.mySelectedAllergy!.allergyName : widget.editSelectedAllergy!.allergyName ), body: Column( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Expanded( + widget.mySelectedAllergy != null ? Expanded( child: RoundedContainer( margin: EdgeInsets.all(15), child: ListView.builder( itemCount: - widget.mySelectedAllergy.allergyReactionDTOs!.length, + widget.mySelectedAllergy!.allergyReactionDTOs!.length, itemBuilder: (context, index) { loading = false; return Column(children: [ @@ -74,17 +77,17 @@ class _ReactionsSelectionAllergiesWidgetState showTrailingIcon: false, initiallyExpanded: widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index].isSelected!, leading: Checkbox( activeColor: Color(0xffD02127), value: widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index].isSelected!, onChanged: (value) { widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index].isSelected = value; setState(() { @@ -92,7 +95,7 @@ class _ReactionsSelectionAllergiesWidgetState }), title: AppText(widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] .allergyReactionName!), children: [ @@ -111,16 +114,16 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).mild, + value: 1, groupValue: widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection, + .severity, onChanged: (value) { widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection = value; + .severity = value; setState(() {}); }, ), @@ -140,16 +143,16 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).moderate, + value: 2, groupValue: widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection, + .severity, onChanged: (value) { widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection = value; + .severity = value; setState(() {}); }, ), @@ -169,16 +172,16 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).severe, + value: 3, groupValue: widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection, + .severity, onChanged: (value) { widget - .mySelectedAllergy + .mySelectedAllergy! .allergyReactionDTOs![index] - .reactionSelection = value; + .severity = value; setState(() {}); }, ), @@ -195,6 +198,127 @@ class _ReactionsSelectionAllergiesWidgetState Divider(), ]); }, + ))) : Expanded( + child: RoundedContainer( + margin: EdgeInsets.all(15), + child: ListView.builder( + itemCount: + widget.editSelectedAllergy!.patientsAllergyReactionsDTOs!.length, + itemBuilder: (context, index) { + loading = false; + return Column(children: [ + ExpansionTile( + key: Key(index.toString()), + dense: false, + enableFeedback: false, + showTrailingIcon: false, + + initiallyExpanded: widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected!, + leading: + Checkbox( + activeColor: Color(0xffD02127), + value: widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected!, onChanged: (value) { + + widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected = value; + setState(() { + + }); + + }), + title: AppText( widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .allergyReactionName!), + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: ListTile( + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: TranslationBase.of(context).mild, + groupValue:getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!), + onChanged: (value) { + widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .reactionSelection = getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!); + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context).mild, + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: TranslationBase.of(context).moderate, + groupValue: getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!), + onChanged: (value) { + widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .reactionSelection =getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!); + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context).moderate, + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: VisualDensity.compact, + value: TranslationBase.of(context).severe, + groupValue: getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!), + onChanged: (value) { + widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .reactionSelection =getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + .severity!); + + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context).severe, + fontSize: 10, + ), + ], + ))) + ], + ) + ], + ), + Divider(), + ]); + }, ))) ], ), @@ -224,15 +348,22 @@ class _ReactionsSelectionAllergiesWidgetState Expanded( child: Container( child: AppButton( + loading: loading, title: TranslationBase.of(context).save, vPadding: 8, hPadding: 8, color: AppGlobal.appGreenColor, fontColor: Colors.white, onPressed: () { - widget.addReactionFun(widget - .mySelectedAllergy - ); + if(widget.mySelectedAllergy ==null) { + + editAllergy(); + } + else{ + + addAllergy(); + + } }, ), ), @@ -251,6 +382,35 @@ class _ReactionsSelectionAllergiesWidgetState // }, // ) - ); + )); + } + getSeverityByID(int id){ + Map severity={ + 1:TranslationBase.of(context).mild, + 2:TranslationBase.of(context).moderate, + 3:TranslationBase.of(context).severe + + }; + return severity[id]; + } + addAllergy() async{ + setLoader(true); + AllergiesListVidaPlus request = widget + .mySelectedAllergy!; + request.allergyReactionDTOs = widget + .mySelectedAllergy!.allergyReactionDTOs!.where((i) => i.isSelected!).toList(); + await widget.model!.addAllergies(request, widget.patientInfo); + setLoader(false); + Navigator.of(context).pop(); + } + + editAllergy(){ + + } + setLoader(bool value) { + loading = value; + setState(() { + + }); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 0242bb46..ee4a3933 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -1,181 +1,207 @@ - import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; +import '../../../../../../core/model/patient/patiant_info_model.dart'; import '../../../../../../widgets/transitions/fade_page.dart'; -import '../chief_complaint/widgets/add_soap_item.dart'; import 'add_allergies.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; class UpdateAllergiesWidgetVidaPlus extends StatefulWidget { List? myAllergiesList; + final PatiantInformtion patientInfo; - UpdateAllergiesWidgetVidaPlus({Key? key, this.myAllergiesList}); + UpdateAllergiesWidgetVidaPlus( + {Key? key, this.myAllergiesList, required this.patientInfo}); @override _UpdateAllergiesWidgetState createState() => _UpdateAllergiesWidgetState(); } bool noKnownAllergies = false; -enum Severity {mild,moderate,severe } + +enum Severity { mild, moderate, severe } class _UpdateAllergiesWidgetState extends State { SOAPViewModel? model; @override Widget build(BuildContext context) { - ProjectViewModel projectViewModel = Provider.of(context); - changeAllState() { - setState(() { - print(widget.myAllergiesList); - }); - } - - return Column( - children: [ - SizedBox( - height: 20, - ), - AddSoapItem( - title: "${TranslationBase.of(context).addAllergies}", - onAddSoapItemClicked: () { - Navigator.push( - context, - FadePage( - page: AddAllergies(), - ), - ); - }, - ), - SizedBox( - height: 20, - ), - widget.myAllergiesList!.isEmpty - ? Row( - mainAxisSize: MainAxisSize.max, - children: [ - Checkbox( - value: noKnownAllergies, - checkColor: Colors.white, - activeColor: Colors.red, - onChanged: (value) { - noKnownAllergies = value!; - setState(() {}); - }, - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - // Reduces padding around checkbox - visualDensity: - VisualDensity.compact, // Minimizes size further - ), - AppText(TranslationBase.of(context).noKnownAllergies) - ], - ) - : Divider( - thickness: 1, - color: Color(0xffEFEFEF), - ), - ListView( - padding: EdgeInsets.all(10), - shrinkWrap: true, - children: widget.myAllergiesList!.map((selectedAllergy) { - return Column( - - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - selectedAllergy.allergyName!, - fontSize: 12, - fontWeight: FontWeight.w800, - letterSpacing: -0.48, - ), - - selectedAllergy.patientsAllergyReactionsDTOs!.isNotEmpty ? ListView( - shrinkWrap: true, - children: selectedAllergy.patientsAllergyReactionsDTOs!.map((PatientsAllergyReactionsDTOs reaction) => Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - -Row(children: [ AppText(reaction.allergyReactionName!, fontSize: 10,), - AppText(" - "), - AppText( - Severity.values[reaction.severity! -1].name, - - color: Color(0xFFCC9B14), - fontSize: 10, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - )],) - - ],)).toList()) : AppText("----"), - - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - SizedBox( - height: 10, - ), - TextButton.icon( - onPressed: () {}, - icon: SvgPicture.asset( - "assets/images/svgs/edit-icon.svg", - height: 16, - ), - label: AppText( - "Edit", - fontSize: 12, + return BaseView( + onModelReady: (model) {}, + builder: (_, model, w) => Column( + children: [ + SizedBox( + height: 20, + ), + AddSoapItem( + title: "${TranslationBase.of(context).addAllergies}", + onAddSoapItemClicked: () { + Navigator.push( + context, + FadePage( + page: AddAllergies( + patientInfo: widget.patientInfo, + // addAllergiesFun: (){ + // print("addAllergies save"); + // }, ), ), - TextButton.icon( - onPressed: () {}, - icon: SvgPicture.asset( - "assets/images/svgs/resolve.svg", - height: 18, + ); + }, + ), + SizedBox( + height: 20, + ), + widget.myAllergiesList!.isEmpty + ? Row( + mainAxisSize: MainAxisSize.max, + children: [ + Checkbox( + value: noKnownAllergies, + checkColor: Colors.white, + activeColor: Colors.red, + onChanged: (value) { + noKnownAllergies = value!; + setState(() {}); + }, + materialTapTargetSize: + MaterialTapTargetSize.shrinkWrap, + // Reduces padding around checkbox + visualDensity: + VisualDensity.compact, // Minimizes size further + ), + AppText(TranslationBase.of(context).noKnownAllergies) + ], + ) + : Divider( + thickness: 1, + color: Color(0xffEFEFEF), + ), + ListView( + padding: EdgeInsets.all(10), + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + children: widget.myAllergiesList!.map((selectedAllergy) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + selectedAllergy.allergyName!, + fontSize: 12, + fontWeight: FontWeight.w800, + letterSpacing: -0.48, ), - label: AppText("Resolve", - fontSize: 12, color: Color(0xff359846))) - ], - ) - ], - ); - }).toList()), - ], - ); + selectedAllergy + .patientsAllergyReactionsDTOs!.isNotEmpty + ? ListView( + shrinkWrap: true, + children: selectedAllergy + .patientsAllergyReactionsDTOs! + .map((PatientsAllergyReactionsDTOs + reaction) => + Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Row( + children: [ + AppText( + reaction + .allergyReactionName!, + fontSize: 10, + ), + AppText(" - "), + AppText( + Severity + .values[ + reaction.severity! - + 1] + .name, + color:getColor(reaction.severity!), + fontSize: 10, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ) + ], + ) + ], + )) + .toList()) + : AppText("----"), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + SizedBox( + height: 10, + ), + TextButton.icon( + onPressed: () { + Navigator.push( + context, + FadePage( + page: + ReactionsSelectionAllergiesWidget( + model: model, + mySelectedAllergy: null, + editSelectedAllergy: selectedAllergy!, + patientInfo: widget.patientInfo, + ))); + }, + icon: SvgPicture.asset( + "assets/images/svgs/edit-icon.svg", + height: 16, + ), + label: AppText( + TranslationBase.of(context).edit, + fontSize: 12, + ), + ), + TextButton.icon( + onPressed: () { + resolveAllergy(model, selectedAllergy); + }, + icon: SvgPicture.asset( + "assets/images/svgs/resolve.svg", + height: 18, + ), + label: AppText( + TranslationBase.of(context).resolve, + fontSize: 12, + color: Color(0xff359846))) + ], + ) + ], + ); + }).toList()), + ], + )); } -// -// removeAllergy(MySelectedAllergy mySelectedAllergy) { -// List allergy = -// // ignore: missing_return -// widget.myAllergiesList! -// .where((element) => mySelectedAllergy.selectedAllergySeverity!.id == element.selectedAllergySeverity!.id && mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id) -// .toList(); -// -// if (allergy.length > 0) { -// if (allergy.first.isLocal) { -// setState(() { -// widget.myAllergiesList!.remove(allergy.first); -// }); -// } -// setState(() { -// allergy[0].isChecked = false; -// }); -// } -// } -// openAllergiesList(BuildContext context, Function changeParentState) { -// showModalBottomSheet( -// backgroundColor: Colors.white, -// isScrollControlled: true, -// isDismissible: false, -// context: context, -// builder: (context) { -// return AddAllergies(); -// }); -// } + resolveAllergy( + SOAPViewModel model, PatientAllergiesVidaPlus selectedAllergy) async{ + GifLoaderDialogUtils.showMyDialog(context); + + await model.resolveAllergies(selectedAllergy, widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); + + } + Color getColor(int severity){ + Map color ={ + 1:Color(0xff359846) , + 2:Color(0xFFCC9B14), + 3:Color(0xffD02127) + }; + return color[severity]; + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index ef076dcf..f06810e9 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; @@ -5,6 +6,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plu import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; class AddChiefComplaint extends StatelessWidget { @@ -13,6 +15,7 @@ class AddChiefComplaint extends StatelessWidget { final String? firstField; final String? secondField; final String? thirdField; + final PatiantInformtion patientInfo; const AddChiefComplaint( {super.key, @@ -20,7 +23,9 @@ class AddChiefComplaint extends StatelessWidget { required this.selectedType, this.firstField, this.secondField, - this.thirdField}); + this.thirdField, + required this.patientInfo + }); @override Widget build(BuildContext context) { @@ -43,6 +48,13 @@ class AddChiefComplaint extends StatelessWidget { firstField: firstField, secondField: secondField, thirdField: thirdField, + searchData: model.searchChiefComplaintList, + onSearch:(String value){ + searchChiefComplaint(model, value); + }, + onSave: (String chiefComplaint){ + addChiefComplaint(model, chiefComplaint); + }, ), SizedBox(height: 16,), PreviousCheifComplaints() @@ -53,4 +65,13 @@ class AddChiefComplaint extends StatelessWidget { ), ); } + addChiefComplaint(SOAPViewModel model, String CC) async{ + + await model.saveChiefComplaint(patientInfo, CC); + } + searchChiefComplaint(SOAPViewModel model, String CC) async{ + + await model.searchChiefComplaint(patientInfo, CC); + + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index dc1d7e29..6bb0ddad 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,21 +1,27 @@ +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; -import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; class UpdateChiefComplaints extends StatelessWidget { final List complaints; - - const UpdateChiefComplaints({Key? key, required this.complaints}) + final PatiantInformtion patientInfo; + const UpdateChiefComplaints({Key? key, required this.complaints, required this.patientInfo}) : super(key: key); @override Widget build(BuildContext context) { - return Padding( + return BaseView( + onModelReady: (model){ + WidgetsBinding.instance.addPostFrameCallback((_) { + getChiefComplaints(model); + }); + }, + builder: (_, model, w) => Padding( padding: const EdgeInsets.all(12.0), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ AddSoapItem( @@ -25,6 +31,8 @@ class UpdateChiefComplaints extends StatelessWidget { MaterialPageRoute( builder: (BuildContext context) => AddChiefComplaint( complaints: complaints, + patientInfo: patientInfo, + selectedType: '', firstField: '', secondField: '', @@ -34,15 +42,24 @@ class UpdateChiefComplaints extends StatelessWidget { title: "Add Chief Complaint", ), SizedBox(height: 16), - if (complaints.isEmpty) ...{ - Center(child: EmptyComplaints()) - } else ...{ + Container(width: MediaQuery.of(context).size.width, + height: 40, + child: ListView.builder( - itemBuilder: (_, index) => ComplaintItems( - complaint: complaints[index], - onCrossClicked: (complaints) {})) - } + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.getChiefComplaintListVidaPlus.length, + itemBuilder: (_, index) => + ComplaintItems( + complaint: model.getChiefComplaintListVidaPlus[index].chiefComplain!, + onCrossClicked: (complaints) {}) + + )) + ]), - ); + )); + } + getChiefComplaints(SOAPViewModel model){ + model.getChiefComplaint(patientInfo); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index fd83e263..c7d437c2 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -1,8 +1,12 @@ +import 'dart:async'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; -import 'package:hexcolor/hexcolor.dart'; class ComplaintSelection extends StatefulWidget { final List complaints; @@ -10,13 +14,20 @@ class ComplaintSelection extends StatefulWidget { final String? firstField; final String? secondField; final String? thirdField; + final Function(String cheifComplaint)? onSave; + final Function(String value)? onSearch; + final List? searchData; const ComplaintSelection({super.key, required this.complaints, required this.selectedType, this.firstField, this.secondField, - this.thirdField}); + this.thirdField, + this.onSave, + this.onSearch, + this.searchData + }); @override State createState() => _ComplaintSelectionState(); @@ -84,7 +95,11 @@ class _ComplaintSelectionState extends State { @override Widget build(BuildContext context) { - return Material( + return BaseView( + onModelReady: (model){ + + }, + builder: (_, model, w) => Material( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), side: BorderSide( @@ -194,16 +209,32 @@ class _ComplaintSelectionState extends State { ), ), ), - TextWithSelectedItems() + TextWithSelectedItems(model) ], ), ), - ); + )); } FocusNode _focus = FocusNode(); + Timer? _tTimer; + void _onStopped(String text) { + widget.onSearch!(text); + print(text); + } + + void _onTextChanged(String text) { + + if (_tTimer != null) { + _tTimer!.cancel(); + } + _tTimer = Timer(Duration(milliseconds: 500), (){ + _onStopped(text); + + }); + } - Widget TextWithSelectedItems() { + Widget TextWithSelectedItems(SOAPViewModel model) { return Material( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), @@ -227,33 +258,65 @@ class _ComplaintSelectionState extends State { ), ), SizedBox(height: 8,), + Row(children: [ + Expanded(child: Padding( + padding: EdgeInsets.only(left: 10,right: 10), + child: + + TextFormField( + autofocus: true, + + decoration: InputDecoration( + hintText: '', + border: InputBorder.none, + isCollapsed: true, + suffixIcon: model.state == ViewState.BusyLocal ?Transform.scale( + scale: 0.5, + child: CircularProgressIndicator(strokeWidth: 2,) ,): SizedBox() + ), + onChanged: _onTextChanged,) + + ),) + + ],), + Stack(children: [ + Positioned(child:Material( + elevation: 4.0, // Optional: for shadow effect + child: + ConstrainedBox( + constraints: BoxConstraints( + minHeight: 0, + maxHeight: 300), + child: + ListView.builder( + shrinkWrap: true, + itemCount: widget.searchData!.length, + itemBuilder: (context, index) { + return ListTile( + + title: InkWell(child:AppText(widget.searchData![index].chiefComplain!), onTap:(){ + var cc = widget.searchData![index].chiefComplain; + model.searchChiefComplaintList!.length =0; + setState((){}); + widget.onSave!(cc!); + })); + }))))]), + SizedBox( height: 43, child: Row( children: [ + Expanded( child: ListView.builder(scrollDirection: Axis.horizontal, - itemCount: widget.complaints.length + 1, + itemCount: widget.complaints.length, itemBuilder: (context, index) { - if (index == widget.complaints.length) { - return SizedBox( - width: MediaQuery - .sizeOf(context) - .width, - child: TextField( - decoration: InputDecoration.collapsed( - hintText: '', - ), - onChanged: (value) { - },), - ); - } else { return ComplaintItems( complaint: widget.complaints[index], onCrossClicked: (complaints) {}); - } - }), + }) + // }), ), ], ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index ff6a513a..814769de 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -10,38 +10,23 @@ class ComplaintItems extends StatelessWidget { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.all(8.0), - child: Material( - color: Color(0XAAA5A5A5), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(5),), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox(width: 6,), - AppText( - complaint, - fontWeight: FontWeight.w400, - fontSize: 14, - color: Color(0xFF575757), - ), - SizedBox(width: 8,), - InkWell( - onTap: () { - onCrossClicked(complaint); - }, - child: Icon( - Icons.close, - size: 16, - color: Color(0xFFD02127), - ), - ), - SizedBox(width: 4,), - - ], - ), - ), - ); + return Container( + padding: const EdgeInsets.all(5.0), + width: 120, + height: 40, + alignment: Alignment.center, + decoration: BoxDecoration( + color: Color(0xffEAEAEA), + borderRadius: BorderRadius.circular( + 5, + )), + child: AppText( + textOverflow: TextOverflow.ellipsis, + complaint, + fontWeight: FontWeight.w400, + fontSize: 14, + color: Color(0xFF575757), + ), + ); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart index c40ec72b..a0333151 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart @@ -1,25 +1,48 @@ +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; -import '../../../../../../utils/translations_delegate_base_utils.dart'; -import '../../../../../../widgets/shared/app_texts_widget.dart'; -import '../../../../../../widgets/shared/text_fields/app-textfield-custom.dart'; class UpdatePresentIllness extends StatefulWidget { + PatiantInformtion? patientInfo; + UpdatePresentIllness(this.patientInfo, {Key? key}) : super(key: key); + @override - State createState() => _UpdatePresentIllnessState(); + State createState() => UpdatePresentIllnessState(); } -class _UpdatePresentIllnessState extends State { - bool isPatientSelected = false; +class UpdatePresentIllnessState extends State { + bool isPatientSelected = true; bool isFamilySelected = false; bool isOtherSelected = false; final TextEditingController familyController = TextEditingController(); final TextEditingController otherController = TextEditingController(); + final TextEditingController patientController = TextEditingController(); + @override + void initState() { + + super.initState(); + } @override Widget build(BuildContext context) { - return Column( + + return BaseView( + onModelReady: (model){ + WidgetsBinding.instance.addPostFrameCallback((_) { + getHopi(model); + }); + }, + builder: (_, model, w) => Column( + // key:UpdatePresentIllness.HopiKey, crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( @@ -36,7 +59,7 @@ class _UpdatePresentIllnessState extends State { ListTileTheme( horizontalTitleGap: 0, child: CheckboxListTile( - value: isPatientSelected, + value: this.isPatientSelected, activeColor: Color(0xFFD02127), checkColor: Colors.white, controlAffinity: ListTileControlAffinity.leading, @@ -174,27 +197,67 @@ class _UpdatePresentIllnessState extends State { height: 8, ), AppTextFieldCustom( + isTextFieldHasSuffix: true, hintText: TranslationBase.of(context).remarks, - controller: otherController, + controller: patientController, inputType: TextInputType.multiline, maxLines: 25, minLines: 3, hasBorder: true, onClick: () {}, - onChanged: (value) {}, - onFieldSubmitted: () {}, + onChanged: (value) { + print("On Field Changed.."); + }, + onFieldSubmitted: () { + print("---Submit....."); + }, + suffixIcon: IconButton(icon:Icon(Icons.save_as_outlined, color: Colors.red, size: 25,), onPressed: (){ + saveHopi(model); + },), ), SizedBox( height: 8, ), - AppText( - 'Last saved: 22-10-2024 08:07 am [3 hours ago]', - fontSize: 10, - fontWeight: FontWeight.normal, - textAlign: TextAlign.start, - color: Color(0XFF575757), - ), + + // AppText( + // 'Last saved: 22-10-2024 08:07 am [3 hours ago]', + // fontSize: 10, + // fontWeight: FontWeight.normal, + // textAlign: TextAlign.start, + // color: Color(0XFF575757), + // ), ], + ), + ); } + saveHopi(SOAPViewModel model) async{ + GifLoaderDialogUtils.showMyDialog(context); + if(patientController.text.isEmpty) { + DrAppToastMsg.showErrorToast("Please Enter Remarks"); + return; + } + Map request = { + "hpi": patientController.text, + "isHpiTakenPatient": isPatientSelected, + "isHpiTakenFamily": isFamilySelected, + "isHpiTakenOther": isOtherSelected, + "hpiTakenOtherText": otherController.text, + "hpiTakenFamilyText": familyController.text, + }; + await model!.saveHopi(request, widget.patientInfo!); + GifLoaderDialogUtils.hideDialog(context); + } + getHopi(SOAPViewModel model) async{ + await model!.getHopi(widget.patientInfo!); + setData(model); + } + setData(SOAPViewModel model){ + if(model.getHopiDetails.isNotEmpty) { + patientController.text = model.getHopiDetails[0].hpi!; + isOtherSelected = model.getHopiDetails[0].isHpiTakenOther!; + isFamilySelected = model.getHopiDetails[0].isHpiTakenFamily!; + isPatientSelected = model.getHopiDetails[0].isHpiTakenPatient!; + } + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index 396c08ea..54b51c41 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -203,6 +203,7 @@ class _UpdateSubjectivePageVidaPlusState }, child: UpdateChiefComplaints( complaints: [], + patientInfo: widget.patientInfo, ), isExpanded: isChiefExpand, ), @@ -222,7 +223,7 @@ class _UpdateSubjectivePageVidaPlusState }); }, child: Column( - children: [UpdatePresentIllness()], + children: [UpdatePresentIllness(widget.patientInfo)], ), isExpanded: isHistoryExpand, ), @@ -245,6 +246,7 @@ class _UpdateSubjectivePageVidaPlusState children: [ UpdateAllergiesWidgetVidaPlus( myAllergiesList: myAllergiesList, + patientInfo: widget.patientInfo ), SizedBox( height: 30, @@ -321,11 +323,10 @@ class _UpdateSubjectivePageVidaPlusState } } - @override + Function nextFunction(model) { - // addSubjectiveInfo(model: model, - // // myAllergiesList: myAllergiesList.where((i) => i.isChecked).toList(), - // myHistoryList: myHistoryList); - return () {}; + //need to be implemented .. + return (){}; } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 1bcc942a..4608e1e0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex = 2; + int _currentIndex = 0; List myAllergiesList = []; List myHistoryList = []; @@ -97,6 +97,18 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ + + + UpdateSubjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), + UpdateObjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), UpdateAssessmentPage( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, @@ -111,16 +123,6 @@ class _UpdateSoapIndexVidaPlusState extends State sOAPViewModel: model, changeStateFun: changeStateFun, ), - UpdateObjectivePageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState), - UpdateSubjectivePageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState), ], ), ) @@ -175,6 +177,7 @@ class _UpdateSoapIndexVidaPlusState extends State fontWeight: FontWeight.w600, color: Colors.red[700]!, onPressed: () async { + model.nextOnSubjectPage(model); }, ), diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart index 049cc26e..87f341eb 100644 --- a/lib/widgets/auth/sms-popup.dart +++ b/lib/widgets/auth/sms-popup.dart @@ -344,7 +344,7 @@ class SMSOTP { } checkValue() async { - if (verifyAccountForm.currentState!.validate() && _token !=null) { + if (verifyAccountForm.currentState!.validate() ) { //&& _token !=null removed cloud flare for vida plus // if (digit1.text.isNotEmpty && digit2.text.isNotEmpty && digit3.text.isNotEmpty && digit4.text.isNotEmpty) { onSuccess(digit1.text.toString() + digit2.text.toString() + digit3.text.toString() + digit4.text.toString()); this.isClosed = true; From 6392620df7a7f8351b5d82ba988f1cd33bb20d04 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 24 Nov 2024 08:41:37 +0300 Subject: [PATCH 31/76] WD: vida plus episode changes --- assets/images/svgs/favoriteadded.svg | 3 + lib/config/config.dart | 20 + lib/config/localized_values.dart | 14 +- lib/core/enum/master_lookup_key.dart | 4 +- .../assessment/FavoriteDiseaseDetails.dart | 92 +++ .../SOAP/assessment/audit_diagnosis.dart | 37 + .../model/SOAP/assessment/diagnosis_type.dart | 10 + .../patient_previous_diagnosis.dart | 190 ++++++ .../SOAP/assessment/search_diagnosis.dart | 83 +++ .../patient_physical_examination.dart | 97 +++ .../post_physical_examination_model.dart | 54 ++ lib/core/service/base/lookup-service.dart | 2 +- .../soap/SOAP_service.dart | 340 +++++++++- lib/core/viewModel/SOAP_view_model.dart | 174 ++++- .../objective/add_examination_page.dart | 2 +- .../objective/update_objective_page.dart | 4 +- .../assessment/add_diagnosis.dart | 82 ++- .../assessment/update_assessment_page.dart | 50 +- .../assessment/widget/audit_item.dart | 94 +++ .../widget/audit_list_bottom_sheet.dart | 62 ++ .../assessment/widget/current_diagnosis.dart | 155 ++++- .../assessment/widget/empty_dropdown.dart | 20 + .../assessment/widget/enter_diagnosis.dart | 639 +++++++++++------- .../assessment/widget/favotite_diagnosis.dart | 416 ++++++++++++ .../assessment/widget/previous_diagnosis.dart | 97 ++- .../widget/previous_diagnosis_item.dart | 86 ++- .../add_examination_page_vida_plus.dart | 4 +- ...inations_list_search_vida_plus_widget.dart | 93 +-- .../update_objective_page_vida_plus.dart | 91 +-- .../update_soap_index_vida_plus.dart | 16 +- .../translations_delegate_base_utils.dart | 10 + 31 files changed, 2566 insertions(+), 475 deletions(-) create mode 100644 assets/images/svgs/favoriteadded.svg create mode 100644 lib/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart create mode 100644 lib/core/model/SOAP/assessment/audit_diagnosis.dart create mode 100644 lib/core/model/SOAP/assessment/diagnosis_type.dart create mode 100644 lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart create mode 100644 lib/core/model/SOAP/assessment/search_diagnosis.dart create mode 100644 lib/core/model/SOAP/physical_exam/patient_physical_examination.dart create mode 100644 lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart diff --git a/assets/images/svgs/favoriteadded.svg b/assets/images/svgs/favoriteadded.svg new file mode 100644 index 00000000..3b4577cf --- /dev/null +++ b/assets/images/svgs/favoriteadded.svg @@ -0,0 +1,3 @@ + + + diff --git a/lib/config/config.dart b/lib/config/config.dart index ad086d11..b7dd3ee2 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -308,6 +308,26 @@ const UPDATE_ALLERGIES = 'Services/DoctorApplication.svc/REST/UpdateAllergy'; const GET_CHIEF_COMPLAINT_VP = 'Services/DoctorApplication.svc/REST/ChiefComplaintDetails'; +const SEARCH_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/SearchDiagnosis'; + +const DIAGNOSIS_TYPE = 'Services/DoctorApplication.svc/REST/DiagnosisType'; + +const CONDITION_TYPE = 'Services/DoctorApplication.svc/REST/DiagnosisCondition'; + +const CREATE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/CreateDiagnosis'; + +const PREVIOUS_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisPreviousDetails'; + +const AUDIT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAudit'; + +const REMOVE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisRemove'; + +const FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisGetFavourite'; + +const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAddFavourite'; + +const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/ContinuePreviousEpisode'; + var selectedPatientType = 1; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 22b0cc41..b8d6f97f 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1203,7 +1203,17 @@ const Map> localizedValues = { "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, "mild": {"en": "Mild", "ar":"خفيف"}, - "moderate": {"en": "Moderate", "ar":"معتدل"}, + "noRemarks": {"en": "No Remarks", "ar":"لا ملاحظات"}, + "event": {"en": "Event: ", "ar":"حدث: "}, + "deletedRemarks": {"en": "Deleted Remarks: ", "ar":"ملاحظات محذوفة: "}, + "newValue": {"en": "New Value: ", "ar":"قيمة جديدة: "}, + "fieldName": {"en": "Field Name: ", "ar":"اسم الحقل: "}, + "oldValue": {"en": "Old Value: ", "ar":"القيمة القديمة: "}, + "favoriteDiagnosis": {"en": "Favorite Diagnosis", "ar":"التشخيص المفضل"}, + "addToFavorite": {"en": "Add To Favorite", "ar":"إضافة إلى المفضلة"}, "noDiagnosisFound": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, - + "areYouSureYouWantToDeleteDiagnosis": { + "en": "Are you sure you want to delete diagnosis", + "ar": "هل أنت متأكد من أنك تريد حذف التشخيص" + } }; diff --git a/lib/core/enum/master_lookup_key.dart b/lib/core/enum/master_lookup_key.dart index 04608719..514caf56 100644 --- a/lib/core/enum/master_lookup_key.dart +++ b/lib/core/enum/master_lookup_key.dart @@ -5,7 +5,7 @@ enum MasterKeysService { HistorySocial, HistorySports, HistorySurgical, - PhysicalExamination, + PostPhysicalExaminationModel, AllergySeverity, physiotherapyGoals, DiagnosisCondition, @@ -45,7 +45,7 @@ extension SelectedMasterKeysService on MasterKeysService { case MasterKeysService.HistorySurgical: return 66; break; - case MasterKeysService.PhysicalExamination: + case MasterKeysService.PostPhysicalExaminationModel: return 59; break; case MasterKeysService.AllergySeverity: diff --git a/lib/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart b/lib/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart new file mode 100644 index 00000000..19614800 --- /dev/null +++ b/lib/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart @@ -0,0 +1,92 @@ +class FavoriteDiseaseDetails { + String? categoryCode; + int? categoryId; + String? chapterCode; + String? codeRange; + String? createdBy; + String? diseaseType; + String? diseases; + String? diseasesCode; + int? diseasesId; + int? favoritesId; + int? hospitalGroupId; + int? hospitalId; + int? icdId; + String? icdSubVersion; + String? icdType; + String? icdVersion; + bool? isDeleted; + String? parentDiseasesCode; + String? problemCode; + String? problemDescription; + int? problemMasterId; + int? problemMasterRevisionId; + String? problemName; + String? problemType; + String? rowVersion; + String? sectionCode; + int? specificationId; + + FavoriteDiseaseDetails.fromJson(Map json) { + categoryCode = json['CategoryCode']; + categoryId = json['CategoryId']; + chapterCode = json['ChapterCode']; + codeRange = json['CodeRange']; + createdBy = json['CreatedBy']; + diseaseType = json['DiseaseType']; + diseases = json['Diseases']; + diseasesCode = json['DiseasesCode']; + diseasesId = json['DiseasesId']; + favoritesId = json['FavoritesId']; + hospitalGroupId = json['HospitalGroupID']; + hospitalId = json['HospitalID']; + icdId = json['IcdId']; + icdSubVersion = json['IcdSubVersion']; + icdType = json['IcdType']; + icdVersion = json['IcdVersion']; + isDeleted = json['IsDeleted']; + parentDiseasesCode = json['ParentDiseasesCode']; + problemCode = json['ProblemCode']; + problemDescription = json['ProblemDescription']; + problemMasterId = json['ProblemMasterID']; + problemMasterRevisionId = json['ProblemMasterRevisionID']; + problemName = json['ProblemName']; + problemType = json['ProblemType']; + rowVersion = json['RowVersion']; + sectionCode = json['SectionCode']; + specificationId = json['SpecificationId']; + } + + // toJson method + Map toJson() { + return { + 'CategoryCode': categoryCode, + 'CategoryId': categoryId, + 'ChapterCode': chapterCode, + 'CodeRange': codeRange, + 'CreatedBy': createdBy, + 'DiseaseType': diseaseType, + 'Diseases': diseases, + 'DiseasesCode': diseasesCode, + 'DiseasesId': diseasesId, + 'FavoritesId': favoritesId, + 'HospitalGroupID': hospitalGroupId, + 'HospitalID': hospitalId, + 'IcdId': icdId, + 'IcdSubVersion': icdSubVersion, + 'IcdType': icdType, + 'IcdVersion': icdVersion, + 'IsDeleted': isDeleted, + 'ParentDiseasesCode': parentDiseasesCode, + 'ProblemCode': problemCode, + 'ProblemDescription': problemDescription, + 'ProblemMasterID': problemMasterId, + 'ProblemMasterRevisionID': problemMasterRevisionId, + 'ProblemName': problemName, + 'ProblemType': problemType, + 'RowVersion': rowVersion, + 'SectionCode': sectionCode, + 'SpecificationId': specificationId, + }; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/assessment/audit_diagnosis.dart b/lib/core/model/SOAP/assessment/audit_diagnosis.dart new file mode 100644 index 00000000..ac7abbdc --- /dev/null +++ b/lib/core/model/SOAP/assessment/audit_diagnosis.dart @@ -0,0 +1,37 @@ +class AuditDiagnosis { + String? approvedBy; + String? approvedOn; + String? createdBy; + String? createdOn; + String? deletedBy; + String? deletedOn; + String? deletedRemarks; + String? diagnosisType; + bool? isEventIdentifiedExternally; + bool? isResolved; + String? modifiedBy; + String? modifiedOn; + int? patientId; + int? patientProblemRevisionId; + String? remarks; + String? status; + + AuditDiagnosis.fromJson(Map json) { + approvedBy = json['approvedBy']; + approvedOn = json['approvedOn']; + createdBy = json['createdBy']; + createdOn = json['createdOn']; + deletedBy = json['deletedBy']; + deletedOn = json['deletedOn']; + deletedRemarks = json['deletedRemarks']; + diagnosisType = json['diagnosisType']; + isEventIdentifiedExternally = json['isEventIdentifiedExternally']; + isResolved = json['isResolved']; + modifiedBy = json['modifiedBy']; + modifiedOn = json['modifiedOn']; + patientId = json['patientId']; + patientProblemRevisionId = json['patientProblemRevisionId']; + remarks = json['remarks']; + status = json['status']; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/assessment/diagnosis_type.dart b/lib/core/model/SOAP/assessment/diagnosis_type.dart new file mode 100644 index 00000000..549342d0 --- /dev/null +++ b/lib/core/model/SOAP/assessment/diagnosis_type.dart @@ -0,0 +1,10 @@ +class DiagnosisType { + String? diagnosisType; + String? name; + + + DiagnosisType.fromJson(Map json) { + diagnosisType = json['diagnosisType'] ?? ''; + name = json['name'] ?? ''; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart new file mode 100644 index 00000000..0cc2401e --- /dev/null +++ b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart @@ -0,0 +1,190 @@ +class PatientPreviousDiagnosis { + bool? active; + int? admissionId; + int? admissionRequestId; + int? appointmentId; + String? approvedBy; + String? approvedOn; + int? assessmentId; + int? chiefComplainId; + int? clinicGroupId; + int? clinicId; + String? condition; + String? createdBy; + String? createdOn; + String? deletedBy; + String? deletedByDoctorName; + String? deletedOn; + String? deletedRemarks; + String? diagnosisType; + int? doctorId; + int? episodeId; + int? hospitalGroupId; + int? hospitalId; + dynamic icdCodeDetailsDto; + String? icdSubVersion; + String? icdType; + dynamic icdVersion; + String? location; + String? loginUserId; + String? modifiedBy; + String? modifiedOn; + String? module; + String? parentLocation; + int? patientId; + dynamic patientProblemChangeHistories; + int? patientProblemId; + int? patientProblemRevisionId; + int? pomrId; + bool? previousProblem; + int? problemId; + String? problemName; + String? remarks; + bool? resolved; + String? selectedCategoryCode; + String? selectedChapterCode; + String? selectedDisease; + String? selectedIcdCode; + String? selectedSectionCode; + String? status; + List? visitWisePatientDiagnoses; + bool? visitWiseSelected; + + PatientPreviousDiagnosis.fromJson(Map json) { + active = json['active']; + admissionId = json['admissionId']; + admissionRequestId = json['admissionRequestId']; + appointmentId = json['appointmentId']; + approvedBy = json['approvedBy']; + approvedOn = json['approvedOn']; + assessmentId = json['assessmentId']; + chiefComplainId = json['chiefComplainId']; + clinicGroupId = json['clinicGroupId']; + clinicId = json['clinicId']; + condition = json['condition']; + createdBy = json['createdBy']; + createdOn = json['createdOn']; + deletedBy = json['deletedBy']; + deletedByDoctorName = json['deletedByDoctorName']; + deletedOn = json['deletedOn']; + deletedRemarks = json['deletedRemarks']; + diagnosisType = json['diagnosisType']; + doctorId = json['doctorId']; + episodeId = json['episodeId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + icdCodeDetailsDto = json['icdCodeDetailsDto']; + icdSubVersion = json['icdSubVersion']; + icdType = json['icdType']; + icdVersion = json['icdVersion']; + location = json['location']; + loginUserId = json['loginUserId']; + modifiedBy = json['modifiedBy']; + modifiedOn = json['modifiedOn']; + module = json['module']; + parentLocation = json['parentLocation']; + patientId = json['patientId']; + patientProblemChangeHistories = json['patientProblemChangeHistories']; + patientProblemId = json['patientProblemId']; + patientProblemRevisionId = json['patientProblemRevisionId']; + pomrId = json['pomrId']; + previousProblem = json['previousProblem']; + problemId = json['problemId']; + problemName = json['problemName']; + remarks = json['remarks']; + resolved = json['resolved']; + selectedCategoryCode = json['selectedCategoryCode']; + selectedChapterCode = json['selectedChapterCode']; + selectedDisease = json['selectedDisease']; + selectedIcdCode = json['selectedIcdCode']; + selectedSectionCode = json['selectedSectionCode']; + status = json['status']; + visitWiseSelected = json['visitWiseSelected']; + if (json['visitWisePatientDiagnoses'] != null) { + visitWisePatientDiagnoses = []; + json['visitWisePatientDiagnoses'].forEach((v) { + visitWisePatientDiagnoses!.add(VisitWisePatientDiagnosis.fromJson(v)); + }); + } + } +} + +class VisitWisePatientDiagnosis { + bool? active; + int? admissionId; + int? appointmentId; + String? approvedBy; + String? approvedOn; + int? assessmentId; + int? clinicId; + String? condition; + String? createdBy; + String? createdOn; + String? deletedBy; + String? deletedOn; + String? deletedRemarks; + String? diagnosisType; + int? doctorId; + int? episodeId; + int? hospitalGroupId; + int? hospitalId; + String? icdSubVersion; + String? icdType; + dynamic icdVersion; // Adjust type if necessary + bool? isPreviousProblem; + String? location; + String? loginUserId; + String? modifiedBy; + String? modifiedOn; + int? patientDiagnosisId; + int? patientId; + int? patientProblemRevisionId; + int? pomrId; + String? problemName; + String? remarks; + bool? resolved; + bool? selected; + String? selectedDisease; + int? selectedDoctorId; + String? selectedIcdCode; + + VisitWisePatientDiagnosis.fromJson(Map json) { + active = json['active']; + admissionId = json['admissionId']; + appointmentId = json['appointmentId']; + approvedBy = json['approvedBy']; + approvedOn = json['approvedOn']; + assessmentId = json['assessmentId']; + clinicId = json['clinicId']; + condition = json['condition']; + createdBy = json['createdBy']; + createdOn = json['createdOn']; + deletedBy = json['deletedBy']; + deletedOn = json['deletedOn']; + deletedRemarks = json['deletedRemarks']; + diagnosisType = json['diagnosisType']; + doctorId = json['doctorId']; + episodeId = json['episodeId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + icdSubVersion = json['icdSubVersion']; + icdType = json['icdType']; + icdVersion = json['icdVersion']; + isPreviousProblem = json['isPreviousProblem']; + location = json['location']; + loginUserId = json['loginUserId']; + modifiedBy = json['modifiedBy']; + modifiedOn = json['modifiedOn']; + patientDiagnosisId = json['patientDiagnosisId']; + patientId = json['patientId']; + patientProblemRevisionId = json['patientProblemRevisionId']; + pomrId = json['pomrId']; + problemName = json['problemName']; + remarks = json['remarks']; + resolved = json['resolved']; + selected = json['selected']; + selectedDisease = json['selectedDisease']; + selectedDoctorId = json['selectedDoctorId']; + selectedIcdCode = json['selectedIcdCode']; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/assessment/search_diagnosis.dart b/lib/core/model/SOAP/assessment/search_diagnosis.dart new file mode 100644 index 00000000..832ff167 --- /dev/null +++ b/lib/core/model/SOAP/assessment/search_diagnosis.dart @@ -0,0 +1,83 @@ +class SearchDiagnosis { + String? category; + String? categoryId; + String? codeRange; + String? diseaseType; + String? diseases; + String? diseasesBCode; + String? diseasesCode; + String? diseasesDataId; + String? diseasesId; + String? diseasesName; + int? hospitalGroupId; + int? hospitalId; + String? icdSubVersion; + String? icdType; + List? icdVersion; + String? icdVersionDisplay; + bool? isDeleted; + String? layerID; + String? parentDiseasesCode; + String? specification; + int? specificationId; + String? specificationNo; + + // Default constructor + SearchDiagnosis(); + + // fromJson constructor + SearchDiagnosis.fromJson(Map json) { + category = json['category']; + categoryId = json['categoryId']; + codeRange = json['codeRange']; + diseaseType = json['diseaseType']; + diseases = json['diseases']; + diseasesBCode = json['diseasesBCode']; + diseasesCode = json['diseasesCode']; + diseasesDataId = json['diseasesDataId']; + diseasesId = json['diseasesId']; + diseasesName = json['diseasesName']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + icdSubVersion = json['icdSubVersion']; + icdType = json['icdType']; + icdVersion = json['icdVersion'] != null + ? List.from(json['icdVersion']) + : null; + icdVersionDisplay = json['icdVersionDisplay']; + isDeleted = json['isDeleted'] == "True"; + layerID = json['layerID']; + parentDiseasesCode = json['parentDiseasesCode']; + specification = json['specification']; + specificationId = json['specificationId']; + specificationNo = json['specificationNo']; + } + + // toJson method + Map toJson() { + return { + 'category': category, + 'categoryId': categoryId, + 'codeRange': codeRange, + 'diseaseType': diseaseType, + 'diseases': diseases, + 'diseasesBCode': diseasesBCode, + 'diseasesCode': diseasesCode, + 'diseasesDataId': diseasesDataId, + 'diseasesId': diseasesId, + 'diseasesName': diseasesName, + 'hospitalGroupId': hospitalGroupId, + 'hospitalId': hospitalId, + 'icdSubVersion': icdSubVersion, + 'icdType': icdType, + 'icdVersion': icdVersion, + 'icdVersionDisplay': icdVersionDisplay, + 'isDeleted': isDeleted.toString(), + 'layerID': layerID, + 'parentDiseasesCode': parentDiseasesCode, + 'specification': specification, + 'specificationId': specificationId, + 'specificationNo': specificationNo, + }; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart b/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart new file mode 100644 index 00000000..9938648f --- /dev/null +++ b/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart @@ -0,0 +1,97 @@ +class PatientPhysicalExamination { + int? patientPhysicalExaminationRevisionID; + int? patientPhysicalExaminationID; + int? patientID; + int? physicalExaminationSystemID; + String? physicalExaminationDescription; + int? physicalExaminationCondition; + String? remark; + int? assessmentId; + String? userType; + int? specialtyID; + String? specialityDescription; + String? loginUserId; + bool? isMandatory; + String? examinationType; + dynamic additionalParams; // Use dynamic for null or varied types + int? hospitalGroupID; + int? hospitalID; + int? dbCRUDOperation; + bool? isActive; + int? createdBy; + String? createdOn; + int? modifiedBy; + String? modifiedOn; + int? approvedBy; + String? approvedOn; + String? rowVersion; + int? pomrid; + + // Default constructor + PatientPhysicalExamination(); + + // fromJson constructor + PatientPhysicalExamination.fromJson(Map json) { + patientPhysicalExaminationRevisionID = + json['patientPhysicalExaminationRevisionID']; + patientPhysicalExaminationID = json['patientPhysicalExaminationID']; + patientID = json['patientID']; + physicalExaminationSystemID = json['physicalExaminationSystemID']; + physicalExaminationDescription = json['physicalExaminationDescription']; + physicalExaminationCondition = json['physicalExaminationCondition']; + remark = json['remark']; + assessmentId = json['assessmentId']; + userType = json['userType']; + specialtyID = json['specialtyID']; + specialityDescription = json['specialityDescription']; + loginUserId = json['loginUserId']; + isMandatory = json['isMandatory']; + examinationType = json['examinationType']; + additionalParams = json['additionalParams']; + hospitalGroupID = json['hospitalGroupID']; + hospitalID = json['hospitalID']; + dbCRUDOperation = json['dbCRUDOperation']; + isActive = json['isActive']; + createdBy = json['createdBy']; + createdOn = json['createdOn']; + modifiedBy = json['modifiedBy']; + modifiedOn = json['modifiedOn']; + approvedBy = json['approvedBy']; + approvedOn = json['approvedOn']; + rowVersion = json['rowVersion']; + pomrid = json['pomrid']; + } + + // toJson method + Map toJson() { + return { + 'patientPhysicalExaminationRevisionID': patientPhysicalExaminationRevisionID, + 'patientPhysicalExaminationID': patientPhysicalExaminationID, + 'patientID': patientID, + 'physicalExaminationSystemID': physicalExaminationSystemID, + 'physicalExaminationDescription': physicalExaminationDescription, + 'physicalExaminationCondition': physicalExaminationCondition, + 'remark': remark, + 'assessmentId': assessmentId, + 'userType': userType, + 'specialtyID': specialtyID, + 'specialityDescription': specialityDescription, + 'loginUserId': loginUserId, + 'isMandatory': isMandatory, + 'examinationType': examinationType, + 'additionalParams': additionalParams, + 'hospitalGroupID': hospitalGroupID, + 'hospitalID': hospitalID, + 'dbCRUDOperation': dbCRUDOperation, + 'isActive': isActive, + 'createdBy': createdBy, + 'createdOn': createdOn, + 'modifiedBy': modifiedBy, + 'modifiedOn': modifiedOn, + 'approvedBy': approvedBy, + 'approvedOn': approvedOn, + 'rowVersion': rowVersion, + 'pomrid': pomrid, + }; + } +} diff --git a/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart b/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart new file mode 100644 index 00000000..127b5e49 --- /dev/null +++ b/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart @@ -0,0 +1,54 @@ +class PostPhysicalExaminationModel { + bool? isChecked; + bool? selected; + int? pomrid; + int? patientID; + bool? isClinicPhysicalExamination; + int? physicalExaminationSystemID; + String? physicalExaminationDescription; + int? specialityID; + dynamic selectedOptions; + bool? isMandatory; + String? specialityDescription; + int? physicalExaminationCondition; + String? loginUserId; + String? remark; + + PostPhysicalExaminationModel(); + + PostPhysicalExaminationModel.fromJson(Map json) { + isChecked = json['isChecked']; + selected = json['selected']; + pomrid = json['pomrid']; + patientID = json['patientID']; + isClinicPhysicalExamination = json['isClinicPhysicalExamination']; + physicalExaminationSystemID = json['physicalExaminationSystemID']; + physicalExaminationDescription = json['physicalExaminationDescription']; + specialityID = json['specialityID']; + selectedOptions = json['selectedOptions']; + isMandatory = json['isMandatory']; + specialityDescription = json['specialityDescription']; + physicalExaminationCondition = json['physicalExaminationCondition']; + loginUserId = json['loginUserId']; + remark = json['remark']; + } + + Map toJson() { + return { + 'isChecked': isChecked, + 'selected': selected, + 'pomrid': pomrid, + 'patientID': patientID, + 'isClinicPhysicalExamination': isClinicPhysicalExamination, + 'physicalExaminationSystemID': physicalExaminationSystemID, + 'physicalExaminationDescription': physicalExaminationDescription, + 'specialityID': specialityID, + 'selectedOptions': selectedOptions, + 'isMandatory': isMandatory, + 'specialityDescription': specialityDescription, + 'physicalExaminationCondition': physicalExaminationCondition, + 'loginUserId': loginUserId, + 'remark': remark, + }; + } +} \ No newline at end of file diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index b9f6a69f..d7254814 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -109,7 +109,7 @@ class LookupService extends BaseService { _historySurgicalList.add(MasterKeyModel.fromJson(v)); }); break; - case MasterKeysService.PhysicalExamination: + case MasterKeysService.PostPhysicalExaminationModel: _physicalExaminationList.clear(); entryList.forEach((v) { _physicalExaminationList.add(MasterKeyModel.fromJson(v)); diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index e6321cd3..7fc58e7a 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -3,11 +3,16 @@ import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_mod import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; @@ -25,11 +30,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_e import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; -import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; -import 'package:http/http.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../utils/date-utils.dart'; import '../../../model/SOAP/assessment/patch_assessment_req_model.dart'; @@ -48,6 +50,16 @@ class SOAPService extends LookupService { List hopiDetails = []; List patientChiefComplaintListVidaPlus = []; List searchChiefComplaintListVidaPlus = []; + List patientPreviousDiagnosisList = []; + List favoriteDiagnosisDetailsList = []; + List auditDiagnosislist = []; + List searchDiagnosisList = []; + List patientPhysicalExaminationList = []; + Map diagnosisTypeList = {}; + Map conditionTypeList = {}; + List icdVersionList = []; + bool addedToFavorite = false; + bool showAuditBottomSheet = false; int? episodeID; bool isPrescriptionOrder = false; @@ -426,7 +438,7 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -437,10 +449,8 @@ class SOAPService extends LookupService { Future resolveAllergies( PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { - /*changed request parameters based on the vida plus requested */ - var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); List? reaction = allergy.patientsAllergyReactionsDTOs!; @@ -464,7 +474,7 @@ class SOAPService extends LookupService { "allergyTypeName": allergy.allergyTypeName, "assessmentId": 0, "isActive": allergy.isActivePatientsAllergy, - "patientsAllergyReactionsDTOs":reactionRequest, + "patientsAllergyReactionsDTOs": reactionRequest, "dbCRUDOperation": 2, "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, @@ -477,7 +487,7 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(RESOLVE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Resolved Successfully"); + DrAppToastMsg.showSuccesToast("Resolved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -519,7 +529,7 @@ class SOAPService extends LookupService { await baseAppClient.post(UPDATE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -544,7 +554,7 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(CREATE_HOPI, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("History Saved Successfully"); + DrAppToastMsg.showSuccesToast("History Saved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -581,7 +591,8 @@ class SOAPService extends LookupService { patientChiefComplaintListVidaPlus.clear(); response['ListChiefComplaintDetails']['resultData'].forEach((v) { - patientChiefComplaintListVidaPlus.add(GetChiefComplaintVidaPlus.fromJson(v)); + patientChiefComplaintListVidaPlus + .add(GetChiefComplaintVidaPlus.fromJson(v)); }); }, onFailure: (String error, int statusCode) { hasError = true; @@ -631,4 +642,311 @@ class SOAPService extends LookupService { super.error = error; }, body: request); } + + searchDiagnosis(PatiantInformtion patient, String diagnosis) async { + Map request = { + "diseaseCode": diagnosis, + }; + hasError = false; + searchDiagnosisList.clear(); + + await baseAppClient.post(SEARCH_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['List_Diagnosis']['resultData'] + .forEach((v) => searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); + _processData(); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + void _processData() { + Set icdVersions = {}; + for (var item in searchDiagnosisList) { + if (item.icdVersion != null) { + icdVersions.addAll(item.icdVersion ?? []); + } + } + icdVersionList = icdVersions.toList(); + } + + SearchDiagnosis? findParent(String selectedICD) { + for (var item in searchDiagnosisList) { + if (item.icdVersion != null && + (item.icdVersion as List).contains(selectedICD)) { + return item; + } + } + return null; + } + + getDiagnosisType(PatiantInformtion patient) async { + Map request = {}; + hasError = false; + diagnosisTypeList.clear(); + await baseAppClient.post(DIAGNOSIS_TYPE, + onSuccess: (dynamic response, int statusCode) { + response['ListDiagnosisTypeModel']['resultData'] + .forEach((v) => diagnosisTypeList[v['name']] = v['diagnosisType']); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + getConditionType(PatiantInformtion patient) async { + Map request = {}; + hasError = false; + conditionTypeList.clear(); + await baseAppClient.post(CONDITION_TYPE, + onSuccess: (dynamic response, int statusCode) { + response['ListDiagnosisCondition']['resultData'] + .forEach((v) => conditionTypeList[v['itemName']] = v['id']); + ; + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + auditDiagnosis( + PatiantInformtion patient, + String patientProblemRevisionID, + ) async { + Map request = { + "patientProblemRevisionId": patientProblemRevisionID, + "ProjectID": patient.projectId + }; + hasError = false; + auditDiagnosislist.clear(); + await baseAppClient.post(AUDIT_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['ListDaignosisAudit']['resultData'] + .forEach((v) => auditDiagnosislist.add(AuditDiagnosis.fromJson(v))); + showAuditBottomSheet = auditDiagnosislist.isNotEmpty; + }, onFailure: (String error, int statusCode) { + auditDiagnosislist.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + getPreviousDiagnosis(PatiantInformtion patient) async { + Map request = { + // "HospitalGroupID": await sharedPref.getString(DOCTOR_SETUP_ID), //setup + // "hospitalId": patient.projectId, + // "patientId": patient.patientId, + // "patientPomrId": patient.pomrId, + // "startRow": 0, + // "endRow": 1000, + // "ProjectID": patient.projectId + //todo just for the test as the create diagnosis is still not working + "HospitalGroupID": 105, + "hospitalId": 313, + "patientId": 70010976, + "patientPomrId": 8414, + "startRow": 0, + "endRow": 2, + "ProjectID": 313 + }; + hasError = false; + patientPreviousDiagnosisList.clear(); + await baseAppClient.post(PREVIOUS_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['ListDiagnosisPrviousDetials']['resultData'].forEach((v) => + patientPreviousDiagnosisList + .add(PatientPreviousDiagnosis.fromJson(v))); + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + removeDiagnosis(PatiantInformtion patientInfo, String? patientProblemId, + String? problemId, String? deletedRemarks) async { + Map request = { + // "patientProblemId": patientProblemId, + // "patientId": patientInfo.patientId, + // "problemId": problemId, + // "deletedRemarks": deletedRemarks, + // "ProjectID": patientInfo.projectId + //todo just for the test as the create diagnosis is still not working + "patientProblemId": 13691, + "patientId": 70010986, + "problemId": 41698, + "deletedRemarks": "kethees test", + "ProjectID": 313 + }; + hasError = false; + patientPreviousDiagnosisList.clear(); + await baseAppClient.post(REMOVE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast(response['ListDiagnosisRemove']['message']); + //todo get the current diagnosis after the delete if it is successful + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + favoriteDiagnosis( + PatiantInformtion patientInfo, + ) async { + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + + Map request = { + "projectId": patientInfo.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "userId": user?['List_MemberInformation'][0]['MemberID'], + "favoritesType": "DIAGNOSIS", + "clinicId": patientInfo.clinicId, + "ProjectID": patientInfo.projectId, + }; + hasError = false; + favoriteDiagnosisDetailsList.clear(); + await baseAppClient.post(FAVORITE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['ListDiagnosisGetFavourite']['resultData'].forEach((v) => + favoriteDiagnosisDetailsList.add(FavoriteDiseaseDetails.fromJson(v))); + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + getPhysicalExamination( + PatiantInformtion patientInfo, + ) async { + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + + Map request = { + "patientId": patientInfo.patientId, + "pomrId": patientInfo.pomrId, + "hospitalId": patientInfo.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "ProjectID":patientInfo.projectId + }; + hasError = false; + patientPhysicalExaminationList.clear(); + await baseAppClient.post(FAVORITE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['ListPhysicalExam']['resultData'].forEach((v) => + patientPhysicalExaminationList.add(PatientPhysicalExamination.fromJson(v))); + }, onFailure: (String error, int statusCode) { + physicalExaminationList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, + String subFavoriteCode, String? userId) async { + Map request = { + "ProjectID": paitientInfo.projectId, + "listDiagnosisFavourite": [ + { + "createdBy": doctorName, + "favoritesType": "DIAGNOSIS", + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "hospitalId": paitientInfo.projectId, + "subFavoritesCode": subFavoriteCode, + "userId": userId + } + ] + }; + hasError = false; + addedToFavorite = false; + favoriteDiagnosisDetailsList.clear(); + await baseAppClient.post(ADD_TO_FAVORITE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + var result = response['ListDiagnosisAddFavourite']['resultData']; + if ((result as List).isEmpty) { + addedToFavorite = false; + DrAppToastMsg.showErrorToast( + response['ListDiagnosisAddFavourite']['message']); + } else { + addedToFavorite = true; + DrAppToastMsg.showSuccesToast("Added To Favorite"); + } + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { + Map request = { + "patientProblemRevisionId": diagnosis.patientProblemRevisionId, + "patientId": paitientInfo.patientId, + "doctorId": paitientInfo.doctorId, + "pomrId": paitientInfo.pomrId, + "appointmentId": paitientInfo.appointmentNo, + "createdBy": diagnosis.createdBy, + "hospitalId": diagnosis.hospitalId, + "hospitalGroupId": diagnosis.hospitalGroupId, + "clinicGroupId": diagnosis.clinicGroupId, + "clinicId": diagnosis.clinicId, + "isSelected": true, + "ProjectID":paitientInfo.projectId + }; + hasError = false; + addedToFavorite = false; + await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + var result = response['ContinuePreviousEpisode']['resultData']; + if ((result as List).isEmpty) { + DrAppToastMsg.showErrorToast( + response['ContinuePreviousEpisode']['message']); + } + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + createDiagnosis(PatiantInformtion patient, SearchDiagnosis searchDiagnosis, + int diagnosisType, String conditionType, String remarks, bool isNew) { + /*{ +"codeRange": "A79", +"selectedDisease": "Trench fever", +"categoryId": 3962, +"diseasesCode": "A79.0", +"diseasesId": 17664, +"selectedIcdCode": "A79.0", +"selectedCategoryCode": "A79.0", +"selectedSectionCode": "A79", +"selectedChapterCode": "XX", +"selectedNandaCode": "A79.0", +"codeType": "ICD", +"problemId": 1634, +"icdId": 1, +"problemName": "default", +}*/ + + var request = { + "pomrId": patient.pomrId, + "appointmentId": patient.appointmentNo, + "clinicGroupId": patient.clinicGroupId, + "clinicId": patient.clinicId, + "patientId": patient.patientId, + "hospitalId": searchDiagnosis.hospitalId, + "hospitalGroupId": searchDiagnosis.hospitalGroupId, + "diagnosisType": diagnosisType, + "condition": conditionType, + "remarks": remarks, + "icdType": searchDiagnosis.icdType, + "icdVersion": searchDiagnosis.icdVersion, + "icdSubVersion": searchDiagnosis.icdSubVersion, + "isNew": isNew, + "specificationId": searchDiagnosis.specificationId, + }; + } } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index be098f49..7b431a04 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; @@ -6,6 +7,11 @@ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; @@ -21,6 +27,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_I import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; @@ -108,10 +115,36 @@ class SOAPViewModel extends BaseViewModel { List get searchChiefComplaintList => _SOAPService.searchChiefComplaintListVidaPlus; + List get searchDiagnosisList => + _SOAPService.searchDiagnosisList; + + List get icdVersionList => _SOAPService.icdVersionList; + + List get patientPreviousDiagnosis => + _SOAPService.patientPreviousDiagnosisList; + + List get favoriteDiagnosisDetails => + _SOAPService.favoriteDiagnosisDetailsList; + + Map get diagnosisTypeList => _SOAPService.diagnosisTypeList; + + Map get conditionTypeMap => _SOAPService.conditionTypeList; + + List get conditionTypeList => + _SOAPService.conditionTypeList.keys.toList(); + List get getChiefComplaintListVidaPlus => _SOAPService.patientChiefComplaintListVidaPlus; + List get patientPhysicalExaminationList => + _SOAPService.patientPhysicalExaminationList; + + List get auditDiagnosislist => + _SOAPService.auditDiagnosislist; + int? get episodeID => _SOAPService.episodeID; + bool get isFavorite => _SOAPService.addedToFavorite; + bool get showAudit => _SOAPService.showAuditBottomSheet; bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; bool isAddProgress = true; @@ -120,6 +153,7 @@ class SOAPViewModel extends BaseViewModel { String complaintsControllerError = ''; String medicationControllerError = ''; String illnessControllerError = ''; + String selectedIcd = ''; get medicationStrengthList => _SOAPService.medicationStrengthListWithModel; @@ -430,7 +464,7 @@ class SOAPViewModel extends BaseViewModel { return result.first; } break; - case MasterKeysService.PhysicalExamination: + case MasterKeysService.PostPhysicalExaminationModel: List result = physicalExaminationList.where((element) { return element.id == id && element.typeId == masterKeys.getMasterKeyService(); @@ -1002,4 +1036,142 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + + searchDiagnosis(PatiantInformtion patientInfo, String searchQuery) async { + setState(ViewState.BusyLocal); + await _SOAPService.searchDiagnosis(patientInfo, searchQuery); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + getConditionAndType(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getDiagnosisType(patientInfo); + await _SOAPService.getConditionType(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + getType(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + // await _SOAPService.getDiagnosisType(patientInfo); + await _SOAPService.getConditionType(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + getPreviousPatientDetails(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getPreviousDiagnosis(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + getAuditOfDiagnosis( + PatiantInformtion patient, + String patientProblemRevisionID, + ) async { + setState(ViewState.BusyLocal); + await _SOAPService.auditDiagnosis(patient, patientProblemRevisionID); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + SearchDiagnosis? findTheDiagnosisItem(String icdVersion) { + selectedIcd = icdVersion; + return _SOAPService.findParent(icdVersion); + } + + void removeDiagnosis( + PatiantInformtion patientInfo, { + String? patientProblemId, + String? problemId, + String? deletedRemarks, + }) async { + setState(ViewState.BusyLocal); + await _SOAPService.removeDiagnosis( + patientInfo, patientProblemId, problemId, deletedRemarks); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + void favoriteDiagnosis( + PatiantInformtion patientInfo, { + String? patientProblemId, + String? problemId, + String? deletedRemarks, + }) async { + setState(ViewState.BusyLocal); + await _SOAPService.favoriteDiagnosis(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + void addToFavoriteDiagnosis( + PatiantInformtion patientInfo, { + SearchDiagnosis? diagnosis + }) async { + setState(ViewState.BusyLocal); + Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + await _SOAPService.addToFavoriteDiagnosis(patientInfo,profile?['DoctorName'] ??'',diagnosis?.diseasesBCode ?? '',user?['List_MemberInformation'][0]['MemberID'] ??''); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + void convertPreviousDiagnosisCurrent( + PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { + setState(ViewState.BusyLocal); + await _SOAPService.convertPreviousDiagnosisCurrent(paitientInfo,diagnosis); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + void getPhysicalExamination( + PatiantInformtion paitientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getPhysicalExamination(paitientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + void toggleFavorite(bool status ){ + _SOAPService.addedToFavorite + = status; + } + + void toggleShowBottomSheetValue(bool status){ + _SOAPService.showAuditBottomSheet + = status; + } + } diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index 7be4b062..238f8dd8 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -38,7 +38,7 @@ class _AddExaminationPageState extends State { if (model.physicalExaminationList.length == 0) { WidgetsBinding.instance.addPostFrameCallback((_) async { await model.getMasterLookup( - MasterKeysService.PhysicalExamination, + MasterKeysService.PostPhysicalExaminationModel, ); }); } diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index b44c35db..d9d4ed1b 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -63,11 +63,11 @@ class _UpdateObjectivePageState extends State implements Ob await model.getPatientPhysicalExam(widget.patientInfo); if (model.patientPhysicalExamList.isNotEmpty) { if (model.physicalExaminationList.length == 0) { - await model.getMasterLookup(MasterKeysService.PhysicalExamination); + await model.getMasterLookup(MasterKeysService.PostPhysicalExaminationModel); } model.patientPhysicalExamList.forEach((element) { MasterKeyModel? examMaster = model.getOneMasterKey( - masterKeys: MasterKeysService.PhysicalExamination, + masterKeys: MasterKeysService.PostPhysicalExaminationModel, id: element.examId, ); MySelectedExamination tempEam = SoapUtils.generateMySelectedExamination( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart index e9e5d933..c271a5ae 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart @@ -1,13 +1,23 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; class AddDiagnosis extends StatefulWidget { + final PatiantInformtion patientInfo; + + const AddDiagnosis({super.key, required this.patientInfo}); + @override State createState() => _AddDiagnosisState(); } @@ -15,6 +25,7 @@ class AddDiagnosis extends StatefulWidget { class _AddDiagnosisState extends State with SingleTickerProviderStateMixin { TabController? _tabController; + bool isLoading = true; @override void initState() { @@ -25,7 +36,18 @@ class _AddDiagnosisState extends State @override Widget build(BuildContext context) { return BaseView( + onModelReady: (model) { + WidgetsBinding.instance.addPostFrameCallback((_) { + model.toggleFavorite(false); + model.getConditionAndType(widget.patientInfo); + model.favoriteDiagnosis(widget.patientInfo); + setState(() { + isLoading = false; + }); + }); + }, builder: (_, model, w) => AppScaffold( + isLoading: model.state == ViewState.BusyLocal , isShowAppBar: true, appBar: PatientSearchHeader( title: TranslationBase.of(context).addDiagnosis), @@ -51,7 +73,7 @@ class _AddDiagnosisState extends State ), Tab( child: AppText( - TranslationBase.of(context).mappedDiagnosis, + TranslationBase.of(context).favoriteDiagnosis, color: Color(0xFF6D6D6D), fontSize: 14, fontWeight: FontWeight.w600, @@ -65,13 +87,67 @@ class _AddDiagnosisState extends State child: TabBarView( controller: _tabController, children: [ - EnterDiagnosis(), - EnterDiagnosis(), + EnterDiagnosis( + patientInfo: widget.patientInfo, + ), + FavoriteDiagnosis( + patientInfo: widget.patientInfo, + ), ], ), ), ], ), + bottomSheet: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Padding( + padding: const EdgeInsets.all(10), + child: Column( + children: [ + Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + // height: SizeConfig.heightMultiplier! * + // (SizeConfig.isHeightVeryShort ? 8 : 6), + // padding: 10, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).save, + fontWeight: FontWeight.w600, + color: Color(0xFF359846), + onPressed: () async {}, + ), + ), + ], + ), + ) + ], + ), + ), + ), )); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart index a320ce92..09c07d54 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_assement.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; @@ -67,49 +68,15 @@ class _UpdateAssessmentPageState extends State model.setAssessmentCallBack(this); mySelectedAssessmentList.clear(); WidgetsBinding.instance.addPostFrameCallback((_) async { - await model.isPrescriptionOrderCreated(widget.patientInfo); - await model.onUpdateAssessmentStepStart(widget.patientInfo); - - if (model.patientAssessmentList.isNotEmpty) { - model.patientAssessmentList.forEach((element) { - MasterKeyModel? diagnosisType = model.getOneMasterKey( - masterKeys: MasterKeysService.DiagnosisType, - id: element.diagnosisTypeID, - ); - MasterKeyModel? selectedICD = model.getOneMasterKey( - masterKeys: MasterKeysService.ICD10, - id: element.icdCode10ID, - ); - MasterKeyModel? diagnosisCondition = model.getOneMasterKey( - masterKeys: MasterKeysService.DiagnosisCondition, - id: element.conditionID!, - ); - if (diagnosisCondition != null && - diagnosisType != null && - diagnosisCondition != null) { - MySelectedAssessment temMySelectedAssessment = - SoapUtils.generateMySelectedAssessment( - appointmentNo: element.appointmentNo, - remark: element.remarks, - diagnosisType: diagnosisType, - diagnosisCondition: diagnosisCondition, - selectedICD: selectedICD, - doctorID: element.doctorID, - doctorName: element.doctorName, - createdBy: element.createdBy, - createdOn: element.createdOn, - icdCode10ID: element.icdCode10ID); - - mySelectedAssessmentList.add(temMySelectedAssessment); - } - }); - } - + widget.changeLoadingState(true); + model.getPreviousPatientDetails(widget.patientInfo); widget.changeLoadingState(false); + //todo handle get diagnosis list }); }, builder: (_, model, w) => AppScaffold( isShowAppBar: false, + isLoading: model.state == ViewState.BusyLocal, backgroundColor: Theme.of(context).scaffoldBackgroundColor, body: SingleChildScrollView( physics: ScrollPhysics(), @@ -158,7 +125,7 @@ class _UpdateAssessmentPageState extends State Tab( child: AppText( TranslationBase.of(context) - .currentDiagnosis, + .previousDiagnosis, color: Color(0xFF6D6D6D), fontSize: 14, fontWeight: FontWeight.w600, @@ -175,10 +142,13 @@ class _UpdateAssessmentPageState extends State controller: _tabController, children: [ CurrentDiagnosis( + patientInfo: widget.patientInfo, + model: model, currentDiagnosisItems: [''], ), PreviousDiagnosis( - diagnosisItems: [''], + diagnosisItems: model.patientPreviousDiagnosis, + patientInfo: widget.patientInfo, ) ], ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart new file mode 100644 index 00000000..3fc197f7 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart @@ -0,0 +1,94 @@ +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; + +class AuditItem extends StatelessWidget { + final AuditDiagnosis auditDiagnosis; + + const AuditItem({super.key, required this.auditDiagnosis}); + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppText( + auditDiagnosis.createdBy ?? '', + fontWeight: FontWeight.w600, + fontSize: 12, + color: Color(0xFF2B353E), + ), + AppText( + getDate(auditDiagnosis.createdOn?.isNotEmpty== true ? auditDiagnosis.createdOn ?? '' : auditDiagnosis.modifiedOn??''), + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF2B353E), + ), + ], + ), + SizedBox(height: 4,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + AppText( + "${TranslationBase.of(context).diagnosis}: ${auditDiagnosis.diagnosisType}", + fontWeight: FontWeight.w600, + fontSize: 12, + color: Color(0xFF2B353E), + ), + AppText( + getTime(auditDiagnosis.createdOn?.isNotEmpty== true ? auditDiagnosis.createdOn ?? '' : auditDiagnosis.modifiedOn??''), + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF2B353E), + ), + ], + ), + SizedBox( + height: 4, + ), + + Visibility( + visible: auditDiagnosis.deletedRemarks?.isEmpty == true, + child: AppText( + //todo handle the item after the discussion from the vidapro team this is temporary + "${TranslationBase.of(context).remarks}: ${auditDiagnosis.remarks?.isNotEmpty == true? auditDiagnosis.remarks : TranslationBase.of(context).noRemarks}", + fontWeight: FontWeight.w600, + fontSize: 12, + color: Color(0xFF2B353E), + ), + ), + Visibility( + visible: auditDiagnosis.deletedRemarks?.isNotEmpty == true, + child: AppText( + //todo handle the item after the discussion from the vidapro team this is temporary + "${TranslationBase.of(context).deletedRemarks}${auditDiagnosis.deletedRemarks}", + fontWeight: FontWeight.w600, + fontSize: 12, + color: Color(0xFF2B353E), + ), + ), + ], + ), + ); + } + + String getDate(String dateTime) { + if (dateTime.isEmpty) return ''; + DateTime now = DateTime.now(); + return DateFormat('dd MMM yyyy').format(now); + } + + String getTime(String dateTime) { + if (dateTime.isEmpty) return ''; + DateTime now = DateTime.now(); + return DateFormat('hh:mm a').format(now); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart new file mode 100644 index 00000000..befb56e5 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart @@ -0,0 +1,62 @@ +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; + +class AuditListBottomSheet extends StatelessWidget { + final List auditList; + + const AuditListBottomSheet({super.key, required this.auditList}); + + @override + Widget build(BuildContext context) { + return SizedBox( + height: (auditList.length>1)?MediaQuery.sizeOf(context).height*.56:MediaQuery.sizeOf(context).height*.28, + child: Material( + color: Color(0xFFF7F7F7), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 32), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).audit, + fontWeight: FontWeight.w700, + fontSize: 24, + color: Color(0xFF2B353E), + ), + SizedBox( + height: 16, + ), + SizedBox( + height: (auditList.length>1)?MediaQuery.sizeOf(context).height*.25:MediaQuery.sizeOf(context).height*.12, + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10)), + color: Colors.white, + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Expanded( + child: ListView.separated( + + itemCount: auditList.length, + itemBuilder: (context, index) => AuditItem( + auditDiagnosis: auditList[index], + ), + separatorBuilder: (_, __) => Divider(), + )) + ], + ), + ), + ) + ], + ), + ), + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 8d64deee..71a69dbb 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -1,15 +1,35 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; -class CurrentDiagnosis extends StatelessWidget { +import '../../../../../../widgets/shared/text_fields/app-textfield-custom.dart'; + +class CurrentDiagnosis extends StatefulWidget { + final PatiantInformtion patientInfo; final List currentDiagnosisItems; + final SOAPViewModel model; + + const CurrentDiagnosis( + {super.key, + required this.currentDiagnosisItems, + required this.patientInfo, + required this.model}); + + @override + State createState() => _CurrentDiagnosisState(); +} - const CurrentDiagnosis({super.key, required this.currentDiagnosisItems}); +class _CurrentDiagnosisState extends State { + TextEditingController deleteController = TextEditingController(); @override Widget build(BuildContext context) { @@ -24,7 +44,12 @@ class CurrentDiagnosis extends StatelessWidget { AddSoapItem( title: TranslationBase.of(context).addNewDiagnosis, onAddSoapItemClicked: () { - Navigator.push(context, FadePage(page: AddDiagnosis())); + Navigator.push( + context, + FadePage( + page: AddDiagnosis( + patientInfo: widget.patientInfo, + ))); }), SizedBox( height: 16, @@ -33,29 +58,125 @@ class CurrentDiagnosis extends StatelessWidget { SizedBox( height: 16, ), - if (currentDiagnosisItems.isEmpty) ...{ + if (widget.currentDiagnosisItems.isEmpty) ...{ Center( child: EmptyDiagnosis(), ), } else ...{ Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return SoapDetailItem( + title: 'lorem ipsum', + status: 'active', + condition: 'acute', + remarks: 'initial', + onSoapDetailActionClicked: (action) { + switch (action) { + case SoapDetailItemActions.EDIT: + // TODO: Handle this case. + case SoapDetailItemActions.RESOLVE: + // TODO: Handle this case. - child: - ListView.separated( - itemBuilder: (_, index) { - return SoapDetailItem( - title: 'lorem ipsum', - status: 'active', - condition: 'acute', - remarks: 'initial', - onSoapDetailActionClicked: (action) {}, - ); - }, - separatorBuilder: (_, index) => Divider(), - itemCount: currentDiagnosisItems.length)) + case SoapDetailItemActions.REMOVE: + showConfirmationDialog(context, + "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", + () { + widget.model + .removeDiagnosis(widget.patientInfo); + }); + case SoapDetailItemActions.CHANGE_STATUS: + // TODO: Handle this case. + default: + } + }, + ); + }, + separatorBuilder: (_, index) => Divider(), + itemCount: widget.currentDiagnosisItems.length)) } ], ), ); } + + showConfirmationDialog( + BuildContext context, String message, Function okFunction) { + return showDialog( + context: context, + barrierDismissible: true, // user must tap button! + builder: (_) { + return Container( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AlertDialog( + title: null, + content: Container( + child: Column( + children: [ + AppText(message), + SizedBox( + height: 8, + ), + AppText( + TranslationBase.of(context) + .areYouSureYouWantToDeleteDiagnosis, + textAlign: TextAlign.center, + ), + SizedBox( + height: 8, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: deleteController, + maxLines: 25, + minLines: 3, + hasBorder: true, + onChanged: (value) {}, + inputType: TextInputType.multiline, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ], + ), + ), + actions: [ + Row( + children: [ + Expanded( + child: AppButton( + onPressed: () { + Navigator.of(context).pop(); + }, + title: TranslationBase.of(context).cancel, + fontColor: Colors.black, + color: Color(0xffEAEAEA), + ), + ), + SizedBox( + width: 8, + ), + Expanded( + child: AppButton( + onPressed: () { + okFunction(); + Navigator.of(context).pop(); + }, + title: TranslationBase.of(context).delete, + fontColor: Colors.white, + color: Colors.red[600], + ), + ), + ], + ), + ], + ), + ], + ), + ); + }).then((value) { + deleteController.clear(); + }); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart new file mode 100644 index 00000000..1db5dd98 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; + +class EmptyDropDown extends StatelessWidget{ + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.all(12.0), + child: Row( + children: [ + Expanded(child: SizedBox.shrink()), + Align( + alignment: Alignment.centerLeft, + child: Icon(Icons.keyboard_arrow_down), + ) + ], + ), + ); + } + +} \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 8e34b682..45b6ddbe 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -1,14 +1,27 @@ +import 'dart:async'; + import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hexcolor/hexcolor.dart'; -List patientState = ["","Stable", "Not Stable", "Not Defined"]; + +List patientState = ["", "Stable", "Not Stable", "Not Defined"]; class EnterDiagnosis extends StatefulWidget { + final PatiantInformtion patientInfo; + + const EnterDiagnosis({super.key, required this.patientInfo}); + @override State createState() => _EnterDiagnosisState(); } @@ -17,276 +30,420 @@ class _EnterDiagnosisState extends State { final TextEditingController filteredSearchController = TextEditingController(); bool showAllDiagnosis = true; - bool status = true; - String selectedItem = "Stable"; + String status = ''; + String? selectedItem; TextEditingController remarksController = TextEditingController(); + Timer? _tTimer; + SOAPViewModel? model; + SearchDiagnosis? selectedDiagnosis; + void _onTextChanged(String text) { + if (_tTimer != null) { + _tTimer!.cancel(); + } + _tTimer = Timer(Duration(milliseconds: 500), () { + _onStopped(text); + }); + } + + void _onStopped(String searchText) async { + await model?.searchDiagnosis(widget.patientInfo, searchText); + } @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).addDiagnosis, - fontWeight: FontWeight.w600, - color: Color(0xFF2E303A), - fontSize: 16, - ), - SizedBox( - height: 16, - ), - AppTextFieldCustom( - hintText: TranslationBase.of(context).selectAllergy, - isTextFieldHasSuffix: true, - hasBorder: true, - controller: filteredSearchController, - onChanged: (value) {}, - onFieldSubmitted: () {}, - suffixIcon: IconButton( - icon: Icon( - Icons.search, - color: Color(0xff2B353E), - size: 30, - ), - onPressed: () {}, - ), - ), - SizedBox( - height: 8, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + return BaseView( + onModelReady: (model) { + this.model = model; + }, + builder: (_, model, w) => SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - children: [ - Switch( - value: showAllDiagnosis, - activeColor: Colors.red, - onChanged: (bool value) { - setState(() { - showAllDiagnosis = value; - }); + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, + ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).diagnosis, + isTextFieldHasSuffix: true, + hasBorder: true, + controller: filteredSearchController, + onClick: () { + setState( + () { + selectedDiagnosis = null; + filteredSearchController.text = ''; + model.selectedIcd = ''; }, + ); + }, + onChanged: (value) { + if (value != null) _onTextChanged(value); + }, + onFieldSubmitted: () {}, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Color(0xff2B353E), + size: 30, ), - SizedBox( - width: 8, - ), - AppText( - TranslationBase.of(context).showAllDiagnosis, - fontWeight: FontWeight.w500, - color: Color(0xFF2E303A), - fontSize: 11, - ), - ], + onPressed: () {}, + ), ), - SvgPicture.asset('assets/images/svgs/information.svg'), - ], - ), - Container( - margin: EdgeInsets.only(bottom: 12), - child: AppText( - TranslationBase.of(context).condition, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: 11, - ), - ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () {}, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 1 ? HexColor("#D02127") : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - TranslationBase.of(context).acute, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + Positioned( + child: Material( + elevation: 4.0, // Optional: for shadow effect + child: ConstrainedBox( + constraints: BoxConstraints(minHeight: 0, maxHeight: 300), + child: ListView.builder( + shrinkWrap: true, + itemCount: model.icdVersionList.length, + itemBuilder: (context, index) { + return ListTile( + title: InkWell( + child: AppText(model.icdVersionList[index]), + onTap: () { + setState( + () { + selectedDiagnosis = + model.findTheDiagnosisItem( + model.icdVersionList[index]); + filteredSearchController.text = + model.icdVersionList[index]; + model.searchDiagnosisList.clear(); + model.icdVersionList.clear(); + }, + ); + }, + ), + ); + }, ), - ], + ), ), - )), - Expanded( - child: InkWell( - onTap: () {}, - child: Row( + ), + SizedBox( + height: 8, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: - status == 2 ? HexColor("#D02127") : Colors.white, - shape: BoxShape.circle, - ), - ), + Switch( + value: showAllDiagnosis, + activeColor: Colors.red, + onChanged: (bool value) { + setState(() { + showAllDiagnosis = value; + }); + }, + ), + SizedBox( + width: 8, ), AppText( - TranslationBase.of(context).subAcute, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + TranslationBase.of(context).showAllDiagnosis, + fontWeight: FontWeight.w500, + color: Color(0xFF2E303A), + fontSize: 11, ), ], ), + SvgPicture.asset('assets/images/svgs/information.svg'), + ], + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, ), ), - Expanded( - child: InkWell( - onTap: () {}, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: - status == 3 ? HexColor("#D02127") : Colors.white, - shape: BoxShape.circle, + // Row( + // children: [ + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = ""; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: + // Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 1 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).acute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "2"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 2 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).subAcute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "3"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 3 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).chronic, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // ], + // ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.conditionTypeList.length, + itemBuilder: (context, index) => InkWell( + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: + Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: + status == model.conditionTypeList[index] + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], ), - ), - ), + )), + ), + SizedBox( + height: 8, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ AppText( - TranslationBase.of(context).chronic, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + TranslationBase.of(context).diagnoseType, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, ), + model.diagnosisTypeList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem == null + ? model.diagnosisTypeList.keys.first + : selectedItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedItem = newValue; + }); + }, + items: model.diagnosisTypeList.keys.map((item) { + return DropdownMenuItem( + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), ], ), ), ), - ], - ), - SizedBox(height: 8,), - - Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: - const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).patientCondition, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), - ), - SizedBox( - height: 4, - ), - DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem, - iconSize: 25, - elevation: 16, - - onChanged: (newValue) async { - setState(() { - selectedItem = newValue ?? ""; - }); - }, - items: patientState.map((item) { - return DropdownMenuItem( - child: AppText( - item, - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, - ), - value: item, - ); - }).toList(), - ), - ), - ], + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), ), - ), - ), - Container( - margin: EdgeInsets.only(top: 8), - child: AppTextFieldCustom( - hintText: TranslationBase.of(context).remarks, - controller: remarksController, - minLines: 2, - maxLines: 4, - inputType: TextInputType.multiline, - onChanged: (value) {}, - onClick: () {}, - onFieldSubmitted: () {}, - ), - ), - SizedBox( - height: 16, - ), - Row( - children: [ - SvgPicture.asset('assets/images/svgs/save_as_draft.svg'), SizedBox( - width: 4, - ), - AppText( - TranslationBase.of(context).saveAsDraft, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF449BF1), + height: 16, ), + InkWell( + onTap: () { + if (selectedDiagnosis != null) + model.addToFavoriteDiagnosis(widget.patientInfo, + diagnosis: selectedDiagnosis); + }, + child: Row( + children: [ + SvgPicture.asset(model.isFavorite + ? 'assets/images/svgs/favoriteadded.svg' + : 'assets/images/svgs/favorite.svg'), + SizedBox( + width: 4, + ), + AppText( + TranslationBase.of(context).addToFavorite, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ), + ) ], - ) - ], + ), + ), ), ); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart new file mode 100644 index 00000000..219f45cb --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -0,0 +1,416 @@ +import 'dart:async'; + +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hexcolor/hexcolor.dart'; + +List patientState = ["", "Stable", "Not Stable", "Not Defined"]; + +class FavoriteDiagnosis extends StatefulWidget { + final PatiantInformtion patientInfo; + + const FavoriteDiagnosis({super.key, required this.patientInfo}); + + @override + State createState() => _FavoriteDiagnosisState(); +} + +class _FavoriteDiagnosisState extends State { + final TextEditingController filteredSearchController = + TextEditingController(); + bool showAllDiagnosis = true; + String status = ''; + String? selectedItem; + String? selectedFavorite; + TextEditingController remarksController = TextEditingController(); + Timer? _tTimer; + SOAPViewModel? model; + SearchDiagnosis? selectedDiagnosis; + + void _onTextChanged(String text) { + if (_tTimer != null) { + _tTimer!.cancel(); + } + _tTimer = Timer(Duration(milliseconds: 500), () { + _onStopped(text); + }); + } + + void _onStopped(String searchText) async { + await model?.searchDiagnosis(widget.patientInfo, searchText); + } + + @override + Widget build(BuildContext context) { + return BaseView( + onModelReady: (model) { + this.model = model; + WidgetsBinding.instance.addPostFrameCallback((_) { + model.favoriteDiagnosis(widget.patientInfo); + }); + }, + builder: (_, model, w) => SingleChildScrollView( + child: Padding( + padding: + const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, + ), + SizedBox( + height: 16, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnosis, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.favoriteDiagnosisDetails.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + itemHeight: null, + value: selectedFavorite == null + ? model.favoriteDiagnosisDetails.first + .diseases + : selectedFavorite, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedFavorite = newValue; + }); + }, + items: model.favoriteDiagnosisDetails + .map((item) { + return DropdownMenuItem( + child: AppText( + item.diseases ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item.diseases, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + + SizedBox( + height: 8, + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + ), + // Row( + // children: [ + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = ""; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: + // Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 1 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).acute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "2"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 2 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).subAcute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "3"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 3 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).chronic, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // ], + // ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.conditionTypeList.length, + itemBuilder: (context, index) => InkWell( + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: + EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == + model.conditionTypeList[index] + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: + SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + ), + SizedBox( + height: 8, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnoseType, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.diagnosisTypeList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + itemHeight: null, + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem == null + ? model.diagnosisTypeList.keys.first + : selectedItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedItem = newValue; + }); + }, + items: model.diagnosisTypeList.keys + .map((item) { + return DropdownMenuItem( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + SizedBox( + height: 16, + ), + ], + ), + ), + )); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 48dc1189..20a30c2f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -1,3 +1,9 @@ +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; @@ -5,10 +11,14 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plu import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:flutter/material.dart'; +import '../../../../../../core/viewModel/SOAP_view_model.dart'; + class PreviousDiagnosis extends StatelessWidget { - final List diagnosisItems; + final List diagnosisItems; + final PatiantInformtion patientInfo; - const PreviousDiagnosis({super.key, required this.diagnosisItems}); + const PreviousDiagnosis( + {super.key, required this.diagnosisItems, required this.patientInfo}); @override Widget build(BuildContext context) { @@ -17,27 +27,68 @@ class PreviousDiagnosis extends StatelessWidget { child: EmptyDiagnosis(), ); - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Flexible( - child: ListView.separated( - itemBuilder: (_, index) { - return PreviousDiagnosisItem( - title: 'lorem ipsum', - status: 'active', - condition: 'acute', - remarks: 'initial', - onSoapDetailActionClicked: (action) {}, - ); - }, - separatorBuilder: (_, index) => Divider(), - itemCount: diagnosisItems.length), - ) - ], - ), + return BaseView( + onModelReady: (model) async {}, + builder: (_, model, w) { + if(model.showAudit){ + WidgetsBinding.instance.addPostFrameCallback((_){ + showAuditBottomSheet(context,model.auditDiagnosislist,model.toggleShowBottomSheetValue); + model.toggleShowBottomSheetValue(false); + }); + } + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return PreviousDiagnosisItem( + title: diagnosisItems[index].selectedDisease ?? '', + status: diagnosisItems[index].status ?? '', + condition: diagnosisItems[index].condition ?? '', + remarks: diagnosisItems[index].remarks ?? '', + onSoapDetailActionClicked: (action) { + switch (action) { + case SoapDetailItemActions.AUDIT: + model.getAuditOfDiagnosis( + patientInfo, + diagnosisItems[index] + .patientProblemRevisionId + ?.toString() ?? + ''); + break; + case SoapDetailItemActions.CHANGE_STATUS: + model.convertPreviousDiagnosisCurrent(patientInfo, diagnosisItems[index]); + default: + } + }, + ); + }, + separatorBuilder: (_, index) => Divider(), + itemCount: diagnosisItems.length), + ) + ], + ), + );} ); } + + void showAuditBottomSheet( + BuildContext context, + List diagnosis, void Function(bool status) toggleShowBottomSheetValue, + ) { + showModalBottomSheet( + isDismissible: true, + context: context, + shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), + builder: (_) { + return AuditListBottomSheet( + auditList: diagnosis, + ); + }, + ).then((value)=>toggleShowBottomSheetValue(false)); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart index 8cb6c800..0b83fc8f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart @@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:hexcolor/hexcolor.dart'; typedef OnSoapDetailActionClicked = Function(SoapDetailItemActions); @@ -29,35 +30,49 @@ class PreviousDiagnosisItem extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Stack( - children: [ + // Stack( + // children: [ Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - title, - color: Color(0XFF2B353E), - fontSize: 12, - fontWeight: FontWeight.bold, - ), Row( children: [ - AppText( - "${TranslationBase.of(context).condition}:", - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - SizedBox( - width: 4, - ), - AppText( - condition, - color: Color(0xffD02127), - fontSize: 10, - fontWeight: FontWeight.w500, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + title, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.bold, + ), + SizedBox(height: 4,), + Row( + children: [ + AppText( + "${TranslationBase.of(context).condition}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + condition, + color: Color(0xffD02127), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + ], + ), ), + Status(status: status), + ], ), Visibility( @@ -77,10 +92,10 @@ class PreviousDiagnosisItem extends StatelessWidget { )) ], ), - Align( - alignment: Alignment.topRight, child: Status(status: status)) - ], - ), + // Align( + // alignment: Alignment.topRight, child: Status(status: status)) + // ], + // ), SizedBox( height: 16, ), @@ -103,13 +118,18 @@ class PreviousDiagnosisItem extends StatelessWidget { ), SizedBox( width: 187, - child: AppButton( - onPressed: () { - onSoapDetailActionClicked( - SoapDetailItemActions.CHANGE_STATUS); - }, - title: TranslationBase.of(context).makeCurrentDiagnosis, - ), + height: 27, + child: Material( + color: HexColor("#D02127"), + shape: RoundedRectangleBorder(borderRadius:BorderRadius.circular(5.0)) , + child: InkWell( + onTap: () { + onSoapDetailActionClicked( + SoapDetailItemActions.CHANGE_STATUS); + }, + child:Center(child: AppText( TranslationBase.of(context).makeCurrentDiagnosis, color: Colors.white,)), + ), + ), ) ], ) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart index 9b2c73a2..49b0d9d7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart @@ -43,7 +43,7 @@ class _AddExaminationPageVidaPlusState if (model.physicalExaminationList.length == 0) { WidgetsBinding.instance.addPostFrameCallback((_) async { await model.getMasterLookup( - MasterKeysService.PhysicalExamination, + MasterKeysService.PostPhysicalExaminationModel, ); }); } @@ -77,7 +77,7 @@ class _AddExaminationPageVidaPlusState children: [ ExaminationsListSearchVidaPlusWidget( mySelectedExamination: widget.mySelectedExamination, - masterList: model.physicalExaminationList, + masterList: model.patientPhysicalExaminationList, isServiceSelected: (master) => isServiceSelected(master), removeExamination: (selectedExamination) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart index 954f6cf2..502114c9 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -12,7 +13,7 @@ class ExaminationsListSearchVidaPlusWidget extends StatefulWidget { final Function(MySelectedExamination) removeExamination; final Function(MySelectedExamination) addExamination; final bool Function(MasterKeyModel) isServiceSelected; - final List? masterList; + final List? masterList; final List? mySelectedExamination; ExaminationsListSearchVidaPlusWidget({required this.removeExamination, required this.addExamination, required this.isServiceSelected, this.masterList, this.mySelectedExamination}); @@ -23,7 +24,7 @@ class ExaminationsListSearchVidaPlusWidget extends StatefulWidget { class _ExaminationsListSearchVidaPlusWidgetState extends State { int expandedIndex = -1; - List? items = []; + List? items = []; TextEditingController filteredSearchController = TextEditingController(); @override @@ -66,55 +67,55 @@ class _ExaminationsListSearchVidaPlusWidgetState extends State dummySearchList = []; - dummySearchList.addAll(widget.masterList as Iterable); - if (query.isNotEmpty) { - List dummyListData = []; - dummySearchList.forEach((item) { - if (item.nameAr!.toLowerCase().contains(query.toLowerCase()) || item.nameEn!.toLowerCase().contains(query.toLowerCase())) { - dummyListData.add(item); - } - }); - setState(() { - items!.clear(); - items!.addAll(dummyListData); - }); - return; - } else { - setState(() { - items!.clear(); - items!.addAll(widget.masterList as Iterable); - }); - } + // List dummySearchList = []; + // dummySearchList.addAll(widget.masterList as Iterable); + // if (query.isNotEmpty) { + // List dummyListData = []; + // dummySearchList.forEach((item) { + // if (item.nameAr!.toLowerCase().contains(query.toLowerCase()) || item.nameEn!.toLowerCase().contains(query.toLowerCase())) { + // dummyListData.add(item); + // } + // }); + // setState(() { + // items!.clear(); + // items!.addAll(dummyListData); + // }); + // return; + // } else { + // setState(() { + // items!.clear(); + // items!.addAll(widget.masterList as Iterable); + // }); + // } } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart index fc8e53d7..7f5805c5 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -68,40 +68,45 @@ class _UpdateObjectivePageVidaPlusState @override Widget build(BuildContext context) { - return BaseView( onModelReady: (model) async { WidgetsBinding.instance.addPostFrameCallback((_) async { - model.setObjectiveCallBack(this); - mySelectedExamination.clear(); - model.isAddExamInProgress = true; - await model.getPatientPhysicalExam(widget.patientInfo); - if (model.patientPhysicalExamList.isNotEmpty) { - if (model.physicalExaminationList.length == 0) { - await model.getMasterLookup(MasterKeysService.PhysicalExamination); + if (model.patientPhysicalExaminationList == 0) { + model.getPhysicalExamination(widget.patientInfo); } - model.patientPhysicalExamList.forEach((element) { - MasterKeyModel? examMaster = model.getOneMasterKey( - masterKeys: MasterKeysService.PhysicalExamination, - id: element.examId, - ); - MySelectedExamination tempEam = - SoapUtils.generateMySelectedExamination( - examination: examMaster, - remark: element.remarks, - isNormal: element.isNormal, - createdBy: element.createdBy, - createdOn: element.createdOn, - editedOn: element.editedOn, - notExamined: element.notExamined, - isNew: element.isNew, - isLocal: false, - isAbnormal: element.isAbnormal, - ); - mySelectedExamination.add(tempEam); - }); - } - widget.changeLoadingState(false);}); + // model.getPatientPhysicalExam(widget.patientInfo); + model.setObjectiveCallBack(this); + mySelectedExamination.clear(); + model.isAddExamInProgress = true; + await model.getPatientPhysicalExam(widget.patientInfo); + if (model.patientPhysicalExamList.isNotEmpty) { + if (model.physicalExaminationList.length == 0) { + await model + .getMasterLookup(MasterKeysService.PostPhysicalExaminationModel); + } + model.patientPhysicalExamList.forEach((element) { + MasterKeyModel? examMaster = model.getOneMasterKey( + masterKeys: MasterKeysService.PostPhysicalExaminationModel, + id: element.examId, + ); + MySelectedExamination tempEam = + SoapUtils.generateMySelectedExamination( + examination: examMaster, + remark: element.remarks, + isNormal: element.isNormal, + createdBy: element.createdBy, + createdOn: element.createdOn, + editedOn: element.editedOn, + notExamined: element.notExamined, + isNew: element.isNew, + isLocal: false, + isAbnormal: element.isAbnormal, + ); + mySelectedExamination.add(tempEam); + }); + } + widget.changeLoadingState(false); + }); }, builder: (_, model, w) => AppScaffold( isShowAppBar: false, @@ -131,29 +136,31 @@ class _UpdateObjectivePageVidaPlusState child: Column( mainAxisSize: MainAxisSize.min, children: [ - SizedBox(height: 10,), + SizedBox( + height: 10, + ), AddSoapItem( title: TranslationBase.of(context).physicalExamination, onAddSoapItemClicked: () { openExaminationList(context); }), - SizedBox(height: 16,), + SizedBox( + height: 16, + ), if (mySelectedExamination.isEmpty) ...{ - - Center( + Center( child: Padding( padding: const EdgeInsets.all(65), - child: EmptyWidget(TranslationBase.of(context).noPhysicalExamination), + child: EmptyWidget(TranslationBase.of(context) + .noPhysicalExamination), ), ), - } else ...{ Divider(), ListOfExamination( - listOfSelection: mySelectedExamination - ) + listOfSelection: mySelectedExamination) } // if (mySelectedExamination.isNotEmpty && mySelectedExamination.first.isLocal) @@ -333,10 +340,8 @@ class _UpdateObjectivePageVidaPlusState mySelectedExamination: mySelectedExamination, addSelectedExamination: (List mySelectedExaminationLocal) { - pushAddExamination(mySelectedExaminationLocal); - // mySelectedExaminationLocal.forEach((element) { // if (mySelectedExamination.singleWhere( // (it) => @@ -377,12 +382,14 @@ class _UpdateObjectivePageVidaPlusState await submitUpdateObjectivePage(model); } - void pushAddExamination(List mySelectedExaminationLocal) { + void pushAddExamination( + List mySelectedExaminationLocal) { Navigator.push( context, FadePage( page: AddDetailsToExaminationVidaPlus( - mySelectedExamination: mySelectedExamination,), + mySelectedExamination: mySelectedExamination, + ), ), ); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 4608e1e0..50cf8db0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex = 0; + int _currentIndex =2; List myAllergiesList = []; List myHistoryList = []; @@ -98,7 +98,12 @@ class _UpdateSoapIndexVidaPlusState extends State scrollDirection: Axis.horizontal, children: [ - + UpdateAssessmentPage( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState, + ), UpdateSubjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, @@ -109,12 +114,7 @@ class _UpdateSoapIndexVidaPlusState extends State currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState), - UpdateAssessmentPage( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState, - ), + UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 27db82f0..d443785b 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1932,6 +1932,16 @@ class TranslationBase { String get subAcute => localizedValues['subAcute']![locale.languageCode]!; String get chronic => localizedValues['chronic']![locale.languageCode]!; + String get addToFavorite => localizedValues['addToFavorite']![locale.languageCode]!; + String get favoriteDiagnosis => localizedValues['favoriteDiagnosis']![locale.languageCode]!; + String get areYouSureYouWantToDeleteDiagnosis => localizedValues['areYouSureYouWantToDeleteDiagnosis']![locale.languageCode]!; + String get fieldName => localizedValues['fieldName']![locale.languageCode]!; + String get oldValue => localizedValues['oldValue']![locale.languageCode]!; + String get newValue => localizedValues['newValue']![locale.languageCode]!; + String get event => localizedValues['event']![locale.languageCode]!; + String get deletedRemarks => localizedValues['deletedRemarks']![locale.languageCode]!; + String get noRemarks => localizedValues['noRemarks']![locale.languageCode]!; + } class TranslationBaseDelegate extends LocalizationsDelegate { From b727e66ac150b2a9a911390fd44914535602d1e5 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Sun, 24 Nov 2024 18:16:54 +0300 Subject: [PATCH 32/76] SOAP vida plus in progress --- lib/config/config.dart | 9 + lib/config/localized_values.dart | 2 + .../episode_by_chief_complaint_vidaplus.dart | 245 ++++++ .../home_medication_vp/GetHomeMedication.dart | 156 ++++ .../soap/SOAP_service.dart | 185 ++++- lib/core/viewModel/SOAP_view_model.dart | 72 ++ ..._key_checkbox_search_allergies_widget.dart | 6 +- .../allergies/reactions_selection.dart | 695 ++++++++++-------- .../allergies/update_allergies_widget.dart | 173 +++-- .../chief_complaint/AddChiefComplaints.dart | 83 ++- .../chief_complaint/chief_complaints.dart | 21 +- .../widgets/ComplaintSelection.dart | 21 +- .../widgets/complaint_items.dart | 51 +- .../widgets/listOfComplaints.dart | 28 +- .../widgets/previous_cheif_complaints.dart | 55 +- .../subjective/medication/add_medication.dart | 342 +++++++++ .../medication/update_medication_widget.dart | 64 ++ .../update_present_illness.dart | 10 +- .../update_subjective_page_vida_plus.dart | 236 +++--- .../translations_delegate_base_utils.dart | 3 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 21 files changed, 1931 insertions(+), 528 deletions(-) create mode 100644 lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart create mode 100644 lib/core/model/SOAP/home_medication_vp/GetHomeMedication.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index ad086d11..01ddb6ef 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -308,6 +308,15 @@ const UPDATE_ALLERGIES = 'Services/DoctorApplication.svc/REST/UpdateAllergy'; const GET_CHIEF_COMPLAINT_VP = 'Services/DoctorApplication.svc/REST/ChiefComplaintDetails'; +const CONTINUE_EPISODE_VP = 'Services/DoctorApplication.svc/REST/ContinueEpisode'; + +const UPDATE_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/UpdateChiefComplaint'; + +const EPISODE_BY_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/EpisodeByChiefcomplaint'; + +const GET_EDIT_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergy'; + +const GET_HOME_MEDICATION = 'Services/DoctorApplication.svc/REST/GetHomeMedication'; var selectedPatientType = 1; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 22b0cc41..cde167f4 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1205,5 +1205,7 @@ const Map> localizedValues = { "mild": {"en": "Mild", "ar":"خفيف"}, "moderate": {"en": "Moderate", "ar":"معتدل"}, "noDiagnosisFound": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, + "activate": {"en": "Activate", "ar":"فعل"}, + "resolved": {"en": "Resolved", "ar":"تم الحل"}, }; diff --git a/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart b/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart new file mode 100644 index 00000000..3494289f --- /dev/null +++ b/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart @@ -0,0 +1,245 @@ +class EpisodeByChiefComplaintVidaPlus { + int? clinicId; + String? createdOn; + int? doctorId; + int? episodeStatus; + int? hospitalGroupId; + int? hospitalId; + String? modifiedOn; + int? patientEpisodeId; + int? patientId; + List? patientPomrs; + + EpisodeByChiefComplaintVidaPlus( + {this.clinicId, + this.createdOn, + this.doctorId, + this.episodeStatus, + this.hospitalGroupId, + this.hospitalId, + this.modifiedOn, + this.patientEpisodeId, + this.patientId, + this.patientPomrs}); + + EpisodeByChiefComplaintVidaPlus.fromJson(Map json) { + clinicId = json['clinicId']; + createdOn = json['createdOn']; + doctorId = json['doctorId']; + episodeStatus = json['episodeStatus']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + modifiedOn = json['modifiedOn']; + patientEpisodeId = json['patientEpisodeId']; + patientId = json['patientId']; + if (json['patientPomrs'] != null) { + patientPomrs = []; + json['patientPomrs'].forEach((v) { + patientPomrs!.add(new PatientPomrs.fromJson(v)); + }); + } + } + + Map toJson() { + final Map data = new Map(); + data['clinicId'] = this.clinicId; + data['createdOn'] = this.createdOn; + data['doctorId'] = this.doctorId; + data['episodeStatus'] = this.episodeStatus; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['modifiedOn'] = this.modifiedOn; + data['patientEpisodeId'] = this.patientEpisodeId; + data['patientId'] = this.patientId; + if (this.patientPomrs != null) { + data['patientPomrs'] = this.patientPomrs!.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class PatientPomrs { + int? appointmentId; + int? chiefComplainTemplateId; + List? chiefComplains; + int? clinicGroupId; + String? createdOn; + int? doctorId; + String? doctorName; + int? episodeId; + bool? fallowUp; + bool? fallowUpRequired; + bool? isReadOnly; + String? modifiedOn; + int? patientId; + int? patientPomrId; + String? pomrSingOn; + int? pomrStatus; + bool? readOnly; + String? seenAtStatus; + String? vprnSeenAtStatus; + + PatientPomrs( + {this.appointmentId, + this.chiefComplainTemplateId, + this.chiefComplains, + this.clinicGroupId, + this.createdOn, + this.doctorId, + this.doctorName, + this.episodeId, + this.fallowUp, + this.fallowUpRequired, + this.isReadOnly, + this.modifiedOn, + this.patientId, + this.patientPomrId, + this.pomrSingOn, + this.pomrStatus, + this.readOnly, + this.seenAtStatus, + this.vprnSeenAtStatus}); + + PatientPomrs.fromJson(Map json) { + appointmentId = json['appointmentId']; + chiefComplainTemplateId = json['chiefComplainTemplateId']; + if (json['chiefComplains'] != null) { + chiefComplains = []; + json['chiefComplains'].forEach((v) { + chiefComplains!.add(new ChiefComplains.fromJson(v)); + }); + } + clinicGroupId = json['clinicGroupId']; + createdOn = json['createdOn']; + doctorId = json['doctorId']; + doctorName = json['doctorName']; + episodeId = json['episodeId']; + fallowUp = json['fallowUp']; + fallowUpRequired = json['fallowUpRequired']; + isReadOnly = json['isReadOnly']; + modifiedOn = json['modifiedOn']; + patientId = json['patientId']; + patientPomrId = json['patientPomrId']; + pomrSingOn = json['pomrSingOn']; + pomrStatus = json['pomrStatus']; + readOnly = json['readOnly']; + seenAtStatus = json['seenAtStatus']; + vprnSeenAtStatus = json['vprnSeenAtStatus']; + } + + Map toJson() { + final Map data = new Map(); + data['appointmentId'] = this.appointmentId; + data['chiefComplainTemplateId'] = this.chiefComplainTemplateId; + if (this.chiefComplains != null) { + data['chiefComplains'] = + this.chiefComplains!.map((v) => v.toJson()).toList(); + } + data['clinicGroupId'] = this.clinicGroupId; + data['createdOn'] = this.createdOn; + data['doctorId'] = this.doctorId; + data['doctorName'] = this.doctorName; + data['episodeId'] = this.episodeId; + data['fallowUp'] = this.fallowUp; + data['fallowUpRequired'] = this.fallowUpRequired; + data['isReadOnly'] = this.isReadOnly; + data['modifiedOn'] = this.modifiedOn; + data['patientId'] = this.patientId; + data['patientPomrId'] = this.patientPomrId; + data['pomrSingOn'] = this.pomrSingOn; + data['pomrStatus'] = this.pomrStatus; + data['readOnly'] = this.readOnly; + data['seenAtStatus'] = this.seenAtStatus; + data['vprnSeenAtStatus'] = this.vprnSeenAtStatus; + return data; + } +} + +class ChiefComplains { + int? appointmentId; + String? chiefComplain; + int? chiefComplainId; + int? clinicId; + String? createdBy; + int? createdId; + String? createdOn; + int? doctorId; + String? doctorName; + int? episodeId; + int? hospitalGroupId; + int? hospitalId; + String? loginUserId; + String? modifiedBy; + Null? modifiedId; + String? modifiedOn; + int? patientId; + String? patientName; + int? patientPomrId; + + ChiefComplains( + {this.appointmentId, + this.chiefComplain, + this.chiefComplainId, + this.clinicId, + this.createdBy, + this.createdId, + this.createdOn, + this.doctorId, + this.doctorName, + this.episodeId, + this.hospitalGroupId, + this.hospitalId, + this.loginUserId, + this.modifiedBy, + this.modifiedId, + this.modifiedOn, + this.patientId, + this.patientName, + this.patientPomrId}); + + ChiefComplains.fromJson(Map json) { + appointmentId = json['appointmentId']; + chiefComplain = json['chiefComplain']; + chiefComplainId = json['chiefComplainId']; + clinicId = json['clinicId']; + createdBy = json['createdBy']; + createdId = json['createdId']; + createdOn = json['createdOn']; + doctorId = json['doctorId']; + doctorName = json['doctorName']; + episodeId = json['episodeId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + loginUserId = json['loginUserId']; + modifiedBy = json['modifiedBy']; + modifiedId = json['modifiedId']; + modifiedOn = json['modifiedOn']; + patientId = json['patientId']; + patientName = json['patientName']; + patientPomrId = json['patientPomrId']; + } + + Map toJson() { + final Map data = new Map(); + data['appointmentId'] = this.appointmentId; + data['chiefComplain'] = this.chiefComplain; + data['chiefComplainId'] = this.chiefComplainId; + data['clinicId'] = this.clinicId; + data['createdBy'] = this.createdBy; + data['createdId'] = this.createdId; + data['createdOn'] = this.createdOn; + data['doctorId'] = this.doctorId; + data['doctorName'] = this.doctorName; + data['episodeId'] = this.episodeId; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['loginUserId'] = this.loginUserId; + data['modifiedBy'] = this.modifiedBy; + data['modifiedId'] = this.modifiedId; + data['modifiedOn'] = this.modifiedOn; + data['patientId'] = this.patientId; + data['patientName'] = this.patientName; + data['patientPomrId'] = this.patientPomrId; + return data; + } +} diff --git a/lib/core/model/SOAP/home_medication_vp/GetHomeMedication.dart b/lib/core/model/SOAP/home_medication_vp/GetHomeMedication.dart new file mode 100644 index 00000000..01d186c3 --- /dev/null +++ b/lib/core/model/SOAP/home_medication_vp/GetHomeMedication.dart @@ -0,0 +1,156 @@ +class GetHomeMedicationList { + List? personalizationEntity; + int? appointmentId; + int? clinicGroupId; + int? clinicId; + String? createdTime; + String? doseQuantity; + String? formularyName; + String? frequencyId; + String? frequencyString; + String? genericFormularyId; + String? homeMedFrom; + int? hospitalGroupId; + int? hospitalId; + String? id; + bool? isActive; + bool? isEHRIPReconciled; + bool? isEHROPReconciled; + bool? isERIPReconciled; + bool? isFreeText; + bool? isReconciled; + bool? isUnknownDetail; + String? lastUpdatedTime; + int? patientId; + int? patientPomrId; + String? prescribeTypeAlias; + int? prescribedItemId; + String? prescribedItemName; + String? remarks; + String? routeId; + String? routeString; + String? rowVersion; + String? sentence; + String? strengthId; + String? strengthString; + + GetHomeMedicationList( + {this.personalizationEntity, + this.appointmentId, + this.clinicGroupId, + this.clinicId, + this.createdTime, + this.doseQuantity, + this.formularyName, + this.frequencyId, + this.frequencyString, + this.genericFormularyId, + this.homeMedFrom, + this.hospitalGroupId, + this.hospitalId, + this.id, + this.isActive, + this.isEHRIPReconciled, + this.isEHROPReconciled, + this.isERIPReconciled, + this.isFreeText, + this.isReconciled, + this.isUnknownDetail, + this.lastUpdatedTime, + this.patientId, + this.patientPomrId, + this.prescribeTypeAlias, + this.prescribedItemId, + this.prescribedItemName, + this.remarks, + this.routeId, + this.routeString, + this.rowVersion, + this.sentence, + this.strengthId, + this.strengthString}); + + GetHomeMedicationList.fromJson(Map json) { + if (json['PersonalizationEntity'] != null) { + personalizationEntity = []; + json['PersonalizationEntity'].forEach((v) { + personalizationEntity!.add( v.fromJson(v)); + }); + } + appointmentId = json['appointmentId']; + clinicGroupId = json['clinicGroupId']; + clinicId = json['clinicId']; + createdTime = json['createdTime']; + doseQuantity = json['doseQuantity']; + formularyName = json['formularyName']; + frequencyId = json['frequencyId']; + frequencyString = json['frequencyString']; + genericFormularyId = json['genericFormularyId']; + homeMedFrom = json['homeMedFrom']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + id = json['id']; + isActive = json['isActive']; + isEHRIPReconciled = json['isEHRIPReconciled']; + isEHROPReconciled = json['isEHROPReconciled']; + isERIPReconciled = json['isERIPReconciled']; + isFreeText = json['isFreeText']; + isReconciled = json['isReconciled']; + isUnknownDetail = json['isUnknownDetail']; + lastUpdatedTime = json['lastUpdatedTime']; + patientId = json['patientId']; + patientPomrId = json['patientPomrId']; + prescribeTypeAlias = json['prescribeTypeAlias']; + prescribedItemId = json['prescribedItemId']; + prescribedItemName = json['prescribedItemName']; + remarks = json['remarks']; + routeId = json['routeId']; + routeString = json['routeString']; + rowVersion = json['rowVersion']; + sentence = json['sentence']; + strengthId = json['strengthId']; + strengthString = json['strengthString']; + } + + Map toJson() { + final Map data = new Map(); + if (this.personalizationEntity != null) { + data['PersonalizationEntity'] = + this.personalizationEntity!.map((v) => v.toJson()).toList(); + } + data['appointmentId'] = this.appointmentId; + data['clinicGroupId'] = this.clinicGroupId; + data['clinicId'] = this.clinicId; + data['createdTime'] = this.createdTime; + data['doseQuantity'] = this.doseQuantity; + data['formularyName'] = this.formularyName; + data['frequencyId'] = this.frequencyId; + data['frequencyString'] = this.frequencyString; + data['genericFormularyId'] = this.genericFormularyId; + data['homeMedFrom'] = this.homeMedFrom; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['id'] = this.id; + data['isActive'] = this.isActive; + data['isEHRIPReconciled'] = this.isEHRIPReconciled; + data['isEHROPReconciled'] = this.isEHROPReconciled; + data['isERIPReconciled'] = this.isERIPReconciled; + data['isFreeText'] = this.isFreeText; + data['isReconciled'] = this.isReconciled; + data['isUnknownDetail'] = this.isUnknownDetail; + data['lastUpdatedTime'] = this.lastUpdatedTime; + data['patientId'] = this.patientId; + data['patientPomrId'] = this.patientPomrId; + data['prescribeTypeAlias'] = this.prescribeTypeAlias; + data['prescribedItemId'] = this.prescribedItemId; + data['prescribedItemName'] = this.prescribedItemName; + data['remarks'] = this.remarks; + data['routeId'] = this.routeId; + data['routeString'] = this.routeString; + data['rowVersion'] = this.rowVersion; + data['sentence'] = this.sentence; + data['strengthId'] = this.strengthId; + data['strengthString'] = this.strengthString; + return data; + } +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index e6321cd3..2aa75087 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -3,11 +3,13 @@ import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_mod import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetHomeMedication.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; @@ -48,6 +50,9 @@ class SOAPService extends LookupService { List hopiDetails = []; List patientChiefComplaintListVidaPlus = []; List searchChiefComplaintListVidaPlus = []; + List episodeByChiefComplaintListVidaPlus = []; + List getHomeMedicationList = []; + int? episodeID; bool isPrescriptionOrder = false; @@ -376,6 +381,25 @@ class SOAPService extends LookupService { }, body: request); } + + Future getEditAllergies(int allergyId) async { + hasError = false; + + await baseAppClient.post(GET_EDIT_ALLERGIES, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + searchAllergiesList.clear(); + + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: {"allergyId": allergyId}); + } + + Future searchAllergies(String searchKey) async { hasError = false; @@ -487,39 +511,48 @@ class SOAPService extends LookupService { } Future updateAllergies( - AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { - allergy.allergyReactionDTOs!.forEach((value) { - value.patientID = patientInfo.patientMRN; - value.pomrid = patientInfo.episodeNo; - value.allergyReactionMappingID = 1; + PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { + + var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); + List? reaction = + allergy.patientsAllergyReactionsDTOs!; + List? reactionRequest = []; + reaction.forEach((value) { + reactionRequest.add(AllergyReactionDTOs( + patientID: patientInfo.patientMRN, + pomrid: int.parse(patientInfo.pomrId!), + hospitalGroupID: value.hospitalGroupID, + allergyReactionMappingID: 0, + hospitalID: value.hospitalID, + isActive: value.isActive, + allergyReactionID: value.allergyReactionID, + allergyReactionName: value.allergyReactionName, + severity: value.severity)); }); var request = { - "patientsAllergyRevisionID": allergy.allergyRevisionID, + "pomrId": patientInfo.pomrId, "patientMRN": patientInfo.patientMRN, - "allergyDiseaseType": 0, "allergyTypeName": allergy.allergyTypeName, - "episodeId": patientInfo.episodeNo, - "isUpdatedByNurse": false, - "remarks": allergy.remark, - "createdBy": patientInfo.doctorId, - "createdOn": AppDateUtils.convertDateToFormat( - DateTime.now(), "yyyy-MM-dd kk:mm:ss"), "assessmentId": 0, - "isActive": allergy.isActive, - "isActivePatientsAllergy": true, - "patientsAllergyReactionsDTOs": allergy.allergyReactionDTOs, - "dbCRUDOperation": 1, + "isActive": allergy.isActivePatientsAllergy, + "isActivePatientsAllergy": allergy.isActivePatientsAllergy, + "patientsAllergyReactionsDTOs":reactionRequest, + "dbCRUDOperation": 2, "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, - "allergyTypeID": allergy.allergyTypeID + "allergyTypeID": allergy.allergyTypeID, + "remarks": allergy.remark, + "projectId": patientInfo.projectId, + "editedBy": doctorProfile['List_MemberInformation'][0]['MemberID'], + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; await baseAppClient.post(UPDATE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + DrAppToastMsg.showSuccesToast("Allergies Updated Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -631,4 +664,118 @@ class SOAPService extends LookupService { super.error = error; }, body: request); } + + + + continueEpisodeVidaPlus( + PatiantInformtion patient, List chiefComplaint) async { + List> chiefComplaintList=[]; + + chiefComplaint.forEach((action){ + action.chiefComplains!.forEach((action2){ + chiefComplaintList.add({"chiefComplain": action2.chiefComplain,"chiefComplainTemplateId": action!.chiefComplainTemplateId}); + }); + }); + Map request = { + "appointmentId": patient.appointmentNo, + "projectId": patient.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "chiefComplain":chiefComplaintList + + }; + hasError = false; + await baseAppClient.post(CONTINUE_EPISODE_VP, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + updateChiefComplaintVidaPlus( + PatiantInformtion patient, GetChiefComplaintVidaPlus chiefComplaint) async { + Map request = { + "AppointmentNo": patient.appointmentNo, + "pomrId": patient.pomrId, + "PatientMRN": patient.patientMRN, + "PatientName":patient.firstName! + ' '+ patient.lastName! , + "addedChiefComplaintCreateDtos": [ + + ], + "removedChiefComplaintIds":[chiefComplaint.chiefComplainId] + }; + hasError = false; + await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + DrAppToastMsg.showErrorToast(response['List_UpdateChiefComplaint']['message']); + }, onFailure: (String error, int statusCode) { + + hasError = true; + super.error = error; + }, body: request); + } + episodeByChiefComplaint( + PatiantInformtion patient) async { + Map request = { + "patientId": patient.patientId, + "clinicId": patient.clinicId, + }; + hasError = false; + await baseAppClient.post(EPISODE_BY_CHIEF_COMPLAINT, + onSuccess: (dynamic response, int statusCode) { + episodeByChiefComplaintListVidaPlus.clear(); + + response['EpisodeByChiefcomplaint']['resultData'].forEach((v) { + episodeByChiefComplaintListVidaPlus.add(EpisodeByChiefComplaintVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + getHomeMedication( + PatiantInformtion patient) async { + Map request = { + "patientId": patient.patientId, + }; + hasError = false; + await baseAppClient.post(GET_HOME_MEDICATION, + onSuccess: (dynamic response, int statusCode) { + getHomeMedicationList.clear(); + + response['ListHomeMedication']['resultData'].forEach((v) { + getHomeMedicationList.add(GetHomeMedicationList.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + // createCCByEpisodeVidaPlus( + // PatiantInformtion patient, List chiefComplaint) async { + // Map request = + // { + // "appointmentId": patient.appointmentNo, + // "projectId": patient.projectId, + // "setupId": 105, + // "chiefComplain":chiefComplaint, + // "patientId": patient.patientId, + // "pomrId": patient.pomrId, + // "doctorId": 2, + // }; + // + // hasError = false; + // await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, + // onSuccess: (dynamic response, int statusCode) { + // print("Success"); + // }, onFailure: (String error, int statusCode) { + // hasError = true; + // super.error = error; + // }, body: request); + // } } + diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index be098f49..ba6a0c24 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; @@ -16,6 +17,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetHomeMedication.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; @@ -36,6 +38,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/assessment/assessment_call_back.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/objective/objective_call_back.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/plan/plan_call_back.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/cheif_complaints/update_Chief_complaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; import '../../locator.dart'; @@ -111,6 +114,11 @@ class SOAPViewModel extends BaseViewModel { List get getChiefComplaintListVidaPlus => _SOAPService.patientChiefComplaintListVidaPlus; + + List get episodeByChiefComplaintListVidaPlus => + _SOAPService.episodeByChiefComplaintListVidaPlus; + + int? get episodeID => _SOAPService.episodeID; bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; @@ -132,6 +140,11 @@ class SOAPViewModel extends BaseViewModel { List? get allMedicationList => _prescriptionService.allMedicationList; + + List? get getHomeMedicationList => + _SOAPService.getHomeMedicationList; + + late SubjectiveCallBack subjectiveCallBack; setSubjectiveCallBack(SubjectiveCallBack callBack) { @@ -921,6 +934,16 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + getEditAllergiesVidaPlus(int AllergyID ) async { + setState(ViewState.BusyLocal); + await _SOAPService.getEditAllergies(AllergyID); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + searchAllergies(String searchKey) async { setState(ViewState.BusyLocal); await _SOAPService.searchAllergies(searchKey); @@ -953,6 +976,18 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + + updateAllergies( + PatientAllergiesVidaPlus request, PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.updateAllergies(request, patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + saveHopi(Map req, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.saveHopi(req, patientInfo); @@ -1002,4 +1037,41 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + updateChiefComplaint(PatiantInformtion patientInfo, GetChiefComplaintVidaPlus CC) async { + setState(ViewState.BusyLocal); + await _SOAPService.updateChiefComplaintVidaPlus(patientInfo, CC); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + episodeByChiefComplaint(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.episodeByChiefComplaint(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + createCCByEpisode(PatiantInformtion patientInfo, List chiefComplaint) async { + setState(ViewState.BusyLocal); + await _SOAPService.continueEpisodeVidaPlus(patientInfo, chiefComplaint); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + getHomeMedication(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getHomeMedication(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index b0dae525..10370c01 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -138,11 +138,7 @@ openReaction(model, AllergiesListVidaPlus mySelectedAllergy){ mySelectedAllergy: mySelectedAllergy, patientInfo: widget.patientInfo ) - // addReactionFun: (AllergiesListVidaPlus mySelectedAllergy) { - // - // Navigator.of(context).pop(); - // - // }) + )); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 938f4c6a..b45912ef 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -1,18 +1,17 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../../../../../config/config.dart'; -import '../../../../../../core/model/patient/patiant_info_model.dart'; -import '../../../../../../core/viewModel/project_view_model.dart'; -import '../../../../../../widgets/shared/app_scaffold_widget.dart'; -import '../../../../../../widgets/shared/buttons/app_buttons_widget.dart'; -import '../../../../../base/base_view.dart'; -import '../../../../patient_search/patient_search_header.dart'; class ReactionsSelectionAllergiesWidget extends StatefulWidget { @@ -27,10 +26,9 @@ class ReactionsSelectionAllergiesWidget extends StatefulWidget { Key? key, required this.model, required this.patientInfo, - this.mySelectedAllergy, + this.mySelectedAllergy, this.editSelectedAllergy, this.isEdit = false, - this.buttonName, }) : super(key: key); @@ -42,7 +40,7 @@ class ReactionsSelectionAllergiesWidget extends StatefulWidget { class _ReactionsSelectionAllergiesWidgetState extends State { bool loading = false; - + TextEditingController remark = TextEditingController(); @override void initState() { super.initState(); @@ -50,367 +48,474 @@ class _ReactionsSelectionAllergiesWidgetState @override Widget build(BuildContext context) { - return BaseView( - builder: (_, model, w) => AppScaffold( - isLoading:loading, - appBar: PatientSearchHeader( - title: widget.mySelectedAllergy !=null ?widget.mySelectedAllergy!.allergyName : widget.editSelectedAllergy!.allergyName - ), - body: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - widget.mySelectedAllergy != null ? Expanded( - child: RoundedContainer( - margin: EdgeInsets.all(15), - child: ListView.builder( - itemCount: - widget.mySelectedAllergy!.allergyReactionDTOs!.length, - itemBuilder: (context, index) { - loading = false; - return Column(children: [ - ExpansionTile( - key: Key(index.toString()), - dense: false, - enableFeedback: false, - showTrailingIcon: false, - - initiallyExpanded: widget - .mySelectedAllergy! - .allergyReactionDTOs![index].isSelected!, - leading: - Checkbox( - activeColor: Color(0xffD02127), - value: widget - .mySelectedAllergy! - .allergyReactionDTOs![index].isSelected!, onChanged: (value) { - - widget - .mySelectedAllergy! - .allergyReactionDTOs![index].isSelected = value; - setState(() { - - }); + builder: (_, model, w) => AppScaffold( + isLoading: loading, + appBar: PatientSearchHeader( + title: widget.mySelectedAllergy != null + ? widget.mySelectedAllergy!.allergyName + : widget.editSelectedAllergy!.allergyName), + body: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + widget.mySelectedAllergy != null + ? Expanded( + child: RoundedContainer( + margin: EdgeInsets.only(top:10, left: 15, right: 15, bottom: 10), + child: ListView.builder( + itemCount: widget.mySelectedAllergy! + .allergyReactionDTOs!.length, + itemBuilder: (context, index) { + loading = false; - }), - title: AppText(widget - .mySelectedAllergy! - .allergyReactionDTOs![index] - .allergyReactionName!), - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: ListTile( - title: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Radio( - activeColor: Color(0xffD02127), - materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, - // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: 1, - groupValue: widget - .mySelectedAllergy! - .allergyReactionDTOs![index] - .severity, - onChanged: (value) { - widget - .mySelectedAllergy! - .allergyReactionDTOs![index] - .severity = value; - setState(() {}); - }, - ), - AppText( - TranslationBase.of(context).mild, - fontSize: 10, - ), - ], - ))), - Expanded( - child: ListTile( - title: Row( - children: [ - Radio( + return Column(children: [ + ExpansionTile( + key: Key(index.toString()), + dense: false, + enableFeedback: false, + showTrailingIcon: false, + initiallyExpanded: widget + .mySelectedAllergy! + .allergyReactionDTOs![index] + .isSelected!, + leading: Checkbox( activeColor: Color(0xffD02127), - materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, - // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: 2, - groupValue: widget + value: widget .mySelectedAllergy! .allergyReactionDTOs![index] - .severity, + .isSelected!, onChanged: (value) { widget .mySelectedAllergy! .allergyReactionDTOs![index] - .severity = value; + .isSelected = value; setState(() {}); - }, - ), - AppText( - TranslationBase.of(context).moderate, - fontSize: 10, - ), + }), + title: AppText(widget + .mySelectedAllergy! + .allergyReactionDTOs![index] + .allergyReactionName!), + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: ListTile( + title: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize + .shrinkWrap, + // Reduces padding around checkbox + visualDensity: + VisualDensity.compact, + value: 1, + groupValue: widget + .mySelectedAllergy! + .allergyReactionDTOs![index] + .severity, + onChanged: (value) { + widget + .mySelectedAllergy! + .allergyReactionDTOs![ + index] + .severity = value; + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context) + .mild, + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize + .shrinkWrap, + // Reduces padding around checkbox + visualDensity: + VisualDensity.compact, + value: 2, + groupValue: widget + .mySelectedAllergy! + .allergyReactionDTOs![index] + .severity, + onChanged: (value) { + widget + .mySelectedAllergy! + .allergyReactionDTOs![ + index] + .severity = value; + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context) + .moderate, + fontSize: 10, + ), + ], + ))), + Expanded( + child: ListTile( + title: Row( + children: [ + Radio( + activeColor: Color(0xffD02127), + materialTapTargetSize: + MaterialTapTargetSize + .shrinkWrap, + // Reduces padding around checkbox + visualDensity: + VisualDensity.compact, + value: 3, + groupValue: widget + .mySelectedAllergy! + .allergyReactionDTOs![index] + .severity, + onChanged: (value) { + widget + .mySelectedAllergy! + .allergyReactionDTOs![ + index] + .severity = value; + setState(() {}); + }, + ), + AppText( + TranslationBase.of(context) + .severe, + fontSize: 10, + ), + ], + ))) + ], + ) ], - ))), - Expanded( - child: ListTile( - title: Row( - children: [ - Radio( + ), + Divider(), + ]); + }, + ))) + : Expanded( + child: RoundedContainer( + margin: EdgeInsets.all(15), + child: ListView.builder( + itemCount: widget.editSelectedAllergy! + .patientsAllergyReactionsDTOs!.length, + itemBuilder: (context, index) { + loading = false; + return Column(children: [ + ExpansionTile( + key: Key(index.toString()), + dense: false, + enableFeedback: false, + showTrailingIcon: false, + initiallyExpanded: widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![index] + .isSelected!, + leading: Checkbox( activeColor: Color(0xffD02127), - materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, - // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: 3, - groupValue: widget - .mySelectedAllergy! - .allergyReactionDTOs![index] - .severity, + value: widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .isSelected!, onChanged: (value) { widget - .mySelectedAllergy! - .allergyReactionDTOs![index] - .severity = value; + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .isSelected = value; setState(() {}); - }, - ), - AppText( - TranslationBase.of(context).severe, - fontSize: 10, - ), - ], - ))) - ], - ) - ], - ), - Divider(), - ]); - }, - ))) : Expanded( - child: RoundedContainer( - margin: EdgeInsets.all(15), - child: ListView.builder( - itemCount: - widget.editSelectedAllergy!.patientsAllergyReactionsDTOs!.length, - itemBuilder: (context, index) { - loading = false; - return Column(children: [ - ExpansionTile( - key: Key(index.toString()), - dense: false, - enableFeedback: false, - showTrailingIcon: false, - - initiallyExpanded: widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected!, - leading: - Checkbox( - activeColor: Color(0xffD02127), - value: widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected!, onChanged: (value) { - - widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index].isSelected = value; - setState(() { - - }); - - }), - title: AppText( widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .allergyReactionName!), - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: ListTile( - title: Row( + }), + title: AppText(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![index] + .allergyReactionName!), + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: ListTile( + title: Row( mainAxisSize: MainAxisSize.min, children: [ Radio( activeColor: Color(0xffD02127), materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, + MaterialTapTargetSize + .shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).mild, - groupValue:getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + visualDensity: + VisualDensity.compact, + value: + TranslationBase.of(context) + .mild, + groupValue: getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] .severity!), onChanged: (value) { - widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .reactionSelection = getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .severity!); + widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .reactionSelection = + getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .severity!); setState(() {}); }, ), AppText( - TranslationBase.of(context).mild, + TranslationBase.of(context) + .mild, fontSize: 10, ), ], ))), - Expanded( - child: ListTile( - title: Row( + Expanded( + child: ListTile( + title: Row( children: [ Radio( activeColor: Color(0xffD02127), materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, + MaterialTapTargetSize + .shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).moderate, - groupValue: getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + visualDensity: + VisualDensity.compact, + value: + TranslationBase.of(context) + .moderate, + groupValue: getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] .severity!), onChanged: (value) { - widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .reactionSelection =getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .severity!); + widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .reactionSelection = + getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .severity!); setState(() {}); }, ), AppText( - TranslationBase.of(context).moderate, + TranslationBase.of(context) + .moderate, fontSize: 10, ), ], ))), - Expanded( - child: ListTile( - title: Row( + Expanded( + child: ListTile( + title: Row( children: [ Radio( activeColor: Color(0xffD02127), materialTapTargetSize: - MaterialTapTargetSize.shrinkWrap, + MaterialTapTargetSize + .shrinkWrap, // Reduces padding around checkbox - visualDensity: VisualDensity.compact, - value: TranslationBase.of(context).severe, - groupValue: getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] + visualDensity: + VisualDensity.compact, + value: + TranslationBase.of(context) + .severe, + groupValue: getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] .severity!), onChanged: (value) { - widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .reactionSelection =getSeverityByID(widget.editSelectedAllergy!.patientsAllergyReactionsDTOs![index] - .severity!); + widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .reactionSelection = + getSeverityByID(widget + .editSelectedAllergy! + .patientsAllergyReactionsDTOs![ + index] + .severity!); setState(() {}); }, ), AppText( - TranslationBase.of(context).severe, + TranslationBase.of(context) + .severe, fontSize: 10, ), ], ))) - ], - ) - ], - ), - Divider(), - ]); - }, - ))) - ], - ), - bottomSheet: Container( - height: 90, - color: Colors.white, - margin: EdgeInsets.all(10), - child: Row( - children: [ - Expanded( - child: Container( - child: AppButton( - title: TranslationBase.of(context).cancel, - vPadding: 8, - hPadding: 8, - color: Color(0xffEAEAEA), - fontColor: Colors.black, - onPressed: () { - Navigator.of(context).pop(); - }, - ), - ), - ), - SizedBox( - width: 8, - ), - Expanded( - child: Container( - child: AppButton( - loading: loading, - title: TranslationBase.of(context).save, - vPadding: 8, - hPadding: 8, - color: AppGlobal.appGreenColor, - fontColor: Colors.white, - onPressed: () { - if(widget.mySelectedAllergy ==null) { + ], + ) + ], + ), + Divider(), + ]); + }, + ))), - editAllergy(); - } - else{ + Container( + margin: EdgeInsets.only(left: 15, right: 15), + child: AppTextFieldCustom( - addAllergy(); + hintText: + TranslationBase.of(context).remarks, + controller: remark, + maxLines: 4, + minLines: 4, + hasBorder: true, + inputType: TextInputType.multiline, - } - }, - ), - ), - ), + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + )), + SizedBox(height: 90,) ], - )) + ), + bottomSheet: Container( + height: 70, + color: Colors.white, + margin: EdgeInsets.all(10), + child: Row( + children: [ + Expanded( + child: Container( + child: AppButton( + title: TranslationBase.of(context).cancel, + vPadding: 8, + hPadding: 8, + color: Color(0xffEAEAEA), + fontColor: Colors.black, + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ), + ), + SizedBox( + width: 8, + ), + Expanded( + child: Container( + child: AppButton( + loading: loading, + title: TranslationBase.of(context).save, + vPadding: 8, + hPadding: 8, + color: AppGlobal.appGreenColor, + fontColor: Colors.white, + onPressed: () { + if (widget.isEdit == true) { + editAllergy(); + } else { + addAllergy(); + } + }, + ), + ), + ), + ], + )) - // CustomBottomSheetContainer( - // buttonColor: Color(0xff359846), - // fontColor: Colors.white, - // label: TranslationBase.of(context).next, - // onTap: () { - // widget.addReactionFun(widget - // .mySelectedAllergy - // ); - // }, - // ) + // CustomBottomSheetContainer( + // buttonColor: Color(0xff359846), + // fontColor: Colors.white, + // label: TranslationBase.of(context).next, + // onTap: () { + // widget.addReactionFun(widget + // .mySelectedAllergy + // ); + // }, + // ) - )); + )); } - getSeverityByID(int id){ - Map severity={ - 1:TranslationBase.of(context).mild, - 2:TranslationBase.of(context).moderate, - 3:TranslationBase.of(context).severe - }; + getSeverityByID(int id) { + Map severity = { + 1: TranslationBase.of(context).mild, + 2: TranslationBase.of(context).moderate, + 3: TranslationBase.of(context).severe + }; return severity[id]; } - addAllergy() async{ - setLoader(true); - AllergiesListVidaPlus request = widget - .mySelectedAllergy!; - request.allergyReactionDTOs = widget - .mySelectedAllergy!.allergyReactionDTOs!.where((i) => i.isSelected!).toList(); - await widget.model!.addAllergies(request, widget.patientInfo); - setLoader(false); - Navigator.of(context).pop(); + + addAllergy() async { + setLoader(true); + AllergiesListVidaPlus request = widget.mySelectedAllergy!; + request.remark = remark.text; + request.allergyReactionDTOs = widget.mySelectedAllergy!.allergyReactionDTOs! + .where((i) => i.isSelected!) + .toList(); + await widget.model!.addAllergies(request, widget.patientInfo); + await widget.model!.getAllergiesVidaPlus(widget.patientInfo); + setLoader(false); + Navigator.of(context).pop(); } - editAllergy(){ + editAllergy() async{ + setLoader(true); + PatientAllergiesVidaPlus request = widget.editSelectedAllergy!; + request.remark = remark.text; + request.patientsAllergyReactionsDTOs =[]; + widget.mySelectedAllergy!.allergyReactionDTOs! + .forEach((i){ + if(i.isSelected!){ + request.patientsAllergyReactionsDTOs!.add(PatientsAllergyReactionsDTOs( + pomrId: i.pomrid, + patientID:i.patientID, + hospitalGroupID:i.hospitalGroupID, + hospitalID:i.hospitalID, + isActive:i.isActive, + allergyReactionMappingID:i.allergyReactionMappingID, + allergyReactionID:i.allergyReactionID, + allergyReactionName: i.allergyReactionName, + severity:i.severity, + + )); + } + }); + + await widget.model!.updateAllergies(request, widget.patientInfo); + setLoader(false); + Navigator.of(context).pop(); } + setLoader(bool value) { loading = value; - setState(() { - - }); + setState(() {}); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index ee4a3933..11f79794 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -102,8 +102,9 @@ class _UpdateAllergiesWidgetState extends State { fontWeight: FontWeight.w800, letterSpacing: -0.48, ), - selectedAllergy - .patientsAllergyReactionsDTOs!.isNotEmpty + selectedAllergy.patientsAllergyReactionsDTOs! + .isNotEmpty && + selectedAllergy.isActivePatientsAllergy! ? ListView( shrinkWrap: true, children: selectedAllergy @@ -114,6 +115,9 @@ class _UpdateAllergiesWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ + SizedBox( + height: 5, + ), Row( children: [ AppText( @@ -128,7 +132,8 @@ class _UpdateAllergiesWidgetState extends State { reaction.severity! - 1] .name, - color:getColor(reaction.severity!), + color: getColor( + reaction.severity!), fontSize: 10, fontWeight: FontWeight.w600, letterSpacing: -0.48, @@ -138,49 +143,70 @@ class _UpdateAllergiesWidgetState extends State { ], )) .toList()) - : AppText("----"), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - SizedBox( - height: 10, - ), - TextButton.icon( - onPressed: () { - Navigator.push( - context, - FadePage( - page: - ReactionsSelectionAllergiesWidget( - model: model, - mySelectedAllergy: null, - editSelectedAllergy: selectedAllergy!, - patientInfo: widget.patientInfo, - ))); - }, - icon: SvgPicture.asset( - "assets/images/svgs/edit-icon.svg", - height: 16, - ), - label: AppText( - TranslationBase.of(context).edit, - fontSize: 12, - ), - ), - TextButton.icon( - onPressed: () { - resolveAllergy(model, selectedAllergy); - }, - icon: SvgPicture.asset( - "assets/images/svgs/resolve.svg", - height: 18, - ), - label: AppText( - TranslationBase.of(context).resolve, - fontSize: 12, - color: Color(0xff359846))) - ], - ) + : selectedAllergy.isActivePatientsAllergy! + ? AppText("----") + : AppText( + TranslationBase.of(context).resolved, + color: Colors.lightBlue, + fontSize: 10, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ), + selectedAllergy.isActivePatientsAllergy! && + selectedAllergy.allergyID! != 0 + ? Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + TextButton.icon( + onPressed: () { + editAllergy(selectedAllergy, model); + }, + icon: SvgPicture.asset( + "assets/images/svgs/edit-icon.svg", + height: 16, + ), + label: AppText( + TranslationBase.of(context).edit, + fontSize: 12, + ), + ), + TextButton.icon( + onPressed: () { + resolveAllergy( + model, selectedAllergy); + }, + icon: SvgPicture.asset( + "assets/images/svgs/resolve.svg", + height: 18, + ), + label: AppText( + TranslationBase.of(context).resolve, + fontSize: 12, + color: Color(0xff359846))) + ], + ) + : selectedAllergy.allergyID! != 0 + ? Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + TextButton.icon( + onPressed: () { + activateAllergy( + model, selectedAllergy); + }, + icon: SvgPicture.asset( + "assets/images/svgs/resolve.svg", + height: 18, + color: Color(0xffD02127), + ), + label: AppText( + TranslationBase.of(context) + .activate, + fontSize: 12, + color: Color(0xffD02127))) + ], + ) + : SizedBox() ], ); }).toList()), @@ -189,19 +215,58 @@ class _UpdateAllergiesWidgetState extends State { } resolveAllergy( - SOAPViewModel model, PatientAllergiesVidaPlus selectedAllergy) async{ + SOAPViewModel model, PatientAllergiesVidaPlus selectedAllergy) async { GifLoaderDialogUtils.showMyDialog(context); - await model.resolveAllergies(selectedAllergy, widget.patientInfo); + await model.resolveAllergies(selectedAllergy, widget.patientInfo); + await model.getAllergiesVidaPlus(widget.patientInfo); GifLoaderDialogUtils.hideDialog(context); + } + + activateAllergy( + SOAPViewModel model, PatientAllergiesVidaPlus selectedAllergy) async { + GifLoaderDialogUtils.showMyDialog(context); + await model.updateAllergies(selectedAllergy, widget.patientInfo); + await model.getAllergiesVidaPlus(widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); } - Color getColor(int severity){ - Map color ={ - 1:Color(0xff359846) , - 2:Color(0xFFCC9B14), - 3:Color(0xffD02127) + + Color getColor(int severity) { + Map color = { + 1: Color(0xff359846), + 2: Color(0xFFCC9B14), + 3: Color(0xffD02127) }; - return color[severity]; + return color[severity]; + } + + editAllergy( + PatientAllergiesVidaPlus selectedAllergy, SOAPViewModel model) async { + GifLoaderDialogUtils.showMyDialog(context); + await model.getEditAllergiesVidaPlus(selectedAllergy.allergyID!); + GifLoaderDialogUtils.hideDialog(context); + markSelected(selectedAllergy, model); + Navigator.push( + context, + FadePage( + page: ReactionsSelectionAllergiesWidget( + model: model, + mySelectedAllergy: model.searchAllergiesVidaPlus[0], + editSelectedAllergy: selectedAllergy!, + patientInfo: widget.patientInfo, + isEdit: true, + ))); + } + + markSelected(PatientAllergiesVidaPlus selectedAllergy, SOAPViewModel model) { + model.searchAllergiesVidaPlus[0].allergyReactionDTOs!.forEach((element) { + selectedAllergy.patientsAllergyReactionsDTOs!.forEach((element2) { + if (element.allergyReactionID == element2.allergyReactionID) { + element.isSelected = true; + element.severity =element2.severity; + } + }); + }); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index f06810e9..480882e6 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -1,3 +1,5 @@ +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; @@ -9,29 +11,38 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; -class AddChiefComplaint extends StatelessWidget { - final List complaints; +class AddChiefComplaint extends StatefulWidget { + final List complaints; final String selectedType; final String? firstField; final String? secondField; final String? thirdField; final PatiantInformtion patientInfo; - const AddChiefComplaint( - {super.key, - required this.complaints, - required this.selectedType, - this.firstField, - this.secondField, - this.thirdField, - required this.patientInfo - }); + const AddChiefComplaint({super.key, + required this.complaints, + required this.selectedType, + this.firstField, + this.secondField, + this.thirdField, + required this.patientInfo + }); + @override + State createState() => _AddChiefComplaintState(); +} + + +class _AddChiefComplaintState extends State { @override Widget build(BuildContext context) { return BaseView( + onModelReady: (model){ + episodeByChiefComplaint(model); + }, builder: (_, model, w) => AppScaffold( isShowAppBar: true, + appBar: PatientSearchHeader( title: TranslationBase.of(context).addChiefComplaint ), @@ -43,21 +54,29 @@ class AddChiefComplaint extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, children: [ ComplaintSelection( - complaints: ['option1' ,'option 2'], - selectedType: selectedType, - firstField: firstField, - secondField: secondField, - thirdField: thirdField, + complaints: widget.complaints, + selectedType: widget.selectedType, + firstField: widget.firstField, + secondField:widget. secondField, + thirdField: widget.thirdField, searchData: model.searchChiefComplaintList, onSearch:(String value){ searchChiefComplaint(model, value); }, onSave: (String chiefComplaint){ - addChiefComplaint(model, chiefComplaint); + addChiefComplaint(model, chiefComplaint, context); }, + onCrossClicked: (GetChiefComplaintVidaPlus chiefComplaint){ + updateChiefComplaint(model, chiefComplaint, context); + }, ), SizedBox(height: 16,), - PreviousCheifComplaints() + PreviousChiefComplaints( + model.episodeByChiefComplaintListVidaPlus, + (List chiefComplaint){ + createCCByEpisode(model, chiefComplaint); + }, + ) ], ), ), @@ -65,13 +84,33 @@ class AddChiefComplaint extends StatelessWidget { ), ); } - addChiefComplaint(SOAPViewModel model, String CC) async{ - - await model.saveChiefComplaint(patientInfo, CC); + addChiefComplaint(SOAPViewModel model, String CC, BuildContext context) async{ + GifLoaderDialogUtils.showMyDialog(context); + await model.saveChiefComplaint(widget.patientInfo, CC); + await model.getChiefComplaint(widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); } searchChiefComplaint(SOAPViewModel model, String CC) async{ + await model.searchChiefComplaint(widget.patientInfo, CC); + + } + updateChiefComplaint(SOAPViewModel model, GetChiefComplaintVidaPlus cc, BuildContext context) async{ + GifLoaderDialogUtils.showMyDialog(context); + await model.updateChiefComplaint(widget.patientInfo, cc); + await model.getChiefComplaint(widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); + setState(() { - await model.searchChiefComplaint(patientInfo, CC); + }); + } + episodeByChiefComplaint(SOAPViewModel model) async{ + await model.episodeByChiefComplaint(widget.patientInfo); } + createCCByEpisode(model, List chiefComplaint) async{ + GifLoaderDialogUtils.showMyDialog(context); + await model.createCCByEpisode(widget.patientInfo, chiefComplaint); + GifLoaderDialogUtils.hideDialog(context); + Navigator.of(context).pop(); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 6bb0ddad..3297a83b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -1,20 +1,28 @@ +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/medication/update_medication_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; class UpdateChiefComplaints extends StatelessWidget { final List complaints; final PatiantInformtion patientInfo; + const UpdateChiefComplaints({Key? key, required this.complaints, required this.patientInfo}) : super(key: key); @override + Widget build(BuildContext context) { + TextEditingController medicationController = TextEditingController(); return BaseView( onModelReady: (model){ WidgetsBinding.instance.addPostFrameCallback((_) { @@ -30,7 +38,7 @@ class UpdateChiefComplaints extends StatelessWidget { context, MaterialPageRoute( builder: (BuildContext context) => AddChiefComplaint( - complaints: complaints, + complaints: model.getChiefComplaintListVidaPlus, patientInfo: patientInfo, selectedType: '', @@ -39,7 +47,7 @@ class UpdateChiefComplaints extends StatelessWidget { thirdField: ''), )); }, - title: "Add Chief Complaint", + title: TranslationBase.of(context).addChiefComplaint, ), SizedBox(height: 16), Container(width: MediaQuery.of(context).size.width, @@ -51,10 +59,12 @@ class UpdateChiefComplaints extends StatelessWidget { itemCount: model.getChiefComplaintListVidaPlus.length, itemBuilder: (_, index) => ComplaintItems( - complaint: model.getChiefComplaintListVidaPlus[index].chiefComplain!, - onCrossClicked: (complaints) {}) + complaint: model.getChiefComplaintListVidaPlus[index]!, + onCrossClicked: (complaints) { - )) + }) + + )), ]), )); @@ -62,4 +72,5 @@ class UpdateChiefComplaints extends StatelessWidget { getChiefComplaints(SOAPViewModel model){ model.getChiefComplaint(patientInfo); } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index c7d437c2..fa801b4c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; @@ -9,7 +10,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; class ComplaintSelection extends StatefulWidget { - final List complaints; + final List complaints; final String selectedType; final String? firstField; final String? secondField; @@ -17,7 +18,7 @@ class ComplaintSelection extends StatefulWidget { final Function(String cheifComplaint)? onSave; final Function(String value)? onSearch; final List? searchData; - + final Function(GetChiefComplaintVidaPlus)? onCrossClicked; const ComplaintSelection({super.key, required this.complaints, required this.selectedType, @@ -26,7 +27,8 @@ class ComplaintSelection extends StatefulWidget { this.thirdField, this.onSave, this.onSearch, - this.searchData + this.searchData, + this.onCrossClicked }); @override @@ -233,7 +235,7 @@ class _ComplaintSelectionState extends State { }); } - + TextEditingController searchController = TextEditingController(); Widget TextWithSelectedItems(SOAPViewModel model) { return Material( shape: RoundedRectangleBorder( @@ -265,7 +267,7 @@ class _ComplaintSelectionState extends State { TextFormField( autofocus: true, - + controller: searchController, decoration: InputDecoration( hintText: '', border: InputBorder.none, @@ -298,7 +300,9 @@ class _ComplaintSelectionState extends State { var cc = widget.searchData![index].chiefComplain; model.searchChiefComplaintList!.length =0; setState((){}); + widget.onSave!(cc!); + searchController.text =''; })); }))))]), @@ -313,8 +317,11 @@ class _ComplaintSelectionState extends State { itemBuilder: (context, index) { return ComplaintItems( - complaint: widget.complaints[index], - onCrossClicked: (complaints) {}); + complaint: widget.complaints[index]!, + isDeletable:true, + onCrossClicked: (complaints) { + widget.onCrossClicked!(complaints); + }); }) // }), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index 814769de..2bda8432 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -1,32 +1,63 @@ +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; -class ComplaintItems extends StatelessWidget { - final String complaint; - final Function(String) onCrossClicked; +class ComplaintItems extends StatefulWidget { + final GetChiefComplaintVidaPlus complaint; + final Function(GetChiefComplaintVidaPlus) onCrossClicked; + final bool isDeletable; const ComplaintItems( - {super.key, required this.complaint, required this.onCrossClicked}); + {super.key, required this.complaint, required this.onCrossClicked, this.isDeletable = false}); + + @override + State createState() => _ComplaintItemsState(); +} + +class _ComplaintItemsState extends State { @override Widget build(BuildContext context) { - return Container( + return Stack(children: [ Container( padding: const EdgeInsets.all(5.0), width: 120, height: 40, + margin:const EdgeInsets.all(5.0) , alignment: Alignment.center, decoration: BoxDecoration( color: Color(0xffEAEAEA), borderRadius: BorderRadius.circular( 5, )), - child: AppText( - textOverflow: TextOverflow.ellipsis, - complaint, + child:Text( + widget.complaint.chiefComplain!, + style: TextStyle( + overflow: TextOverflow.ellipsis, fontWeight: FontWeight.w400, + height: 1.2, fontSize: 14, - color: Color(0xFF575757), + color: Color(0xFF575757), + ), + maxLines: 1, + softWrap: false, + textAlign: TextAlign.center, + )), + widget.isDeletable ? Positioned( + top:0, + bottom: 0, + right: 10, + child: InkWell( + onTap: () { + widget.onCrossClicked(widget.complaint); + }, + child: Icon( + Icons.close, + size: 18, + color: Color(0xFFD02127), ), - ); + ), + ) :SizedBox() + ],); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart index 0e29f6ae..ba83eff7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart @@ -28,13 +28,17 @@ class ListOfComplaintsItem extends StatelessWidget { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + AppText( name, fontWeight: FontWeight.w600, fontSize: 16, textAlign: TextAlign.start, color: Color(0xFF2E303A), + textOverflow: TextOverflow.ellipsis, + ), + SizedBox( height: 4, ), @@ -50,15 +54,23 @@ class ListOfComplaintsItem extends StatelessWidget { SizedBox( width: 4, ), - AppText( + Container( + width: MediaQuery.of(context).size.width * 0.32, + + child: AppText( createdBy, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: 12, textAlign: TextAlign.start, + textOverflow: TextOverflow.ellipsis, color: Color(0xFF2E303A), ), + ) ], ), + SizedBox( + height: 5, + ), Row( children: [ AppText( @@ -71,13 +83,19 @@ class ListOfComplaintsItem extends StatelessWidget { SizedBox( width: 4, ), - AppText( + Container( + width: MediaQuery.of(context).size.width * 0.32, + + child:AppText( createdAt, fontWeight: FontWeight.w400, textAlign: TextAlign.start, - fontSize: 15, + fontSize: 12, + textOverflow: TextOverflow.ellipsis, color: Color(0xFF2E303A), - ), + allowExpand: false, + maxLines: 1, + )), ], ) ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart index 06443a35..4662dd90 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart @@ -1,11 +1,16 @@ +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import 'package:quiver/time.dart'; -import '../../../../../../../widgets/shared/app_texts_widget.dart'; -class PreviousCheifComplaints extends StatelessWidget { - const PreviousCheifComplaints({super.key}); +class PreviousChiefComplaints extends StatelessWidget { + final List complaints; + final Function(List)? onSendClicked; + PreviousChiefComplaints(this.complaints,this.onSendClicked, {super.key,}); @override Widget build(BuildContext context) { @@ -18,7 +23,7 @@ class PreviousCheifComplaints extends StatelessWidget { )), color: Colors.white, child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 10), child: Column( mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, @@ -41,22 +46,46 @@ class PreviousCheifComplaints extends StatelessWidget { color: Color(0xFF575757), ), SizedBox( - height: 16, + height: 10, ), Flexible( child: ListView.separated( shrinkWrap: true, - itemCount: 2, - separatorBuilder: (context, index) => Divider(), + separatorBuilder: (context, index2) => Divider(), + itemCount: complaints.length, itemBuilder: (context, index) { - return ListOfComplaintsItem( - name: "name", - createdBy: "createdBy", - createdAt: "createdAt", - onSendClick: () {}); - })) + return complaints[index].patientPomrs!.isNotEmpty ? ListOfComplaintsItem( + name: getChildValue(complaints[index].patientPomrs!, 1), + createdBy: getChildValue(complaints[index].patientPomrs!,2), + createdAt: getChildValue(complaints[index].patientPomrs!, 3), + onSendClick: () { + onSendClicked!(complaints[index].patientPomrs!); + }) :SizedBox(); + }) + + + + + + ) ], ), )); } +String getChildValue(List? patientPomrs, int key) { + List value = []; + patientPomrs!.forEach((element) { + if(key ==1) { + element.chiefComplains!.forEach((element2) { + value.add(element2.chiefComplain!); + }); + }else if(key ==2) { + value.add(element.doctorName!); + }else { + value.add(element.createdOn!); + } + }); + + return value.join(" "); +} } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart new file mode 100644 index 00000000..034da359 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart @@ -0,0 +1,342 @@ +// ignore: must_be_immutable +import 'package:autocomplete_textfield/autocomplete_textfield.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; +import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + + +// ignore: must_be_immutable +class AddMedication extends StatefulWidget { + final Function(MySelectedAllergy mySelectedAllergy) addMedicationFun; + TextEditingController medicationController; + + AddMedication({Key? key, required this.addMedicationFun, required this.medicationController}) : super(key: key); + + @override + _AddMedicationState createState() => _AddMedicationState(); +} + +class _AddMedicationState extends State { + MasterKeyModel? _selectedMedicationDose; + MasterKeyModel? _selectedMedicationStrength; + MasterKeyModel? _selectedMedicationRoute; + MasterKeyModel? _selectedMedicationFrequency; + + TextEditingController doseController = TextEditingController(); + TextEditingController strengthController = TextEditingController(); + TextEditingController routeController = TextEditingController(); + TextEditingController frequencyController = TextEditingController(); + GetMedicationResponseModel? _selectedMedication; + + GlobalKey> key = GlobalKey>(); + bool isFormSubmitted = false; + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return BaseView( + onModelReady: (model) async { + // model.onAddMedicationStart(); + }, + builder: (_, model, w) => AppScaffold( + backgroundColor: Colors.white, + baseViewModel: model, + isShowAppBar: true, + appBar: PatientSearchHeader( + + title:TranslationBase.of(context).addMedication, + ), + body: Container( + padding: EdgeInsets.all(15), + child: + SingleChildScrollView( + child: Column( + children: [ + // SizedBox( + // height: SizeConfig.heightMultiplier! * + // (SizeConfig.isHeightVeryShort + // ? 2 + // : SizeConfig.isHeightShort + // ? 2 + // : 2), + // ), + // Container( + // // height: screenSize.height * 0.070, + // child: InkWell( + // onTap: model.allMedicationList != null + // ? () { + // setState(() { + // _selectedMedication = GetMedicationResponseModel(); + // }); + // } + // : null, + // child: _selectedMedication == null + // // ? + // CustomAutoCompleteTextField( + // isShowError: isFormSubmitted && _selectedMedication == null, + // child: AutoCompleteTextField( + // decoration: TextFieldsUtils.textFieldSelectorDecoration(TranslationBase.of(context).searchMedicineNameHere, "", true, suffixIcon: Icons.search), + // itemSubmitted: (item) => setState(() => _selectedMedication = item), + // key: key, + // suggestions: model.allMedicationList!, + // itemBuilder: (context, suggestion) => new Padding(child: AppText(suggestion.description! + '/' + suggestion.genericName!), padding: EdgeInsets.all(8.0)), + // itemSorter: (a, b) => 1, + // itemFilter: (suggestion, input) => + // suggestion.genericName!.toLowerCase().startsWith(input.toLowerCase()) || + // suggestion.description!.toLowerCase().startsWith(input.toLowerCase()) || + // suggestion.keywords!.toLowerCase().startsWith(input.toLowerCase()), + // ), + // ) + // : + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + hintText: _selectedMedication != null + ? _selectedMedication!.description! + (' (${_selectedMedication!.genericName} )') + : TranslationBase.of(context).searchMedicineNameHere, + minLines: 1, + maxLines: 1, + isTextFieldHasSuffix: true, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Colors.grey.shade600, + ), + onPressed: () {}, + ), + + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + // ), + // ), + if (_selectedMedication != null) + Column( + children: [ + SizedBox( + height: 3, + ), + Container( + width: MediaQuery.of(context).size.width * 0.7, + child: AppText( + _selectedMedication!.description! + (' (${_selectedMedication!.genericName} )'), + color: Color(0xFF575757), + fontSize: 10, + fontWeight: FontWeight.w700, + letterSpacing: -0.4, + ), + ), + ], + ), + SizedBox( + height: 5, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + + onClick: model.medicationDoseTimeList != null + ? () { + MasterKeyDailog dialog = MasterKeyDailog( + list: model.medicationDoseTimeList, + okText: TranslationBase.of(context).ok, + selectedValue: _selectedMedicationDose, + okFunction: (selectedValue) { + setState(() { + _selectedMedicationDose = selectedValue; + + doseController.text = projectViewModel.isArabic ? _selectedMedicationDose!.nameAr! : _selectedMedicationDose!.nameEn!; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).doseTime, + maxLines: 1, + minLines: 1, + isTextFieldHasSuffix: true, + controller: doseController, + validationError: isFormSubmitted && _selectedMedicationDose == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 5, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + + isTextFieldHasSuffix: true, + onClick: model.medicationStrengthList != null + ? () { + MasterKeyDailog dialog = MasterKeyDailog( + list: model.medicationStrengthList, + okText: TranslationBase.of(context).ok, + selectedValue: _selectedMedicationStrength, + okFunction: (selectedValue) { + setState(() { + _selectedMedicationStrength = selectedValue; + + strengthController.text = projectViewModel.isArabic ? _selectedMedicationStrength!.nameAr! : _selectedMedicationStrength!.nameEn!; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).strength, + maxLines: 1, + minLines: 1, + controller: strengthController, + validationError: isFormSubmitted && _selectedMedicationStrength == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 5, + ), + SizedBox( + height: 5, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + enabled: false, + isTextFieldHasSuffix: true, + onClick: model.medicationRouteList != null + ? () { + MasterKeyDailog dialog = MasterKeyDailog( + list: model.medicationRouteList, + selectedValue: _selectedMedicationRoute, + okText: TranslationBase.of(context).ok, + okFunction: (selectedValue) { + setState(() { + _selectedMedicationRoute = selectedValue; + + routeController.text = projectViewModel.isArabic ? _selectedMedicationRoute!.nameAr! : _selectedMedicationRoute!.nameEn!; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).route, + maxLines: 1, + minLines: 1, + controller: routeController, + validationError: isFormSubmitted && _selectedMedicationRoute == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 5, + ), + SizedBox( + height: 5, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + onClick: model.medicationFrequencyList != null + ? () { + MasterKeyDailog dialog = MasterKeyDailog( + list: model.medicationFrequencyList, + okText: TranslationBase.of(context).ok, + selectedValue: _selectedMedicationFrequency, + okFunction: (selectedValue) { + setState(() { + _selectedMedicationFrequency = selectedValue; + + frequencyController.text = projectViewModel.isArabic ? _selectedMedicationFrequency!.nameAr! : _selectedMedicationFrequency!.nameEn!; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).frequency, + enabled: false, + maxLines: 1, + minLines: 1, + isTextFieldHasSuffix: true, + controller: frequencyController, + validationError: isFormSubmitted && _selectedMedicationFrequency == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + // SizedBox( + // height: SizeConfig.heightMultiplier! * + // (SizeConfig.isHeightVeryShort + // ? 20 + // : SizeConfig.isHeightShort + // ? 15 + // : 10), + // ), + ], + ), + ),), + + + bottomSheet: model.state != ViewState.Idle + ? Container( + height: 0, + ) + : CustomBottomSheetContainer( + label: TranslationBase.of(context).addMedication, + onTap: () { + setState(() { + isFormSubmitted = true; + }); + if (_selectedMedication != null && + _selectedMedicationDose != null && + _selectedMedicationStrength != null && + _selectedMedicationRoute != null && + _selectedMedicationFrequency != null) { + widget.medicationController.text = widget.medicationController.text + + '${_selectedMedication!.description} (${TranslationBase.of(context).doseTime} ) ${doseController.text} (${TranslationBase.of(context).strength}) ${strengthController.text} (${TranslationBase.of(context).route}) ${routeController.text} (${TranslationBase.of(context).frequency}) ${frequencyController.text} \n \n'; + Navigator.of(context).pop(); + } + }, + )), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart new file mode 100644 index 00000000..26606791 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart @@ -0,0 +1,64 @@ +import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; +import 'package:flutter/material.dart'; + +import 'add_medication.dart'; + +class UpdateMedicationWidget extends StatefulWidget { + final TextEditingController? medicationController; + + UpdateMedicationWidget({ + Key? key, + this.medicationController, + }); + + @override + _UpdateMedicationWidgetState createState() => _UpdateMedicationWidgetState(); +} + +class _UpdateMedicationWidgetState extends State { + @override + Widget build(BuildContext context) { + return Column( + children: [ + AddSoapItem( + title: "${TranslationBase.of(context).addMedication}", + onAddSoapItemClicked: () { + Navigator.push( + context, + FadePage( + page:AddMedication( + addMedicationFun: (MySelectedAllergy mySelectedAllergy) {}, + medicationController: widget.medicationController!, + ) + + )); + // openMedicationList(context); + }, + ), + SizedBox( + height: 20, + ) + + + ], + ); + } + // + // openMedicationList(BuildContext context) { + // showModalBottomSheet( + // backgroundColor: Colors.white, + // isScrollControlled: true, + // isDismissible: false, + // context: context, + // builder: (context) { + // return AddMedication( + // addMedicationFun: (MySelectedAllergy mySelectedAllergy) {}, + // medicationController: widget.medicationController!, + // ); + // }); + // } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart index a0333151..6938ec87 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart @@ -127,9 +127,14 @@ class UpdatePresentIllnessState extends State { maxLines: 25, minLines: 3, hasBorder: true, + isTextFieldHasSuffix: true, onClick: () {}, onChanged: (value) {}, onFieldSubmitted: () {}, + + suffixIcon: IconButton(icon:Icon(Icons.save_as_outlined, color: Colors.red, size: 25,), onPressed: (){ + saveHopi(model); + },), ), ])), @@ -174,9 +179,12 @@ class UpdatePresentIllnessState extends State { maxLines: 25, minLines: 3, hasBorder: true, + isTextFieldHasSuffix: true, onClick: () {}, onChanged: (value) {}, - onFieldSubmitted: () {}, + onFieldSubmitted: () {}, suffixIcon: IconButton(icon:Icon(Icons.save_as_outlined, color: Colors.red, size: 25,), onPressed: (){ + saveHopi(model); + },), ), ], ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index 54b51c41..46c803a7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -9,12 +9,13 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/soap_utils.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import '../../../../../core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; @@ -42,6 +43,7 @@ class _UpdateSubjectivePageVidaPlusState bool isChiefExpand = false; bool isHistoryExpand = false; bool isAllergiesExpand = false; + bool isMedicationExpand =false; TextEditingController illnessController = TextEditingController(); TextEditingController complaintsController = TextEditingController(); TextEditingController medicationController = TextEditingController(); @@ -50,73 +52,73 @@ class _UpdateSubjectivePageVidaPlusState List myAllergiesList = []; List myHistoryList = []; - getHistory(SOAPViewModel model) async { - widget.changeLoadingState(true); - if (model.patientHistoryList.isNotEmpty) { - model.patientHistoryList.forEach((element) { - if (element.historyType == - MasterKeysService.HistoryFamily.getMasterKeyService()) { - MasterKeyModel? history = model.getOneMasterKey( - masterKeys: MasterKeysService.HistoryFamily, - id: element.historyId, - ); - if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils - .generateMySelectedHistory(history: history, - isChecked: element.isChecked, - remark: element.remarks, - isLocal: false); - myHistoryList.add(mySelectedHistory); - } - } - if (element.historyType == - MasterKeysService.HistoryMedical.getMasterKeyService()) { - MasterKeyModel? history = model.getOneMasterKey( - masterKeys: MasterKeysService.HistoryMedical, - id: element.historyId, - ); - if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils - .generateMySelectedHistory(history: history, - isChecked: element.isChecked, - remark: element.remarks, - isLocal: false); - myHistoryList.add(mySelectedHistory); - } - } - if (element.historyType == - MasterKeysService.HistorySports.getMasterKeyService()) { - MasterKeyModel? history = model.getOneMasterKey( - masterKeys: MasterKeysService.HistorySports, - id: element.historyId, - ); - if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils - .generateMySelectedHistory(history: history, - isChecked: element.isChecked, - remark: element.remarks, - isLocal: false); - myHistoryList.add(mySelectedHistory); - } - } - if (element.historyType == - MasterKeysService.HistorySurgical.getMasterKeyService()) { - MasterKeyModel? history = model.getOneMasterKey( - masterKeys: MasterKeysService.HistorySurgical, - id: element.historyId, - ); - if (history != null) { - MySelectedHistory mySelectedHistory = SoapUtils - .generateMySelectedHistory(history: history, - isChecked: element.isChecked, - remark: element.remarks, - isLocal: false); - myHistoryList.add(mySelectedHistory); - } - } - }); - } - } + // getHistory(SOAPViewModel model) async { + // widget.changeLoadingState(true); + // if (model.patientHistoryList.isNotEmpty) { + // model.patientHistoryList.forEach((element) { + // if (element.historyType == + // MasterKeysService.HistoryFamily.getMasterKeyService()) { + // MasterKeyModel? history = model.getOneMasterKey( + // masterKeys: MasterKeysService.HistoryFamily, + // id: element.historyId, + // ); + // if (history != null) { + // MySelectedHistory mySelectedHistory = SoapUtils + // .generateMySelectedHistory(history: history, + // isChecked: element.isChecked, + // remark: element.remarks, + // isLocal: false); + // myHistoryList.add(mySelectedHistory); + // } + // } + // if (element.historyType == + // MasterKeysService.HistoryMedical.getMasterKeyService()) { + // MasterKeyModel? history = model.getOneMasterKey( + // masterKeys: MasterKeysService.HistoryMedical, + // id: element.historyId, + // ); + // if (history != null) { + // MySelectedHistory mySelectedHistory = SoapUtils + // .generateMySelectedHistory(history: history, + // isChecked: element.isChecked, + // remark: element.remarks, + // isLocal: false); + // myHistoryList.add(mySelectedHistory); + // } + // } + // if (element.historyType == + // MasterKeysService.HistorySports.getMasterKeyService()) { + // MasterKeyModel? history = model.getOneMasterKey( + // masterKeys: MasterKeysService.HistorySports, + // id: element.historyId, + // ); + // if (history != null) { + // MySelectedHistory mySelectedHistory = SoapUtils + // .generateMySelectedHistory(history: history, + // isChecked: element.isChecked, + // remark: element.remarks, + // isLocal: false); + // myHistoryList.add(mySelectedHistory); + // } + // } + // if (element.historyType == + // MasterKeysService.HistorySurgical.getMasterKeyService()) { + // MasterKeyModel? history = model.getOneMasterKey( + // masterKeys: MasterKeysService.HistorySurgical, + // id: element.historyId, + // ); + // if (history != null) { + // MySelectedHistory mySelectedHistory = SoapUtils + // .generateMySelectedHistory(history: history, + // isChecked: element.isChecked, + // remark: element.remarks, + // isLocal: false); + // myHistoryList.add(mySelectedHistory); + // } + // } + // }); + // } + // } getAllergies(SOAPViewModel model) async { await model.getAllergiesVidaPlus(widget.patientInfo); @@ -146,31 +148,34 @@ class _UpdateSubjectivePageVidaPlusState Widget build(BuildContext context) { return BaseView( onModelReady: (model) async { - myAllergiesList.clear(); - myHistoryList.clear(); - model.setSubjectiveCallBack(this); - await model.onUpdateSubjectStepStart(widget.patientInfo); + WidgetsBinding.instance.addPostFrameCallback((_) async { + myAllergiesList.clear(); + myHistoryList.clear(); + model.setSubjectiveCallBack(this); + // await model.onUpdateSubjectStepStart(widget.patientInfo); - if (model.patientChiefComplaintList.isNotEmpty) { - isChiefExpand = true; - complaintsController.text = Utils.parseHtmlString( - model.patientChiefComplaintList[0].chiefComplaint!); - illnessController.text = model.patientChiefComplaintList[0].hopi!; - medicationController.text = - model.patientChiefComplaintList[0].currentMedication != null - ? !(model.patientChiefComplaintList[0].currentMedication!) - .isNotEmpty - ? model.patientChiefComplaintList[0].currentMedication! + '\n \n' - : model.patientChiefComplaintList[0].currentMedication! - : ""; - } - if (widget.patientInfo.admissionNo == null) { - // await getHistory(model); + if (model.patientChiefComplaintList.isNotEmpty) { + isChiefExpand = true; + complaintsController.text = Utils.parseHtmlString( + model.patientChiefComplaintList[0].chiefComplaint!); + illnessController.text = model.patientChiefComplaintList[0].hopi!; + medicationController.text = + model.patientChiefComplaintList[0].currentMedication != null + ? !(model.patientChiefComplaintList[0].currentMedication!) + .isNotEmpty + ? model.patientChiefComplaintList[0].currentMedication! + + '\n \n' + : model.patientChiefComplaintList[0].currentMedication! + : ""; + } + if (widget.patientInfo.admissionNo == null) { + // await getHistory(model); - await getAllergies(model); - } + await getAllergies(model); + } - widget.changeLoadingState(false); + widget.changeLoadingState(false); + }); }, builder: (_, model, w) => AppScaffold( @@ -255,6 +260,34 @@ class _UpdateSubjectivePageVidaPlusState ), isExpanded: isAllergiesExpand, ), + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + ExpandableSOAPWidget( + headerTitle: TranslationBase + .of(context) + .currentMedications, + onTap: () { + setState(() { + isMedicationExpand = !isMedicationExpand; + }); + }, + child: Column(children: [ + SizedBox( + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 4 : 2), + ), + UpdateMedicationWidget( + medicationController: medicationController, + ), + SizedBox( + height: 10, + ), + + ],), + isExpanded: isMedicationExpand, + ), SizedBox( height: SizeConfig.heightMultiplier! * (SizeConfig.isHeightVeryShort ? 20 : 10), @@ -330,3 +363,26 @@ class _UpdateSubjectivePageVidaPlusState } } + +// +// UpdateMedicationWidget( +// medicationController: medicationController, +// ), +// SizedBox( +// height: 10, +// ), +// AppTextFieldCustom( +// hintText: TranslationBase.of(context).currentMedications, +// controller: medicationController, +// maxLines: 25, +// minLines: 7, +// hasBorder: true, +// inputType: TextInputType.multiline, +// // validationError: medicationControllerError != '' ? medicationControllerError : "", +// onClick: () {}, +// onChanged: (value) {}, +// onFieldSubmitted: () {}, +// ), +// SizedBox( +// height: 10, +// ) \ No newline at end of file diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 27db82f0..128b871c 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1931,7 +1931,8 @@ class TranslationBase { String get acute => localizedValues['acute']![locale.languageCode]!; String get subAcute => localizedValues['subAcute']![locale.languageCode]!; String get chronic => localizedValues['chronic']![locale.languageCode]!; - + String get activate => localizedValues['activate']![locale.languageCode]!; + String get resolved => localizedValues['resolved']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index e026f689..ab8bc62a 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,7 +15,7 @@ import maps_launcher import path_provider_foundation import shared_preferences_foundation import speech_to_text_macos -import sqflite_darwin +import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { From 5e31c9cf985a45fabe9569366b995d079f83f59b Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 25 Nov 2024 09:14:47 +0300 Subject: [PATCH 33/76] WD: general speciality --- lib/config/config.dart | 4 + .../SOAP/physical_exam/GeneralSpeciality.dart | 24 + .../soap/SOAP_service.dart | 705 ++++++++++-------- lib/core/viewModel/SOAP_view_model.dart | 60 +- .../add_details_to_examination_vida_plus.dart | 48 +- .../add_examination_page_vida_plus.dart | 85 ++- .../add_examination_vida_plus_widget.dart | 258 +------ ...inations_list_search_vida_plus_widget.dart | 36 +- .../objective/list_of_examination.dart | 28 +- .../update_objective_page_vida_plus.dart | 316 ++++---- 10 files changed, 696 insertions(+), 868 deletions(-) create mode 100644 lib/core/model/SOAP/physical_exam/GeneralSpeciality.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index b7dd3ee2..70c60788 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -328,6 +328,10 @@ const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/Diagnosis const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/ContinuePreviousEpisode'; +const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchPhysicalExam'; + +const GET_GENERAL_SPECIALITY = 'Services/DoctorApplication.svc/REST/GetGeneralSpeciality'; + var selectedPatientType = 1; diff --git a/lib/core/model/SOAP/physical_exam/GeneralSpeciality.dart b/lib/core/model/SOAP/physical_exam/GeneralSpeciality.dart new file mode 100644 index 00000000..7428f6a2 --- /dev/null +++ b/lib/core/model/SOAP/physical_exam/GeneralSpeciality.dart @@ -0,0 +1,24 @@ +class GeneralSpeciality { + int? id; + bool? isActive; + String? name; + int? rowVersion; + bool isSelected = false; + + GeneralSpeciality(); + + GeneralSpeciality.fromJson(Map json) { + id = json['id']; + isActive = json['isActive']; + name = json['name']; + rowVersion = json['rowVersion']; + } + Map toJson() { + return { + 'id': id, + 'isActive': isActive, + 'name': name, + 'rowVersion': rowVersion, + }; + } +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 7fc58e7a..c7d74ce0 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -12,7 +12,9 @@ import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_ import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_examination_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; @@ -55,6 +57,7 @@ class SOAPService extends LookupService { List auditDiagnosislist = []; List searchDiagnosisList = []; List patientPhysicalExaminationList = []; + List generalSpeciality = []; Map diagnosisTypeList = {}; Map conditionTypeList = {}; List icdVersionList = []; @@ -69,26 +72,25 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_EPISODE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - episodeID = response['EpisodeID']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postEpisodeReqModel.toJson()); + print("Success"); + episodeID = response['EpisodeID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postEpisodeReqModel.toJson()); } - Future postEpisodeForInPatient( - PostEpisodeForInpatientRequestModel - postEpisodeForInpatientRequestModel) async { + Future postEpisodeForInPatient(PostEpisodeForInpatientRequestModel + postEpisodeForInpatientRequestModel) async { hasError = false; await baseAppClient.post(POST_EPISODE_FOR_IN_PATIENT, onSuccess: (dynamic response, int statusCode) { - episodeID = response['EpisodeID']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postEpisodeForInpatientRequestModel.toJson()); + episodeID = response['EpisodeID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postEpisodeForInpatientRequestModel.toJson()); } Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async { @@ -96,11 +98,11 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: postAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: postAllergyRequestModel.toJson()); } Future postHistories( @@ -108,11 +110,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: postHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: postHistoriesRequestModel.toJson()); } Future postChiefComplaint( @@ -121,11 +123,11 @@ class SOAPService extends LookupService { super.error = ""; await baseAppClient.post(POST_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postChiefComplaintRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postChiefComplaintRequestModel.toJson()); } Future postPhysicalExam( @@ -133,11 +135,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postPhysicalExamRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postPhysicalExamRequestModel.toJson()); } Future postProgressNote( @@ -145,11 +147,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postProgressNoteRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postProgressNoteRequestModel.toJson()); } Future postAssessment( @@ -157,11 +159,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postAssessmentRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postAssessmentRequestModel.toJson()); } Future patchAllergy(PostAllergyRequestModel patchAllergyRequestModel) async { @@ -169,11 +171,11 @@ class SOAPService extends LookupService { await baseAppClient.post(PATCH_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = "\n" + error; - }, body: patchAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = "\n" + error; + }, body: patchAllergyRequestModel.toJson()); } Future patchHistories( @@ -181,11 +183,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: patchHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: patchHistoriesRequestModel.toJson()); } Future patchChiefComplaint( @@ -194,11 +196,11 @@ class SOAPService extends LookupService { super.error = ""; await baseAppClient.post(PATCH_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchChiefComplaintRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchChiefComplaintRequestModel.toJson()); } Future patchPhysicalExam( @@ -206,11 +208,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchPhysicalExamRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchPhysicalExamRequestModel.toJson()); } Future patchProgressNote( @@ -218,11 +220,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchProgressNoteRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchProgressNoteRequestModel.toJson()); } Future patchAssessment( @@ -230,11 +232,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchAssessmentRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchAssessmentRequestModel.toJson()); } Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async { @@ -243,16 +245,16 @@ class SOAPService extends LookupService { ///TODO Elham* change the url constant to get getPatientAllergy await baseAppClient.post(GET_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesList.clear(); + print("Success"); + patientAllergiesList.clear(); - response['List_Allergies']['entityList'].forEach((v) { - patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: generalGetReqForSOAP.toJson()); + response['List_Allergies']['entityList'].forEach((v) { + patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: generalGetReqForSOAP.toJson()); } Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, @@ -260,15 +262,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - if (isFirst) patientHistoryList.clear(); - response['List_History']['entityList'].forEach((v) { - patientHistoryList.add(GetHistoryResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getHistoryReqModel.toJson()); + print("Success"); + if (isFirst) patientHistoryList.clear(); + response['List_History']['entityList'].forEach((v) { + patientHistoryList.add(GetHistoryResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getHistoryReqModel.toJson()); } Future getPatientChiefComplaint( @@ -276,15 +278,16 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientChiefComplaintList.clear(); - response['List_ChiefComplaint']['entityList'].forEach((v) { - patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getChiefComplaintReqModel.toJson()); + print("Success"); + patientChiefComplaintList.clear(); + response['List_ChiefComplaint']['entityList'].forEach((v) { + patientChiefComplaintList.add( + GetChiefComplaintResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getChiefComplaintReqModel.toJson()); } Future getPatientPhysicalExam( @@ -292,14 +295,14 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - patientPhysicalExamList.clear(); - response['PhysicalExamList']['entityList'].forEach((v) { - patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getPhysicalExamReqModel.toJson()); + patientPhysicalExamList.clear(); + response['PhysicalExamList']['entityList'].forEach((v) { + patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getPhysicalExamReqModel.toJson()); } Future getPatientProgressNote( @@ -307,15 +310,16 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientProgressNoteList.clear(); - response['ProgressNoteList']['entityList'].forEach((v) { - patientProgressNoteList.add(GetPatientProgressNoteResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getGetProgressNoteReqModel.toJson()); + print("Success"); + patientProgressNoteList.clear(); + response['ProgressNoteList']['entityList'].forEach((v) { + patientProgressNoteList.add( + GetPatientProgressNoteResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getGetProgressNoteReqModel.toJson()); } Future getPatientAssessment( @@ -323,15 +327,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAssessmentList.clear(); - response['AssessmentList']['entityList'].forEach((v) { - patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getAssessmentReqModel.toJson()); + print("Success"); + patientAssessmentList.clear(); + response['AssessmentList']['entityList'].forEach((v) { + patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getAssessmentReqModel.toJson()); } Future getEpisodeForInpatient( @@ -339,31 +343,31 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_EPISODE_FOR_INPATIENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); + print("Success"); - episodeID = response["GetEpisodeNo"]; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getEpisodeForInpatientReqModel.toJson()); + episodeID = response["GetEpisodeNo"]; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getEpisodeForInpatientReqModel.toJson()); } Future isPrescriptionOrderCreated(PatiantInformtion patientInfo) async { hasError = false; await baseAppClient.post(IS_PRESCRIPTION_ORDER_CREATED, onSuccess: (dynamic response, int statusCode) { - print("Success"); - - isPrescriptionOrder = response['IsPrescriptionCreated']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "PatientMRN": patientInfo.patientMRN, - "EncounterNo": patientInfo.appointmentNo, - "EncounterType": patientInfo.appointmentTypeId, - "DoctorID": patientInfo.doctorId, - }); + print("Success"); + + isPrescriptionOrder = response['IsPrescriptionCreated']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "PatientMRN": patientInfo.patientMRN, + "EncounterNo": patientInfo.appointmentNo, + "EncounterType": patientInfo.appointmentTypeId, + "DoctorID": patientInfo.doctorId, + }); } /* vida plus API allergies */ @@ -376,16 +380,16 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATIENT_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesVidaPlus.clear(); + print("Success"); + patientAllergiesVidaPlus.clear(); - response['List_PatientAllergies']['resultData'].forEach((v) { - patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['List_PatientAllergies']['resultData'].forEach((v) { + patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } Future searchAllergies(String searchKey) async { @@ -393,20 +397,20 @@ class SOAPService extends LookupService { await baseAppClient.post(SEARCH_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - searchAllergiesList.clear(); + print("Success"); + searchAllergiesList.clear(); - response['List_SearchAllergies']['resultData'].forEach((v) { - searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: {"AllergyName": searchKey}); + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: {"AllergyName": searchKey}); } - Future addAllergies( - AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { + Future addAllergies(AllergiesListVidaPlus allergy, + PatiantInformtion patientInfo) async { allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; value.pomrid = int.parse(patientInfo.pomrId!); @@ -438,22 +442,22 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } - Future resolveAllergies( - PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { + Future resolveAllergies(PatientAllergiesVidaPlus allergy, + PatiantInformtion patientInfo) async { /*changed request parameters based on the vida plus requested */ var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); List? reaction = - allergy.patientsAllergyReactionsDTOs!; + allergy.patientsAllergyReactionsDTOs!; List? reactionRequest = []; reaction.forEach((value) { reactionRequest.add(AllergyReactionDTOs( @@ -487,17 +491,17 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(RESOLVE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Resolved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Resolved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } - Future updateAllergies( - AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { + Future updateAllergies(AllergiesListVidaPlus allergy, + PatiantInformtion patientInfo) async { allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; value.pomrid = patientInfo.episodeNo; @@ -529,13 +533,13 @@ class SOAPService extends LookupService { await baseAppClient.post(UPDATE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } saveHopi(Map req, PatiantInformtion patient) async { @@ -548,17 +552,15 @@ class SOAPService extends LookupService { "patientId": patient.patientMRN, "patientPomrId": patient.pomrId, }; - Map finalRequest = {} - ..addAll(request) - ..addAll(req); + Map finalRequest = {}..addAll(request)..addAll(req); hasError = false; await baseAppClient.post(CREATE_HOPI, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("History Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: finalRequest); + DrAppToastMsg.showSuccesToast("History Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: finalRequest); } getHopi(PatiantInformtion patient) async { @@ -569,15 +571,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(HOPI_DETAILS, onSuccess: (dynamic response, int statusCode) { - hopiDetails.clear(); + hopiDetails.clear(); - response['DetailHOPI']['resultData'].forEach((v) { - hopiDetails.add(GetHopiDetails.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['DetailHOPI']['resultData'].forEach((v) { + hopiDetails.add(GetHopiDetails.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } getChiefComplaint(PatiantInformtion patient) async { @@ -588,20 +590,20 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - patientChiefComplaintListVidaPlus.clear(); + patientChiefComplaintListVidaPlus.clear(); - response['ListChiefComplaintDetails']['resultData'].forEach((v) { - patientChiefComplaintListVidaPlus - .add(GetChiefComplaintVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['ListChiefComplaintDetails']['resultData'].forEach((v) { + patientChiefComplaintListVidaPlus + .add(GetChiefComplaintVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - postChiefComplaintVidaPlus( - PatiantInformtion patient, String cheifComplaint) async { + postChiefComplaintVidaPlus(PatiantInformtion patient, + String cheifComplaint) async { Map request = { "ListCreateChiefComplaint": [ { @@ -615,11 +617,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } searchChiefComplaintVidaPlus(PatiantInformtion patient, String CC) async { @@ -631,16 +633,17 @@ class SOAPService extends LookupService { searchChiefComplaintListVidaPlus.clear(); await baseAppClient.post(SEARCH_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - // - response['List_SearchChiefComplaint']['resultData'].forEach((v) { - searchChiefComplaintListVidaPlus.add(SearchChiefComplaint.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + searchChiefComplaintListVidaPlus.clear(); + // + response['List_SearchChiefComplaint']['resultData'].forEach((v) { + searchChiefComplaintListVidaPlus.add( + SearchChiefComplaint.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } searchDiagnosis(PatiantInformtion patient, String diagnosis) async { @@ -652,14 +655,15 @@ class SOAPService extends LookupService { await baseAppClient.post(SEARCH_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['List_Diagnosis']['resultData'] - .forEach((v) => searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); - _processData(); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['List_Diagnosis']['resultData'] + .forEach((v) => + searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); + _processData(); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } void _processData() { @@ -688,13 +692,14 @@ class SOAPService extends LookupService { diagnosisTypeList.clear(); await baseAppClient.post(DIAGNOSIS_TYPE, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisTypeModel']['resultData'] - .forEach((v) => diagnosisTypeList[v['name']] = v['diagnosisType']); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisTypeModel']['resultData'] + .forEach((v) => + diagnosisTypeList[v['name']] = v['diagnosisType']); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } getConditionType(PatiantInformtion patient) async { @@ -703,20 +708,18 @@ class SOAPService extends LookupService { conditionTypeList.clear(); await baseAppClient.post(CONDITION_TYPE, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisCondition']['resultData'] - .forEach((v) => conditionTypeList[v['itemName']] = v['id']); - ; - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisCondition']['resultData'] + .forEach((v) => conditionTypeList[v['itemName']] = v['id']); + ; + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } - auditDiagnosis( - PatiantInformtion patient, - String patientProblemRevisionID, - ) async { + auditDiagnosis(PatiantInformtion patient, + String patientProblemRevisionID,) async { Map request = { "patientProblemRevisionId": patientProblemRevisionID, "ProjectID": patient.projectId @@ -725,14 +728,15 @@ class SOAPService extends LookupService { auditDiagnosislist.clear(); await baseAppClient.post(AUDIT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDaignosisAudit']['resultData'] - .forEach((v) => auditDiagnosislist.add(AuditDiagnosis.fromJson(v))); - showAuditBottomSheet = auditDiagnosislist.isNotEmpty; - }, onFailure: (String error, int statusCode) { - auditDiagnosislist.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDaignosisAudit']['resultData'] + .forEach((v) => + auditDiagnosislist.add(AuditDiagnosis.fromJson(v))); + showAuditBottomSheet = auditDiagnosislist.isNotEmpty; + }, onFailure: (String error, int statusCode) { + auditDiagnosislist.clear(); + hasError = true; + super.error = error; + }, body: request); } getPreviousDiagnosis(PatiantInformtion patient) async { @@ -757,14 +761,14 @@ class SOAPService extends LookupService { patientPreviousDiagnosisList.clear(); await baseAppClient.post(PREVIOUS_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisPrviousDetials']['resultData'].forEach((v) => - patientPreviousDiagnosisList - .add(PatientPreviousDiagnosis.fromJson(v))); - }, onFailure: (String error, int statusCode) { - patientPreviousDiagnosisList.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisPrviousDetials']['resultData'].forEach((v) => + patientPreviousDiagnosisList + .add(PatientPreviousDiagnosis.fromJson(v))); + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); } removeDiagnosis(PatiantInformtion patientInfo, String? patientProblemId, @@ -786,18 +790,17 @@ class SOAPService extends LookupService { patientPreviousDiagnosisList.clear(); await baseAppClient.post(REMOVE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast(response['ListDiagnosisRemove']['message']); - //todo get the current diagnosis after the delete if it is successful - }, onFailure: (String error, int statusCode) { - patientPreviousDiagnosisList.clear(); - hasError = true; - super.error = error; - }, body: request); + DrAppToastMsg.showSuccesToast( + response['ListDiagnosisRemove']['message']); + //todo get the current diagnosis after the delete if it is successful + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); } - favoriteDiagnosis( - PatiantInformtion patientInfo, - ) async { + favoriteDiagnosis(PatiantInformtion patientInfo,) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { @@ -812,18 +815,17 @@ class SOAPService extends LookupService { favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisGetFavourite']['resultData'].forEach((v) => - favoriteDiagnosisDetailsList.add(FavoriteDiseaseDetails.fromJson(v))); - }, onFailure: (String error, int statusCode) { - favoriteDiagnosisDetailsList.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisGetFavourite']['resultData'].forEach((v) => + favoriteDiagnosisDetailsList.add( + FavoriteDiseaseDetails.fromJson(v))); + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); } - getPhysicalExamination( - PatiantInformtion patientInfo, - ) async { + getPhysicalExamination(PatiantInformtion patientInfo,) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { @@ -831,19 +833,59 @@ class SOAPService extends LookupService { "pomrId": patientInfo.pomrId, "hospitalId": patientInfo.projectId, "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "ProjectID":patientInfo.projectId + "ProjectID": patientInfo.projectId }; hasError = false; patientPhysicalExaminationList.clear(); - await baseAppClient.post(FAVORITE_DIAGNOSIS, + await baseAppClient.post(SEARCH_PHYSICAL_EXAMINATION, onSuccess: (dynamic response, int statusCode) { - response['ListPhysicalExam']['resultData'].forEach((v) => - patientPhysicalExaminationList.add(PatientPhysicalExamination.fromJson(v))); - }, onFailure: (String error, int statusCode) { + response['ListPhysicalExam']['resultData'].forEach((v) => + patientPhysicalExaminationList.add( + PatientPhysicalExamination.fromJson(v))); + }, onFailure: (String error, int statusCode) { physicalExaminationList.clear(); - hasError = true; - super.error = error; - }, body: request); + hasError = true; + super.error = error; + }, body: request); + } + + postPhysicalExamination(PatiantInformtion patientInfo,List physicalExamination) async { + var jsonListOfPhysicalExamination = []; + physicalExamination.forEach((value)=>jsonListOfPhysicalExamination.add(value.toJson())); + + Map request = { + "ProjectID": patientInfo.patientId, + "listCreatPhysicalExam": jsonListOfPhysicalExamination + }; + hasError = false; + await baseAppClient.post(SEARCH_PHYSICAL_EXAMINATION, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast( + response['ListPhysicalExam']['message']); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + + getGeneralSpeciality(PatiantInformtion patientInfo) async { + + Map request = { + "ProjectID": patientInfo.patientId, + }; + hasError = false; + generalSpeciality.clear(); + await baseAppClient.post(GET_GENERAL_SPECIALITY, + onSuccess: (dynamic response, int statusCode) { + response['ListGeneralSpeciality']['resultData'].forEach((v) => + generalSpeciality.add( + GeneralSpeciality.fromJson(v))); + }, onFailure: (String error, int statusCode) { + hasError = true; + generalSpeciality.clear(); + super.error = error; + }, body: request); } addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, @@ -866,23 +908,24 @@ class SOAPService extends LookupService { favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(ADD_TO_FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - var result = response['ListDiagnosisAddFavourite']['resultData']; - if ((result as List).isEmpty) { - addedToFavorite = false; - DrAppToastMsg.showErrorToast( - response['ListDiagnosisAddFavourite']['message']); - } else { - addedToFavorite = true; - DrAppToastMsg.showSuccesToast("Added To Favorite"); - } - }, onFailure: (String error, int statusCode) { - favoriteDiagnosisDetailsList.clear(); - hasError = true; - super.error = error; - }, body: request); - } - - convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { + var result = response['ListDiagnosisAddFavourite']['resultData']; + if ((result as List).isEmpty) { + addedToFavorite = false; + DrAppToastMsg.showErrorToast( + response['ListDiagnosisAddFavourite']['message']); + } else { + addedToFavorite = true; + DrAppToastMsg.showSuccesToast("Added To Favorite"); + } + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + + convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, + PatientPreviousDiagnosis diagnosis) async { Map request = { "patientProblemRevisionId": diagnosis.patientProblemRevisionId, "patientId": paitientInfo.patientId, @@ -895,21 +938,21 @@ class SOAPService extends LookupService { "clinicGroupId": diagnosis.clinicGroupId, "clinicId": diagnosis.clinicId, "isSelected": true, - "ProjectID":paitientInfo.projectId + "ProjectID": paitientInfo.projectId }; hasError = false; addedToFavorite = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - var result = response['ContinuePreviousEpisode']['resultData']; - if ((result as List).isEmpty) { - DrAppToastMsg.showErrorToast( - response['ContinuePreviousEpisode']['message']); - } - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + var result = response['ContinuePreviousEpisode']['resultData']; + if ((result as List).isEmpty) { + DrAppToastMsg.showErrorToast( + response['ContinuePreviousEpisode']['message']); + } + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } createDiagnosis(PatiantInformtion patient, SearchDiagnosis searchDiagnosis, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 7b431a04..1b1e3bf7 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -29,6 +29,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_ex import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_examination_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; @@ -48,6 +49,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjecti import '../../locator.dart'; import '../model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import '../model/SOAP/assessment/patch_assessment_req_model.dart'; +import '../model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'base_view_model.dart'; class SOAPViewModel extends BaseViewModel { @@ -142,8 +144,13 @@ class SOAPViewModel extends BaseViewModel { List get auditDiagnosislist => _SOAPService.auditDiagnosislist; + List get speciality => + _SOAPService.generalSpeciality; + int? get episodeID => _SOAPService.episodeID; + bool get isFavorite => _SOAPService.addedToFavorite; + bool get showAudit => _SOAPService.showAuditBottomSheet; bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; @@ -1128,24 +1135,27 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void addToFavoriteDiagnosis( - PatiantInformtion patientInfo, { - SearchDiagnosis? diagnosis - }) async { + void addToFavoriteDiagnosis(PatiantInformtion patientInfo, + {SearchDiagnosis? diagnosis}) async { setState(ViewState.BusyLocal); Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); Map? user = await sharedPref.getObj(LOGGED_IN_USER); - await _SOAPService.addToFavoriteDiagnosis(patientInfo,profile?['DoctorName'] ??'',diagnosis?.diseasesBCode ?? '',user?['List_MemberInformation'][0]['MemberID'] ??''); + await _SOAPService.addToFavoriteDiagnosis( + patientInfo, + profile?['DoctorName'] ?? '', + diagnosis?.diseasesBCode ?? '', + user?['List_MemberInformation'][0]['MemberID'] ?? ''); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); } - void convertPreviousDiagnosisCurrent( - PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { + + void convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, + PatientPreviousDiagnosis diagnosis) async { setState(ViewState.BusyLocal); - await _SOAPService.convertPreviousDiagnosisCurrent(paitientInfo,diagnosis); + await _SOAPService.convertPreviousDiagnosisCurrent(paitientInfo, diagnosis); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1153,8 +1163,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void getPhysicalExamination( - PatiantInformtion paitientInfo) async { + void getPhysicalExamination(PatiantInformtion paitientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.getPhysicalExamination(paitientInfo); if (_SOAPService.hasError) { @@ -1164,14 +1173,33 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void toggleFavorite(bool status ){ - _SOAPService.addedToFavorite - = status; + void postPhysicalExamination(PatiantInformtion patientInfo, + List physicalExamination) async { + setState(ViewState.BusyLocal); + await _SOAPService.postPhysicalExamination( + patientInfo, physicalExamination); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + void getGeneralSpeciality(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getGeneralSpeciality( + patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); } - void toggleShowBottomSheetValue(bool status){ - _SOAPService.showAuditBottomSheet - = status; + void toggleFavorite(bool status) { + _SOAPService.addedToFavorite = status; } + void toggleShowBottomSheetValue(bool status) { + _SOAPService.showAuditBottomSheet = status; + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index c310ddc7..07e6443e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; @@ -15,7 +16,7 @@ import 'package:provider/provider.dart'; import '../../../../../core/viewModel/project_view_model.dart'; class AddDetailsToExaminationVidaPlus extends StatefulWidget { - final List? mySelectedExamination; + final List? mySelectedExamination; const AddDetailsToExaminationVidaPlus({super.key, this.mySelectedExamination}); @@ -43,31 +44,26 @@ class _AddDetailsToExaminationVidaPlusState extends State? mySelectedExamination; - final Function(List) addSelectedExamination; - final Function(MasterKeyModel) removeExamination; + final PatiantInformtion patientInfo; + final List? examination; - AddExaminationPageVidaPlus( - {this.mySelectedExamination, - required this.addSelectedExamination, - required this.removeExamination}); + ///todo handle the data if edit is added + AddExaminationPageVidaPlus({required this.patientInfo, this.examination}); @override _AddExaminationPageVidaPlusState createState() => @@ -28,12 +34,11 @@ class AddExaminationPageVidaPlus extends StatefulWidget { class _AddExaminationPageVidaPlusState extends State { - List mySelectedExaminationLocal = []; + List mySelectedExaminationLocal = []; @override initState() { super.initState(); - mySelectedExaminationLocal = widget.mySelectedExamination!; } @override @@ -42,15 +47,16 @@ class _AddExaminationPageVidaPlusState onModelReady: (model) async { if (model.physicalExaminationList.length == 0) { WidgetsBinding.instance.addPostFrameCallback((_) async { - await model.getMasterLookup( - MasterKeysService.PostPhysicalExaminationModel, - ); + if (model.speciality.isEmpty) { + await model.getGeneralSpeciality(widget.patientInfo); + } }); } }, builder: (_, model, w) => AppScaffold( baseViewModel: model, isShowAppBar: true, + isLoading: model.state == ViewState.Busy, appBar: PatientSearchHeader( title: TranslationBase.of(context).examinationPart), backgroundColor: Colors.white, @@ -76,19 +82,42 @@ class _AddExaminationPageVidaPlusState mainAxisSize: MainAxisSize.max, children: [ ExaminationsListSearchVidaPlusWidget( - mySelectedExamination: widget.mySelectedExamination, - masterList: model.patientPhysicalExaminationList, - isServiceSelected: (master) => - isServiceSelected(master), + masterList: model.speciality, removeExamination: (selectedExamination) { + if(selectedExamination == null ) return; + setState(() { mySelectedExaminationLocal .remove(selectedExamination); + // Find the object by its ID + try { + final speciality = + model.speciality.firstWhere( + (speciality) => + speciality.id == selectedExamination.id, + orElse: () => throw Exception( + 'Speciality with ID ${selectedExamination.id} not found!'), + ); + + speciality.isSelected = false; + } catch (e) {} }); }, addExamination: (selectedExamination) { + if(selectedExamination == null ) return; + mySelectedExaminationLocal.insert( 0, selectedExamination); + + try { + final speciality = model.speciality.firstWhere( + (speciality) => + speciality.id == selectedExamination.id, + orElse: () => throw Exception( + 'Speciality with ID ${selectedExamination.id} not found!'), + ); + speciality.isSelected = true; + } catch (e) {} //setState(() {}); }, ), @@ -128,10 +157,7 @@ class _AddExaminationPageVidaPlusState fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { - Navigator.pop(context); - widget.addSelectedExamination(mySelectedExaminationLocal); - - + pushAddExamination(mySelectedExaminationLocal); }, ), ), @@ -141,14 +167,15 @@ class _AddExaminationPageVidaPlusState ); } - isServiceSelected(MasterKeyModel masterKey) { - Iterable exam = mySelectedExaminationLocal.where( - (element) => - masterKey.id == element.selectedExamination!.id && - masterKey.typeId == element.selectedExamination!.typeId); - if (exam.length > 0) { - return true; - } - return false; + void pushAddExamination( + List mySelectedExaminationLocal) { + Navigator.push( + context, + FadePage( + page: AddDetailsToExaminationVidaPlus( + mySelectedExamination: mySelectedExaminationLocal, + ), + ), + ); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart index a4510410..90fec299 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart @@ -1,6 +1,7 @@ // ignore: must_be_immutable import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -13,22 +14,16 @@ import 'package:provider/provider.dart'; // ignore: must_be_immutable class AddExaminationVidaPlusWidget extends StatefulWidget { - MasterKeyModel? item; - final Function(MySelectedExamination) removeExamination; - final Function(MySelectedExamination) addExamination; - final bool Function(MasterKeyModel) isServiceSelected; - bool isExpand; + GeneralSpeciality? item; + final Function(GeneralSpeciality?) removeExamination; + final Function(GeneralSpeciality?) addExamination; - final Function() expandClick; - final List? mySelectedExamination; + final List? mySelectedExamination; AddExaminationVidaPlusWidget({ this.item, required this.removeExamination, required this.addExamination, - required this.isServiceSelected, - this.isExpand = false, - required this.expandClick, this.mySelectedExamination, }); @@ -43,17 +38,7 @@ class _AddExaminationVidaPlusWidgetState extends State exam = widget.mySelectedExamination!.where((element) => masterKey.id == element.selectedExamination!.id && masterKey.typeId == element.selectedExamination!.typeId); - if (exam.length > 0) { - return exam.first; + } } - return null; } + } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart index 502114c9..f3baebfc 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/examinations_list_search_vida_plus_widget.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart'; @@ -8,23 +9,25 @@ import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dar import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; - class ExaminationsListSearchVidaPlusWidget extends StatefulWidget { - final Function(MySelectedExamination) removeExamination; - final Function(MySelectedExamination) addExamination; - final bool Function(MasterKeyModel) isServiceSelected; - final List? masterList; - final List? mySelectedExamination; + final Function(GeneralSpeciality?) removeExamination; + final Function(GeneralSpeciality?) addExamination; + final List? masterList; - ExaminationsListSearchVidaPlusWidget({required this.removeExamination, required this.addExamination, required this.isServiceSelected, this.masterList, this.mySelectedExamination}); + ExaminationsListSearchVidaPlusWidget( + {required this.removeExamination, + required this.addExamination, + this.masterList}); @override - _ExaminationsListSearchVidaPlusWidgetState createState() => _ExaminationsListSearchVidaPlusWidgetState(); + _ExaminationsListSearchVidaPlusWidgetState createState() => + _ExaminationsListSearchVidaPlusWidgetState(); } -class _ExaminationsListSearchVidaPlusWidgetState extends State { +class _ExaminationsListSearchVidaPlusWidgetState + extends State { int expandedIndex = -1; - List? items = []; + List? items = []; TextEditingController filteredSearchController = TextEditingController(); @override @@ -44,7 +47,8 @@ class _ExaminationsListSearchVidaPlusWidgetState extends State AddExaminationVidaPlusWidget( + item: items![index], + addExamination: widget.addExamination, + removeExamination: widget.removeExamination, + ), + separatorBuilder: (_, __) => Divider(), + ) // ...items!.mapIndexed((index, item) { // return Column( // children: [ diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart index a9b246e2..01f4ce6d 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; @@ -8,7 +9,7 @@ import 'package:provider/provider.dart'; import '../../../../../utils/translations_delegate_base_utils.dart'; class ListOfExamination extends StatelessWidget { - final List listOfSelection; + final List listOfSelection; const ListOfExamination({super.key, required this.listOfSelection}); @@ -20,25 +21,8 @@ class ListOfExamination extends StatelessWidget { physics: NeverScrollableScrollPhysics(), shrinkWrap: true, itemBuilder: (_, index) => SoapDetailItem( - title: projectViewModel.isArabic - ? listOfSelection[index] - .selectedExamination! - .nameAr != - null && - listOfSelection[index] - .selectedExamination! - .nameAr != - "" - ? listOfSelection[index] - .selectedExamination! - .nameAr! - : listOfSelection[index] - .selectedExamination! - .nameEn! - : listOfSelection[index] - .selectedExamination! - .nameEn!, - condition: getCondition(listOfSelection[index], context)??TranslationBase.of(context).notExamined, + title: "${listOfSelection[index].physicalExaminationDescription}", + condition: getCondition(listOfSelection[index].physicalExaminationCondition ?? 3, context)??TranslationBase.of(context).notExamined, remarks: listOfSelection[index].remark??'', onSoapDetailActionClicked: (action) { ///todo handle the event as per the actiion @@ -51,9 +35,9 @@ class ListOfExamination extends StatelessWidget { ); } - String? getCondition(MySelectedExamination examination, BuildContext context) => examination.isNormal + String? getCondition(int condition, BuildContext context) => condition ==0 ? TranslationBase.of(context).normal - : examination.isAbnormal + : condition == 1 ? TranslationBase.of(context).abnormal : TranslationBase.of(context).notExamined; } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart index 7f5805c5..008ec26e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; @@ -51,7 +52,7 @@ class UpdateObjectivePageVidaPlus extends StatefulWidget { class _UpdateObjectivePageVidaPlusState extends State implements ObjectiveCallBack { bool isSysExaminationExpand = false; - List mySelectedExamination = []; + List mySelectedExamination = []; BoxDecoration containerBorderDecoration( Color containerColor, Color borderColor) { @@ -74,37 +75,6 @@ class _UpdateObjectivePageVidaPlusState if (model.patientPhysicalExaminationList == 0) { model.getPhysicalExamination(widget.patientInfo); } - // model.getPatientPhysicalExam(widget.patientInfo); - model.setObjectiveCallBack(this); - mySelectedExamination.clear(); - model.isAddExamInProgress = true; - await model.getPatientPhysicalExam(widget.patientInfo); - if (model.patientPhysicalExamList.isNotEmpty) { - if (model.physicalExaminationList.length == 0) { - await model - .getMasterLookup(MasterKeysService.PostPhysicalExaminationModel); - } - model.patientPhysicalExamList.forEach((element) { - MasterKeyModel? examMaster = model.getOneMasterKey( - masterKeys: MasterKeysService.PostPhysicalExaminationModel, - id: element.examId, - ); - MySelectedExamination tempEam = - SoapUtils.generateMySelectedExamination( - examination: examMaster, - remark: element.remarks, - isNormal: element.isNormal, - createdBy: element.createdBy, - createdOn: element.createdOn, - editedOn: element.editedOn, - notExamined: element.notExamined, - isNew: element.isNew, - isLocal: false, - isAbnormal: element.isAbnormal, - ); - mySelectedExamination.add(tempEam); - }); - } widget.changeLoadingState(false); }); }, @@ -220,177 +190,143 @@ class _UpdateObjectivePageVidaPlusState ); } - submitUpdateObjectivePage(SOAPViewModel model) async { - if (mySelectedExamination.isNotEmpty) { - if (!model.isAddExamInProgress && - widget.patientInfo.admissionNo != null && - widget.patientInfo.admissionNo!.isNotEmpty) { - Navigator.of(context).pop(); - } else { - widget.changeLoadingState(true); - Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - - DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); - PostPhysicalExamRequestModel postPhysicalExamRequestModel = - new PostPhysicalExamRequestModel(); - mySelectedExamination.forEach((exam) { - if (postPhysicalExamRequestModel - .listHisProgNotePhysicalExaminationVM == - null) - postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM = - []; - ListHisProgNotePhysicalExaminationVM - listHisProgNotePhysicalExaminationVM = - ListHisProgNotePhysicalExaminationVM( - patientMRN: widget.patientInfo.patientMRN, - episodeId: widget.patientInfo.episodeNo == null - ? 0 - : widget.patientInfo.episodeNo, - appointmentNo: widget.patientInfo.appointmentNo == null - ? 0 - : widget.patientInfo.appointmentNo, - remarks: exam.remark ?? '', - createdBy: exam.createdBy ?? doctorProfile.doctorID, - createdOn: exam.createdOn ?? DateTime.now().toIso8601String(), - editedBy: doctorProfile.doctorID, - editedOn: DateTime.now().toIso8601String(), - examId: exam.selectedExamination!.id, - examType: exam.selectedExamination!.typeId, - isAbnormal: exam.isAbnormal, - isNormal: exam.isNormal, - notExamined: exam.notExamined, - examinationType: exam.isNormal - ? 1 - : exam.isAbnormal - ? 2 - : 3, - examinationTypeName: exam.isNormal - ? "Normal" - : exam.isAbnormal - ? 'AbNormal' - : "Not Examined", - isNew: exam.isNew, - ); - if (widget.patientInfo.admissionNo != null && - widget.patientInfo.admissionNo!.isNotEmpty) { - listHisProgNotePhysicalExaminationVM.admissionNo = - int.parse(widget.patientInfo.admissionNo!); - } else { - listHisProgNotePhysicalExaminationVM.admissionNo = 0; - } - postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM! - .add(listHisProgNotePhysicalExaminationVM); - }); - - if (model.patientPhysicalExamList.isEmpty) { - await model.postPhysicalExam(postPhysicalExamRequestModel); - } else { - await model.patchPhysicalExam(postPhysicalExamRequestModel); - } - - if (model.state == ViewState.ErrorLocal) { - widget.changeLoadingState(false); - Utils.showErrorToast(model.error); - if (widget.patientInfo.admissionNo != null && - widget.patientInfo.admissionNo!.isNotEmpty) { - // Navigator.of(context).pop(); - model.isAddExamInProgress = false; - } - } else { - if (widget.patientInfo.admissionNo != null && - widget.patientInfo.admissionNo!.isNotEmpty) { - // Navigator.of(context).pop(); - widget.changeLoadingState(false); - model.isAddExamInProgress = false; - } else { - widget.changeLoadingState(true); - widget.changePageViewIndex(2); - } - } - } - } else { - Utils.showErrorToast(TranslationBase.of(context).examinationErrorMsg); - } - } - - removeExamination(MasterKeyModel masterKey) { - Iterable history = mySelectedExamination.where( - (element) => - masterKey.id == element.selectedExamination!.id && - masterKey.typeId == element.selectedExamination!.typeId); + // submitUpdateObjectivePage(SOAPViewModel model) async { + // if (mySelectedExamination.isNotEmpty) { + // if (!model.isAddExamInProgress && + // widget.patientInfo.admissionNo != null && + // widget.patientInfo.admissionNo!.isNotEmpty) { + // Navigator.of(context).pop(); + // } else { + // widget.changeLoadingState(true); + // Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + // + // DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + // PostPhysicalExamRequestModel postPhysicalExamRequestModel = + // new PostPhysicalExamRequestModel(); + // mySelectedExamination.forEach((exam) { + // if (postPhysicalExamRequestModel + // .listHisProgNotePhysicalExaminationVM == + // null) + // postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM = + // []; + // ListHisProgNotePhysicalExaminationVM + // listHisProgNotePhysicalExaminationVM = + // ListHisProgNotePhysicalExaminationVM( + // patientMRN: widget.patientInfo.patientMRN, + // episodeId: widget.patientInfo.episodeNo == null + // ? 0 + // : widget.patientInfo.episodeNo, + // appointmentNo: widget.patientInfo.appointmentNo == null + // ? 0 + // : widget.patientInfo.appointmentNo, + // remarks: exam.remark ?? '', + // createdBy: exam.createdBy ?? doctorProfile.doctorID, + // createdOn: exam.createdOn ?? DateTime.now().toIso8601String(), + // editedBy: doctorProfile.doctorID, + // editedOn: DateTime.now().toIso8601String(), + // examId: exam.selectedExamination!.id, + // examType: exam.selectedExamination!.typeId, + // isAbnormal: exam.isAbnormal, + // isNormal: exam.isNormal, + // notExamined: exam.notExamined, + // examinationType: exam.isNormal + // ? 1 + // : exam.isAbnormal + // ? 2 + // : 3, + // examinationTypeName: exam.isNormal + // ? "Normal" + // : exam.isAbnormal + // ? 'AbNormal' + // : "Not Examined", + // isNew: exam.isNew, + // ); + // if (widget.patientInfo.admissionNo != null && + // widget.patientInfo.admissionNo!.isNotEmpty) { + // listHisProgNotePhysicalExaminationVM.admissionNo = + // int.parse(widget.patientInfo.admissionNo!); + // } else { + // listHisProgNotePhysicalExaminationVM.admissionNo = 0; + // } + // postPhysicalExamRequestModel.listHisProgNotePhysicalExaminationVM! + // .add(listHisProgNotePhysicalExaminationVM); + // }); + // + // if (model.patientPhysicalExamList.isEmpty) { + // await model.postPhysicalExam(postPhysicalExamRequestModel); + // } else { + // await model.patchPhysicalExam(postPhysicalExamRequestModel); + // } + // + // if (model.state == ViewState.ErrorLocal) { + // widget.changeLoadingState(false); + // Utils.showErrorToast(model.error); + // if (widget.patientInfo.admissionNo != null && + // widget.patientInfo.admissionNo!.isNotEmpty) { + // // Navigator.of(context).pop(); + // model.isAddExamInProgress = false; + // } + // } else { + // if (widget.patientInfo.admissionNo != null && + // widget.patientInfo.admissionNo!.isNotEmpty) { + // // Navigator.of(context).pop(); + // widget.changeLoadingState(false); + // model.isAddExamInProgress = false; + // } else { + // widget.changeLoadingState(true); + // widget.changePageViewIndex(2); + // } + // } + // } + // } else { + // Utils.showErrorToast(TranslationBase.of(context).examinationErrorMsg); + // } + // } - if (history.length > 0) { - setState(() { - if (history.first.isLocal) { - mySelectedExamination.remove(history.first); - } else { - history.first.notExamined = true; - history.first.isNormal = false; - history.first.isAbnormal = false; - } - }); - } - } + // removeExamination(MasterKeyModel masterKey) { + // Iterable history = mySelectedExamination.where( + // (element) => + // masterKey.id == element.selectedExamination!.id && + // masterKey.typeId == element.selectedExamination!.typeId); + // + // if (history.length > 0) { + // setState(() { + // if (history.first.isLocal) { + // mySelectedExamination.remove(history.first); + // } else { + // history.first.notExamined = true; + // history.first.isNormal = false; + // history.first.isAbnormal = false; + // } + // }); + // } + // } openExaminationList(BuildContext context) { Navigator.push( context, FadePage( page: AddExaminationPageVidaPlus( - mySelectedExamination: mySelectedExamination, - addSelectedExamination: - (List mySelectedExaminationLocal) { - pushAddExamination(mySelectedExaminationLocal); - - // mySelectedExaminationLocal.forEach((element) { - // if (mySelectedExamination.singleWhere( - // (it) => - // it.selectedExamination!.id == - // element.selectedExamination!.id, - // orElse: () => MySelectedExamination()) == - // MySelectedExamination()) { - // mySelectedExamination.insert(0, element); - // } - // }); - - /// remove items. - // List removedList = []; - // mySelectedExamination.forEach((element) { - // if (mySelectedExaminationLocal.singleWhere( - // (it) => - // it.selectedExamination!.id == - // element.selectedExamination!.id, - // orElse: () => MySelectedExamination()) == - // MySelectedExamination()) { - // removedList.add(element); - // } - // }); - - // removedList.forEach((element) { - // removeExamination(element.selectedExamination!); - // }); - // Navigator.of(context).pop(); - // setState(() {}); - }, - removeExamination: (masterKey) => removeExamination(masterKey)), + patientInfo: widget.patientInfo, + ), ), ); } @override nextFunction(model) async { - await submitUpdateObjectivePage(model); + // await submitUpdateObjectivePage(model); } - void pushAddExamination( - List mySelectedExaminationLocal) { - Navigator.push( - context, - FadePage( - page: AddDetailsToExaminationVidaPlus( - mySelectedExamination: mySelectedExamination, - ), - ), - ); - } + // void pushAddExamination( + // List mySelectedExaminationLocal) { + // Navigator.push( + // context, + // FadePage( + // page: AddDetailsToExaminationVidaPlus( + // mySelectedExamination: mySelectedExamination, + // ), + // ), + // ); + // } } From a1960c8799ba372aa290e583f3651e7ae7ece104 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 25 Nov 2024 15:18:20 +0300 Subject: [PATCH 34/76] WD: adding the physical examinatoin. --- lib/config/config.dart | 4 + lib/config/localized_values.dart | 1 + .../model/SOAP/physical_exam/Category.dart | 93 +++ .../CreatePhysicalExamination.dart | 71 ++ .../post_physical_examination_model.dart | 1 + .../soap/SOAP_service.dart | 718 +++++++++--------- lib/core/viewModel/SOAP_view_model.dart | 41 +- .../add_details_to_examination_vida_plus.dart | 126 ++- .../add_examination_page_vida_plus.dart | 1 + .../objective/widget/examination_items.dart | 505 +++++++----- .../translations_delegate_base_utils.dart | 1 + 11 files changed, 968 insertions(+), 594 deletions(-) create mode 100644 lib/core/model/SOAP/physical_exam/Category.dart create mode 100644 lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 70c60788..23a4af3e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -332,6 +332,10 @@ const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchP const GET_GENERAL_SPECIALITY = 'Services/DoctorApplication.svc/REST/GetGeneralSpeciality'; +const GET_SPECIALITY_DETAILS = 'Services/DoctorApplication.svc/REST/SearchGeneralSpeciality'; + +const POST_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/PostPhysicalExam'; + var selectedPatientType = 1; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b8d6f97f..95c2b501 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -485,6 +485,7 @@ const Map> localizedValues = { "ar": "ملاحظات على نوع النظام الغذائي" }, "save": {"en": "SAVE", "ar": "حفظ"}, + "saveSmall": {"en": "Save", "ar": "حفظ"}, "postPlansEstimatedCost": { "en": "POST PLANS & ESTIMATED COST", "ar": "خطط ما بعد العملية والتكلفة المقدرة" diff --git a/lib/core/model/SOAP/physical_exam/Category.dart b/lib/core/model/SOAP/physical_exam/Category.dart new file mode 100644 index 00000000..84cecfcc --- /dev/null +++ b/lib/core/model/SOAP/physical_exam/Category.dart @@ -0,0 +1,93 @@ +import 'package:flutter/material.dart'; + +class Condition { + String? conditionCode; + String? conditionName; + + Condition(); + + Condition.fromJson(Map json) { + conditionCode = json['conditionCode']; + conditionName = json['conditionName']; + } + + Map toJson() { + return { + 'conditionCode': conditionCode, + 'conditionName': conditionName, + }; + } +} + +class Category { + int? categoryId; + String? code; + String? codeAlias; + List? conditionsList; + String? description; + String? descriptionAlias; + int? id; + bool? isActive; + bool? isBuiltin; + String? languageCode; + String? name; + String? nameAlias; + int? rowVersion; + int? specialityId; + String? specialityName; + List? translationValues; + bool isSelected = false; + TextEditingController remarksController = TextEditingController(); + int selectedCondition = -1; + String? pomrId; + int? paitientId; + int? userID; + + Category(); + + Category.fromJson(Map json,int? specialityId, String specialityName, String? pomrId, int paitientId, int userID) { + categoryId = json['categoryId']; + code = json['code']; + codeAlias = json['codeAlias']; + if (json['conditionsList'] != null) { + conditionsList = []; + json['conditionsList'].forEach((v) { + conditionsList!.add(Condition.fromJson(v)); + }); + } + description = json['description']; + descriptionAlias = json['descriptionAlias']; + id = json['id']; + isActive = json['isActive']; + isBuiltin = json['isBuiltin']; + languageCode = json['languageCode']; + name = json['name']; + nameAlias = json['nameAlias']; + rowVersion = json['rowVersion']; + translationValues = json['translationValues']; + this.specialityName = specialityName; + this.specialityId = specialityId; + this.pomrId = pomrId; + this.paitientId = paitientId; + this.userID = userID; + } + + Map toJson() { + return { + 'categoryId': categoryId, + 'code': code, + 'codeAlias': codeAlias, + 'conditionsList': conditionsList?.map((v) => v.toJson()).toList(), + 'description': description, + 'descriptionAlias': descriptionAlias, + 'id': id, + 'isActive': isActive, + 'isBuiltin': isBuiltin, + 'languageCode': languageCode, + 'name': name, + 'nameAlias': nameAlias, + 'rowVersion': rowVersion, + 'translationValues': translationValues, + }; + } +} \ No newline at end of file diff --git a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart new file mode 100644 index 00000000..b97999f4 --- /dev/null +++ b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart @@ -0,0 +1,71 @@ +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/Category.dart'; + +class CreatePhysicalExamination { + bool? isChecked; // it will be told + bool? selected; // same as above + String? pomrid; // paitient + int? patientID; // paitint + bool? isClinicPhysicalExamination; // it will be told + int? physicalExaminationSystemID; // category id + String? physicalExaminationDescription; // name of the category + int? specialityID; // id of the specialitiy id + dynamic selectedOptions; // it will also be told but it could be sent as null + bool? isMandatory; // it will also be checked default value is false + String? specialityDescription; // name of the speciality + int? physicalExaminationCondition; // condition selected + String? loginUserId; // doctor id + String? remark; + + CreatePhysicalExamination(); + + CreatePhysicalExamination.fromJson(Map json) { + isChecked = json['isChecked']; + selected = json['selected']; + pomrid = json['pomrid']; + patientID = json['patientID']; + isClinicPhysicalExamination = json['isClinicPhysicalExamination']; + physicalExaminationSystemID = json['physicalExaminationSystemID']; + physicalExaminationDescription = json['physicalExaminationDescription']; + specialityID = json['specialityID']; + selectedOptions = json['selectedOptions']; + isMandatory = json['isMandatory']; + specialityDescription = json['specialityDescription']; + physicalExaminationCondition = json['physicalExaminationCondition']; + loginUserId = json['loginUserId']; + remark = json['remark']; + } + + Map toJson() { + return { + 'isChecked': isChecked, + 'selected': selected, + 'pomrid': pomrid, + 'patientID': patientID, + 'isClinicPhysicalExamination': isClinicPhysicalExamination, + 'physicalExaminationSystemID': physicalExaminationSystemID, + 'physicalExaminationDescription': physicalExaminationDescription, + 'specialityID': specialityID, + 'selectedOptions': selectedOptions, + 'isMandatory': isMandatory, + 'specialityDescription': specialityDescription, + 'physicalExaminationCondition': physicalExaminationCondition, + 'loginUserId': loginUserId, + 'remark': remark, + }; + } +} + +extension ConvertCategoryToCreatePhysicalExamination on Category { + CreatePhysicalExamination createPhysicalExaminationFromCategory() => + CreatePhysicalExamination() + ..physicalExaminationDescription = this.name + ..physicalExaminationSystemID = this.categoryId + ..physicalExaminationCondition = this.selectedCondition + ..remark = this.remarksController.text + ..selected = false + ..isChecked = false + ..specialityID = this.specialityId + ..patientID = this.paitientId + ..pomrid = this.pomrId + ..loginUserId = this.userID?.toString(); +} diff --git a/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart b/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart index 127b5e49..026d8c54 100644 --- a/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart +++ b/lib/core/model/SOAP/physical_exam/post_physical_examination_model.dart @@ -1,3 +1,4 @@ +@deprecated class PostPhysicalExaminationModel { bool? isChecked; bool? selected; diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index c7d74ce0..28f973dc 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -12,6 +12,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_ import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/Category.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_examination_model.dart'; @@ -58,6 +60,7 @@ class SOAPService extends LookupService { List searchDiagnosisList = []; List patientPhysicalExaminationList = []; List generalSpeciality = []; + Map> specialityDetails = {}; Map diagnosisTypeList = {}; Map conditionTypeList = {}; List icdVersionList = []; @@ -72,25 +75,26 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_EPISODE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - episodeID = response['EpisodeID']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postEpisodeReqModel.toJson()); + print("Success"); + episodeID = response['EpisodeID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postEpisodeReqModel.toJson()); } - Future postEpisodeForInPatient(PostEpisodeForInpatientRequestModel - postEpisodeForInpatientRequestModel) async { + Future postEpisodeForInPatient( + PostEpisodeForInpatientRequestModel + postEpisodeForInpatientRequestModel) async { hasError = false; await baseAppClient.post(POST_EPISODE_FOR_IN_PATIENT, onSuccess: (dynamic response, int statusCode) { - episodeID = response['EpisodeID']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postEpisodeForInpatientRequestModel.toJson()); + episodeID = response['EpisodeID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postEpisodeForInpatientRequestModel.toJson()); } Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async { @@ -98,11 +102,11 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: postAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: postAllergyRequestModel.toJson()); } Future postHistories( @@ -110,11 +114,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: postHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: postHistoriesRequestModel.toJson()); } Future postChiefComplaint( @@ -123,11 +127,11 @@ class SOAPService extends LookupService { super.error = ""; await baseAppClient.post(POST_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postChiefComplaintRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postChiefComplaintRequestModel.toJson()); } Future postPhysicalExam( @@ -135,11 +139,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postPhysicalExamRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postPhysicalExamRequestModel.toJson()); } Future postProgressNote( @@ -147,11 +151,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postProgressNoteRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postProgressNoteRequestModel.toJson()); } Future postAssessment( @@ -159,11 +163,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postAssessmentRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postAssessmentRequestModel.toJson()); } Future patchAllergy(PostAllergyRequestModel patchAllergyRequestModel) async { @@ -171,11 +175,11 @@ class SOAPService extends LookupService { await baseAppClient.post(PATCH_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = "\n" + error; - }, body: patchAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = "\n" + error; + }, body: patchAllergyRequestModel.toJson()); } Future patchHistories( @@ -183,11 +187,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = super.error! + "\n" + error; - }, body: patchHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = super.error! + "\n" + error; + }, body: patchHistoriesRequestModel.toJson()); } Future patchChiefComplaint( @@ -196,11 +200,11 @@ class SOAPService extends LookupService { super.error = ""; await baseAppClient.post(PATCH_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchChiefComplaintRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchChiefComplaintRequestModel.toJson()); } Future patchPhysicalExam( @@ -208,11 +212,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchPhysicalExamRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchPhysicalExamRequestModel.toJson()); } Future patchProgressNote( @@ -220,11 +224,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchProgressNoteRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchProgressNoteRequestModel.toJson()); } Future patchAssessment( @@ -232,11 +236,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchAssessmentRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchAssessmentRequestModel.toJson()); } Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async { @@ -245,16 +249,16 @@ class SOAPService extends LookupService { ///TODO Elham* change the url constant to get getPatientAllergy await baseAppClient.post(GET_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesList.clear(); + print("Success"); + patientAllergiesList.clear(); - response['List_Allergies']['entityList'].forEach((v) { - patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: generalGetReqForSOAP.toJson()); + response['List_Allergies']['entityList'].forEach((v) { + patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: generalGetReqForSOAP.toJson()); } Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, @@ -262,15 +266,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - if (isFirst) patientHistoryList.clear(); - response['List_History']['entityList'].forEach((v) { - patientHistoryList.add(GetHistoryResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getHistoryReqModel.toJson()); + print("Success"); + if (isFirst) patientHistoryList.clear(); + response['List_History']['entityList'].forEach((v) { + patientHistoryList.add(GetHistoryResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getHistoryReqModel.toJson()); } Future getPatientChiefComplaint( @@ -278,16 +282,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientChiefComplaintList.clear(); - response['List_ChiefComplaint']['entityList'].forEach((v) { - patientChiefComplaintList.add( - GetChiefComplaintResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getChiefComplaintReqModel.toJson()); + print("Success"); + patientChiefComplaintList.clear(); + response['List_ChiefComplaint']['entityList'].forEach((v) { + patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getChiefComplaintReqModel.toJson()); } Future getPatientPhysicalExam( @@ -295,14 +298,14 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - patientPhysicalExamList.clear(); - response['PhysicalExamList']['entityList'].forEach((v) { - patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getPhysicalExamReqModel.toJson()); + patientPhysicalExamList.clear(); + response['PhysicalExamList']['entityList'].forEach((v) { + patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getPhysicalExamReqModel.toJson()); } Future getPatientProgressNote( @@ -310,16 +313,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientProgressNoteList.clear(); - response['ProgressNoteList']['entityList'].forEach((v) { - patientProgressNoteList.add( - GetPatientProgressNoteResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getGetProgressNoteReqModel.toJson()); + print("Success"); + patientProgressNoteList.clear(); + response['ProgressNoteList']['entityList'].forEach((v) { + patientProgressNoteList.add(GetPatientProgressNoteResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getGetProgressNoteReqModel.toJson()); } Future getPatientAssessment( @@ -327,15 +329,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAssessmentList.clear(); - response['AssessmentList']['entityList'].forEach((v) { - patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getAssessmentReqModel.toJson()); + print("Success"); + patientAssessmentList.clear(); + response['AssessmentList']['entityList'].forEach((v) { + patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getAssessmentReqModel.toJson()); } Future getEpisodeForInpatient( @@ -343,31 +345,31 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_EPISODE_FOR_INPATIENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); + print("Success"); - episodeID = response["GetEpisodeNo"]; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getEpisodeForInpatientReqModel.toJson()); + episodeID = response["GetEpisodeNo"]; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getEpisodeForInpatientReqModel.toJson()); } Future isPrescriptionOrderCreated(PatiantInformtion patientInfo) async { hasError = false; await baseAppClient.post(IS_PRESCRIPTION_ORDER_CREATED, onSuccess: (dynamic response, int statusCode) { - print("Success"); - - isPrescriptionOrder = response['IsPrescriptionCreated']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "PatientMRN": patientInfo.patientMRN, - "EncounterNo": patientInfo.appointmentNo, - "EncounterType": patientInfo.appointmentTypeId, - "DoctorID": patientInfo.doctorId, - }); + print("Success"); + + isPrescriptionOrder = response['IsPrescriptionCreated']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "PatientMRN": patientInfo.patientMRN, + "EncounterNo": patientInfo.appointmentNo, + "EncounterType": patientInfo.appointmentTypeId, + "DoctorID": patientInfo.doctorId, + }); } /* vida plus API allergies */ @@ -380,16 +382,16 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATIENT_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesVidaPlus.clear(); + print("Success"); + patientAllergiesVidaPlus.clear(); - response['List_PatientAllergies']['resultData'].forEach((v) { - patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['List_PatientAllergies']['resultData'].forEach((v) { + patientAllergiesVidaPlus.add(PatientAllergiesVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } Future searchAllergies(String searchKey) async { @@ -397,20 +399,20 @@ class SOAPService extends LookupService { await baseAppClient.post(SEARCH_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - searchAllergiesList.clear(); + print("Success"); + searchAllergiesList.clear(); - response['List_SearchAllergies']['resultData'].forEach((v) { - searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: {"AllergyName": searchKey}); + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: {"AllergyName": searchKey}); } - Future addAllergies(AllergiesListVidaPlus allergy, - PatiantInformtion patientInfo) async { + Future addAllergies( + AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; value.pomrid = int.parse(patientInfo.pomrId!); @@ -442,22 +444,22 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } - Future resolveAllergies(PatientAllergiesVidaPlus allergy, - PatiantInformtion patientInfo) async { + Future resolveAllergies( + PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { /*changed request parameters based on the vida plus requested */ var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); List? reaction = - allergy.patientsAllergyReactionsDTOs!; + allergy.patientsAllergyReactionsDTOs!; List? reactionRequest = []; reaction.forEach((value) { reactionRequest.add(AllergyReactionDTOs( @@ -491,17 +493,17 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(RESOLVE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Resolved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Resolved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } - Future updateAllergies(AllergiesListVidaPlus allergy, - PatiantInformtion patientInfo) async { + Future updateAllergies( + AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; value.pomrid = patientInfo.episodeNo; @@ -533,13 +535,13 @@ class SOAPService extends LookupService { await baseAppClient.post(UPDATE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] - }); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "listProgNotePatientAllergyDiseaseVM": [request] + }); } saveHopi(Map req, PatiantInformtion patient) async { @@ -552,15 +554,17 @@ class SOAPService extends LookupService { "patientId": patient.patientMRN, "patientPomrId": patient.pomrId, }; - Map finalRequest = {}..addAll(request)..addAll(req); + Map finalRequest = {} + ..addAll(request) + ..addAll(req); hasError = false; await baseAppClient.post(CREATE_HOPI, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("History Saved Successfully"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: finalRequest); + DrAppToastMsg.showSuccesToast("History Saved Successfully"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: finalRequest); } getHopi(PatiantInformtion patient) async { @@ -571,15 +575,15 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(HOPI_DETAILS, onSuccess: (dynamic response, int statusCode) { - hopiDetails.clear(); + hopiDetails.clear(); - response['DetailHOPI']['resultData'].forEach((v) { - hopiDetails.add(GetHopiDetails.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['DetailHOPI']['resultData'].forEach((v) { + hopiDetails.add(GetHopiDetails.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } getChiefComplaint(PatiantInformtion patient) async { @@ -590,20 +594,20 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(GET_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - patientChiefComplaintListVidaPlus.clear(); + patientChiefComplaintListVidaPlus.clear(); - response['ListChiefComplaintDetails']['resultData'].forEach((v) { - patientChiefComplaintListVidaPlus - .add(GetChiefComplaintVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + response['ListChiefComplaintDetails']['resultData'].forEach((v) { + patientChiefComplaintListVidaPlus + .add(GetChiefComplaintVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - postChiefComplaintVidaPlus(PatiantInformtion patient, - String cheifComplaint) async { + postChiefComplaintVidaPlus( + PatiantInformtion patient, String cheifComplaint) async { Map request = { "ListCreateChiefComplaint": [ { @@ -617,11 +621,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } searchChiefComplaintVidaPlus(PatiantInformtion patient, String CC) async { @@ -633,17 +637,16 @@ class SOAPService extends LookupService { searchChiefComplaintListVidaPlus.clear(); await baseAppClient.post(SEARCH_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - // - response['List_SearchChiefComplaint']['resultData'].forEach((v) { - searchChiefComplaintListVidaPlus.add( - SearchChiefComplaint.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + searchChiefComplaintListVidaPlus.clear(); + // + response['List_SearchChiefComplaint']['resultData'].forEach((v) { + searchChiefComplaintListVidaPlus.add(SearchChiefComplaint.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } searchDiagnosis(PatiantInformtion patient, String diagnosis) async { @@ -655,15 +658,14 @@ class SOAPService extends LookupService { await baseAppClient.post(SEARCH_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['List_Diagnosis']['resultData'] - .forEach((v) => - searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); - _processData(); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['List_Diagnosis']['resultData'] + .forEach((v) => searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); + _processData(); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } void _processData() { @@ -692,14 +694,13 @@ class SOAPService extends LookupService { diagnosisTypeList.clear(); await baseAppClient.post(DIAGNOSIS_TYPE, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisTypeModel']['resultData'] - .forEach((v) => - diagnosisTypeList[v['name']] = v['diagnosisType']); - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisTypeModel']['resultData'] + .forEach((v) => diagnosisTypeList[v['name']] = v['diagnosisType']); + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } getConditionType(PatiantInformtion patient) async { @@ -708,18 +709,20 @@ class SOAPService extends LookupService { conditionTypeList.clear(); await baseAppClient.post(CONDITION_TYPE, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisCondition']['resultData'] - .forEach((v) => conditionTypeList[v['itemName']] = v['id']); - ; - }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisCondition']['resultData'] + .forEach((v) => conditionTypeList[v['itemName']] = v['id']); + ; + }, onFailure: (String error, int statusCode) { + searchChiefComplaintListVidaPlus.clear(); + hasError = true; + super.error = error; + }, body: request); } - auditDiagnosis(PatiantInformtion patient, - String patientProblemRevisionID,) async { + auditDiagnosis( + PatiantInformtion patient, + String patientProblemRevisionID, + ) async { Map request = { "patientProblemRevisionId": patientProblemRevisionID, "ProjectID": patient.projectId @@ -728,15 +731,14 @@ class SOAPService extends LookupService { auditDiagnosislist.clear(); await baseAppClient.post(AUDIT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDaignosisAudit']['resultData'] - .forEach((v) => - auditDiagnosislist.add(AuditDiagnosis.fromJson(v))); - showAuditBottomSheet = auditDiagnosislist.isNotEmpty; - }, onFailure: (String error, int statusCode) { - auditDiagnosislist.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDaignosisAudit']['resultData'] + .forEach((v) => auditDiagnosislist.add(AuditDiagnosis.fromJson(v))); + showAuditBottomSheet = auditDiagnosislist.isNotEmpty; + }, onFailure: (String error, int statusCode) { + auditDiagnosislist.clear(); + hasError = true; + super.error = error; + }, body: request); } getPreviousDiagnosis(PatiantInformtion patient) async { @@ -761,14 +763,14 @@ class SOAPService extends LookupService { patientPreviousDiagnosisList.clear(); await baseAppClient.post(PREVIOUS_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisPrviousDetials']['resultData'].forEach((v) => - patientPreviousDiagnosisList - .add(PatientPreviousDiagnosis.fromJson(v))); - }, onFailure: (String error, int statusCode) { - patientPreviousDiagnosisList.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisPrviousDetials']['resultData'].forEach((v) => + patientPreviousDiagnosisList + .add(PatientPreviousDiagnosis.fromJson(v))); + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); } removeDiagnosis(PatiantInformtion patientInfo, String? patientProblemId, @@ -790,17 +792,18 @@ class SOAPService extends LookupService { patientPreviousDiagnosisList.clear(); await baseAppClient.post(REMOVE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast( - response['ListDiagnosisRemove']['message']); - //todo get the current diagnosis after the delete if it is successful - }, onFailure: (String error, int statusCode) { - patientPreviousDiagnosisList.clear(); - hasError = true; - super.error = error; - }, body: request); + DrAppToastMsg.showSuccesToast(response['ListDiagnosisRemove']['message']); + //todo get the current diagnosis after the delete if it is successful + }, onFailure: (String error, int statusCode) { + patientPreviousDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); } - favoriteDiagnosis(PatiantInformtion patientInfo,) async { + favoriteDiagnosis( + PatiantInformtion patientInfo, + ) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { @@ -815,17 +818,18 @@ class SOAPService extends LookupService { favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - response['ListDiagnosisGetFavourite']['resultData'].forEach((v) => - favoriteDiagnosisDetailsList.add( - FavoriteDiseaseDetails.fromJson(v))); - }, onFailure: (String error, int statusCode) { - favoriteDiagnosisDetailsList.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListDiagnosisGetFavourite']['resultData'].forEach((v) => + favoriteDiagnosisDetailsList.add(FavoriteDiseaseDetails.fromJson(v))); + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); } - getPhysicalExamination(PatiantInformtion patientInfo,) async { + getPhysicalExamination( + PatiantInformtion patientInfo, + ) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { @@ -839,38 +843,41 @@ class SOAPService extends LookupService { patientPhysicalExaminationList.clear(); await baseAppClient.post(SEARCH_PHYSICAL_EXAMINATION, onSuccess: (dynamic response, int statusCode) { - response['ListPhysicalExam']['resultData'].forEach((v) => - patientPhysicalExaminationList.add( - PatientPhysicalExamination.fromJson(v))); - }, onFailure: (String error, int statusCode) { - physicalExaminationList.clear(); - hasError = true; - super.error = error; - }, body: request); + response['ListPhysicalExam']['resultData'].forEach((v) => + patientPhysicalExaminationList + .add(PatientPhysicalExamination.fromJson(v))); + }, onFailure: (String error, int statusCode) { + physicalExaminationList.clear(); + hasError = true; + super.error = error; + }, body: request); } - postPhysicalExamination(PatiantInformtion patientInfo,List physicalExamination) async { - var jsonListOfPhysicalExamination = []; - physicalExamination.forEach((value)=>jsonListOfPhysicalExamination.add(value.toJson())); + Future postPhysicalExamination(PatiantInformtion patientInfo, + List physicalExamination) async { + List jsonListOfPhysicalExamination = []; + physicalExamination + .forEach((value) => jsonListOfPhysicalExamination.add(value.createPhysicalExaminationFromCategory())); Map request = { "ProjectID": patientInfo.patientId, "listCreatPhysicalExam": jsonListOfPhysicalExamination }; hasError = false; - await baseAppClient.post(SEARCH_PHYSICAL_EXAMINATION, + bool data = await baseAppClient.post(POST_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast( - response['ListPhysicalExam']['message']); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); - } + DrAppToastMsg.showSuccesToast(response['ListPhysicalExam']['message']); + return true; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + return false; + }, body: request); + return data; + } getGeneralSpeciality(PatiantInformtion patientInfo) async { - Map request = { "ProjectID": patientInfo.patientId, }; @@ -878,14 +885,13 @@ class SOAPService extends LookupService { generalSpeciality.clear(); await baseAppClient.post(GET_GENERAL_SPECIALITY, onSuccess: (dynamic response, int statusCode) { - response['ListGeneralSpeciality']['resultData'].forEach((v) => - generalSpeciality.add( - GeneralSpeciality.fromJson(v))); - }, onFailure: (String error, int statusCode) { - hasError = true; - generalSpeciality.clear(); - super.error = error; - }, body: request); + response['ListGeneralSpeciality']['resultData'] + .forEach((v) => generalSpeciality.add(GeneralSpeciality.fromJson(v))); + }, onFailure: (String error, int statusCode) { + hasError = true; + generalSpeciality.clear(); + super.error = error; + }, body: request); } addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, @@ -908,20 +914,20 @@ class SOAPService extends LookupService { favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(ADD_TO_FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - var result = response['ListDiagnosisAddFavourite']['resultData']; - if ((result as List).isEmpty) { - addedToFavorite = false; - DrAppToastMsg.showErrorToast( - response['ListDiagnosisAddFavourite']['message']); - } else { - addedToFavorite = true; - DrAppToastMsg.showSuccesToast("Added To Favorite"); - } - }, onFailure: (String error, int statusCode) { - favoriteDiagnosisDetailsList.clear(); - hasError = true; - super.error = error; - }, body: request); + var result = response['ListDiagnosisAddFavourite']['resultData']; + if ((result as List).isEmpty) { + addedToFavorite = false; + DrAppToastMsg.showErrorToast( + response['ListDiagnosisAddFavourite']['message']); + } else { + addedToFavorite = true; + DrAppToastMsg.showSuccesToast("Added To Favorite"); + } + }, onFailure: (String error, int statusCode) { + favoriteDiagnosisDetailsList.clear(); + hasError = true; + super.error = error; + }, body: request); } convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, @@ -944,15 +950,35 @@ class SOAPService extends LookupService { addedToFavorite = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - var result = response['ContinuePreviousEpisode']['resultData']; - if ((result as List).isEmpty) { - DrAppToastMsg.showErrorToast( - response['ContinuePreviousEpisode']['message']); - } - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + var result = response['ContinuePreviousEpisode']['resultData']; + if ((result as List).isEmpty) { + DrAppToastMsg.showErrorToast( + response['ContinuePreviousEpisode']['message']); + } + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + getSpecialityDetails(String speciality, int? specialityId, + PatiantInformtion patientInfo) async { + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + var userId = user?['List_MemberInformation'][0]['MemberID']; + Map request = {"searchParam": speciality}; + hasError = false; + List categoryData = []; + await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + response['ContinuePreviousEpisode']['resultData'].forEach( + (value) => categoryData.add(Category.fromJson(value, specialityId, speciality,patientInfo.pomrId,patientInfo.patientId,user?['List_MemberInformation'][0]['MemberID']))); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + if (!hasError) { + specialityDetails[speciality] = categoryData; + } } createDiagnosis(PatiantInformtion patient, SearchDiagnosis searchDiagnosis, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 1b1e3bf7..283d2586 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -25,6 +25,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_reques import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/Category.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; @@ -144,8 +146,10 @@ class SOAPViewModel extends BaseViewModel { List get auditDiagnosislist => _SOAPService.auditDiagnosislist; - List get speciality => - _SOAPService.generalSpeciality; + List get speciality => _SOAPService.generalSpeciality; + + Map> get specialityDetails => + _SOAPService.specialityDetails; int? get episodeID => _SOAPService.episodeID; @@ -1173,21 +1177,33 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void postPhysicalExamination(PatiantInformtion patientInfo, - List physicalExamination) async { + Future postPhysicalExamination(PatiantInformtion patientInfo, + List physicalExamination) async { setState(ViewState.BusyLocal); - await _SOAPService.postPhysicalExamination( + bool result = await _SOAPService.postPhysicalExamination( patientInfo, physicalExamination); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); + + return result; } + void getGeneralSpeciality(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); - await _SOAPService.getGeneralSpeciality( - patientInfo); + await _SOAPService.getGeneralSpeciality(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + void getSpecialityDetails(String speciality,int? specialityId, PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getSpecialityDetails(speciality,specialityId, patientInfo); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1202,4 +1218,15 @@ class SOAPViewModel extends BaseViewModel { void toggleShowBottomSheetValue(bool status) { _SOAPService.showAuditBottomSheet = status; } + + void savePhysicalexamination() { + var mappedItems = + setState(ViewState.BusyLocal); + // await _SOAPService.getSpecialityDetails(speciality); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index 07e6443e..013d841e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -1,6 +1,8 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciality.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; @@ -10,6 +12,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plu import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -17,15 +20,20 @@ import '../../../../../core/viewModel/project_view_model.dart'; class AddDetailsToExaminationVidaPlus extends StatefulWidget { final List? mySelectedExamination; + final PatiantInformtion patientInfo; - const AddDetailsToExaminationVidaPlus({super.key, this.mySelectedExamination}); + const AddDetailsToExaminationVidaPlus( + {super.key, + this.mySelectedExamination, + required this.patientInfo}); @override State createState() => _AddDetailsToExaminationVidaPlusState(); } -class _AddDetailsToExaminationVidaPlusState extends State { +class _AddDetailsToExaminationVidaPlusState + extends State { bool isSysExaminationExpand = false; @override @@ -33,47 +41,87 @@ class _AddDetailsToExaminationVidaPlusState extends State( - onModelReady: (model) async {}, + onModelReady: (model) async { + widget.mySelectedExamination?.forEach((value) => + model.getSpecialityDetails( + value.name ?? '', value.id, widget.patientInfo)); + }, builder: (_, model, w) => AppScaffold( - baseViewModel: model, - isShowAppBar: true, - appBar: PatientSearchHeader( - title: TranslationBase.of(context).examinationPart), - backgroundColor: Colors.white, - body: Padding( - padding: const EdgeInsets.all(20.0), - child: Column( - children: [ - // Expanded( - // child: ListView.separated( - // itemBuilder: (context, index) { - // return ExpandableSOAPWidget( - // headerTitle:, - // onTap: () { - // setState(() { - // isSysExaminationExpand = !isSysExaminationExpand; - // }); - // }, - // child: ExaminationItems(examination:widget.mySelectedExamination![index]), - // isExpanded: isSysExaminationExpand, - // ); - // - // }, - // separatorBuilder: (context, index) { - // return SizedBox(height: 8,); - // }, - // itemCount: widget?.mySelectedExamination?.length ?? 0), - // ), - ], + baseViewModel: model, + isShowAppBar: true, + isLoading: model.state == ViewState.BusyLocal, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).examinationPart), + backgroundColor: Colors.white, + body: Padding( + padding: const EdgeInsets.all(20.0), + child: Column( + children: [ + Expanded( + child: ListView.separated( + itemBuilder: (context, index) { + var title = + model.specialityDetails.keys.elementAt(index); + return ExpandableSOAPWidget( + headerTitle: title, + onTap: () { + setState(() { + isSysExaminationExpand = + !isSysExaminationExpand; + }); + }, + child: ExaminationItems( + examination: model.specialityDetails[title]), + isExpanded: isSysExaminationExpand, + ); + }, + separatorBuilder: (context, index) { + return SizedBox( + height: 8, + ); + }, + itemCount: model.specialityDetails.length ?? 0), + ), + ], + ), ), - ))); + bottomNavigationBar: Material( + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).cancelSmall, + color: Color(0xffEAEAEA), + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () async { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 10, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).saveSmall, + color: Color(0xff359846), + fontColor: Colors.white, + fontWeight: FontWeight.w600, + onPressed: () async { + model.savePhysicalexamination(); + }, + ), + ), + ], + ))), + )); } } - - - - /* Container( padding: EdgeInsets.symmetric(horizontal: 12), child: Column( @@ -226,4 +274,4 @@ class _AddDetailsToExaminationVidaPlusState extends State? examination; const ExaminationItems({super.key, this.examination}); @@ -21,15 +22,13 @@ class ExaminationItems extends StatefulWidget { class _ExaminationItemsState extends State { bool isExpanded = false; - int status = 1; - - TextEditingController remarksController = TextEditingController(); + List? examinations; @override void initState() { // TODO: implement initState super.initState(); - remarksController.text = widget.examination?.remark ?? ""; + this.examinations = examinations; } @override @@ -37,210 +36,312 @@ class _ExaminationItemsState extends State { ProjectViewModel projectViewModel = Provider.of(context); return Column( children: [ - ListTileTheme( - horizontalTitleGap: 0, - child: CheckboxListTile( - activeColor: Color(0xFFD02127), - checkColor: Colors.white, - contentPadding: EdgeInsets.zero, - side: MaterialStateBorderSide.resolveWith( - (Set states) { - if (states.contains(MaterialState.selected)) { - return const BorderSide(color: Color(0xFFD02127)); - } - return const BorderSide(color: Color(0xFFE6E6E6)); - }, - ), - shape: - RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)), - value: isExpanded, - controlAffinity: ListTileControlAffinity.leading, - onChanged: (bool? value) { - setState(() { - isExpanded = value ?? false; - }); - }, - title: AppText( - projectViewModel.isArabic - ? widget.examination!.selectedExamination!.nameAr != null && - widget.examination!.selectedExamination!.nameAr != "" - ? widget.examination!.selectedExamination!.nameAr! - : widget.examination!.selectedExamination!.nameEn! - : widget.examination!.selectedExamination!.nameEn!, - color: Color(0XFF575757), - fontSize: 14, - fontWeight: FontWeight.w400, - ), - ), - ), - (isExpanded) - ? Container( - padding: EdgeInsets.symmetric(horizontal: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.only(bottom: 8), - child: AppText( - TranslationBase.of(context).condition, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, - ), + Expanded( + child: ListView.builder( + itemCount: examinations?.length ?? 0, + itemBuilder: (context, index) => Column( + children: [ + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + contentPadding: EdgeInsets.zero, + side: MaterialStateBorderSide.resolveWith( + (Set states) { + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, ), - Row( - children: [ - Expanded( - child: InkWell( - onTap: () { - setState(() { - status = 1; - }); - widget.examination!.isNormal = true; - widget.examination!.isAbnormal = false; - widget.examination!.notExamined = false; - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: - Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 1 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - TranslationBase.of(context).normal, - fontWeight: FontWeight.normal, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + value: examinations?[index].isSelected, + controlAffinity: ListTileControlAffinity.leading, + onChanged: (bool? value) { + setState(() { + examinations?[index].isSelected = value ?? false; + }); + }, + title: AppText( + examinations![index].name!, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + ), + ), + (examinations?[index].isSelected == true) + ? Container( + padding: EdgeInsets.symmetric(horizontal: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(bottom: 8), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier! * 1.6, ), - ], - ), - )), - Expanded( - child: InkWell( - onTap: () { - setState(() { - status = 2; - }); - widget.examination!.isNormal = false; - widget.examination!.isAbnormal = true; - widget.examination!.notExamined = false; - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: - Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 2 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - TranslationBase.of(context).abnormal, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: examinations?[index] + .conditionsList + ?.length ?? + 0, + itemBuilder: (context, currentIndex) => InkWell( + onTap: () { + setState(() { + examinations?[index] + .selectedCondition = + int.parse(examinations?[index] + .conditionsList?[ + currentIndex] + .conditionName ?? + "-1"); + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric( + horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: examinations?[index] + .selectedCondition == + int.parse(examinations?[ + index] + .conditionsList?[ + currentIndex] + .conditionName ?? + "-1") + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + examinations?[index] + .conditionsList?[ + currentIndex] + .conditionCode ?? + '', + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: + SizeConfig.textMultiplier! * + 1.6, + ), + ], + ), + )), + ), + // Row( + // children: [ + // if(examinations?[index] + // .conditionsList?.length == 1) + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[0] + // .conditionName ?? + // "-1"); + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[0] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // examinations?[index] + // .conditionsList?[0] + // .conditionCode ?? + // TranslationBase.of(context).normal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[1] + // .conditionName ?? + // "-1"); + // }); + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[1] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // examinations?[index] + // .conditionsList?[1] + // .conditionCode ?? + // TranslationBase.of(context).abnormal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[2] + // .conditionName ?? + // "-1"); + // }); + // }); + // + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[2] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // Expanded( + // child: AppText( + // examinations?[index] + // .conditionsList?[2] + // .conditionCode ?? + // TranslationBase.of(context).notExamined, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ), + // ], + // ), + // )), + // ], + // ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: examinations?[index].remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, ), - ], - ), - )), - if (widget.examination?.isLocal == false) - Expanded( - child: InkWell( - onTap: () { - setState(() { - status = 3; - }); - widget.examination!.isNormal = false; - widget.examination!.isAbnormal = false; - widget.examination!.notExamined = true; - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 3 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - Expanded( - child: AppText( - TranslationBase.of(context).notExamined, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, - ), - ), - ], ), - )), - ], - ), - Container( - margin: EdgeInsets.only(top: 8), - child: AppTextFieldCustom( - hintText: TranslationBase.of(context).remarks, - controller: remarksController, - minLines: 2, - maxLines: 4, - inputType: TextInputType.multiline, - onChanged: (value) { - widget.examination!.remark = value; - }, - onClick: () {}, - onFieldSubmitted: () {}, - ), - ), - ], - ), - ) - : SizedBox.shrink(), - SizedBox( - height: 8, + ], + ), + ) + : SizedBox.shrink(), + ], + ), + ), ), - Divider() ], ); } diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index d443785b..4d6a185d 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -503,6 +503,7 @@ class TranslationBase { String get cancel => localizedValues['cancel']![locale.languageCode]!; String get cancelSmall => localizedValues['cancelSmall']![locale.languageCode]!; + String get saveSmall => localizedValues['saveSmall']![locale.languageCode]!; String get ok => localizedValues['ok']![locale.languageCode]!; From d098b419e283a1a1b5ca2da6cb40443772022bbb Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 26 Nov 2024 09:35:16 +0300 Subject: [PATCH 35/76] WD: get Progress note api integrated --- lib/config/config.dart | 2 + .../SOAP/assessment/search_diagnosis.dart | 15 + .../SOAP/progress_note/progress_note.dart | 85 +++++ .../soap/SOAP_service.dart | 31 ++ lib/core/viewModel/SOAP_view_model.dart | 15 + .../plan/update_plan_page_vida_plus.dart | 295 +++++++----------- .../plan/widget/list_of_notes.dart | 3 +- 7 files changed, 266 insertions(+), 180 deletions(-) create mode 100644 lib/core/model/SOAP/progress_note/progress_note.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 23a4af3e..8ef1f0e1 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -336,6 +336,8 @@ const GET_SPECIALITY_DETAILS = 'Services/DoctorApplication.svc/REST/SearchGenera const POST_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/PostPhysicalExam'; +const GET_PROGRESS_NOTE_NEW = 'Services/DoctorApplication.svc/REST/GetProgressNote'; + var selectedPatientType = 1; diff --git a/lib/core/model/SOAP/assessment/search_diagnosis.dart b/lib/core/model/SOAP/assessment/search_diagnosis.dart index 832ff167..3a02db9c 100644 --- a/lib/core/model/SOAP/assessment/search_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/search_diagnosis.dart @@ -21,6 +21,11 @@ class SearchDiagnosis { String? specification; int? specificationId; String? specificationNo; + String? selectedIcdCode; + String? selectedCategoryCode; + String? selectedSectionCode; + String? selectedChapterCode; + String? selectedNandaCode; // Default constructor SearchDiagnosis(); @@ -51,6 +56,11 @@ class SearchDiagnosis { specification = json['specification']; specificationId = json['specificationId']; specificationNo = json['specificationNo']; + selectedIcdCode = json['selectedIcdCode']; + selectedCategoryCode = json['selectedCategoryCode']; + selectedSectionCode = json['selectedSectionCode']; + selectedChapterCode = json['selectedChapterCode']; + selectedNandaCode = json['selectedNandaCode']; } // toJson method @@ -78,6 +88,11 @@ class SearchDiagnosis { 'specification': specification, 'specificationId': specificationId, 'specificationNo': specificationNo, + 'selectedIcdCode': selectedIcdCode, + 'selectedCategoryCode': selectedCategoryCode, + 'selectedSectionCode': selectedSectionCode, + 'selectedChapterCode': selectedChapterCode, + 'selectedNandaCode': selectedNandaCode, }; } } \ No newline at end of file diff --git a/lib/core/model/SOAP/progress_note/progress_note.dart b/lib/core/model/SOAP/progress_note/progress_note.dart new file mode 100644 index 00000000..3afc7be9 --- /dev/null +++ b/lib/core/model/SOAP/progress_note/progress_note.dart @@ -0,0 +1,85 @@ +class ProgressNote { + int? clinicGroupId; + int? clinicId; + int? createdById; + String? createdOn; + int? employeeId; + int? hospitalGroupId; + int? hospitalId; + String? loginUserId; + String? manualDate; + String? modifiedOn; + String? patientCondition; + String? patientConditionName; + int? patientId; + int? patientPomrId; + String? progressNote; + int? progressNoteId; + String? progressNotesTypes; + String? progressNotesTypesName; + String? speciality; + String? specialityName; + int? subCategoryId; + String? userFullName; + int? userId; + String? userType; + + ProgressNote(); + + ProgressNote.fromJson(Map json) { + clinicGroupId = json['clinicGroupId']; + clinicId = json['clinicId']; + createdById = json['createdById']; + createdOn = json['createdOn']; + employeeId = json['employeeId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + loginUserId = json['loginUserId']; + manualDate = json['manualDate']; + modifiedOn = json['modifiedOn']; + patientCondition = json['patientCondition']; + patientConditionName = json['patientConditionName']; + patientId = json['patientId']; + patientPomrId = json['patientPomrId']; + progressNote = json['progressNote']; + progressNoteId = json['progressNoteId']; + progressNotesTypes = json['progressNotesTypes']; + progressNotesTypesName = json['progressNotesTypesName']; + speciality = json['speciality']; + specialityName = json['specialityName']; + subCategoryId = json['subCategoryId']; + userFullName = json['userFullName']; + userId = json['userId']; + userType = json['userType']; + } + + // toJson method + Map toJson() { + return { + 'clinicGroupId': clinicGroupId, + 'clinicId': clinicId, + 'createdById': createdById, + 'createdOn': createdOn, + 'employeeId': employeeId, + 'hospitalGroupId': hospitalGroupId, + 'hospitalId': hospitalId, + 'loginUserId': loginUserId, + 'manualDate': manualDate, + 'modifiedOn': modifiedOn, + 'patientCondition': patientCondition, + 'patientConditionName': patientConditionName, + 'patientId': patientId, + 'patientPomrId': patientPomrId, + 'progressNote': progressNote, + 'progressNoteId': progressNoteId, + 'progressNotesTypes': progressNotesTypes, + 'progressNotesTypesName': progressNotesTypesName, + 'speciality': speciality, + 'specialityName': specialityName, + 'subCategoryId': subCategoryId, + 'userFullName': userFullName, + 'userId': userId, + 'userType': userType, + }; + } +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 28f973dc..934f0ea0 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -34,6 +34,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_e import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import '../../../../config/shared_pref_kay.dart'; @@ -48,6 +49,7 @@ class SOAPService extends LookupService { List patientHistoryList = []; List patientPhysicalExamList = []; List patientProgressNoteList = []; + List patientProgressNoteListVidaPlus = []; List patientAssessmentList = []; List searchAllergiesList = []; List patientAllergiesVidaPlus = []; @@ -961,6 +963,35 @@ class SOAPService extends LookupService { }, body: request); } + Future getProgressNoteNew( + PatiantInformtion patientInformation) async { + Map request = { + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "hospitalId": patientInformation.projectId, + "patientId": patientInformation.patientId, + "patientPomrId": patientInformation.pomrId, + "endRow": 10000, // because no information is provided for the end row + "startRow": 0, + "ProjectID":patientInformation.projectId + }; + hasError = false; + await baseAppClient.post(GET_PROGRESS_NOTE, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + patientProgressNoteListVidaPlus.clear(); + response['ProgressNoteList']['resultData'].forEach((v) { + v['data'].forEach((progressNote){ + patientProgressNoteListVidaPlus.add(ProgressNote.fromJson(progressNote)); + + }); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + getSpecialityDetails(String speciality, int? specialityId, PatiantInformtion patientInfo) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 283d2586..bab64bde 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -36,6 +36,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/soap/SOAP_service.dart'; @@ -147,6 +148,7 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.auditDiagnosislist; List get speciality => _SOAPService.generalSpeciality; + List get progressNote => _SOAPService.patientProgressNoteListVidaPlus; Map> get specialityDetails => _SOAPService.specialityDetails; @@ -1219,6 +1221,9 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.showAuditBottomSheet = status; } + /** + * todo as physical examination is having some issue and under discussion + */ void savePhysicalexamination() { var mappedItems = setState(ViewState.BusyLocal); @@ -1229,4 +1234,14 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + + void getProgressNote(PatiantInformtion patientInformation) async { + setState(ViewState.BusyLocal); + await _SOAPService.getProgressNoteNew(patientInformation); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index 0921a8a0..98228a8c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -1,28 +1,17 @@ -import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/enum/view_state.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; -import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; -import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/plan/plan_call_back.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/empty_progress_note.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; -import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; @@ -50,14 +39,7 @@ class UpdatePlanPageVidaPlus extends StatefulWidget { class _UpdatePlanPageVidaPlusState extends State implements PlanCallBack { - bool isAddProgress = true; bool isProgressExpanded = true; - List listOfProgressNote = [GetPatientProgressNoteResModel()]; - GetPatientProgressNoteResModel patientProgressNote = - GetPatientProgressNoteResModel(); - - TextEditingController progressNoteController = - TextEditingController(text: null); BoxDecoration containerBorderDecoration( Color containerColor, Color borderColor) { @@ -75,88 +57,56 @@ class _UpdatePlanPageVidaPlusState extends State @override void initState() { super.initState(); - if (patientProgressNote.planNote != null) { - setState(() { - isAddProgress = false; - }); - } } - getPatientProgressNote(SOAPViewModel model, - {bool isAddProgress = false}) async { - GetProgressNoteReqModel getGetProgressNoteReqModel = - GetProgressNoteReqModel( - appointmentNo: - int.parse(widget.patientInfo.appointmentNo.toString()), - patientMRN: widget.patientInfo.patientMRN, - episodeID: widget.patientInfo.episodeNo.toString(), - editedBy: '', - doctorID: ''); - await widget.sOAPViewModel - .getPatientProgressNote(getGetProgressNoteReqModel); - - ///TODO set progressNote in model; - if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { - progressNoteController.text = Utils.parseHtmlString( - widget.sOAPViewModel.patientProgressNoteList[0].planNote!); - patientProgressNote.planNote = progressNoteController.text; - - patientProgressNote.createdByName = - widget.sOAPViewModel.patientProgressNoteList[0].createdByName; - patientProgressNote.createdOn = - widget.sOAPViewModel.patientProgressNoteList[0].createdOn; - patientProgressNote.editedOn = - widget.sOAPViewModel.patientProgressNoteList[0].editedOn; - patientProgressNote.editedByName = - widget.sOAPViewModel.patientProgressNoteList[0].editedByName; - patientProgressNote.appointmentNo = - widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; - setState(() { - isAddProgress = isAddProgress; - widget.sOAPViewModel.isAddProgress = isAddProgress; - widget.sOAPViewModel.progressNoteText = progressNoteController.text; - }); - } - } + // getPatientProgressNote(SOAPViewModel model, + // {bool isAddProgress = false}) async { + // GetProgressNoteReqModel getGetProgressNoteReqModel = + // GetProgressNoteReqModel( + // appointmentNo: + // int.parse(widget.patientInfo.appointmentNo.toString()), + // patientMRN: widget.patientInfo.patientMRN, + // episodeID: widget.patientInfo.episodeNo.toString(), + // editedBy: '', + // doctorID: ''); + // await widget.sOAPViewModel + // .getPatientProgressNote(getGetProgressNoteReqModel); + // + // ///TODO set progressNote in model; + // if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { + // progressNoteController.text = Utils.parseHtmlString( + // widget.sOAPViewModel.patientProgressNoteList[0].planNote!); + // patientProgressNote.planNote = progressNoteController.text; + // + // patientProgressNote.createdByName = + // widget.sOAPViewModel.patientProgressNoteList[0].createdByName; + // patientProgressNote.createdOn = + // widget.sOAPViewModel.patientProgressNoteList[0].createdOn; + // patientProgressNote.editedOn = + // widget.sOAPViewModel.patientProgressNoteList[0].editedOn; + // patientProgressNote.editedByName = + // widget.sOAPViewModel.patientProgressNoteList[0].editedByName; + // patientProgressNote.appointmentNo = + // widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; + // setState(() { + // isAddProgress = isAddProgress; + // widget.sOAPViewModel.isAddProgress = isAddProgress; + // widget.sOAPViewModel.progressNoteText = progressNoteController.text; + // }); + // } + // } @override Widget build(BuildContext context) { return BaseView( onModelReady: (model) async { widget.sOAPViewModel.setPlanCallBack(this); - GetProgressNoteReqModel getGetProgressNoteReqModel = - GetProgressNoteReqModel( - appointmentNo: - int.parse(widget.patientInfo.appointmentNo.toString()), - patientMRN: widget.patientInfo.patientMRN, - episodeID: widget.patientInfo.episodeNo.toString(), - editedBy: '', - doctorID: ''); + widget.changeLoadingState(true); WidgetsBinding.instance.addPostFrameCallback((_) async { - await widget.sOAPViewModel - .getPatientProgressNote(getGetProgressNoteReqModel);}); - - if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { - progressNoteController.text = Utils.parseHtmlString( - widget.sOAPViewModel.patientProgressNoteList[0].planNote!); - patientProgressNote.planNote = progressNoteController.text; - patientProgressNote.createdByName = - widget.sOAPViewModel.patientProgressNoteList[0].createdByName; - patientProgressNote.createdOn = - widget.sOAPViewModel.patientProgressNoteList[0].createdOn; - patientProgressNote.editedOn = - widget.sOAPViewModel.patientProgressNoteList[0].editedOn; - patientProgressNote.editedByName = - widget.sOAPViewModel.patientProgressNoteList[0].editedByName; - patientProgressNote.appointmentNo = - widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; - widget.sOAPViewModel.progressNoteText = progressNoteController.text; - - setState(() { - isAddProgress = false; - widget.sOAPViewModel.isAddProgress = false; - }); - } + if (model.progressNote.isEmpty) { + await model.getProgressNote(widget.patientInfo); + } + }); widget.changeLoadingState(false); }, builder: (_, model, w) => AppScaffold( @@ -168,7 +118,6 @@ class _UpdatePlanPageVidaPlusState extends State child: FractionallySizedBox( widthFactor: 0.90, child: Column( - children: [ SOAPStepHeader( currentIndex: widget.currentIndex, @@ -202,7 +151,7 @@ class _UpdatePlanPageVidaPlusState extends State height: 16, ), - if (listOfProgressNote.isEmpty) ...{ + if (model.progressNote.isEmpty) ...{ Center( child: Padding( padding: const EdgeInsets.all(65), @@ -211,9 +160,7 @@ class _UpdatePlanPageVidaPlusState extends State ), } else ...{ Divider(), - ListOfNotes( - notes: listOfProgressNote - ) + ListOfNotes(notes: model.progressNote) } // if (mySelectedExamination.isEmpty) ...{ @@ -365,94 +312,84 @@ class _UpdatePlanPageVidaPlusState extends State )); } - submitPlan(SOAPViewModel model) async { - if (progressNoteController.text.isNotEmpty) { - widget.changeLoadingState(true); - PostProgressNoteRequestModel postProgressNoteRequestModel = - new PostProgressNoteRequestModel( - patientMRN: widget.patientInfo.patientMRN, - episodeId: widget.patientInfo.episodeNo, - appointmentNo: widget.patientInfo.appointmentNo, - planNote: patientProgressNote.planNote, - doctorID: widget.patientInfo.doctorId, - createdBy: widget.patientInfo.doctorId, - createdByName: widget.patientInfo.doctorName, - editedBy: ''); - - if (widget.sOAPViewModel.patientProgressNoteList.isEmpty) { - await widget.sOAPViewModel - .postProgressNote(postProgressNoteRequestModel); - } else { - Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); - postProgressNoteRequestModel.editedBy = doctorProfile.doctorID; - await widget.sOAPViewModel - .patchProgressNote(postProgressNoteRequestModel); - } - - if (widget.sOAPViewModel.state == ViewState.ErrorLocal) { - Utils.showErrorToast(widget.sOAPViewModel.error); - } else { - GetProgressNoteReqModel getGetProgressNoteReqModel = - GetProgressNoteReqModel( - appointmentNo: - int.parse(widget.patientInfo.appointmentNo.toString()), - patientMRN: widget.patientInfo.patientMRN, - episodeID: widget.patientInfo.episodeNo.toString(), - editedBy: '', - doctorID: ''); - await widget.sOAPViewModel - .getPatientProgressNote(getGetProgressNoteReqModel); - if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { - progressNoteController.text = Utils.parseHtmlString( - widget.sOAPViewModel.patientProgressNoteList[0].planNote!); - patientProgressNote.planNote = progressNoteController.text; - patientProgressNote.createdByName = - widget.sOAPViewModel.patientProgressNoteList[0].createdByName; - patientProgressNote.createdOn = - widget.sOAPViewModel.patientProgressNoteList[0].createdOn; - patientProgressNote.editedOn = - widget.sOAPViewModel.patientProgressNoteList[0].editedOn; - patientProgressNote.editedByName = - widget.sOAPViewModel.patientProgressNoteList[0].editedByName; - patientProgressNote.appointmentNo = - widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; - - setState(() { - isAddProgress = false; - widget.sOAPViewModel.isAddProgress = false; - }); - } - - Navigator.of(context).pop(); - Utils.showErrorToast("Episode Created Successfully"); - } - widget.changeLoadingState(false); - } else { - Utils.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); - } - } + // submitPlan(SOAPViewModel model) async { + // if (progressNoteController.text.isNotEmpty) { + // widget.changeLoadingState(true); + // PostProgressNoteRequestModel postProgressNoteRequestModel = + // new PostProgressNoteRequestModel( + // patientMRN: widget.patientInfo.patientMRN, + // episodeId: widget.patientInfo.episodeNo, + // appointmentNo: widget.patientInfo.appointmentNo, + // planNote: patientProgressNote.planNote, + // doctorID: widget.patientInfo.doctorId, + // createdBy: widget.patientInfo.doctorId, + // createdByName: widget.patientInfo.doctorName, + // editedBy: ''); + // + // if (widget.sOAPViewModel.patientProgressNoteList.isEmpty) { + // await widget.sOAPViewModel + // .postProgressNote(postProgressNoteRequestModel); + // } else { + // Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + // DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + // postProgressNoteRequestModel.editedBy = doctorProfile.doctorID; + // await widget.sOAPViewModel + // .patchProgressNote(postProgressNoteRequestModel); + // } + // + // if (widget.sOAPViewModel.state == ViewState.ErrorLocal) { + // Utils.showErrorToast(widget.sOAPViewModel.error); + // } else { + // GetProgressNoteReqModel getGetProgressNoteReqModel = + // GetProgressNoteReqModel( + // appointmentNo: + // int.parse(widget.patientInfo.appointmentNo.toString()), + // patientMRN: widget.patientInfo.patientMRN, + // episodeID: widget.patientInfo.episodeNo.toString(), + // editedBy: '', + // doctorID: ''); + // await widget.sOAPViewModel + // .getPatientProgressNote(getGetProgressNoteReqModel); + // if (widget.sOAPViewModel.patientProgressNoteList.isNotEmpty) { + // progressNoteController.text = Utils.parseHtmlString( + // widget.sOAPViewModel.patientProgressNoteList[0].planNote!); + // patientProgressNote.planNote = progressNoteController.text; + // patientProgressNote.createdByName = + // widget.sOAPViewModel.patientProgressNoteList[0].createdByName; + // patientProgressNote.createdOn = + // widget.sOAPViewModel.patientProgressNoteList[0].createdOn; + // patientProgressNote.editedOn = + // widget.sOAPViewModel.patientProgressNoteList[0].editedOn; + // patientProgressNote.editedByName = + // widget.sOAPViewModel.patientProgressNoteList[0].editedByName; + // patientProgressNote.appointmentNo = + // widget.sOAPViewModel.patientProgressNoteList[0].appointmentNo; + // + // setState(() { + // isAddProgress = false; + // widget.sOAPViewModel.isAddProgress = false; + // }); + // } + // + // Navigator.of(context).pop(); + // Utils.showErrorToast("Episode Created Successfully"); + // } + // widget.changeLoadingState(false); + // } else { + // Utils.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); + // } + // } @override nextFunction(model) { - if (progressNoteController.text.isNotEmpty) { - if (isAddProgress) { - submitPlan(model); - } else { - Navigator.of(context).pop(); - } - } else { - Utils.showErrorToast(TranslationBase.of(context).progressNoteErrorMsg); - } + //todo handle the next event here } void navigateToAddPlan() { Navigator.push( - context, - FadePage( - page: AddProgressNote ( - - ), - )); + context, + FadePage( + page: AddProgressNote(), + )); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart index 4929ca0e..d74ab0c3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart @@ -1,9 +1,10 @@ import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart'; import 'package:flutter/material.dart'; class ListOfNotes extends StatelessWidget{ - final List notes; + final List notes; const ListOfNotes({super.key, required this.notes}); @override From 2fbb25de774d48abdfb130a4b021b6a6b8958b6d Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 26 Nov 2024 10:25:52 +0300 Subject: [PATCH 36/76] WD: post physical Examination. --- lib/core/viewModel/SOAP_view_model.dart | 37 ++++++++----------- .../add_details_to_examination_vida_plus.dart | 2 +- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index bab64bde..668e8b7d 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -148,7 +148,9 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.auditDiagnosislist; List get speciality => _SOAPService.generalSpeciality; - List get progressNote => _SOAPService.patientProgressNoteListVidaPlus; + + List get progressNote => + _SOAPService.patientProgressNoteListVidaPlus; Map> get specialityDetails => _SOAPService.specialityDetails; @@ -1179,11 +1181,16 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postPhysicalExamination(PatiantInformtion patientInfo, - List physicalExamination) async { + Future postPhysicalExamination(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); - bool result = await _SOAPService.postPhysicalExamination( - patientInfo, physicalExamination); + List mappedItems = []; + for (List category in specialityDetails.values) { + var selectedCategory = + category.where((value) => value.isSelected == true); + mappedItems.addAll(selectedCategory); + } + bool result = + await _SOAPService.postPhysicalExamination(patientInfo, mappedItems); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1203,9 +1210,11 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void getSpecialityDetails(String speciality,int? specialityId, PatiantInformtion patientInfo) async { + void getSpecialityDetails(String speciality, int? specialityId, + PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); - await _SOAPService.getSpecialityDetails(speciality,specialityId, patientInfo); + await _SOAPService.getSpecialityDetails( + speciality, specialityId, patientInfo); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1221,20 +1230,6 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.showAuditBottomSheet = status; } - /** - * todo as physical examination is having some issue and under discussion - */ - void savePhysicalexamination() { - var mappedItems = - setState(ViewState.BusyLocal); - // await _SOAPService.getSpecialityDetails(speciality); - if (_SOAPService.hasError) { - error = _SOAPService.error; - setState(ViewState.ErrorLocal); - } else - setState(ViewState.Idle); - } - void getProgressNote(PatiantInformtion patientInformation) async { setState(ViewState.BusyLocal); await _SOAPService.getProgressNoteNew(patientInformation); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index 013d841e..fe9bcf38 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -112,7 +112,7 @@ class _AddDetailsToExaminationVidaPlusState fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { - model.savePhysicalexamination(); + model.postPhysicalExamination(widget.patientInfo,); }, ), ), From 7253f6c05e9dca23ef88e248576673fea95180b1 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 27 Nov 2024 10:40:49 +0300 Subject: [PATCH 37/76] WD: physical examination completed. --- lib/config/localized_values.dart | 2 + .../model/SOAP/physical_exam/Category.dart | 2 + .../CreatePhysicalExamination.dart | 5 +- .../patient_physical_examination.dart | 2 +- .../soap/SOAP_service.dart | 80 +- lib/core/viewModel/SOAP_view_model.dart | 47 +- .../add_details_to_examination_vida_plus.dart | 36 +- .../add_examination_page_vida_plus.dart | 106 +- .../add_examination_vida_plus_widget.dart | 2 +- ...inations_list_search_vida_plus_widget.dart | 120 ++- .../objective/list_of_examination.dart | 2 +- .../update_objective_page_vida_plus.dart | 10 +- .../objective/widget/examination_items.dart | 912 ++++++++++++------ .../plan/update_plan_page_vida_plus.dart | 2 +- .../update_soap_index_vida_plus.dart | 22 +- .../translations_delegate_base_utils.dart | 3 + 16 files changed, 848 insertions(+), 505 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 95c2b501..b9a0b7b0 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1204,6 +1204,8 @@ const Map> localizedValues = { "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, "mild": {"en": "Mild", "ar":"خفيف"}, + "remarksCanNotBeEmpty": {"en": "Remarks Can Not Be Empty", "ar":"لا يمكن أن تكون الملاحظات فارغة"}, + "kindlySelectCategory": {"en": "Kindly Select Any Diagnosis Category", "ar":"يرجى اختيار أي فئة تشخيص"}, "noRemarks": {"en": "No Remarks", "ar":"لا ملاحظات"}, "event": {"en": "Event: ", "ar":"حدث: "}, "deletedRemarks": {"en": "Deleted Remarks: ", "ar":"ملاحظات محذوفة: "}, diff --git a/lib/core/model/SOAP/physical_exam/Category.dart b/lib/core/model/SOAP/physical_exam/Category.dart index 84cecfcc..975af7c4 100644 --- a/lib/core/model/SOAP/physical_exam/Category.dart +++ b/lib/core/model/SOAP/physical_exam/Category.dart @@ -42,6 +42,7 @@ class Category { String? pomrId; int? paitientId; int? userID; + bool isExpanded = false; Category(); @@ -55,6 +56,7 @@ class Category { conditionsList!.add(Condition.fromJson(v)); }); } + if(conditionsList?.isNotEmpty == true) selectedCondition = int.parse(conditionsList?.first.conditionName ??'-1'); description = json['description']; descriptionAlias = json['descriptionAlias']; id = json['id']; diff --git a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart index b97999f4..ac77890d 100644 --- a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart +++ b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart @@ -67,5 +67,8 @@ extension ConvertCategoryToCreatePhysicalExamination on Category { ..specialityID = this.specialityId ..patientID = this.paitientId ..pomrid = this.pomrId - ..loginUserId = this.userID?.toString(); + ..loginUserId = this.userID?.toString() + ..isMandatory = false + ..specialityDescription = this.specialityName + ..isClinicPhysicalExamination = true; } diff --git a/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart b/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart index 9938648f..ec4253a6 100644 --- a/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart +++ b/lib/core/model/SOAP/physical_exam/patient_physical_examination.dart @@ -25,7 +25,7 @@ class PatientPhysicalExamination { int? approvedBy; String? approvedOn; String? rowVersion; - int? pomrid; + String? pomrid; // Default constructor PatientPhysicalExamination(); diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 934f0ea0..88a1ac46 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -834,7 +834,16 @@ class SOAPService extends LookupService { ) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); - Map request = { + Map request = + // { + // "patientId": 70024978, + // "pomrId": 10819, + // "hospitalId": 313, + // "hospitalGroupId": 105, + // "ProjectID": 313 + // }; + + { "patientId": patientInfo.patientId, "pomrId": patientInfo.pomrId, "hospitalId": patientInfo.projectId, @@ -855,40 +864,42 @@ class SOAPService extends LookupService { }, body: request); } - Future postPhysicalExamination(PatiantInformtion patientInfo, - List physicalExamination) async { + Future postPhysicalExamination( + PatiantInformtion patientInfo, List physicalExamination) async { List jsonListOfPhysicalExamination = []; - physicalExamination - .forEach((value) => jsonListOfPhysicalExamination.add(value.createPhysicalExaminationFromCategory())); + physicalExamination.forEach((value) => jsonListOfPhysicalExamination + .add(value.createPhysicalExaminationFromCategory())); Map request = { - "ProjectID": patientInfo.patientId, + "ProjectID": patientInfo.projectId, "listCreatPhysicalExam": jsonListOfPhysicalExamination }; hasError = false; - bool data = await baseAppClient.post(POST_PHYSICAL_EXAM, + var success = false; + await baseAppClient.post(POST_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { DrAppToastMsg.showSuccesToast(response['ListPhysicalExam']['message']); - return true; + success = true; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - return false; + success = false; }, body: request); - return data; + return success; } getGeneralSpeciality(PatiantInformtion patientInfo) async { Map request = { - "ProjectID": patientInfo.patientId, + "ProjectID": patientInfo.projectId, }; hasError = false; generalSpeciality.clear(); await baseAppClient.post(GET_GENERAL_SPECIALITY, onSuccess: (dynamic response, int statusCode) { - response['ListGeneralSpeciality']['resultData'] - .forEach((v) => generalSpeciality.add(GeneralSpeciality.fromJson(v))); + response['ListGeneralSpeciality']['resultData'].forEach((v) => + v['categories'].forEach( + (cat) => generalSpeciality.add(GeneralSpeciality.fromJson(cat)))); }, onFailure: (String error, int statusCode) { hasError = true; generalSpeciality.clear(); @@ -963,8 +974,7 @@ class SOAPService extends LookupService { }, body: request); } - Future getProgressNoteNew( - PatiantInformtion patientInformation) async { + Future getProgressNoteNew(PatiantInformtion patientInformation) async { Map request = { "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "hospitalId": patientInformation.projectId, @@ -972,37 +982,43 @@ class SOAPService extends LookupService { "patientPomrId": patientInformation.pomrId, "endRow": 10000, // because no information is provided for the end row "startRow": 0, - "ProjectID":patientInformation.projectId + "ProjectID": patientInformation.projectId }; hasError = false; await baseAppClient.post(GET_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientProgressNoteListVidaPlus.clear(); - response['ProgressNoteList']['resultData'].forEach((v) { - v['data'].forEach((progressNote){ - patientProgressNoteListVidaPlus.add(ProgressNote.fromJson(progressNote)); - - }); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + print("Success"); + patientProgressNoteListVidaPlus.clear(); + response['ProgressNoteList']['resultData'].forEach((v) { + v['data'].forEach((progressNote) { + patientProgressNoteListVidaPlus + .add(ProgressNote.fromJson(progressNote)); + }); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - getSpecialityDetails(String speciality, int? specialityId, PatiantInformtion patientInfo) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); var userId = user?['List_MemberInformation'][0]['MemberID']; Map request = {"searchParam": speciality}; hasError = false; + specialityDetails.clear(); List categoryData = []; - await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, + await baseAppClient.post(GET_SPECIALITY_DETAILS, onSuccess: (dynamic response, int statusCode) { - response['ContinuePreviousEpisode']['resultData'].forEach( - (value) => categoryData.add(Category.fromJson(value, specialityId, speciality,patientInfo.pomrId,patientInfo.patientId,user?['List_MemberInformation'][0]['MemberID']))); + response['ListEyeGeneralSpeciality']['resultData'].forEach((value) => + categoryData.add(Category.fromJson( + value, + specialityId, + speciality, + patientInfo.pomrId, + patientInfo.patientId, + user?['List_MemberInformation'][0]['MemberID']))); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 668e8b7d..870272fc 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -48,6 +48,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/assessme import 'package:doctor_app_flutter/screens/patients/profile/soap_update/objective/objective_call_back.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/plan/plan_call_back.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/subjective_call_back.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import '../../locator.dart'; import '../model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; @@ -147,7 +148,8 @@ class SOAPViewModel extends BaseViewModel { List get auditDiagnosislist => _SOAPService.auditDiagnosislist; - List get speciality => _SOAPService.generalSpeciality; + List? mainSpecialityList = null; + List speciality = []; List get progressNote => _SOAPService.patientProgressNoteListVidaPlus; @@ -1181,16 +1183,21 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postPhysicalExamination(PatiantInformtion patientInfo) async { - setState(ViewState.BusyLocal); + + List getListOfSelectedCategory(){ List mappedItems = []; for (List category in specialityDetails.values) { var selectedCategory = - category.where((value) => value.isSelected == true); + category.where((value) => value.isSelected == true); mappedItems.addAll(selectedCategory); } + return mappedItems; + } + + Future postPhysicalExamination(PatiantInformtion patientInfo, List listOfSelectedCategory) async { + setState(ViewState.BusyLocal); bool result = - await _SOAPService.postPhysicalExamination(patientInfo, mappedItems); + await _SOAPService.postPhysicalExamination(patientInfo, listOfSelectedCategory); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1200,9 +1207,11 @@ class SOAPViewModel extends BaseViewModel { return result; } - void getGeneralSpeciality(PatiantInformtion patientInfo) async { + getGeneralSpeciality(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.getGeneralSpeciality(patientInfo); + mainSpecialityList = _SOAPService.generalSpeciality; + speciality = mainSpecialityList ?? []; if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1210,7 +1219,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void getSpecialityDetails(String speciality, int? specialityId, + getSpecialityDetails(String speciality, int? specialityId, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.getSpecialityDetails( @@ -1230,7 +1239,7 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.showAuditBottomSheet = status; } - void getProgressNote(PatiantInformtion patientInformation) async { + getProgressNote(PatiantInformtion patientInformation) async { setState(ViewState.BusyLocal); await _SOAPService.getProgressNoteNew(patientInformation); if (_SOAPService.hasError) { @@ -1239,4 +1248,26 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + + void changeCurrentCategorySelectedState( + GeneralSpeciality selectedExamination, bool status) { + final item = speciality.firstWhere( + (speciality) => speciality.id == selectedExamination.id, + orElse: () => throw Exception( + 'Speciality with ID ${selectedExamination.id} not found!'), + ); + item.isSelected = status; + notifyListeners(); + } + + void filterData(String query) { + if (query.isEmpty) { + speciality = mainSpecialityList ?? []; + } + var searchList = + mainSpecialityList?.where((value) => value.name?.toLowerCase().contains(query.toLowerCase()) == true).toList() ?? + []; + speciality = searchList; + notifyListeners(); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index fe9bcf38..6abbdb52 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -4,11 +4,13 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/GeneralSpeciali import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -34,7 +36,7 @@ class AddDetailsToExaminationVidaPlus extends StatefulWidget { class _AddDetailsToExaminationVidaPlusState extends State { - bool isSysExaminationExpand = false; + String currentlyExpanded = ''; @override Widget build(BuildContext context) { @@ -42,12 +44,12 @@ class _AddDetailsToExaminationVidaPlusState ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { widget.mySelectedExamination?.forEach((value) => model.getSpecialityDetails( - value.name ?? '', value.id, widget.patientInfo)); + value.name ?? '', value.id, widget.patientInfo));}); }, builder: (_, model, w) => AppScaffold( - baseViewModel: model, isShowAppBar: true, isLoading: model.state == ViewState.BusyLocal, appBar: PatientSearchHeader( @@ -66,13 +68,14 @@ class _AddDetailsToExaminationVidaPlusState headerTitle: title, onTap: () { setState(() { - isSysExaminationExpand = - !isSysExaminationExpand; + if(currentlyExpanded == title) { + currentlyExpanded = ''; + }else currentlyExpanded = title; }); }, child: ExaminationItems( examination: model.specialityDetails[title]), - isExpanded: isSysExaminationExpand, + isExpanded: currentlyExpanded == title, ); }, separatorBuilder: (context, index) { @@ -112,7 +115,26 @@ class _AddDetailsToExaminationVidaPlusState fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { - model.postPhysicalExamination(widget.patientInfo,); + var listOfSelectedCategory = model.getListOfSelectedCategory(); + if(listOfSelectedCategory.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).kindlySelectCategory); + return; + } + if(listOfSelectedCategory.any((value) => value.remarksController.text.isEmpty)){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); + return; + } + var result = await model.postPhysicalExamination(widget.patientInfo,listOfSelectedCategory); + if(result){ + model.getPhysicalExamination(widget.patientInfo); + Navigator.popUntil(context, ((route) { + if (route.settings.name == UPDATE_EPISODE_VIDA_PLUS) { + return true; + } else { + return false; + } + })); + } }, ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart index de5f06a1..56140917 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_page_vida_plus.dart @@ -45,27 +45,22 @@ class _AddExaminationPageVidaPlusState Widget build(BuildContext context) { return BaseView( onModelReady: (model) async { - if (model.physicalExaminationList.length == 0) { - WidgetsBinding.instance.addPostFrameCallback((_) async { - if (model.speciality.isEmpty) { - await model.getGeneralSpeciality(widget.patientInfo); - } - }); - } + WidgetsBinding.instance.addPostFrameCallback((_) async => + await model.getGeneralSpeciality(widget.patientInfo) + ); }, builder: (_, model, w) => AppScaffold( - baseViewModel: model, isShowAppBar: true, - isLoading: model.state == ViewState.Busy, + isLoading: model.state == ViewState.BusyLocal, appBar: PatientSearchHeader( title: TranslationBase.of(context).examinationPart), backgroundColor: Colors.white, - body: Column( - mainAxisAlignment: MainAxisAlignment.start, - mainAxisSize: MainAxisSize.max, - children: [ - Flexible( - child: Padding( + body: SingleChildScrollView( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Padding( padding: const EdgeInsets.all(16.0), child: Material( shape: RoundedRectangleBorder( @@ -75,60 +70,35 @@ class _AddExaminationPageVidaPlusState color: Color(0xFFEFEFEF), )), color: Colors.white, - child: Padding( - padding: const EdgeInsets.all(16.0), - child: SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - ExaminationsListSearchVidaPlusWidget( - masterList: model.speciality, - removeExamination: (selectedExamination) { - if(selectedExamination == null ) return; - - setState(() { - mySelectedExaminationLocal - .remove(selectedExamination); - // Find the object by its ID - try { - final speciality = - model.speciality.firstWhere( - (speciality) => - speciality.id == selectedExamination.id, - orElse: () => throw Exception( - 'Speciality with ID ${selectedExamination.id} not found!'), - ); - - speciality.isSelected = false; - } catch (e) {} - }); - }, - addExamination: (selectedExamination) { - if(selectedExamination == null ) return; - - mySelectedExaminationLocal.insert( - 0, selectedExamination); - - try { - final speciality = model.speciality.firstWhere( - (speciality) => - speciality.id == selectedExamination.id, - orElse: () => throw Exception( - 'Speciality with ID ${selectedExamination.id} not found!'), - ); - speciality.isSelected = true; - } catch (e) {} - //setState(() {}); - }, - ), - ], - ), - ), + child: ExaminationsListSearchVidaPlusWidget( + masterList: model.speciality, + removeExamination: (selectedExamination) { + if(selectedExamination == null ) return; + setState(() { + mySelectedExaminationLocal + .remove(selectedExamination); + // Find the object by its ID + try { + model.changeCurrentCategorySelectedState(selectedExamination, false); + } catch (e) {} + }); + }, + addExamination: (selectedExamination) { + if(selectedExamination == null ) return; + + mySelectedExaminationLocal.insert( + 0, selectedExamination); + + try { + model.changeCurrentCategorySelectedState(selectedExamination, true); + } catch (e) {} + //setState(() {}); + }, ), ), ), - ), - ], + ], + ), ), bottomNavigationBar: Material( color: Colors.white, @@ -157,6 +127,10 @@ class _AddExaminationPageVidaPlusState fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { + if(mySelectedExaminationLocal.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).kindlySelectCategory); + return; + } pushAddExamination(mySelectedExaminationLocal); }, ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart index 90fec299..5721dc70 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_examination_vida_plus_widget.dart @@ -77,7 +77,7 @@ class _AddExaminationVidaPlusWidgetState extends State( + + builder: (_, model, w) => Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + hintText: TranslationBase.of(context).searchExamination, + isTextFieldHasSuffix: false, + hasBorder: false, + controller: filteredSearchController, + onChanged: (value) { + if (value != null) filterSearchResults(model,value); + }, + suffixWidget: InkWell( + child: Icon( + Icons.search, + color: Colors.black, + ), + onTap: () {}, ), - onTap: () {}, + onClick: () {}, + onFieldSubmitted: () {}, ), - onClick: () {}, - onFieldSubmitted: () {}, ), ), - ), - ListView.separated( - itemCount: items?.length ?? 0, - itemBuilder: (_, index) => AddExaminationVidaPlusWidget( - item: items![index], - addExamination: widget.addExamination, - removeExamination: widget.removeExamination, - ), - separatorBuilder: (_, __) => Divider(), - ) - // ...items!.mapIndexed((index, item) { - // return Column( - // children: [ - // AddExaminationVidaPlusWidget( - // item: item, - // addExamination: widget.addExamination, - // removeExamination: widget.removeExamination, - // mySelectedExamination: widget.mySelectedExamination, - // isServiceSelected: widget.isServiceSelected, - // isExpand: index == expandedIndex, - // expandClick: () { - // setState(() { - // if (expandedIndex == index) { - // expandedIndex = -1; - // } else { - // expandedIndex = index; - // } - // }); - // }, - // ), - // Divider() - // ], - // ); - // }).toList(), - ], - ); + + ...model.speciality.mapIndexed((index, item) { + return Column( + children: [ + AddExaminationVidaPlusWidget( + item: item, + addExamination: widget.addExamination, + removeExamination: widget.removeExamination, + ), + SizedBox(height: 8,), + Divider() + ], + ); + }).toList(), + ], + ), + )); } - void filterSearchResults(String query) { + void filterSearchResults(SOAPViewModel model,String query) { + model.filterData(query); // List dummySearchList = []; // dummySearchList.addAll(widget.masterList as Iterable); // if (query.isNotEmpty) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart index 01f4ce6d..38f716c7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -21,7 +21,7 @@ class ListOfExamination extends StatelessWidget { physics: NeverScrollableScrollPhysics(), shrinkWrap: true, itemBuilder: (_, index) => SoapDetailItem( - title: "${listOfSelection[index].physicalExaminationDescription}", + title: "${listOfSelection[index].specialityDescription}>${listOfSelection[index].physicalExaminationDescription}", condition: getCondition(listOfSelection[index].physicalExaminationCondition ?? 3, context)??TranslationBase.of(context).notExamined, remarks: listOfSelection[index].remark??'', onSoapDetailActionClicked: (action) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart index 008ec26e..6cadab91 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -72,14 +72,16 @@ class _UpdateObjectivePageVidaPlusState return BaseView( onModelReady: (model) async { WidgetsBinding.instance.addPostFrameCallback((_) async { - if (model.patientPhysicalExaminationList == 0) { + widget.changeLoadingState(true); + model.getPhysicalExamination(widget.patientInfo); - } + widget.changeLoadingState(false); }); }, builder: (_, model, w) => AppScaffold( isShowAppBar: false, + isLoading: model.state == ViewState.BusyLocal, backgroundColor: Theme.of(context).scaffoldBackgroundColor, body: SingleChildScrollView( physics: ScrollPhysics(), @@ -119,7 +121,7 @@ class _UpdateObjectivePageVidaPlusState height: 16, ), - if (mySelectedExamination.isEmpty) ...{ + if (model.patientPhysicalExaminationList.isEmpty) ...{ Center( child: Padding( padding: const EdgeInsets.all(65), @@ -130,7 +132,7 @@ class _UpdateObjectivePageVidaPlusState } else ...{ Divider(), ListOfExamination( - listOfSelection: mySelectedExamination) + listOfSelection: model.patientPhysicalExaminationList) } // if (mySelectedExamination.isNotEmpty && mySelectedExamination.first.isLocal) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart index 35013e5a..088b3845 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart @@ -28,321 +28,623 @@ class _ExaminationItemsState extends State { void initState() { // TODO: implement initState super.initState(); - this.examinations = examinations; + this.examinations = widget.examination; } @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return Column( - children: [ - Expanded( - child: ListView.builder( - itemCount: examinations?.length ?? 0, - itemBuilder: (context, index) => Column( - children: [ - ListTileTheme( - horizontalTitleGap: 0, - child: CheckboxListTile( - activeColor: Color(0xFFD02127), - checkColor: Colors.white, - contentPadding: EdgeInsets.zero, - side: MaterialStateBorderSide.resolveWith( + return SingleChildScrollView( + child: Column( + children: examinations?.map((value)=> Column( + children: [ + ListTileTheme( + horizontalTitleGap: 0, + child: CheckboxListTile( + activeColor: Color(0xFFD02127), + checkColor: Colors.white, + contentPadding: EdgeInsets.zero, + side: MaterialStateBorderSide.resolveWith( (Set states) { - if (states.contains(MaterialState.selected)) { - return const BorderSide(color: Color(0xFFD02127)); - } - return const BorderSide(color: Color(0xFFE6E6E6)); - }, - ), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16)), - value: examinations?[index].isSelected, - controlAffinity: ListTileControlAffinity.leading, - onChanged: (bool? value) { - setState(() { - examinations?[index].isSelected = value ?? false; - }); - }, - title: AppText( - examinations![index].name!, - color: Color(0XFF575757), - fontSize: 14, - fontWeight: FontWeight.w400, + if (states.contains(MaterialState.selected)) { + return const BorderSide(color: Color(0xFFD02127)); + } + return const BorderSide(color: Color(0xFFE6E6E6)); + }, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16)), + value: value.isSelected, + controlAffinity: ListTileControlAffinity.leading, + onChanged: (bool? selected) { + setState(() { + value?.isSelected = selected ?? false; + }); + }, + title: AppText( + value.name!, + color: Color(0XFF575757), + fontSize: 14, + fontWeight: FontWeight.w400, + ), + ), + ), + (value.isSelected == true) + ? Container( + padding: EdgeInsets.symmetric(horizontal: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(bottom: 8), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, ), ), - ), - (examinations?[index].isSelected == true) - ? Container( - padding: EdgeInsets.symmetric(horizontal: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.only(bottom: 8), - child: AppText( - TranslationBase.of(context).condition, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: value + .conditionsList + ?.length ?? + 0, + itemBuilder: (context, currentIndex) => InkWell( + onTap: () { + setState(() { + value + .selectedCondition = + int.parse(value + .conditionsList?[ + currentIndex] + .conditionName ?? + "-1"); + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric( + horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: value + .selectedCondition == + int.parse(value + .conditionsList?[ + currentIndex] + .conditionName ?? + "-1") + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), ), - ), - SizedBox( - width: MediaQuery.sizeOf(context).width, - height: 24, - child: ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemCount: examinations?[index] - .conditionsList - ?.length ?? - 0, - itemBuilder: (context, currentIndex) => InkWell( - onTap: () { - setState(() { - examinations?[index] - .selectedCondition = - int.parse(examinations?[index] - .conditionsList?[ - currentIndex] - .conditionName ?? - "-1"); - }); - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric( - horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: examinations?[index] - .selectedCondition == - int.parse(examinations?[ - index] - .conditionsList?[ - currentIndex] - .conditionName ?? - "-1") - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - examinations?[index] - .conditionsList?[ - currentIndex] - .conditionCode ?? - '', - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: - SizeConfig.textMultiplier! * - 1.6, - ), - ], - ), - )), - ), - // Row( - // children: [ - // if(examinations?[index] - // .conditionsList?.length == 1) - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // examinations?[index].selectedCondition = - // int.parse(examinations?[index] - // .conditionsList?[0] - // .conditionName ?? - // "-1"); - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: - // EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: examinations?[index].selectedCondition == - // int.parse(examinations?[index] - // .conditionsList?[0] - // .conditionName ?? - // "-1") - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // examinations?[index] - // .conditionsList?[0] - // .conditionCode ?? - // TranslationBase.of(context).normal, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: - // SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // )), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // setState(() { - // examinations?[index].selectedCondition = - // int.parse(examinations?[index] - // .conditionsList?[1] - // .conditionName ?? - // "-1"); - // }); - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: - // EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: examinations?[index].selectedCondition == - // int.parse(examinations?[index] - // .conditionsList?[1] - // .conditionName ?? - // "-1") - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // examinations?[index] - // .conditionsList?[1] - // .conditionCode ?? - // TranslationBase.of(context).abnormal, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: - // SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // )), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // setState(() { - // examinations?[index].selectedCondition = - // int.parse(examinations?[index] - // .conditionsList?[2] - // .conditionName ?? - // "-1"); - // }); - // }); - // - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: - // EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: examinations?[index].selectedCondition == - // int.parse(examinations?[index] - // .conditionsList?[2] - // .conditionName ?? - // "-1") - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // Expanded( - // child: AppText( - // examinations?[index] - // .conditionsList?[2] - // .conditionCode ?? - // TranslationBase.of(context).notExamined, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: - // SizeConfig.textMultiplier! * 1.6, - // ), - // ), - // ], - // ), - // )), - // ], - // ), - Container( - margin: EdgeInsets.only(top: 8), - child: AppTextFieldCustom( - hintText: TranslationBase.of(context).remarks, - controller: examinations?[index].remarksController, - minLines: 2, - maxLines: 4, - inputType: TextInputType.multiline, - onChanged: (value) {}, - onClick: () {}, - onFieldSubmitted: () {}, + AppText( + value + .conditionsList?[ + currentIndex] + .conditionCode ?? + '', + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: + SizeConfig.textMultiplier! * + 1.6, ), - ), - ], - ), - ) - : SizedBox.shrink(), - ], - ), - ), - ), - ], + ], + ), + )), + ), + // Row( + // children: [ + // if(examinations?[index] + // .conditionsList?.length == 1) + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[0] + // .conditionName ?? + // "-1"); + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[0] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // examinations?[index] + // .conditionsList?[0] + // .conditionCode ?? + // TranslationBase.of(context).normal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[1] + // .conditionName ?? + // "-1"); + // }); + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[1] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // examinations?[index] + // .conditionsList?[1] + // .conditionCode ?? + // TranslationBase.of(context).abnormal, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // setState(() { + // examinations?[index].selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[2] + // .conditionName ?? + // "-1"); + // }); + // }); + // + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: + // EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index].selectedCondition == + // int.parse(examinations?[index] + // .conditionsList?[2] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // Expanded( + // child: AppText( + // examinations?[index] + // .conditionsList?[2] + // .conditionCode ?? + // TranslationBase.of(context).notExamined, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * 1.6, + // ), + // ), + // ], + // ), + // )), + // ], + // ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: value.remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + ], + ), + ) + : SizedBox.shrink(), + ], + ),)?.toList() ?? [] + // Expanded( + // child: ListView.builder( + // shrinkWrap: true, + // itemCount: examinations?.length ?? 0, + // itemBuilder: (context, index) => Column( + // children: [ + // ListTileTheme( + // horizontalTitleGap: 0, + // child: CheckboxListTile( + // activeColor: Color(0xFFD02127), + // checkColor: Colors.white, + // contentPadding: EdgeInsets.zero, + // side: MaterialStateBorderSide.resolveWith( + // (Set states) { + // if (states.contains(MaterialState.selected)) { + // return const BorderSide(color: Color(0xFFD02127)); + // } + // return const BorderSide(color: Color(0xFFE6E6E6)); + // }, + // ), + // shape: RoundedRectangleBorder( + // borderRadius: BorderRadius.circular(16)), + // value: examinations?[index].isSelected, + // controlAffinity: ListTileControlAffinity.leading, + // onChanged: (bool? value) { + // setState(() { + // examinations?[index].isSelected = value ?? false; + // }); + // }, + // title: AppText( + // examinations![index].name!, + // color: Color(0XFF575757), + // fontSize: 14, + // fontWeight: FontWeight.w400, + // ), + // ), + // ), + // (examinations?[index].isSelected == true) + // ? Container( + // padding: EdgeInsets.symmetric(horizontal: 12), + // child: Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Container( + // margin: EdgeInsets.only(bottom: 8), + // child: AppText( + // TranslationBase.of(context).condition, + // fontWeight: FontWeight.bold, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ), + // SizedBox( + // width: MediaQuery.sizeOf(context).width, + // height: 24, + // child: ListView.builder( + // shrinkWrap: true, + // scrollDirection: Axis.horizontal, + // itemCount: examinations?[index] + // .conditionsList + // ?.length ?? + // 0, + // itemBuilder: (context, currentIndex) => InkWell( + // onTap: () { + // setState(() { + // examinations?[index] + // .selectedCondition = + // int.parse(examinations?[index] + // .conditionsList?[ + // currentIndex] + // .conditionName ?? + // "-1"); + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric( + // horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: examinations?[index] + // .selectedCondition == + // int.parse(examinations?[ + // index] + // .conditionsList?[ + // currentIndex] + // .conditionName ?? + // "-1") + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // examinations?[index] + // .conditionsList?[ + // currentIndex] + // .conditionCode ?? + // '', + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: + // SizeConfig.textMultiplier! * + // 1.6, + // ), + // ], + // ), + // )), + // ), + // // Row( + // // children: [ + // // if(examinations?[index] + // // .conditionsList?.length == 1) + // // Expanded( + // // child: InkWell( + // // onTap: () { + // // setState(() { + // // examinations?[index].selectedCondition = + // // int.parse(examinations?[index] + // // .conditionsList?[0] + // // .conditionName ?? + // // "-1"); + // // }); + // // }, + // // child: Row( + // // children: [ + // // Container( + // // padding: EdgeInsets.all(2.0), + // // margin: + // // EdgeInsets.symmetric(horizontal: 6), + // // width: 20, + // // height: 20, + // // decoration: BoxDecoration( + // // color: Colors.white, + // // shape: BoxShape.circle, + // // border: Border.all( + // // color: Colors.grey, width: 1), + // // ), + // // child: Container( + // // decoration: BoxDecoration( + // // color: examinations?[index].selectedCondition == + // // int.parse(examinations?[index] + // // .conditionsList?[0] + // // .conditionName ?? + // // "-1") + // // ? HexColor("#D02127") + // // : Colors.white, + // // shape: BoxShape.circle, + // // ), + // // ), + // // ), + // // AppText( + // // examinations?[index] + // // .conditionsList?[0] + // // .conditionCode ?? + // // TranslationBase.of(context).normal, + // // fontWeight: FontWeight.normal, + // // fontFamily: 'Poppins', + // // fontSize: + // // SizeConfig.textMultiplier! * 1.6, + // // ), + // // ], + // // ), + // // )), + // // Expanded( + // // child: InkWell( + // // onTap: () { + // // setState(() { + // // setState(() { + // // examinations?[index].selectedCondition = + // // int.parse(examinations?[index] + // // .conditionsList?[1] + // // .conditionName ?? + // // "-1"); + // // }); + // // }); + // // }, + // // child: Row( + // // children: [ + // // Container( + // // padding: EdgeInsets.all(2.0), + // // margin: + // // EdgeInsets.symmetric(horizontal: 6), + // // width: 20, + // // height: 20, + // // decoration: BoxDecoration( + // // color: Colors.white, + // // shape: BoxShape.circle, + // // border: Border.all( + // // color: Colors.grey, width: 1), + // // ), + // // child: Container( + // // decoration: BoxDecoration( + // // color: examinations?[index].selectedCondition == + // // int.parse(examinations?[index] + // // .conditionsList?[1] + // // .conditionName ?? + // // "-1") + // // ? HexColor("#D02127") + // // : Colors.white, + // // shape: BoxShape.circle, + // // ), + // // ), + // // ), + // // AppText( + // // examinations?[index] + // // .conditionsList?[1] + // // .conditionCode ?? + // // TranslationBase.of(context).abnormal, + // // fontWeight: FontWeight.normal, + // // fontFamily: 'Poppins', + // // fontSize: + // // SizeConfig.textMultiplier! * 1.6, + // // ), + // // ], + // // ), + // // )), + // // Expanded( + // // child: InkWell( + // // onTap: () { + // // setState(() { + // // setState(() { + // // examinations?[index].selectedCondition = + // // int.parse(examinations?[index] + // // .conditionsList?[2] + // // .conditionName ?? + // // "-1"); + // // }); + // // }); + // // + // // }, + // // child: Row( + // // children: [ + // // Container( + // // padding: EdgeInsets.all(2.0), + // // margin: + // // EdgeInsets.symmetric(horizontal: 6), + // // width: 20, + // // height: 20, + // // decoration: BoxDecoration( + // // color: Colors.white, + // // shape: BoxShape.circle, + // // border: Border.all( + // // color: Colors.grey, width: 1), + // // ), + // // child: Container( + // // decoration: BoxDecoration( + // // color: examinations?[index].selectedCondition == + // // int.parse(examinations?[index] + // // .conditionsList?[2] + // // .conditionName ?? + // // "-1") + // // ? HexColor("#D02127") + // // : Colors.white, + // // shape: BoxShape.circle, + // // ), + // // ), + // // ), + // // Expanded( + // // child: AppText( + // // examinations?[index] + // // .conditionsList?[2] + // // .conditionCode ?? + // // TranslationBase.of(context).notExamined, + // // fontWeight: FontWeight.normal, + // // fontFamily: 'Poppins', + // // fontSize: + // // SizeConfig.textMultiplier! * 1.6, + // // ), + // // ), + // // ], + // // ), + // // )), + // // ], + // // ), + // Container( + // margin: EdgeInsets.only(top: 8), + // child: AppTextFieldCustom( + // hintText: TranslationBase.of(context).remarks, + // controller: examinations?[index].remarksController, + // minLines: 2, + // maxLines: 4, + // inputType: TextInputType.multiline, + // onChanged: (value) {}, + // onClick: () {}, + // onFieldSubmitted: () {}, + // ), + // ), + // ], + // ), + // ) + // : SizedBox.shrink(), + // ], + // ), + // ), + // ), + // ], + ), ); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index 98228a8c..b33caa3d 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -104,7 +104,7 @@ class _UpdatePlanPageVidaPlusState extends State widget.changeLoadingState(true); WidgetsBinding.instance.addPostFrameCallback((_) async { if (model.progressNote.isEmpty) { - await model.getProgressNote(widget.patientInfo); + model.getProgressNote(widget.patientInfo); } }); widget.changeLoadingState(false); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 50cf8db0..23283dd3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex =2; + int _currentIndex =3; List myAllergiesList = []; List myHistoryList = []; @@ -97,32 +97,30 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ - - UpdateAssessmentPage( + UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState, + sOAPViewModel: model, + changeStateFun: changeStateFun, ), - UpdateSubjectivePageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState), UpdateObjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState), - - UpdatePlanPageVidaPlus( + UpdateAssessmentPage( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState, - sOAPViewModel: model, - changeStateFun: changeStateFun, ), + UpdateSubjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), ], ), ) diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 4d6a185d..4302f215 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1943,6 +1943,9 @@ class TranslationBase { String get deletedRemarks => localizedValues['deletedRemarks']![locale.languageCode]!; String get noRemarks => localizedValues['noRemarks']![locale.languageCode]!; + String get kindlySelectCategory => localizedValues['kindlySelectCategory']![locale.languageCode]!; + String get remarksCanNotBeEmpty => localizedValues['remarksCanNotBeEmpty']![locale.languageCode]!; + } class TranslationBaseDelegate extends LocalizationsDelegate { From 76ce759e867e762c8ae62e8e9a3ea74fa3476206 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 27 Nov 2024 11:28:32 +0300 Subject: [PATCH 38/76] WD: getting plan --- lib/core/service/patient_medical_file/soap/SOAP_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 88a1ac46..e427f015 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -989,7 +989,7 @@ class SOAPService extends LookupService { onSuccess: (dynamic response, int statusCode) { print("Success"); patientProgressNoteListVidaPlus.clear(); - response['ProgressNoteList']['resultData'].forEach((v) { + response['ListProgressNote']['resultData'].forEach((v) { v['data'].forEach((progressNote) { patientProgressNoteListVidaPlus .add(ProgressNote.fromJson(progressNote)); From 6559dd123f1de8c46d9d587f89b1f5799b995f78 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 27 Nov 2024 16:51:32 +0300 Subject: [PATCH 39/76] WD: create dignosis and favorite diagnosis and listing of diagnosis --- lib/config/config.dart | 4 + lib/config/localized_values.dart | 2 + .../SOAP/assessment/search_diagnosis.dart | 1 + .../soap/SOAP_service.dart | 135 +++- lib/core/viewModel/SOAP_view_model.dart | 70 +- .../assessment/add_diagnosis.dart | 51 -- .../assessment/update_assessment_page.dart | 3 +- .../widget/audit_list_bottom_sheet.dart | 2 +- .../assessment/widget/current_diagnosis.dart | 184 +++-- .../assessment/widget/edit_diagnosis.dart | 422 ++++++++++ .../assessment/widget/enter_diagnosis.dart | 687 ++++++++--------- .../assessment/widget/favotite_diagnosis.dart | 723 ++++++++++-------- .../plan/update_plan_page_vida_plus.dart | 8 +- .../update_soap_index_vida_plus.dart | 15 +- .../translations_delegate_base_utils.dart | 2 + 15 files changed, 1430 insertions(+), 879 deletions(-) create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 8ef1f0e1..d6f98ec6 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -338,6 +338,10 @@ const POST_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/PostPhysi const GET_PROGRESS_NOTE_NEW = 'Services/DoctorApplication.svc/REST/GetProgressNote'; +const GET_LIST_OF_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisDetailsSearch'; + +const EDIT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/EditDiagnosis'; + var selectedPatientType = 1; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b9a0b7b0..283cfb13 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1208,6 +1208,8 @@ const Map> localizedValues = { "kindlySelectCategory": {"en": "Kindly Select Any Diagnosis Category", "ar":"يرجى اختيار أي فئة تشخيص"}, "noRemarks": {"en": "No Remarks", "ar":"لا ملاحظات"}, "event": {"en": "Event: ", "ar":"حدث: "}, + "selectedDiagnosis": {"en": "Kindly Select Diagnosis", "ar":"يرجى اختيار التشخيص: "}, + "selectConditionFirst": {"en": "Kindly Select Diagnosis Condition", "ar":"يرجى اختيار حالة التشخيص: "}, "deletedRemarks": {"en": "Deleted Remarks: ", "ar":"ملاحظات محذوفة: "}, "newValue": {"en": "New Value: ", "ar":"قيمة جديدة: "}, "fieldName": {"en": "Field Name: ", "ar":"اسم الحقل: "}, diff --git a/lib/core/model/SOAP/assessment/search_diagnosis.dart b/lib/core/model/SOAP/assessment/search_diagnosis.dart index 3a02db9c..0a7ab2e7 100644 --- a/lib/core/model/SOAP/assessment/search_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/search_diagnosis.dart @@ -26,6 +26,7 @@ class SearchDiagnosis { String? selectedSectionCode; String? selectedChapterCode; String? selectedNandaCode; + bool isFavorite = false; // Default constructor SearchDiagnosis(); diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index e427f015..d91be174 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -57,6 +57,7 @@ class SOAPService extends LookupService { List patientChiefComplaintListVidaPlus = []; List searchChiefComplaintListVidaPlus = []; List patientPreviousDiagnosisList = []; + List patientDiagnosisList = []; List favoriteDiagnosisDetailsList = []; List auditDiagnosislist = []; List searchDiagnosisList = []; @@ -66,7 +67,6 @@ class SOAPService extends LookupService { Map diagnosisTypeList = {}; Map conditionTypeList = {}; List icdVersionList = []; - bool addedToFavorite = false; bool showAuditBottomSheet = false; int? episodeID; @@ -775,6 +775,37 @@ class SOAPService extends LookupService { }, body: request); } + getDiagnosis(PatiantInformtion patient) async { + Map request = { + "hospitalGroupId": 105, + "hospitalId": 313, + "patientId": 70023498, + "patientPomrId": 9907, + "startRow": 0, + "endRow": 10, + "isSelected": true, + "ProjectID": 313 + // "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + // "hospitalId": patient.projectId, + // "patientId": patient.patientId, + // "patientPomrId": patient.pomrId, + // "startRow": 0, + // "endRow": 1000000, + // "ProjectID": patient.projectId + }; + hasError = false; + await baseAppClient.post(GET_LIST_OF_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + patientDiagnosisList.clear(); + response['ListDiagnosisDetailsSearch']['resultData'].forEach((v) => + patientDiagnosisList.add(PatientPreviousDiagnosis.fromJson(v))); + }, onFailure: (String error, int statusCode) { + patientDiagnosisList.clear(); + hasError = true; + super.error = error; + }, body: request); + } + removeDiagnosis(PatiantInformtion patientInfo, String? patientProblemId, String? problemId, String? deletedRemarks) async { Map request = { @@ -835,15 +866,15 @@ class SOAPService extends LookupService { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = - // { - // "patientId": 70024978, - // "pomrId": 10819, - // "hospitalId": 313, - // "hospitalGroupId": 105, - // "ProjectID": 313 - // }; - - { + // { + // "patientId": 70024978, + // "pomrId": 10819, + // "hospitalId": 313, + // "hospitalGroupId": 105, + // "ProjectID": 313 + // }; + + { "patientId": patientInfo.patientId, "pomrId": patientInfo.pomrId, "hospitalId": patientInfo.projectId, @@ -907,8 +938,8 @@ class SOAPService extends LookupService { }, body: request); } - addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, - String subFavoriteCode, String? userId) async { + Future addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, + String subFavoriteCode, dynamic? userId) async { Map request = { "ProjectID": paitientInfo.projectId, "listDiagnosisFavourite": [ @@ -923,24 +954,27 @@ class SOAPService extends LookupService { ] }; hasError = false; - addedToFavorite = false; + var isFavoriteAdded = false; favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(ADD_TO_FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { var result = response['ListDiagnosisAddFavourite']['resultData']; + isFavoriteAdded = true; if ((result as List).isEmpty) { - addedToFavorite = false; DrAppToastMsg.showErrorToast( response['ListDiagnosisAddFavourite']['message']); } else { - addedToFavorite = true; - DrAppToastMsg.showSuccesToast("Added To Favorite"); + DrAppToastMsg.showSuccesToast(response['ListDiagnosisAddFavourite']['message']); } + }, onFailure: (String error, int statusCode) { favoriteDiagnosisDetailsList.clear(); hasError = true; + isFavoriteAdded = false; super.error = error; }, body: request); + + return isFavoriteAdded; } convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, @@ -960,7 +994,7 @@ class SOAPService extends LookupService { "ProjectID": paitientInfo.projectId }; hasError = false; - addedToFavorite = false; + var addedToFavorite = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { var result = response['ContinuePreviousEpisode']['resultData']; @@ -1028,41 +1062,68 @@ class SOAPService extends LookupService { } } - createDiagnosis(PatiantInformtion patient, SearchDiagnosis searchDiagnosis, - int diagnosisType, String conditionType, String remarks, bool isNew) { - /*{ -"codeRange": "A79", -"selectedDisease": "Trench fever", -"categoryId": 3962, -"diseasesCode": "A79.0", -"diseasesId": 17664, -"selectedIcdCode": "A79.0", -"selectedCategoryCode": "A79.0", -"selectedSectionCode": "A79", -"selectedChapterCode": "XX", -"selectedNandaCode": "A79.0", -"codeType": "ICD", -"problemId": 1634, -"icdId": 1, -"problemName": "default", -}*/ + Future createDiagnosis(PatiantInformtion patient, SearchDiagnosis? searchDiagnosis, + String? diagnosisType, String conditionType, String remarks, bool isNew) async{ + Map? user = await sharedPref.getObj(LOGGED_IN_USER); var request = { "pomrId": patient.pomrId, "appointmentId": patient.appointmentNo, "clinicGroupId": patient.clinicGroupId, "clinicId": patient.clinicId, "patientId": patient.patientId, - "hospitalId": searchDiagnosis.hospitalId, + "hospitalId": searchDiagnosis!.hospitalId, "hospitalGroupId": searchDiagnosis.hospitalGroupId, "diagnosisType": diagnosisType, "condition": conditionType, "remarks": remarks, "icdType": searchDiagnosis.icdType, - "icdVersion": searchDiagnosis.icdVersion, + // "icdVersion": searchDiagnosis.icdVersion, "icdSubVersion": searchDiagnosis.icdSubVersion, "isNew": isNew, "specificationId": searchDiagnosis.specificationId, + "selectedDisease": searchDiagnosis.diseasesName, + "diseasesCode": searchDiagnosis.diseasesCode, + "diseasesId": searchDiagnosis.diseasesId, + "selectedIcdCode": searchDiagnosis.selectedIcdCode, + "selectedCategoryCode": searchDiagnosis.selectedCategoryCode, + "selectedSectionCode": searchDiagnosis.selectedSectionCode, + "selectedChapterCode": searchDiagnosis.selectedChapterCode, + "selectedNandaCode": searchDiagnosis.selectedNandaCode, + "isResolved": false, + "doctorId": patient.doctorId, + "doctorCode": user?['List_MemberInformation'][0]['MemberID'], + "ProjectID": patient.projectId, + "codeRange":searchDiagnosis.codeRange }; + var success = false; + await baseAppClient.post(CREATE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + success = true; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async{ + + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + var request = diag; + var success = false; + await baseAppClient.post(CREATE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + success = true; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; } } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 870272fc..ff0733a4 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -129,6 +129,9 @@ class SOAPViewModel extends BaseViewModel { List get patientPreviousDiagnosis => _SOAPService.patientPreviousDiagnosisList; + List get diagnosisList => + _SOAPService.patientDiagnosisList; + List get favoriteDiagnosisDetails => _SOAPService.favoriteDiagnosisDetailsList; @@ -159,7 +162,6 @@ class SOAPViewModel extends BaseViewModel { int? get episodeID => _SOAPService.episodeID; - bool get isFavorite => _SOAPService.addedToFavorite; bool get showAudit => _SOAPService.showAuditBottomSheet; @@ -1096,6 +1098,16 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + getCurrentDiagnosisList(PatiantInformtion patientInfo) async { + setState(ViewState.BusyLocal); + await _SOAPService.getDiagnosis(patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + getAuditOfDiagnosis( PatiantInformtion patient, String patientProblemRevisionID, @@ -1145,21 +1157,29 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void addToFavoriteDiagnosis(PatiantInformtion patientInfo, + Future addToFavoriteDiagnosis(PatiantInformtion patientInfo, {SearchDiagnosis? diagnosis}) async { setState(ViewState.BusyLocal); Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); Map? user = await sharedPref.getObj(LOGGED_IN_USER); - await _SOAPService.addToFavoriteDiagnosis( + var userID = user?['List_MemberInformation'][0]['MemberID']; + bool result = await _SOAPService.addToFavoriteDiagnosis( patientInfo, profile?['DoctorName'] ?? '', diagnosis?.diseasesBCode ?? '', - user?['List_MemberInformation'][0]['MemberID'] ?? ''); + userID); + + // if (diagnosis != null) { + diagnosis?.isFavorite = result; + // searchDiagnosisList[index] = diagnosis; + // } + if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); + return diagnosis; } void convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, @@ -1183,21 +1203,21 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - - List getListOfSelectedCategory(){ + List getListOfSelectedCategory() { List mappedItems = []; for (List category in specialityDetails.values) { var selectedCategory = - category.where((value) => value.isSelected == true); + category.where((value) => value.isSelected == true); mappedItems.addAll(selectedCategory); } return mappedItems; } - Future postPhysicalExamination(PatiantInformtion patientInfo, List listOfSelectedCategory) async { + Future postPhysicalExamination(PatiantInformtion patientInfo, + List listOfSelectedCategory) async { setState(ViewState.BusyLocal); - bool result = - await _SOAPService.postPhysicalExamination(patientInfo, listOfSelectedCategory); + bool result = await _SOAPService.postPhysicalExamination( + patientInfo, listOfSelectedCategory); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1231,9 +1251,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void toggleFavorite(bool status) { - _SOAPService.addedToFavorite = status; - } void toggleShowBottomSheetValue(bool status) { _SOAPService.showAuditBottomSheet = status; @@ -1249,6 +1266,25 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + Future createDiagnosis( + PatiantInformtion patientInformation, + SearchDiagnosis? searchDiagnosis, + String? diagnosisType, + String conditionType, + String remarks, + bool isNew) async { + setState(ViewState.BusyLocal); + bool result = await _SOAPService.createDiagnosis(patientInformation, + searchDiagnosis, diagnosisType, conditionType, remarks, isNew); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + + return result; + } + void changeCurrentCategorySelectedState( GeneralSpeciality selectedExamination, bool status) { final item = speciality.firstWhere( @@ -1264,9 +1300,11 @@ class SOAPViewModel extends BaseViewModel { if (query.isEmpty) { speciality = mainSpecialityList ?? []; } - var searchList = - mainSpecialityList?.where((value) => value.name?.toLowerCase().contains(query.toLowerCase()) == true).toList() ?? - []; + var searchList = mainSpecialityList + ?.where((value) => + value.name?.toLowerCase().contains(query.toLowerCase()) == true) + .toList() ?? + []; speciality = searchList; notifyListeners(); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart index c271a5ae..d7399d58 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart @@ -38,7 +38,6 @@ class _AddDiagnosisState extends State return BaseView( onModelReady: (model) { WidgetsBinding.instance.addPostFrameCallback((_) { - model.toggleFavorite(false); model.getConditionAndType(widget.patientInfo); model.favoriteDiagnosis(widget.patientInfo); setState(() { @@ -98,56 +97,6 @@ class _AddDiagnosisState extends State ), ], ), - bottomSheet: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(0.0), - ), - border: Border.all(color: HexColor('#707070'), width: 0), - ), - height: SizeConfig.heightMultiplier! * - (SizeConfig.isHeightVeryShort ? 12 : 10), - width: double.infinity, - child: Padding( - padding: const EdgeInsets.all(10), - child: Column( - children: [ - Center( - child: Row( - children: [ - Expanded( - child: AppButton( - title: TranslationBase.of(context).previous, - color: Colors.grey[300]!, - // height: SizeConfig.heightMultiplier! * - // (SizeConfig.isHeightVeryShort ? 8 : 6), - // padding: 10, - fontColor: Colors.black, - fontWeight: FontWeight.w600, - onPressed: () { - Navigator.pop(context); - }, - ), - ), - SizedBox( - width: 5, - ), - Expanded( - child: AppButton( - title: TranslationBase.of(context).save, - fontWeight: FontWeight.w600, - color: Color(0xFF359846), - onPressed: () async {}, - ), - ), - ], - ), - ) - ], - ), - ), - ), )); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart index 09c07d54..e22cc6ff 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -70,6 +70,7 @@ class _UpdateAssessmentPageState extends State WidgetsBinding.instance.addPostFrameCallback((_) async { widget.changeLoadingState(true); model.getPreviousPatientDetails(widget.patientInfo); + model.getCurrentDiagnosisList(widget.patientInfo); widget.changeLoadingState(false); //todo handle get diagnosis list }); @@ -144,7 +145,7 @@ class _UpdateAssessmentPageState extends State CurrentDiagnosis( patientInfo: widget.patientInfo, model: model, - currentDiagnosisItems: [''], + currentDiagnosisItems: model.diagnosisList, ), PreviousDiagnosis( diagnosisItems: model.patientPreviousDiagnosis, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart index befb56e5..f976063b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart @@ -12,7 +12,7 @@ class AuditListBottomSheet extends StatelessWidget { @override Widget build(BuildContext context) { return SizedBox( - height: (auditList.length>1)?MediaQuery.sizeOf(context).height*.56:MediaQuery.sizeOf(context).height*.28, + height: (auditList.length>1)?MediaQuery.sizeOf(context).height*.41:MediaQuery.sizeOf(context).height*.28, child: Material( color: Color(0xFFF7F7F7), shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 71a69dbb..5a493e21 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -1,7 +1,11 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; @@ -15,7 +19,7 @@ import '../../../../../../widgets/shared/text_fields/app-textfield-custom.dart'; class CurrentDiagnosis extends StatefulWidget { final PatiantInformtion patientInfo; - final List currentDiagnosisItems; + final List currentDiagnosisItems; final SOAPViewModel model; const CurrentDiagnosis( @@ -33,71 +37,102 @@ class _CurrentDiagnosisState extends State { @override Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - SizedBox( - height: 10, - ), - AddSoapItem( - title: TranslationBase.of(context).addNewDiagnosis, - onAddSoapItemClicked: () { - Navigator.push( - context, - FadePage( - page: AddDiagnosis( - patientInfo: widget.patientInfo, - ))); - }), - SizedBox( - height: 16, - ), - Divider(), - SizedBox( - height: 16, - ), - if (widget.currentDiagnosisItems.isEmpty) ...{ - Center( - child: EmptyDiagnosis(), - ), - } else ...{ - Flexible( - child: ListView.separated( - itemBuilder: (_, index) { - return SoapDetailItem( - title: 'lorem ipsum', - status: 'active', - condition: 'acute', - remarks: 'initial', - onSoapDetailActionClicked: (action) { - switch (action) { - case SoapDetailItemActions.EDIT: - // TODO: Handle this case. - case SoapDetailItemActions.RESOLVE: - // TODO: Handle this case. - - case SoapDetailItemActions.REMOVE: - showConfirmationDialog(context, - "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", - () { - widget.model - .removeDiagnosis(widget.patientInfo); - }); - case SoapDetailItemActions.CHANGE_STATUS: - // TODO: Handle this case. - default: - } - }, - ); - }, - separatorBuilder: (_, index) => Divider(), - itemCount: widget.currentDiagnosisItems.length)) + return BaseView( + onModelReady: (model) async {}, + builder: (_, model, w) { + if (model.showAudit) { + WidgetsBinding.instance.addPostFrameCallback((_) { + showAuditBottomSheet(context, model.auditDiagnosislist, + model.toggleShowBottomSheetValue); + model.toggleShowBottomSheetValue(false); + }); } - ], - ), - ); + + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + SizedBox( + height: 10, + ), + AddSoapItem( + title: TranslationBase.of(context).addNewDiagnosis, + onAddSoapItemClicked: () async { + bool result = await Navigator.push( + context, + FadePage( + page: AddDiagnosis( + patientInfo: widget.patientInfo, + ))); + if (result) { + model.getCurrentDiagnosisList(widget.patientInfo); + } + }), + SizedBox( + height: 16, + ), + Divider(), + SizedBox( + height: 16, + ), + if (widget.currentDiagnosisItems.isEmpty) ...{ + Center( + child: EmptyDiagnosis(), + ), + } else ...{ + Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return SoapDetailItem( + title: widget.currentDiagnosisItems[index] + .selectedDisease ?? + '', + status: + widget.currentDiagnosisItems[index].status ?? + '', + condition: widget + .currentDiagnosisItems[index].condition ?? + '', + remarks: + widget.currentDiagnosisItems[index].remarks ?? + '', + onSoapDetailActionClicked: (action) { + switch (action) { + case SoapDetailItemActions.AUDIT: + model.getAuditOfDiagnosis( + widget.patientInfo, + widget.currentDiagnosisItems[index] + .patientProblemRevisionId + ?.toString() ?? + ''); + break; + case SoapDetailItemActions.EDIT: + // TODO: Handle this case. + case SoapDetailItemActions.RESOLVE: + // TODO: Handle this case. + + case SoapDetailItemActions.REMOVE: + showConfirmationDialog(context, + "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", + () { + widget.model + .removeDiagnosis(widget.patientInfo); + }); + case SoapDetailItemActions.CHANGE_STATUS: + // TODO: Handle this case. + default: + } + }, + ); + }, + separatorBuilder: (_, index) => Divider(), + itemCount: widget.currentDiagnosisItems.length)) + } + ], + ), + ); + }); } showConfirmationDialog( @@ -179,4 +214,23 @@ class _CurrentDiagnosisState extends State { deleteController.clear(); }); } + + void showAuditBottomSheet( + BuildContext context, + List diagnosis, + void Function(bool status) toggleShowBottomSheetValue, + ) { + showModalBottomSheet( + isDismissible: true, + context: context, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), topRight: Radius.circular(20))), + builder: (_) { + return AuditListBottomSheet( + auditList: diagnosis, + ); + }, + ).then((value) => toggleShowBottomSheetValue(false)); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart new file mode 100644 index 00000000..fca866bc --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -0,0 +1,422 @@ +import 'dart:async'; + +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:hexcolor/hexcolor.dart'; + +List patientState = ["", "Stable", "Not Stable", "Not Defined"]; + +class EnterDiagnosis extends StatefulWidget { + final PatiantInformtion patientInfo; + final PatientPreviousDiagnosis diagnosis; + + const EnterDiagnosis({super.key, required this.patientInfo, required this.diagnosis}); + + @override + State createState() => _EnterDiagnosisState(); +} + +class _EnterDiagnosisState extends State { + final TextEditingController filteredSearchController = + TextEditingController(); + bool showAllDiagnosis = true; + String status = ''; + String? selectedDiagnosisItem; + TextEditingController remarksController = TextEditingController(); + Timer? _tTimer; + SOAPViewModel? model; + SearchDiagnosis? selectedDiagnosis; + + void _onTextChanged(String text) { + if (_tTimer != null) { + _tTimer!.cancel(); + } + _tTimer = Timer(Duration(milliseconds: 500), () { + _onStopped(text); + }); + } + + void _onStopped(String searchText) async { + await model?.searchDiagnosis(widget.patientInfo, searchText); + } + + @override + Widget build(BuildContext context) { + return BaseView( + onModelReady: (model) { + this.model = model; + }, + builder: (_, model, w) => AppScaffold( + isLoading: model.state == ViewState.BusyLocal , + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).addDiagnosis), + body: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, + ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).diagnosis, + isTextFieldHasSuffix: true, + hasBorder: true, + controller: filteredSearchController, + onClick: () { + setState( + () { + selectedDiagnosis = null; + filteredSearchController.text = ''; + model.selectedIcd = ''; + }, + ); + }, + onChanged: (value) { + if (value != null) _onTextChanged(value); + }, + onFieldSubmitted: () {}, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Color(0xff2B353E), + size: 30, + ), + onPressed: () {}, + ), + ), + Positioned( + child: Material( + elevation: 4.0, // Optional: for shadow effect + child: ConstrainedBox( + constraints: BoxConstraints(minHeight: 0, maxHeight: 300), + child: ListView.builder( + shrinkWrap: true, + itemCount: model.icdVersionList.length, + itemBuilder: (context, index) { + return ListTile( + title: InkWell( + child: AppText(model.icdVersionList[index]), + onTap: () { + setState( + () { + selectedDiagnosis = + model.findTheDiagnosisItem( + model.icdVersionList[index]); + filteredSearchController.text = + model.icdVersionList[index]; + model.searchDiagnosisList.clear(); + model.icdVersionList.clear(); + }, + ); + }, + ), + ); + }, + ), + ), + ), + ), + SizedBox( + height: 8, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Switch( + value: showAllDiagnosis, + activeColor: Colors.red, + onChanged: (bool value) { + setState(() { + showAllDiagnosis = value; + }); + }, + ), + SizedBox( + width: 8, + ), + AppText( + TranslationBase.of(context).showAllDiagnosis, + fontWeight: FontWeight.w500, + color: Color(0xFF2E303A), + fontSize: 11, + ), + ], + ), + SvgPicture.asset('assets/images/svgs/information.svg'), + ], + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.conditionTypeList.length, + itemBuilder: (context, index) => InkWell( + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == + model.conditionTypeList[index] + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + ), + SizedBox( + height: 8, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnoseType, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.diagnosisTypeList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedDiagnosisItem == null + ? model.diagnosisTypeList.keys.first + : selectedDiagnosisItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedDiagnosisItem = newValue; + }); + }, + items: + model.diagnosisTypeList.keys.map((item) { + return DropdownMenuItem( + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + SizedBox( + height: 16, + ), + InkWell( + onTap: () async { + if (selectedDiagnosis != null) { + SearchDiagnosis? diagnosis = + await model.addToFavoriteDiagnosis(widget.patientInfo, + diagnosis: selectedDiagnosis); + setState(() { + selectedDiagnosis = diagnosis; + }); + } + }, + child: Row( + children: [ + SvgPicture.asset(selectedDiagnosis?.isFavorite == true + ? 'assets/images/svgs/favoriteadded.svg' + : 'assets/images/svgs/favorite.svg'), + SizedBox( + width: 4, + ), + AppText( + TranslationBase.of(context).addToFavorite, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ), + ) + ], + ), + ), + ), + bottomNavigationBar: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Padding( + padding: const EdgeInsets.all(10), + child: Column( + children: [ + Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).save, + fontWeight: FontWeight.w600, + color: Color(0xFF359846), + onPressed: () async { + selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; + if(selectedDiagnosis == null ){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectedDiagnosis); + return; + } + if(status.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectConditionFirst); + return; + } + + if(remarksController.text.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); + return; + } + + bool result = await model.createDiagnosis( + widget.patientInfo, + selectedDiagnosis, + selectedDiagnosisItem, + status, + remarksController.text, + false); + if (result) { + Navigator.pop(context, result); + } + }, + ), + ), + ], + ), + ) + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 45b6ddbe..0ecac958 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -8,8 +8,11 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -31,7 +34,7 @@ class _EnterDiagnosisState extends State { TextEditingController(); bool showAllDiagnosis = true; String status = ''; - String? selectedItem; + String? selectedDiagnosisItem; TextEditingController remarksController = TextEditingController(); Timer? _tTimer; SOAPViewModel? model; @@ -56,392 +59,354 @@ class _EnterDiagnosisState extends State { onModelReady: (model) { this.model = model; }, - builder: (_, model, w) => SingleChildScrollView( - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).addDiagnosis, - fontWeight: FontWeight.w600, - color: Color(0xFF2E303A), - fontSize: 16, - ), - SizedBox( - height: 16, - ), - AppTextFieldCustom( - hintText: TranslationBase.of(context).diagnosis, - isTextFieldHasSuffix: true, - hasBorder: true, - controller: filteredSearchController, - onClick: () { - setState( - () { - selectedDiagnosis = null; - filteredSearchController.text = ''; - model.selectedIcd = ''; - }, - ); - }, - onChanged: (value) { - if (value != null) _onTextChanged(value); - }, - onFieldSubmitted: () {}, - suffixIcon: IconButton( - icon: Icon( - Icons.search, - color: Color(0xff2B353E), - size: 30, - ), - onPressed: () {}, + builder: (_, model, w) => AppScaffold( + isShowAppBar: false, + body: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, ), - ), - Positioned( - child: Material( - elevation: 4.0, // Optional: for shadow effect - child: ConstrainedBox( - constraints: BoxConstraints(minHeight: 0, maxHeight: 300), - child: ListView.builder( - shrinkWrap: true, - itemCount: model.icdVersionList.length, - itemBuilder: (context, index) { - return ListTile( - title: InkWell( - child: AppText(model.icdVersionList[index]), - onTap: () { - setState( - () { - selectedDiagnosis = - model.findTheDiagnosisItem( - model.icdVersionList[index]); - filteredSearchController.text = - model.icdVersionList[index]; - model.searchDiagnosisList.clear(); - model.icdVersionList.clear(); - }, - ); - }, - ), - ); + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).diagnosis, + isTextFieldHasSuffix: true, + hasBorder: true, + controller: filteredSearchController, + onClick: () { + setState( + () { + selectedDiagnosis = null; + filteredSearchController.text = ''; + model.selectedIcd = ''; }, + ); + }, + onChanged: (value) { + if (value != null) _onTextChanged(value); + }, + onFieldSubmitted: () {}, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Color(0xff2B353E), + size: 30, ), + onPressed: () {}, ), ), - ), - SizedBox( - height: 8, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Switch( - value: showAllDiagnosis, - activeColor: Colors.red, - onChanged: (bool value) { - setState(() { - showAllDiagnosis = value; - }); + Positioned( + child: Material( + elevation: 4.0, // Optional: for shadow effect + child: ConstrainedBox( + constraints: BoxConstraints(minHeight: 0, maxHeight: 300), + child: ListView.builder( + shrinkWrap: true, + itemCount: model.icdVersionList.length, + itemBuilder: (context, index) { + return ListTile( + title: InkWell( + child: AppText(model.icdVersionList[index]), + onTap: () { + setState( + () { + selectedDiagnosis = + model.findTheDiagnosisItem( + model.icdVersionList[index]); + filteredSearchController.text = + model.icdVersionList[index]; + model.searchDiagnosisList.clear(); + model.icdVersionList.clear(); + }, + ); + }, + ), + ); }, ), - SizedBox( - width: 8, - ), - AppText( - TranslationBase.of(context).showAllDiagnosis, - fontWeight: FontWeight.w500, - color: Color(0xFF2E303A), - fontSize: 11, - ), - ], + ), ), - SvgPicture.asset('assets/images/svgs/information.svg'), - ], - ), - Container( - margin: EdgeInsets.only(bottom: 12), - child: AppText( - TranslationBase.of(context).condition, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: 11, ), - ), - // Row( - // children: [ - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = ""; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: - // Border.all(color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 1 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).acute, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // )), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = "2"; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 2 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).subAcute, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // ), - // ), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = "3"; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 3 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).chronic, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // ), - // ), - // ], - // ), - SizedBox( - width: MediaQuery.sizeOf(context).width, - height: 24, - child: ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemCount: model.conditionTypeList.length, - itemBuilder: (context, index) => InkWell( - onTap: () { + SizedBox( + height: 8, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Switch( + value: showAllDiagnosis, + activeColor: Colors.red, + onChanged: (bool value) { setState(() { - status = model.conditionTypeList[index]; + showAllDiagnosis = value; }); }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: - Border.all(color: Colors.grey, width: 1), - ), - child: Container( + ), + SizedBox( + width: 8, + ), + AppText( + TranslationBase.of(context).showAllDiagnosis, + fontWeight: FontWeight.w500, + color: Color(0xFF2E303A), + fontSize: 11, + ), + ], + ), + SvgPicture.asset('assets/images/svgs/information.svg'), + ], + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.conditionTypeList.length, + itemBuilder: (context, index) => InkWell( + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, decoration: BoxDecoration( - color: - status == model.conditionTypeList[index] - ? HexColor("#D02127") - : Colors.white, + color: Colors.white, shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == + model.conditionTypeList[index] + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), ), ), + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], + ), + )), + ), + SizedBox( + height: 8, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnoseType, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.diagnosisTypeList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedDiagnosisItem == null + ? model.diagnosisTypeList.keys.first + : selectedDiagnosisItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedDiagnosisItem = newValue; + }); + }, + items: + model.diagnosisTypeList.keys.map((item) { + return DropdownMenuItem( + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), ), - AppText( - model.conditionTypeList[index], - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, - ), - ], - ), - )), - ), - SizedBox( - height: 8, - ), - Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + ], + ), + ), + ), + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), + ), + SizedBox( + height: 16, + ), + InkWell( + onTap: () async { + if (selectedDiagnosis != null) { + SearchDiagnosis? diagnosis = + await model.addToFavoriteDiagnosis(widget.patientInfo, + diagnosis: selectedDiagnosis); + setState(() { + selectedDiagnosis = diagnosis; + }); + } + }, + child: Row( children: [ + SvgPicture.asset(selectedDiagnosis?.isFavorite == true + ? 'assets/images/svgs/favoriteadded.svg' + : 'assets/images/svgs/favorite.svg'), + SizedBox( + width: 4, + ), AppText( - TranslationBase.of(context).diagnoseType, + TranslationBase.of(context).addToFavorite, textAlign: TextAlign.start, fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ), + ) + ], + ), + ), + ), + bottomNavigationBar: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Padding( + padding: const EdgeInsets.all(10), + child: Column( + children: [ + Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () { + Navigator.pop(context); + }, + ), ), SizedBox( - height: 4, + width: 5, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).save, + fontWeight: FontWeight.w600, + color: Color(0xFF359846), + onPressed: () async { + selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; + if(selectedDiagnosis == null ){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectedDiagnosis); + return; + } + if(status.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectConditionFirst); + return; + } + + if(remarksController.text.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); + return; + } + + bool result = await model.createDiagnosis( + widget.patientInfo, + selectedDiagnosis, + selectedDiagnosisItem, + status, + remarksController.text, + false); + if (result) { + Navigator.pop(context, result); + } + }, + ), ), - model.diagnosisTypeList.isEmpty - ? EmptyDropDown() - : DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem == null - ? model.diagnosisTypeList.keys.first - : selectedItem, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - if (newValue != null) - setState(() { - selectedItem = newValue; - }); - }, - items: model.diagnosisTypeList.keys.map((item) { - return DropdownMenuItem( - child: AppText( - item ?? '', - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, - ), - value: item, - ); - }).toList(), - ), - ), ], ), - ), - ), - Container( - margin: EdgeInsets.only(top: 8), - child: AppTextFieldCustom( - hintText: TranslationBase.of(context).remarks, - controller: remarksController, - minLines: 2, - maxLines: 4, - inputType: TextInputType.multiline, - onChanged: (value) {}, - onClick: () {}, - onFieldSubmitted: () {}, - ), - ), - SizedBox( - height: 16, - ), - InkWell( - onTap: () { - if (selectedDiagnosis != null) - model.addToFavoriteDiagnosis(widget.patientInfo, - diagnosis: selectedDiagnosis); - }, - child: Row( - children: [ - SvgPicture.asset(model.isFavorite - ? 'assets/images/svgs/favoriteadded.svg' - : 'assets/images/svgs/favorite.svg'), - SizedBox( - width: 4, - ), - AppText( - TranslationBase.of(context).addToFavorite, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF449BF1), - ), - ], - ), - ) - ], + ) + ], + ), ), ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index 219f45cb..71e82650 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -9,7 +9,9 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; @@ -60,357 +62,406 @@ class _FavoriteDiagnosisState extends State { model.favoriteDiagnosis(widget.patientInfo); }); }, - builder: (_, model, w) => SingleChildScrollView( - child: Padding( - padding: - const EdgeInsets.symmetric(vertical: 12, horizontal: 16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).addDiagnosis, - fontWeight: FontWeight.w600, - color: Color(0xFF2E303A), - fontSize: 16, - ), - SizedBox( - height: 16, - ), - Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).diagnosis, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), - ), - SizedBox( - height: 4, - ), - model.favoriteDiagnosisDetails.isEmpty - ? EmptyDropDown() - : DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - itemHeight: null, - value: selectedFavorite == null - ? model.favoriteDiagnosisDetails.first - .diseases - : selectedFavorite, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - if (newValue != null) - setState(() { - selectedFavorite = newValue; - }); - }, - items: model.favoriteDiagnosisDetails - .map((item) { - return DropdownMenuItem( - child: AppText( - item.diseases ?? '', - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, - ), - value: item.diseases, - ); - }).toList(), - ), - ), - ], - ), + builder: (_, model, w) => AppScaffold( + body: SingleChildScrollView( + child: Padding( + padding: + const EdgeInsets.symmetric(vertical: 12, horizontal: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addDiagnosis, + fontWeight: FontWeight.w600, + color: Color(0xFF2E303A), + fontSize: 16, ), - ), - - SizedBox( - height: 8, - ), - Container( - margin: EdgeInsets.only(bottom: 12), - child: AppText( - TranslationBase.of(context).condition, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: 11, + SizedBox( + height: 16, ), - ), - // Row( - // children: [ - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = ""; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: - // Border.all(color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 1 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).acute, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // )), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = "2"; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 2 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).subAcute, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // ), - // ), - // Expanded( - // child: InkWell( - // onTap: () { - // setState(() { - // status = "3"; - // }); - // }, - // child: Row( - // children: [ - // Container( - // padding: EdgeInsets.all(2.0), - // margin: EdgeInsets.symmetric(horizontal: 6), - // width: 20, - // height: 20, - // decoration: BoxDecoration( - // color: Colors.white, - // shape: BoxShape.circle, - // border: Border.all( - // color: Colors.grey, width: 1), - // ), - // child: Container( - // decoration: BoxDecoration( - // color: status == 3 - // ? HexColor("#D02127") - // : Colors.white, - // shape: BoxShape.circle, - // ), - // ), - // ), - // AppText( - // TranslationBase.of(context).chronic, - // fontWeight: FontWeight.normal, - // fontFamily: 'Poppins', - // fontSize: SizeConfig.textMultiplier! * 1.6, - // ), - // ], - // ), - // ), - // ), - // ], - // ), - SizedBox( - width: MediaQuery.sizeOf(context).width, - height: 24, - child: ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemCount: model.conditionTypeList.length, - itemBuilder: (context, index) => InkWell( - onTap: () { - setState(() { - status = model.conditionTypeList[index]; - }); - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: - EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == - model.conditionTypeList[index] - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - model.conditionTypeList[index], - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: - SizeConfig.textMultiplier! * 1.6, - ), - ], - ), - )), - ), - SizedBox( - height: 8, - ), - Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).diagnoseType, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), - ), - SizedBox( - height: 4, - ), - model.diagnosisTypeList.isEmpty - ? EmptyDropDown() - : DropdownButtonHideUnderline( - child: DropdownButton( - itemHeight: null, - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem == null - ? model.diagnosisTypeList.keys.first - : selectedItem, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - if (newValue != null) - setState(() { - selectedItem = newValue; - }); - }, - items: model.diagnosisTypeList.keys - .map((item) { - return DropdownMenuItem( - child: Padding( - padding: const EdgeInsets.all(8.0), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnosis, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.favoriteDiagnosisDetails.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + itemHeight: null, + value: selectedFavorite == null + ? model.favoriteDiagnosisDetails.first + .diseases + : selectedFavorite, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedFavorite = newValue; + }); + }, + items: model.favoriteDiagnosisDetails + .map((item) { + return DropdownMenuItem( child: AppText( - item ?? '', + item.diseases ?? '', fontSize: 14, letterSpacing: -0.96, color: AppGlobal.appTextColor, fontWeight: FontWeight.normal, textAlign: TextAlign.left, ), - ), - value: item, - ); - }).toList(), + value: item.diseases, + ); + }).toList(), + ), ), + ], + ), + ), + ), + + SizedBox( + height: 8, + ), + Container( + margin: EdgeInsets.only(bottom: 12), + child: AppText( + TranslationBase.of(context).condition, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + ), + // Row( + // children: [ + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = ""; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: + // Border.all(color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 1 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).acute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // )), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "2"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 2 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).subAcute, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // Expanded( + // child: InkWell( + // onTap: () { + // setState(() { + // status = "3"; + // }); + // }, + // child: Row( + // children: [ + // Container( + // padding: EdgeInsets.all(2.0), + // margin: EdgeInsets.symmetric(horizontal: 6), + // width: 20, + // height: 20, + // decoration: BoxDecoration( + // color: Colors.white, + // shape: BoxShape.circle, + // border: Border.all( + // color: Colors.grey, width: 1), + // ), + // child: Container( + // decoration: BoxDecoration( + // color: status == 3 + // ? HexColor("#D02127") + // : Colors.white, + // shape: BoxShape.circle, + // ), + // ), + // ), + // AppText( + // TranslationBase.of(context).chronic, + // fontWeight: FontWeight.normal, + // fontFamily: 'Poppins', + // fontSize: SizeConfig.textMultiplier! * 1.6, + // ), + // ], + // ), + // ), + // ), + // ], + // ), + SizedBox( + width: MediaQuery.sizeOf(context).width, + height: 24, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: model.conditionTypeList.length, + itemBuilder: (context, index) => InkWell( + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: + EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == + model.conditionTypeList[index] + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: + SizeConfig.textMultiplier! * 1.6, + ), + ], ), - ], + )), + ), + SizedBox( + height: 8, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).diagnoseType, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.diagnosisTypeList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + itemHeight: null, + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem == null + ? model.diagnosisTypeList.keys.first + : selectedItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedItem = newValue; + }); + }, + items: model.diagnosisTypeList.keys + .map((item) { + return DropdownMenuItem( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), ), ), - ), - Container( - margin: EdgeInsets.only(top: 8), - child: AppTextFieldCustom( - hintText: TranslationBase.of(context).remarks, - controller: remarksController, - minLines: 2, - maxLines: 4, - inputType: TextInputType.multiline, - onChanged: (value) {}, - onClick: () {}, - onFieldSubmitted: () {}, + Container( + margin: EdgeInsets.only(top: 8), + child: AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remarksController, + minLines: 2, + maxLines: 4, + inputType: TextInputType.multiline, + onChanged: (value) {}, + onClick: () {}, + onFieldSubmitted: () {}, + ), ), - ), - SizedBox( - height: 16, - ), - ], + SizedBox( + height: 16, + ), + ], + ), ), ), - )); + bottomNavigationBar: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(0.0), + ), + border: Border.all(color: HexColor('#707070'), width: 0), + ), + height: SizeConfig.heightMultiplier! * + (SizeConfig.isHeightVeryShort ? 12 : 10), + width: double.infinity, + child: Padding( + padding: const EdgeInsets.all(10), + child: Column( + children: [ + Center( + child: Row( + children: [ + Expanded( + child: AppButton( + title: TranslationBase.of(context).previous, + color: Colors.grey[300]!, + fontColor: Colors.black, + fontWeight: FontWeight.w600, + onPressed: () { + Navigator.pop(context); + }, + ), + ), + SizedBox( + width: 5, + ), + Expanded( + child: AppButton( + title: TranslationBase.of(context).save, + fontWeight: FontWeight.w600, + color: Color(0xFF359846), + onPressed: () async {}, + ), + ), + ], + ), + ) + ], + ), + ), + ), + )); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index b33caa3d..ff8e2bd0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -101,13 +101,13 @@ class _UpdatePlanPageVidaPlusState extends State return BaseView( onModelReady: (model) async { widget.sOAPViewModel.setPlanCallBack(this); - widget.changeLoadingState(true); WidgetsBinding.instance.addPostFrameCallback((_) async { - if (model.progressNote.isEmpty) { + widget.changeLoadingState(true); + model.getProgressNote(widget.patientInfo); - } + widget.changeLoadingState(false); + }); - widget.changeLoadingState(false); }, builder: (_, model, w) => AppScaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 23283dd3..e9304c61 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex =3; + int _currentIndex =2; List myAllergiesList = []; List myHistoryList = []; @@ -97,6 +97,12 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ + UpdateAssessmentPage( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState, + ), UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, @@ -110,12 +116,7 @@ class _UpdateSoapIndexVidaPlusState extends State currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState), - UpdateAssessmentPage( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState, - ), + UpdateSubjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 4302f215..658ebb0e 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1945,6 +1945,8 @@ class TranslationBase { String get kindlySelectCategory => localizedValues['kindlySelectCategory']![locale.languageCode]!; String get remarksCanNotBeEmpty => localizedValues['remarksCanNotBeEmpty']![locale.languageCode]!; + String get selectedDiagnosis => localizedValues['selectedDiagnosis']![locale.languageCode]!; + String get selectConditionFirst => localizedValues['selectConditionFirst']![locale.languageCode]!; } From 7765e8ff353875b957d01be5a8e8f43e9f487328 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 28 Nov 2024 16:44:13 +0300 Subject: [PATCH 40/76] current medication done. --- lib/config/config.dart | 8 + .../GetSearchCurrentMedication.dart | 40 ++ .../GetSearchCurrentMedicationDetails.dart | 108 +++ .../soap/SOAP_service.dart | 129 +++- lib/core/viewModel/SOAP_view_model.dart | 51 ++ .../add_patient_sick_leave_screen.dart | 4 +- .../allergies/reactions_selection.dart | 12 +- .../subjective/medication/add_medication.dart | 678 ++++++++++-------- .../subjective/medication/dropdown_popup.dart | 150 ++++ .../medication/update_medication_widget.dart | 121 +++- .../update_subjective_page_vida_plus.dart | 2 +- .../update_soap_index_vida_plus.dart | 12 +- 12 files changed, 953 insertions(+), 362 deletions(-) create mode 100644 lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart create mode 100644 lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart create mode 100644 lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/dropdown_popup.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 01ddb6ef..1377a582 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -318,6 +318,14 @@ const GET_EDIT_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergy'; const GET_HOME_MEDICATION = 'Services/DoctorApplication.svc/REST/GetHomeMedication'; +const SEARCH_CURRENT_MEDICATION = 'Services/DoctorApplication.svc/REST/SearchFormulary'; + +const SEARCH_CURRENT_MEDICATION_DETAILS = 'Services/DoctorApplication.svc/REST/GetFormularyMaster'; + +const REMOVE_CURRENT_MEDICATION = 'Services/DoctorApplication.svc/REST/DeleteHomeMedication'; + +const ADD_CURRENT_MEDICATION = 'Services/DoctorApplication.svc/REST/AddHomeMedication'; + var selectedPatientType = 1; //*********change value to decode json from Dropdown ************ diff --git a/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart b/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart new file mode 100644 index 00000000..fd94d9cf --- /dev/null +++ b/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart @@ -0,0 +1,40 @@ +class GetSearchCurrentMedication { + String? formularyName; + String? genericFormularyCode; + String? genericFormularyId; + int? hospitalGroupId; + int? hospitalId; + String? itemType; + bool? outOfStock; + + GetSearchCurrentMedication( + {this.formularyName, + this.genericFormularyCode, + this.genericFormularyId, + this.hospitalGroupId, + this.hospitalId, + this.itemType, + this.outOfStock}); + + GetSearchCurrentMedication.fromJson(Map json) { + formularyName = json['formularyName']; + genericFormularyCode = json['genericFormularyCode']; + genericFormularyId = json['genericFormularyId']; + hospitalGroupId = json['hospitalGroupId']; + hospitalId = json['hospitalId']; + itemType = json['itemType']; + outOfStock = json['outOfStock']; + } + + Map toJson() { + final Map data = new Map(); + data['formularyName'] = this.formularyName; + data['genericFormularyCode'] = this.genericFormularyCode; + data['genericFormularyId'] = this.genericFormularyId; + data['hospitalGroupId'] = this.hospitalGroupId; + data['hospitalId'] = this.hospitalId; + data['itemType'] = this.itemType; + data['outOfStock'] = this.outOfStock; + return data; + } +} diff --git a/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart b/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart new file mode 100644 index 00000000..0cdd9ada --- /dev/null +++ b/lib/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart @@ -0,0 +1,108 @@ +class GetSearchCurrentMedicationDetails { + List? genericItemFrequencyDetailsEntity; + List? genericItemRouteDetailsEntity; + List? itemStrengthDetailsDto; + int? patientTypeId; + + GetSearchCurrentMedicationDetails({this.genericItemFrequencyDetailsEntity, this.genericItemRouteDetailsEntity, this.itemStrengthDetailsDto, this.patientTypeId}); + + GetSearchCurrentMedicationDetails.fromJson(Map json) { + if (json['genericItemFrequencyDetailsEntity'] != null) { + genericItemFrequencyDetailsEntity = []; + json['genericItemFrequencyDetailsEntity'].forEach((v) { genericItemFrequencyDetailsEntity!.add(new GenericItemFrequencyDetailsEntity.fromJson(v)); }); + } + if (json['genericItemRouteDetailsEntity'] != null) { + genericItemRouteDetailsEntity = []; + json['genericItemRouteDetailsEntity'].forEach((v) { genericItemRouteDetailsEntity!.add(new GenericItemRouteDetailsEntity.fromJson(v)); }); + } + if (json['itemStrengthDetailsDto'] != null) { + itemStrengthDetailsDto = []; + json['itemStrengthDetailsDto'].forEach((v) { itemStrengthDetailsDto!.add(new ItemStrengthDetailsDto.fromJson(v)); }); + } + patientTypeId = json['patientTypeId']; + } + + Map toJson() { + final Map data = new Map(); + if (this.genericItemFrequencyDetailsEntity != null) { + data['genericItemFrequencyDetailsEntity'] = this.genericItemFrequencyDetailsEntity!.map((v) => v.toJson()).toList(); + } + if (this.genericItemRouteDetailsEntity != null) { + data['genericItemRouteDetailsEntity'] = this.genericItemRouteDetailsEntity!.map((v) => v.toJson()).toList(); + } + if (this.itemStrengthDetailsDto != null) { + data['itemStrengthDetailsDto'] = this.itemStrengthDetailsDto!.map((v) => v.toJson()).toList(); + } + data['patientTypeId'] = this.patientTypeId; + return data; + } +} + +class GenericItemFrequencyDetailsEntity { + bool? Default; + String? frequency; + int? frequencyId; + int? interval; + + GenericItemFrequencyDetailsEntity({this.Default, this.frequency, this.frequencyId, this.interval}); + +GenericItemFrequencyDetailsEntity.fromJson(Map json) { +Default = json['Default']; +frequency = json['Frequency']; +frequencyId = json['FrequencyId']; +interval = json['Interval']; +} + +Map toJson() { +final Map data = new Map(); +data['Default'] = this.Default; +data['Frequency'] = this.frequency; +data['FrequencyId'] = this.frequencyId; +data['Interval'] = this.interval; +return data; +} +} + +class GenericItemRouteDetailsEntity { +bool? Default; +String? route; +int? routeId; + +GenericItemRouteDetailsEntity({this.Default, this.route, this.routeId}); + +GenericItemRouteDetailsEntity.fromJson(Map json) { +Default = json['default']; +route = json['route']; +routeId = json['routeId']; +} + +Map toJson() { +final Map data = new Map(); +data['default'] = this.Default; +data['route'] = this.route; +data['routeId'] = this.routeId; +return data; +} +} + +class ItemStrengthDetailsDto { +bool? Default; +String? strength; +int? strengthId; + +ItemStrengthDetailsDto({this.Default, this.strength, this.strengthId}); + +ItemStrengthDetailsDto.fromJson(Map json) { +Default = json['default']; +strength = json['strength']; +strengthId = json['strengthId']; +} + +Map toJson() { +final Map data = new Map(); +data['default'] = this.Default; +data['strength'] = this.strength; +data['strengthId'] = this.strengthId; +return data; +} +} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 2aa75087..179e766e 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1,8 +1,10 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/search_chief_complaint_vidaplus.dart'; @@ -10,6 +12,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/get_hopi_details.dart'; import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetHomeMedication.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; @@ -27,16 +31,12 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_e import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; -import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; +import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; -import 'package:http/http.dart'; -import '../../../../config/shared_pref_kay.dart'; -import '../../../../utils/date-utils.dart'; -import '../../../model/SOAP/assessment/patch_assessment_req_model.dart'; -import '../../../model/patient/patiant_info_model.dart'; -import '../../base/lookup-service.dart'; class SOAPService extends LookupService { List patientChiefComplaintList = []; @@ -52,8 +52,8 @@ class SOAPService extends LookupService { List searchChiefComplaintListVidaPlus = []; List episodeByChiefComplaintListVidaPlus = []; List getHomeMedicationList = []; - - + List getSearchCurrentMedication = []; + List getSearchCurrentMedicationDetails = []; int? episodeID; bool isPrescriptionOrder = false; @@ -745,7 +745,6 @@ class SOAPService extends LookupService { await baseAppClient.post(GET_HOME_MEDICATION, onSuccess: (dynamic response, int statusCode) { getHomeMedicationList.clear(); - response['ListHomeMedication']['resultData'].forEach((v) { getHomeMedicationList.add(GetHomeMedicationList.fromJson(v)); }); @@ -755,27 +754,91 @@ class SOAPService extends LookupService { }, body: request); } - // createCCByEpisodeVidaPlus( - // PatiantInformtion patient, List chiefComplaint) async { - // Map request = - // { - // "appointmentId": patient.appointmentNo, - // "projectId": patient.projectId, - // "setupId": 105, - // "chiefComplain":chiefComplaint, - // "patientId": patient.patientId, - // "pomrId": patient.pomrId, - // "doctorId": 2, - // }; - // - // hasError = false; - // await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, - // onSuccess: (dynamic response, int statusCode) { - // print("Success"); - // }, onFailure: (String error, int statusCode) { - // hasError = true; - // super.error = error; - // }, body: request); - // } + searchCurrentMedication( + String query + ) async { + Map request = { + "SearchKey": query + }; + hasError = false; + await baseAppClient.post(SEARCH_CURRENT_MEDICATION, + onSuccess: (dynamic response, int statusCode) { + getSearchCurrentMedication.clear(); + response['ListFormulatorySearch']['resultData'].forEach((v) { + getSearchCurrentMedication.add(GetSearchCurrentMedication.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + + getCurrentMedicationDetails( + String id + ) async { + Map request = { + "genericFormularyId": id + }; + hasError = false; + await baseAppClient.post(SEARCH_CURRENT_MEDICATION_DETAILS, + onSuccess: (dynamic response, int statusCode) { + getSearchCurrentMedicationDetails.clear(); + response['ListFormularyMaster']['resultData'].forEach((v) { + getSearchCurrentMedicationDetails.add(GetSearchCurrentMedicationDetails.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + + removeCurrentMedicationVidaPlus( + String medicationID) async { + Map request = { + + "homeMedicationId":medicationID + }; + hasError = false; + await baseAppClient.post(REMOVE_CURRENT_MEDICATION, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + }, onFailure: (String error, int statusCode) { + + hasError = true; + super.error = error; + }, body: request); + } + + addCurrentMedicationVidaPlus( + Map request, PatiantInformtion patientInfo) async { + + var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); + + Map genericRequest ={ + "patientId": patientInfo.patientId, + "patientPomrId": patientInfo.pomrId, + "hospitalId": patientInfo.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "clinicGroupId": patientInfo.clinicGroupId, + "clinicId": patientInfo.clinicId, + "appointmentId": patientInfo.appointmentNo, + "created_by": patientInfo.doctorId, + "loginUserId": doctorProfile['List_MemberInformation'][0]['MemberID'], + }; + + Map finalRequest = {} + ..addAll(request) + ..addAll(genericRequest); + hasError = false; + await baseAppClient.post(ADD_CURRENT_MEDICATION, + onSuccess: (dynamic response, int statusCode) { + + }, onFailure: (String error, int statusCode) { + + hasError = true; + super.error = error; + }, body: finalRequest); + } } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index ba6a0c24..71a95fe5 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -18,6 +18,8 @@ import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetHomeMedication.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; @@ -145,6 +147,14 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.getHomeMedicationList; + List? get getMedicationListVP => + _SOAPService.getSearchCurrentMedication; + + + List? get getSearchCurrentMedicationDetails => + _SOAPService.getSearchCurrentMedicationDetails; + + late SubjectiveCallBack subjectiveCallBack; setSubjectiveCallBack(SubjectiveCallBack callBack) { @@ -1074,4 +1084,45 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + searchCurrentMedication(String searchQuery) async{ + setState(ViewState.BusyLocal); + await _SOAPService.searchCurrentMedication(searchQuery); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + getCurrentMedicationDetails(String id) async{ + setState(ViewState.BusyLocal); + await _SOAPService.getCurrentMedicationDetails(id); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + removeCurrentMedication(String id) async{ + setState(ViewState.BusyLocal); + await _SOAPService.removeCurrentMedicationVidaPlus(id); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + addCurrentMedication(request, PatiantInformtion patientInfo) async{ + setState(ViewState.BusyLocal); + await _SOAPService.addCurrentMedicationVidaPlus(request, patientInfo); + if (_SOAPService.hasError) { + error = _SOAPService.error; + + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + } diff --git a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart index 0fb93724..9735fe2c 100644 --- a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart +++ b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart @@ -52,7 +52,9 @@ class _AddPatientSickLeaveScreenState extends State { showDatePicker( context: context, initialDate: currentDate ?? DateTime.now(), - firstDate: DateTime(DateTime.now().year - 1), + firstDate: AppDateUtils.convertStringToDate( + widget!.patient!.arrivedOn!, + ), lastDate: DateTime(DateTime.now().year + 1), ).then((pickedDate) { if (pickedDate == null) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index b45912ef..8ac3c13b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -41,8 +41,12 @@ class _ReactionsSelectionAllergiesWidgetState extends State { bool loading = false; TextEditingController remark = TextEditingController(); + List? controllers =[]; + @override void initState() { + controllers = List.generate(widget.mySelectedAllergy! + .allergyReactionDTOs!.length, (index) => ExpansionTileController()); super.initState(); } @@ -71,6 +75,8 @@ class _ReactionsSelectionAllergiesWidgetState return Column(children: [ ExpansionTile( + + controller: controllers![index], key: Key(index.toString()), dense: false, enableFeedback: false, @@ -90,7 +96,11 @@ class _ReactionsSelectionAllergiesWidgetState .mySelectedAllergy! .allergyReactionDTOs![index] .isSelected = value; - setState(() {}); + + value ==true ? controllers![index].expand() : controllers![index].collapse() ; + setState(() { + + }); // setState(() {}); }), title: AppText(widget .mySelectedAllergy! diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart index 034da359..9cf67d16 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/add_medication.dart @@ -2,341 +2,453 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedication.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; +import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/medication/dropdown_popup.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/bottom_sheet/custom_bottom_sheet_container.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/auto_complete_text_field.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; - // ignore: must_be_immutable class AddMedication extends StatefulWidget { - final Function(MySelectedAllergy mySelectedAllergy) addMedicationFun; - TextEditingController medicationController; - - AddMedication({Key? key, required this.addMedicationFun, required this.medicationController}) : super(key: key); + final Function() addMedicationFun; + final PatiantInformtion? patientInfo; + AddMedication({Key? key, required this.addMedicationFun, this.patientInfo}) : super(key: key); @override _AddMedicationState createState() => _AddMedicationState(); } class _AddMedicationState extends State { - MasterKeyModel? _selectedMedicationDose; - MasterKeyModel? _selectedMedicationStrength; - MasterKeyModel? _selectedMedicationRoute; - MasterKeyModel? _selectedMedicationFrequency; + int? _selectedMedicationStrength; + int? _selectedMedicationRoute; + int? _selectedMedicationFrequency; + TextEditingController medicationController = TextEditingController(); TextEditingController doseController = TextEditingController(); TextEditingController strengthController = TextEditingController(); TextEditingController routeController = TextEditingController(); TextEditingController frequencyController = TextEditingController(); - GetMedicationResponseModel? _selectedMedication; - - GlobalKey> key = GlobalKey>(); + GetSearchCurrentMedication? _selectedMedication; + TextEditingController remark = TextEditingController(); + bool isVisible = false; + GlobalKey> key = + GlobalKey>(); bool isFormSubmitted = false; @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return BaseView( - onModelReady: (model) async { - // model.onAddMedicationStart(); - }, - builder: (_, model, w) => AppScaffold( + return BaseView( + onModelReady: (model) async { + // model.onAddMedicationStart(); + }, + builder: (_, model, w) => AppScaffold( backgroundColor: Colors.white, - baseViewModel: model, - isShowAppBar: true, - appBar: PatientSearchHeader( - - title:TranslationBase.of(context).addMedication, - ), - body: Container( - padding: EdgeInsets.all(15), - child: - SingleChildScrollView( - child: Column( - children: [ - // SizedBox( - // height: SizeConfig.heightMultiplier! * - // (SizeConfig.isHeightVeryShort - // ? 2 - // : SizeConfig.isHeightShort - // ? 2 - // : 2), - // ), - // Container( - // // height: screenSize.height * 0.070, - // child: InkWell( - // onTap: model.allMedicationList != null - // ? () { - // setState(() { - // _selectedMedication = GetMedicationResponseModel(); - // }); - // } - // : null, - // child: _selectedMedication == null - // // ? - // CustomAutoCompleteTextField( - // isShowError: isFormSubmitted && _selectedMedication == null, - // child: AutoCompleteTextField( - // decoration: TextFieldsUtils.textFieldSelectorDecoration(TranslationBase.of(context).searchMedicineNameHere, "", true, suffixIcon: Icons.search), - // itemSubmitted: (item) => setState(() => _selectedMedication = item), - // key: key, - // suggestions: model.allMedicationList!, - // itemBuilder: (context, suggestion) => new Padding(child: AppText(suggestion.description! + '/' + suggestion.genericName!), padding: EdgeInsets.all(8.0)), - // itemSorter: (a, b) => 1, - // itemFilter: (suggestion, input) => - // suggestion.genericName!.toLowerCase().startsWith(input.toLowerCase()) || - // suggestion.description!.toLowerCase().startsWith(input.toLowerCase()) || - // suggestion.keywords!.toLowerCase().startsWith(input.toLowerCase()), - // ), - // ) - // : - AppTextFieldCustom( - height: Utils.getTextFieldHeight(), - hintText: _selectedMedication != null - ? _selectedMedication!.description! + (' (${_selectedMedication!.genericName} )') - : TranslationBase.of(context).searchMedicineNameHere, - minLines: 1, - maxLines: 1, - isTextFieldHasSuffix: true, - suffixIcon: IconButton( - icon: Icon( - Icons.search, - color: Colors.grey.shade600, - ), - onPressed: () {}, - ), + baseViewModel: model, + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).addMedication, + ), + body: Container( + padding: EdgeInsets.all(15), + child: SingleChildScrollView( + child: Column( + children: [ - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - // ), - // ), - if (_selectedMedication != null) - Column( - children: [ - SizedBox( - height: 3, - ), - Container( - width: MediaQuery.of(context).size.width * 0.7, - child: AppText( - _selectedMedication!.description! + (' (${_selectedMedication!.genericName} )'), - color: Color(0xFF575757), - fontSize: 10, - fontWeight: FontWeight.w700, - letterSpacing: -0.4, - ), - ), - ], - ), - SizedBox( - height: 5, + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + controller: medicationController, + hintText: + TranslationBase.of(context).searchMedicineNameHere, + minLines: 1, + maxLines: 1, + isTextFieldHasSuffix: true, + validationError: isFormSubmitted && medicationController.text.isEmpty ? TranslationBase.of(context).emptyMessage : null, + suffixIcon: IconButton( + icon: model.state == ViewState.BusyLocal + ? SizedBox( + child: CircularProgressIndicator( + strokeWidth: 2, ), - AppTextFieldCustom( - height: Utils.getTextFieldHeight(), + height: 10, + width: 10, + ) + : Icon( + Icons.search, + color: Colors.grey.shade600, + ), + onPressed: () { + searchMedication(model); + }, + ), + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + // ), + // ), + model.getMedicationListVP!.isNotEmpty & isVisible + ? RoundedContainer( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.60, + child: model.state == ViewState.Idle + ? ListView.builder( + itemCount: model.getMedicationListVP!.length, + itemBuilder: (context, index) { + return ListTile( + onTap: () { + selectMedication(model, index); + }, + title: AppText( + model.getMedicationListVP![index] + .formularyName!, + )); + }, + ) + : SizedBox()) + : SizedBox(), - onClick: model.medicationDoseTimeList != null - ? () { - MasterKeyDailog dialog = MasterKeyDailog( - list: model.medicationDoseTimeList, - okText: TranslationBase.of(context).ok, - selectedValue: _selectedMedicationDose, - okFunction: (selectedValue) { - setState(() { - _selectedMedicationDose = selectedValue; + if (_selectedMedication != null) + Column( + children: [ + SizedBox( + height: 3, + ), + Container( + width: MediaQuery.of(context).size.width * 0.9, + child: AppText( + _selectedMedication!.formularyName!, + color: Color(0xFF575757), + fontSize: 10, + fontWeight: FontWeight.w700, + letterSpacing: -0.4, + ), + ), + ], + ), + SizedBox( + height: 5, + ), - doseController.text = projectViewModel.isArabic ? _selectedMedicationDose!.nameAr! : _selectedMedicationDose!.nameEn!; - }); - }, - ); - showDialog( - barrierDismissible: false, - context: context, - builder: (BuildContext context) { - return dialog; - }, - ); - } - : null, - hintText: TranslationBase.of(context).doseTime, - maxLines: 1, - minLines: 1, - isTextFieldHasSuffix: true, - controller: doseController, - validationError: isFormSubmitted && _selectedMedicationDose == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - SizedBox( - height: 5, - ), - AppTextFieldCustom( - height: Utils.getTextFieldHeight(), + SizedBox( + height: 5, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + enabled: true, + inputFormatters: [ + FilteringTextInputFormatter.digitsOnly + ], + // onClick: model.medicationDoseTimeList != null + // ? () { + // MasterKeyDailog dialog = MasterKeyDailog( + // list: model.medicationDoseTimeList, + // okText: TranslationBase.of(context).ok, + // // selectedValue: _selectedMedicationDose, + // okFunction: (selectedValue) { + // setState(() { + // _selectedMedicationDose = selectedValue; + // + // doseController.text = projectViewModel.isArabic ? _selectedMedicationDose!.nameAr! : _selectedMedicationDose!.nameEn!; + // }); + // }, + // ); + // showDialog( + // barrierDismissible: false, + // context: context, + // builder: (BuildContext context) { + // return dialog; + // }, + // ); + // } + // : null, + hintText: TranslationBase.of(context).doseDetails, + maxLines: 1, + minLines: 1, - isTextFieldHasSuffix: true, - onClick: model.medicationStrengthList != null - ? () { - MasterKeyDailog dialog = MasterKeyDailog( - list: model.medicationStrengthList, - okText: TranslationBase.of(context).ok, - selectedValue: _selectedMedicationStrength, - okFunction: (selectedValue) { - setState(() { - _selectedMedicationStrength = selectedValue; + isTextFieldHasSuffix: false, + controller: doseController, + validationError: isFormSubmitted && doseController.text.isEmpty ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 10, + ), + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + enabled: false, + isTextFieldHasSuffix: true, + onClick: model.getSearchCurrentMedicationDetails! + .isNotEmpty && + model.getSearchCurrentMedicationDetails![0] + .itemStrengthDetailsDto != + null + ? () { - strengthController.text = projectViewModel.isArabic ? _selectedMedicationStrength!.nameAr! : _selectedMedicationStrength!.nameEn!; - }); - }, - ); - showDialog( - barrierDismissible: false, - context: context, - builder: (BuildContext context) { - return dialog; - }, - ); - } - : null, - hintText: TranslationBase.of(context).strength, - maxLines: 1, - minLines: 1, - controller: strengthController, - validationError: isFormSubmitted && _selectedMedicationStrength == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - SizedBox( - height: 5, - ), - SizedBox( - height: 5, - ), - AppTextFieldCustom( - height: Utils.getTextFieldHeight(), - enabled: false, - isTextFieldHasSuffix: true, - onClick: model.medicationRouteList != null - ? () { - MasterKeyDailog dialog = MasterKeyDailog( - list: model.medicationRouteList, - selectedValue: _selectedMedicationRoute, - okText: TranslationBase.of(context).ok, - okFunction: (selectedValue) { - setState(() { - _selectedMedicationRoute = selectedValue; + DropdownPopup dialog = DropdownPopup( + medicationDetails: + model.getSearchCurrentMedicationDetails![0], + isStrength: true, + okText: TranslationBase.of(context).ok, + selectedID:model.getSearchCurrentMedicationDetails![0] + .itemStrengthDetailsDto![0] + .strengthId!, + okFunction: (int id, String value) { + _selectedMedicationStrength = id; + strengthController.text = value; + setState(() {}); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).strength, + maxLines: 1, + minLines: 1, + controller: strengthController, + // validationError: isFormSubmitted && _selectedMedicationStrength == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 5, + ), + SizedBox( + height: 5, + ), - routeController.text = projectViewModel.isArabic ? _selectedMedicationRoute!.nameAr! : _selectedMedicationRoute!.nameEn!; - }); - }, - ); - showDialog( - barrierDismissible: false, - context: context, - builder: (BuildContext context) { - return dialog; - }, - ); - } - : null, - hintText: TranslationBase.of(context).route, - maxLines: 1, - minLines: 1, - controller: routeController, - validationError: isFormSubmitted && _selectedMedicationRoute == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - SizedBox( - height: 5, - ), - SizedBox( - height: 5, - ), - AppTextFieldCustom( - height: Utils.getTextFieldHeight(), - onClick: model.medicationFrequencyList != null - ? () { - MasterKeyDailog dialog = MasterKeyDailog( - list: model.medicationFrequencyList, - okText: TranslationBase.of(context).ok, - selectedValue: _selectedMedicationFrequency, - okFunction: (selectedValue) { - setState(() { - _selectedMedicationFrequency = selectedValue; + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + enabled: false, + isTextFieldHasSuffix: true, - frequencyController.text = projectViewModel.isArabic ? _selectedMedicationFrequency!.nameAr! : _selectedMedicationFrequency!.nameEn!; - }); - }, - ); - showDialog( - barrierDismissible: false, - context: context, - builder: (BuildContext context) { - return dialog; - }, - ); - } - : null, - hintText: TranslationBase.of(context).frequency, - enabled: false, - maxLines: 1, - minLines: 1, - isTextFieldHasSuffix: true, - controller: frequencyController, - validationError: isFormSubmitted && _selectedMedicationFrequency == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - // SizedBox( - // height: SizeConfig.heightMultiplier! * - // (SizeConfig.isHeightVeryShort - // ? 20 - // : SizeConfig.isHeightShort - // ? 15 - // : 10), - // ), - ], - ), - ),), + onClick: model.getSearchCurrentMedicationDetails! + .isNotEmpty && + model.getSearchCurrentMedicationDetails![0] + .genericItemRouteDetailsEntity != + null + ? () { + + DropdownPopup dialog = DropdownPopup( + medicationDetails: + model.getSearchCurrentMedicationDetails![0], + okText: TranslationBase.of(context).ok, + isRoute: true, + selectedID: model + .getSearchCurrentMedicationDetails![0] + .genericItemRouteDetailsEntity![0] + .routeId!, + // selectedText: , + okFunction: (int id, String value) { + setState(() { + _selectedMedicationRoute = id; + routeController.text = value; + }); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).route, + maxLines: 1, + minLines: 1, + controller: routeController, + // validationError: isFormSubmitted && _selectedMedicationRoute == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 10, + ), + + AppTextFieldCustom( + height: Utils.getTextFieldHeight(), + + onClick: model.getSearchCurrentMedicationDetails! + .isNotEmpty && + model.getSearchCurrentMedicationDetails![0] + .genericItemFrequencyDetailsEntity != + null + ? () { + DropdownPopup dialog = DropdownPopup( + medicationDetails: + model.getSearchCurrentMedicationDetails![0], + okText: TranslationBase.of(context).ok, + selectedID: model + .getSearchCurrentMedicationDetails![0] + .genericItemFrequencyDetailsEntity![0] + .frequencyId! , + okFunction: (int id, String value) { + _selectedMedicationFrequency = id; + frequencyController.text = value; + setState(() {}); + }, + ); + showDialog( + barrierDismissible: false, + context: context, + builder: (BuildContext context) { + return dialog; + }, + ); + } + : null, + hintText: TranslationBase.of(context).frequency, + enabled: false, + maxLines: 1, + minLines: 1, + isTextFieldHasSuffix: true, + controller: frequencyController, - bottomSheet: model.state != ViewState.Idle - ? Container( - height: 0, + // validationError: isFormSubmitted && _selectedMedicationFrequency == null ? TranslationBase.of(context).emptyMessage : null, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 10, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).remarks, + controller: remark, + maxLines: 4, + minLines: 4, + hasBorder: true, + inputType: TextInputType.multiline, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, ) - : CustomBottomSheetContainer( - label: TranslationBase.of(context).addMedication, - onTap: () { + ], + ), + ), + ), + bottomSheet: + CustomBottomSheetContainer( + label: TranslationBase.of(context).addMedication, + onTap: () { + if(medicationController.text.isNotEmpty && doseController.text.isNotEmpty){ + addMedication(model); + }else { + isFormSubmitted = true; setState(() { - isFormSubmitted = true; + }); - if (_selectedMedication != null && - _selectedMedicationDose != null && - _selectedMedicationStrength != null && - _selectedMedicationRoute != null && - _selectedMedicationFrequency != null) { - widget.medicationController.text = widget.medicationController.text + - '${_selectedMedication!.description} (${TranslationBase.of(context).doseTime} ) ${doseController.text} (${TranslationBase.of(context).strength}) ${strengthController.text} (${TranslationBase.of(context).route}) ${routeController.text} (${TranslationBase.of(context).frequency}) ${frequencyController.text} \n \n'; - Navigator.of(context).pop(); - } - }, - )), + } + }, + )), ); } + + searchMedication(model) async { + await model.searchCurrentMedication(medicationController.text); + isVisible = true; + setState(() {}); + } + + selectMedication(SOAPViewModel model, int index) { + _selectedMedication = model.getMedicationListVP![index]; + medicationController.text = + model.getMedicationListVP![index].formularyName!; + isVisible = false; + getOtherDetails(model, model.getMedicationListVP![index]); + setState(() {}); + } + + getOtherDetails( + SOAPViewModel model, GetSearchCurrentMedication selectMedicine) async { + GifLoaderDialogUtils.showMyDialog(context); + await model.getCurrentMedicationDetails(selectMedicine.genericFormularyId!); + + GifLoaderDialogUtils.hideDialog(context); + setDefaultValues(model); + } + setDefaultValues(SOAPViewModel model){ + _selectedMedicationStrength = model.getSearchCurrentMedicationDetails![0] + .itemStrengthDetailsDto![0] + .strengthId!; + strengthController.text = model + .getSearchCurrentMedicationDetails![0] + .itemStrengthDetailsDto![0] + .strength!; + + _selectedMedicationRoute = model + .getSearchCurrentMedicationDetails![0] + .genericItemRouteDetailsEntity![0] + .routeId!; + routeController.text= model + .getSearchCurrentMedicationDetails![0] + .genericItemRouteDetailsEntity![0] + .route!; + _selectedMedicationFrequency = model + .getSearchCurrentMedicationDetails![0] + .genericItemFrequencyDetailsEntity![0] + .frequencyId!; + frequencyController.text= model + .getSearchCurrentMedicationDetails![0] + .genericItemFrequencyDetailsEntity![0] + .frequency!; + + } + + addMedication(SOAPViewModel model) async{ + Map request ={ + + "doseQuantity": doseController.text, + "frequencyId": _selectedMedicationFrequency, + "frequencyString":frequencyController.text, + "strengthId": _selectedMedicationStrength, + "strengthString": strengthController.text, + "routeId": _selectedMedicationRoute, + "routeString": routeController.text, + "remarks": remark.text, + "sentence": medicationController.text, + "formularyName": _selectedMedication!.formularyName!, + "genericFormularyId": _selectedMedication!.genericFormularyId!, + + }; + GifLoaderDialogUtils.showMyDialog(context); + + await model.addCurrentMedication(request, widget.patientInfo!); + await model.getHomeMedication(widget.patientInfo!); + GifLoaderDialogUtils.hideDialog(context); + Navigator.of(context).pop(); + + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/dropdown_popup.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/dropdown_popup.dart new file mode 100644 index 00000000..07f7a617 --- /dev/null +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/dropdown_popup.dart @@ -0,0 +1,150 @@ +import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetSearchCurrentMedicationDetails.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + + +class DropdownPopup extends StatefulWidget { + final GetSearchCurrentMedicationDetails? medicationDetails; + bool isStrength; + bool isRoute; + bool isFrequency; + int? selectedID; + String? selectedText; + final okText; + final Function(int selectedID, String selectedText)? okFunction; + DropdownPopup({this.medicationDetails, this.isStrength = false, this.okFunction, this.okText, this.selectedID, this.isRoute =false, this.isFrequency =false, this.selectedText }); + + @override + _DropdownPopupState createState() => _DropdownPopupState(); +} + +class _DropdownPopupState extends State { + @override + void initState() { + super.initState(); + + } + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return showAlertDialog(context, projectViewModel); + } + + showAlertDialog(BuildContext context, ProjectViewModel projectViewModel) { + // set up the buttons + Widget cancelButton = ElevatedButton( + child: AppText( + TranslationBase.of(context).cancel, + color: Colors.white, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3.5 : 5), + ), + onPressed: () { + Navigator.of(context).pop(); + }); + Widget continueButton = ElevatedButton( + child: AppText( + this.widget.okText, + color: Colors.white, + fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3.5 : 5), + ), + onPressed: () { + + // this.widget.okFunction(selectedValue); + Navigator.of(context).pop(); + }); +// set up the AlertDialog + AlertDialog alert = AlertDialog( + // title: Text(widget.title), + content: createDialogList(projectViewModel), + actions: [ + cancelButton, + continueButton, + ], + ); + return alert; + } + + Widget createDialogList(ProjectViewModel projectViewModel) { + return Container( + height: MediaQuery.of(context).size.height * 0.5, + child: SingleChildScrollView( + child: widget.isStrength ? Column( + children: [ + + ...widget.medicationDetails!.itemStrengthDetailsDto! + .map((item) => RadioListTile( + title: AppText( + '${item.strength}', + ), + groupValue: widget.selectedID!.toString(), + value: item.strengthId.toString(), + activeColor: Colors.blue.shade700, + selected: item.strengthId.toString() == widget.selectedID!.toString(), + onChanged: (val) { + widget.selectedID = item.strengthId; + widget.selectedText = item.strength; + widget.okFunction!( item.strengthId!, item.strength!); + + }, + )) + .toList() + ], + ) : + + widget.isRoute ? Column( children: [ + + ...widget.medicationDetails!.genericItemRouteDetailsEntity! + .map((item) => RadioListTile( + title: AppText( + '${item.route}', + ), + groupValue: widget.selectedID!.toString(), + value: item.routeId.toString(), + activeColor: Colors.blue.shade700, + selected: item.routeId.toString() == widget.selectedID!.toString(), + onChanged: (val) { + widget.selectedID = item.routeId; + widget.selectedText = item.route; + widget.okFunction!( item.routeId!, item.route!); + + }, + )) + .toList() + ], + ) : Column( children: [ + + ...widget.medicationDetails!.genericItemFrequencyDetailsEntity! + .map((item) => RadioListTile( + title: AppText( + '${item.frequency}', + ), + groupValue: widget.selectedID!.toString(), + value: item.frequencyId.toString(), + activeColor: Colors.blue.shade700, + selected: item.frequencyId.toString() == widget.selectedID!.toString() , + onChanged: (val) { + widget.selectedID = item.frequencyId; + widget.selectedText = item.frequency; + widget.okFunction!( item.frequencyId!, item.frequency!); + setState(() { + + }); + }, + )) + .toList() + ], + ), + ), + ); + } + + static closeAlertDialog(BuildContext context) { + Navigator.of(context).pop(); + } +} diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart index 26606791..91cfd08c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart @@ -1,18 +1,25 @@ +import 'package:doctor_app_flutter/core/model/SOAP/home_medication_vp/GetHomeMedication.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'add_medication.dart'; class UpdateMedicationWidget extends StatefulWidget { - final TextEditingController? medicationController; - + final PatiantInformtion patientInfo; UpdateMedicationWidget({ Key? key, - this.medicationController, + required this.patientInfo, }); @override @@ -20,45 +27,83 @@ class UpdateMedicationWidget extends StatefulWidget { } class _UpdateMedicationWidgetState extends State { + TextEditingController medicationController = TextEditingController(); + @override Widget build(BuildContext context) { - return Column( - children: [ - AddSoapItem( - title: "${TranslationBase.of(context).addMedication}", - onAddSoapItemClicked: () { - Navigator.push( - context, - FadePage( - page:AddMedication( - addMedicationFun: (MySelectedAllergy mySelectedAllergy) {}, - medicationController: widget.medicationController!, - ) + return BaseView( + onModelReady: (model) async { + model.getHomeMedication(widget.patientInfo); + }, + builder: (_, model, w) => + Column( + children: [ + AddSoapItem( + title: "${TranslationBase + .of(context) + .addMedication}", + onAddSoapItemClicked: () { + Navigator.push( + context, + FadePage( + page: AddMedication( + patientInfo: widget.patientInfo, + addMedicationFun:(){ + + } + ) - )); - // openMedicationList(context); - }, - ), - SizedBox( - height: 20, - ) + )); + // openMedicationList(context); + }, + ), + SizedBox( + height: 20, + ), + ListView( + padding: EdgeInsets.all(10), + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + children: model.getHomeMedicationList!.map((medication) { + return ListTile( + trailing: TextButton.icon( + onPressed: () { + removeMedication(medication, model); + }, + icon: SvgPicture.asset( + "assets/images/svgs/delete.svg", + height: 18, + color: Color(0xffD02127), + ), + label: AppText( + TranslationBase.of(context) + .remove, + fontSize: 12, + color: Color(0xffD02127))), + title: + AppText( + medication.prescribedItemName!, + fontSize: 12, + fontWeight: FontWeight.w800, + letterSpacing: -0.48, + ), + subtitle: AppText( + '${medication.doseQuantity!} - ${ medication.frequencyString!}', + fontSize: 10, - ], - ); + ), + ); + }).toList()), + + + ] + )); + } + removeMedication(GetHomeMedicationList medication, SOAPViewModel model) async{ + GifLoaderDialogUtils.showMyDialog(context); + await model.removeCurrentMedication(medication.id!); + await model.getHomeMedication(widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); } - // - // openMedicationList(BuildContext context) { - // showModalBottomSheet( - // backgroundColor: Colors.white, - // isScrollControlled: true, - // isDismissible: false, - // context: context, - // builder: (context) { - // return AddMedication( - // addMedicationFun: (MySelectedAllergy mySelectedAllergy) {}, - // medicationController: widget.medicationController!, - // ); - // }); - // } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart index 46c803a7..f496ec09 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/update_subjective_page_vida_plus.dart @@ -279,7 +279,7 @@ class _UpdateSubjectivePageVidaPlusState (SizeConfig.isHeightVeryShort ? 4 : 2), ), UpdateMedicationWidget( - medicationController: medicationController, + patientInfo: widget.patientInfo, ), SizedBox( height: 10, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 4608e1e0..8bc4191f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -177,8 +177,8 @@ class _UpdateSoapIndexVidaPlusState extends State fontWeight: FontWeight.w600, color: Colors.red[700]!, onPressed: () async { - - model.nextOnSubjectPage(model); + changePageViewIndex(1); + //model.nextOnSubjectPage(model); }, ), ); @@ -220,7 +220,8 @@ class _UpdateSoapIndexVidaPlusState extends State // padding: 10, disabled: model.state == ViewState.BusyLocal, onPressed: () async { - await model.nextOnObjectivePage(model); + changePageViewIndex(2); + // await model.nextOnObjectivePage(model); }, ), ), @@ -256,7 +257,7 @@ class _UpdateSoapIndexVidaPlusState extends State color: Colors.red[700]!, disabled: model.state == ViewState.BusyLocal, onPressed: () async { - model.nextOnAssessmentPage(model); + changePageViewIndex(3); }, ), ), @@ -294,7 +295,8 @@ class _UpdateSoapIndexVidaPlusState extends State color: Colors.red[700]!, disabled: model.progressNoteText.isEmpty, onPressed: () async { - model.nextOnPlanPage(model); + changePageViewIndex(3); + // model.nextOnPlanPage(model); }, ), ), From 1976c04e12c141aa6c396a79834905389b07b6d8 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 10:32:12 +0300 Subject: [PATCH 41/76] WD: diagnosis and progress note get and getclininc api added. --- lib/config/config.dart | 3 + lib/config/localized_values.dart | 2 + .../patient_previous_diagnosis.dart | 101 +++- lib/core/model/SOAP/progress_note/Clinic.dart | 35 ++ .../soap/SOAP_service.dart | 109 +++- lib/core/viewModel/SOAP_view_model.dart | 39 +- .../assessment/widget/current_diagnosis.dart | 20 +- .../assessment/widget/edit_diagnosis.dart | 399 ++++++++------ .../assessment/widget/enter_diagnosis.dart | 6 +- .../plan/widget/add_progress_note.dart | 7 + .../widget/add_progress_note_details.dart | 488 +++++++++--------- .../update_soap_index_vida_plus.dart | 10 +- .../translations_delegate_base_utils.dart | 2 + 13 files changed, 774 insertions(+), 447 deletions(-) create mode 100644 lib/core/model/SOAP/progress_note/Clinic.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index d6f98ec6..a818633c 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -342,6 +342,9 @@ const GET_LIST_OF_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisDeta const EDIT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/EditDiagnosis'; +const RESOLVE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisResolve'; +const GET_CLINIC = 'Services/DoctorApplication.svc/REST/GetDoctorClinicsForVidaPlus'; + var selectedPatientType = 1; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 283cfb13..240edfef 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1208,11 +1208,13 @@ const Map> localizedValues = { "kindlySelectCategory": {"en": "Kindly Select Any Diagnosis Category", "ar":"يرجى اختيار أي فئة تشخيص"}, "noRemarks": {"en": "No Remarks", "ar":"لا ملاحظات"}, "event": {"en": "Event: ", "ar":"حدث: "}, + "editDiagnosis": {"en": "Edit Diagnosis ", "ar":"تحرير التشخيص"}, "selectedDiagnosis": {"en": "Kindly Select Diagnosis", "ar":"يرجى اختيار التشخيص: "}, "selectConditionFirst": {"en": "Kindly Select Diagnosis Condition", "ar":"يرجى اختيار حالة التشخيص: "}, "deletedRemarks": {"en": "Deleted Remarks: ", "ar":"ملاحظات محذوفة: "}, "newValue": {"en": "New Value: ", "ar":"قيمة جديدة: "}, "fieldName": {"en": "Field Name: ", "ar":"اسم الحقل: "}, + "noChangeRecorded": {"en": "No Change Recorded Unable To Perform Edit", "ar":"لم يتم تسجيل أي تغيير، غير قادر على إجراء التحرير"}, "oldValue": {"en": "Old Value: ", "ar":"القيمة القديمة: "}, "favoriteDiagnosis": {"en": "Favorite Diagnosis", "ar":"التشخيص المفضل"}, "addToFavorite": {"en": "Add To Favorite", "ar":"إضافة إلى المفضلة"}, diff --git a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart index 0cc2401e..c4fc3b71 100644 --- a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart @@ -107,6 +107,61 @@ class PatientPreviousDiagnosis { }); } } + + Map toJson() { + return { + 'active': active, + 'admissionId': admissionId, + 'admissionRequestId': admissionRequestId, + 'appointmentId': appointmentId, + 'approvedBy': approvedBy, + 'approvedOn': approvedOn, + 'assessmentId': assessmentId, + 'chiefComplainId': chiefComplainId, + 'clinicGroupId': clinicGroupId, + 'clinicId': clinicId, + 'condition': condition, + 'createdBy': createdBy, + 'createdOn': createdOn, + 'deletedBy': deletedBy, + 'deletedByDoctorName': deletedByDoctorName, + 'deletedOn': deletedOn, + 'deletedRemarks': deletedRemarks, + 'diagnosisType': diagnosisType, + 'doctorId': doctorId, + 'episodeId': episodeId, + 'hospitalGroupId': hospitalGroupId, + 'hospitalId': hospitalId, + 'icdCodeDetailsDto': icdCodeDetailsDto, + 'icdSubVersion': icdSubVersion, + 'icdType': icdType, + 'icdVersion': icdVersion, + 'location': location, + 'loginUserId': loginUserId, + 'modifiedBy': modifiedBy, + 'modifiedOn': modifiedOn, + 'module': module, + 'parentLocation': parentLocation, + 'patientId': patientId, + 'patientProblemChangeHistories': patientProblemChangeHistories, + 'patientProblemId': patientProblemId, + 'patientProblemRevisionId': patientProblemRevisionId, + 'pomrId': pomrId, + 'previousProblem': previousProblem, + 'problemId': problemId, + 'problemName': problemName, + 'remarks': remarks, + 'resolved': resolved, + 'selectedCategoryCode': selectedCategoryCode, + 'selectedChapterCode': selectedChapterCode, + 'selectedDisease': selectedDisease, + 'selectedIcdCode': selectedIcdCode, + 'selectedSectionCode': selectedSectionCode, + 'status': status, + 'visitWiseSelected': visitWiseSelected, + 'visitWisePatientDiagnoses': visitWisePatientDiagnoses?.map((v) => v.toJson()).toList(), + }; + } } class VisitWisePatientDiagnosis { @@ -130,7 +185,7 @@ class VisitWisePatientDiagnosis { int? hospitalId; String? icdSubVersion; String? icdType; - dynamic icdVersion; // Adjust type if necessary + dynamic icdVersion; bool? isPreviousProblem; String? location; String? loginUserId; @@ -187,4 +242,46 @@ class VisitWisePatientDiagnosis { selectedDoctorId = json['selectedDoctorId']; selectedIcdCode = json['selectedIcdCode']; } -} \ No newline at end of file + + Map toJson() { + return { + 'active': active, + 'admissionId': admissionId, + 'appointmentId': appointmentId, + 'approvedBy': approvedBy, + 'approvedOn': approvedOn, + 'assessmentId': assessmentId, + 'clinicId': clinicId, + 'condition': condition, + 'createdBy': createdBy, + 'createdOn': createdOn, + 'deletedBy': deletedBy, + 'deletedOn': deletedOn, + 'deletedRemarks': deletedRemarks, + 'diagnosisType': diagnosisType, + 'doctorId': doctorId, + 'episodeId': episodeId, + 'hospitalGroupId': hospitalGroupId, + 'hospitalId': hospitalId, + 'icdSubVersion': icdSubVersion, + 'icdType': icdType, + 'icdVersion': icdVersion, + 'isPreviousProblem': isPreviousProblem, + 'location': location, + 'loginUserId': loginUserId, + 'modifiedBy': modifiedBy, + 'modifiedOn': modifiedOn, + 'patientDiagnosisId': patientDiagnosisId, + 'patientId': patientId, + 'patientProblemRevisionId': patientProblemRevisionId, + 'pomrId': pomrId, + 'problemName': problemName, + 'remarks': remarks, + 'resolved': resolved, + 'selected': selected, + 'selectedDisease': selectedDisease, + 'selectedDoctorId': selectedDoctorId, + 'selectedIcdCode': selectedIcdCode, + }; + } +} diff --git a/lib/core/model/SOAP/progress_note/Clinic.dart b/lib/core/model/SOAP/progress_note/Clinic.dart new file mode 100644 index 00000000..70f56492 --- /dev/null +++ b/lib/core/model/SOAP/progress_note/Clinic.dart @@ -0,0 +1,35 @@ +class Clinic { + int? clinicGroupID; + String? clinicGroupName; + int? clinicID; + String? clinicNameArabic; + String? clinicNameEnglish; + + Clinic({ + this.clinicGroupID, + this.clinicGroupName, + this.clinicID, + this.clinicNameArabic, + this.clinicNameEnglish, + }); + + factory Clinic.fromJson(Map json) { + return Clinic( + clinicGroupID: json['clinicGroupID'], + clinicGroupName: json['clinicGroupName'], + clinicID: json['clinicID'], + clinicNameArabic: json['clinicNameArabic'], + clinicNameEnglish: json['clinicNameEnglish'], + ); + } + + Map toJson() { + return { + 'clinicGroupID': clinicGroupID, + 'clinicGroupName': clinicGroupName, + 'clinicID': clinicID, + 'clinicNameArabic': clinicNameArabic, + 'clinicNameEnglish': clinicNameEnglish, + }; + } +} \ No newline at end of file diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index d91be174..361eff19 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -31,6 +31,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_reques import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/Clinic.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; @@ -63,6 +64,7 @@ class SOAPService extends LookupService { List searchDiagnosisList = []; List patientPhysicalExaminationList = []; List generalSpeciality = []; + List clinicsList = []; Map> specialityDetails = {}; Map diagnosisTypeList = {}; Map conditionTypeList = {}; @@ -938,8 +940,8 @@ class SOAPService extends LookupService { }, body: request); } - Future addToFavoriteDiagnosis(PatiantInformtion paitientInfo, String doctorName, - String subFavoriteCode, dynamic? userId) async { + Future addToFavoriteDiagnosis(PatiantInformtion paitientInfo, + String doctorName, String subFavoriteCode, dynamic? userId) async { Map request = { "ProjectID": paitientInfo.projectId, "listDiagnosisFavourite": [ @@ -960,13 +962,13 @@ class SOAPService extends LookupService { onSuccess: (dynamic response, int statusCode) { var result = response['ListDiagnosisAddFavourite']['resultData']; isFavoriteAdded = true; - if ((result as List).isEmpty) { + if ((result is List) && (result as List).isEmpty) { DrAppToastMsg.showErrorToast( response['ListDiagnosisAddFavourite']['message']); } else { - DrAppToastMsg.showSuccesToast(response['ListDiagnosisAddFavourite']['message']); + DrAppToastMsg.showSuccesToast( + response['ListDiagnosisAddFavourite']['message']); } - }, onFailure: (String error, int statusCode) { favoriteDiagnosisDetailsList.clear(); hasError = true; @@ -1062,9 +1064,13 @@ class SOAPService extends LookupService { } } - Future createDiagnosis(PatiantInformtion patient, SearchDiagnosis? searchDiagnosis, - String? diagnosisType, String conditionType, String remarks, bool isNew) async{ - + Future createDiagnosis( + PatiantInformtion patient, + SearchDiagnosis? searchDiagnosis, + String? diagnosisType, + String conditionType, + String remarks, + bool isNew) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); var request = { "pomrId": patient.pomrId, @@ -1094,35 +1100,88 @@ class SOAPService extends LookupService { "doctorId": patient.doctorId, "doctorCode": user?['List_MemberInformation'][0]['MemberID'], "ProjectID": patient.projectId, - "codeRange":searchDiagnosis.codeRange + "codeRange": searchDiagnosis.codeRange }; var success = false; await baseAppClient.post(CREATE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); - success = true; - }, onFailure: (String error, int statusCode) { + DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + success = true; + }, onFailure: (String error, int statusCode) { success = false; - hasError = true; - super.error = error; - }, body: request); + hasError = true; + super.error = error; + }, body: request); return success; } - Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async{ - Map? user = await sharedPref.getObj(LOGGED_IN_USER); - var request = diag; + Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async { + var request = diagnosis.toJson(); var success = false; - await baseAppClient.post(CREATE_DIAGNOSIS, + await baseAppClient.post(EDIT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); - success = true; - }, onFailure: (String error, int statusCode) { + if (response['ListVisitWisePatientDiagnosis']['resultData'] != null && + (response['ListVisitWisePatientDiagnosis']['resultData'] as List) + .isNotEmpty) { + success = true; + return; + } success = false; - hasError = true; - super.error = error; - }, body: request); + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + + Future resolveDiagnosis(PatientPreviousDiagnosis diagnosis) async { + var request = { + "patientProblemRevisionId": diagnosis.patientProblemRevisionId, + "patientProblemId": diagnosis.patientProblemId, + "patientId": diagnosis.patientId, + "doctorId": diagnosis.doctorId, + "pomrId": diagnosis.pomrId, + "appointmentId": diagnosis.appointmentId, + "problemId": diagnosis.problemId, + "diagnosisType": diagnosis.diagnosisType, + }; + var success = false; + await baseAppClient.post(RESOLVE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + if (response['ListDiagnosisResolve'] != null && + response['ListDiagnosisResolve']['resultData'] != null && + (response['ListVisitWisePatientDiagnosis']['resultData'] as List) + .isNotEmpty) { + success = true; + return; + } + success = false; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + + Future getClinic() async { + Map request = {}; + var success = false; + await baseAppClient.post(GET_CLINIC, + onSuccess: (dynamic response, int statusCode) { + response['ListDoctorClinics'].forEach((v) => + v['categories'].forEach( + (cat) => clinicsList.add(Clinic.fromJson(cat)))); + success = false; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); return success; } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index ff0733a4..c621e4c2 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -9,7 +9,6 @@ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_re import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/audit_diagnosis.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/patient_previous_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; @@ -26,13 +25,12 @@ import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_in import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/Category.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/patient_physical_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_examination_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/Clinic.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; @@ -156,6 +154,8 @@ class SOAPViewModel extends BaseViewModel { List get progressNote => _SOAPService.patientProgressNoteListVidaPlus; + List get clinics => + _SOAPService.clinicsList; Map> get specialityDetails => _SOAPService.specialityDetails; @@ -1285,6 +1285,29 @@ class SOAPViewModel extends BaseViewModel { return result; } + + Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async { + setState(ViewState.BusyLocal); + bool result = await _SOAPService.editDiagnosis(diagnosis); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + return result; + } + + Future resolveDiagnosis(PatientPreviousDiagnosis diagnosis) async { + setState(ViewState.BusyLocal); + bool result = await _SOAPService.resolveDiagnosis(diagnosis); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + return result; + } + void changeCurrentCategorySelectedState( GeneralSpeciality selectedExamination, bool status) { final item = speciality.firstWhere( @@ -1308,4 +1331,14 @@ class SOAPViewModel extends BaseViewModel { speciality = searchList; notifyListeners(); } + + getClinics() async { + setState(ViewState.BusyLocal); + await _SOAPService.getClinic(); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 5a493e21..e88f2612 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_list_bottom_sheet.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; @@ -97,7 +98,7 @@ class _CurrentDiagnosisState extends State { remarks: widget.currentDiagnosisItems[index].remarks ?? '', - onSoapDetailActionClicked: (action) { + onSoapDetailActionClicked: (action) async{ switch (action) { case SoapDetailItemActions.AUDIT: model.getAuditOfDiagnosis( @@ -108,9 +109,22 @@ class _CurrentDiagnosisState extends State { ''); break; case SoapDetailItemActions.EDIT: - // TODO: Handle this case. + bool result = await Navigator.push( + context, + FadePage( + page: EditDiagnosis( + patientInfo: widget.patientInfo, diagnosis: widget.currentDiagnosisItems[index], + ))); + if (result) { + model.getCurrentDiagnosisList(widget.patientInfo); + } + break; case SoapDetailItemActions.RESOLVE: - // TODO: Handle this case. + bool result = await model.resolveDiagnosis(widget.currentDiagnosisItems[index]); + if (result) { + model.getCurrentDiagnosisList(widget.patientInfo); + } + break; case SoapDetailItemActions.REMOVE: showConfirmationDialog(context, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index fca866bc..fcb2cc05 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -19,31 +19,41 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; +import 'package:get_it/get_it.dart'; import 'package:hexcolor/hexcolor.dart'; -List patientState = ["", "Stable", "Not Stable", "Not Defined"]; - -class EnterDiagnosis extends StatefulWidget { +class EditDiagnosis extends StatefulWidget { final PatiantInformtion patientInfo; final PatientPreviousDiagnosis diagnosis; - const EnterDiagnosis({super.key, required this.patientInfo, required this.diagnosis}); + const EditDiagnosis( + {super.key, required this.patientInfo, required this.diagnosis}); @override - State createState() => _EnterDiagnosisState(); + State createState() => _EditDiagnosisState(); } -class _EnterDiagnosisState extends State { +class _EditDiagnosisState extends State { final TextEditingController filteredSearchController = - TextEditingController(); + TextEditingController(); bool showAllDiagnosis = true; String status = ''; String? selectedDiagnosisItem; + String? selectedDiagnosisItemValue; TextEditingController remarksController = TextEditingController(); Timer? _tTimer; SOAPViewModel? model; SearchDiagnosis? selectedDiagnosis; + @override + void initState() { + super.initState(); + filteredSearchController.text = widget.diagnosis.selectedDisease ?? ''; + filteredSearchController.text = widget.diagnosis.remarks ?? ''; + status = widget.diagnosis.condition ?? ''; + selectedDiagnosisItemValue = widget.diagnosis?.diagnosisType ?? ''; + } + void _onTextChanged(String text) { if (_tTimer != null) { _tTimer!.cancel(); @@ -59,15 +69,31 @@ class _EnterDiagnosisState extends State { @override Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) { - this.model = model; - }, - builder: (_, model, w) => AppScaffold( - isLoading: model.state == ViewState.BusyLocal , + return BaseView(onModelReady: (model) { + this.model = model; + WidgetsBinding.instance.addPostFrameCallback((_) { + model.getConditionAndType(widget.patientInfo); + }); + }, builder: (_, model, w) { + if (selectedDiagnosisItem == null && model.diagnosisTypeList.isNotEmpty) { + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) { + setState(() { + selectedDiagnosisItem = model.diagnosisTypeList.keys.firstWhere( + (k) => + model.diagnosisTypeList[k] == selectedDiagnosisItemValue, + orElse: () => ''); + if (selectedDiagnosisItem?.isEmpty == true) + selectedDiagnosisItem = null; + }); + } + }); + } + return AppScaffold( + isLoading: model.state == ViewState.BusyLocal, isShowAppBar: true, appBar: PatientSearchHeader( - title: TranslationBase.of(context).addDiagnosis), + title: TranslationBase.of(context).editDiagnosis), body: SingleChildScrollView( child: Padding( padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16), @@ -75,7 +101,7 @@ class _EnterDiagnosisState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - TranslationBase.of(context).addDiagnosis, + TranslationBase.of(context).editDiagnosis, fontWeight: FontWeight.w600, color: Color(0xFF2E303A), fontSize: 16, @@ -90,7 +116,7 @@ class _EnterDiagnosisState extends State { controller: filteredSearchController, onClick: () { setState( - () { + () { selectedDiagnosis = null; filteredSearchController.text = ''; model.selectedIcd = ''; @@ -124,12 +150,12 @@ class _EnterDiagnosisState extends State { child: AppText(model.icdVersionList[index]), onTap: () { setState( - () { + () { selectedDiagnosis = model.findTheDiagnosisItem( model.icdVersionList[index]); filteredSearchController.text = - model.icdVersionList[index]; + model.icdVersionList[index]; model.searchDiagnosisList.clear(); model.icdVersionList.clear(); }, @@ -145,34 +171,34 @@ class _EnterDiagnosisState extends State { SizedBox( height: 8, ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Switch( - value: showAllDiagnosis, - activeColor: Colors.red, - onChanged: (bool value) { - setState(() { - showAllDiagnosis = value; - }); - }, - ), - SizedBox( - width: 8, - ), - AppText( - TranslationBase.of(context).showAllDiagnosis, - fontWeight: FontWeight.w500, - color: Color(0xFF2E303A), - fontSize: 11, - ), - ], - ), - SvgPicture.asset('assets/images/svgs/information.svg'), - ], - ), + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [ + // Row( + // children: [ + // Switch( + // value: showAllDiagnosis, + // activeColor: Colors.red, + // onChanged: (bool value) { + // setState(() { + // showAllDiagnosis = value; + // }); + // }, + // ), + // SizedBox( + // width: 8, + // ), + // AppText( + // TranslationBase.of(context).showAllDiagnosis, + // fontWeight: FontWeight.w500, + // color: Color(0xFF2E303A), + // fontSize: 11, + // ), + // ], + // ), + // SvgPicture.asset('assets/images/svgs/information.svg'), + // ], + // ), Container( margin: EdgeInsets.only(bottom: 12), child: AppText( @@ -190,43 +216,44 @@ class _EnterDiagnosisState extends State { scrollDirection: Axis.horizontal, itemCount: model.conditionTypeList.length, itemBuilder: (context, index) => InkWell( - onTap: () { - setState(() { - status = model.conditionTypeList[index]; - }); - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == - model.conditionTypeList[index] - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, + onTap: () { + setState(() { + status = model.conditionTypeList[index]; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == + model.conditionTypeList[index] + .toLowerCase() + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), ), - ), - ), - AppText( - model.conditionTypeList[index], - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - fontSize: SizeConfig.textMultiplier! * 1.6, + AppText( + model.conditionTypeList[index], + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + fontSize: SizeConfig.textMultiplier! * 1.6, + ), + ], ), - ], - ), - )), + )), ), SizedBox( height: 8, @@ -258,38 +285,38 @@ class _EnterDiagnosisState extends State { model.diagnosisTypeList.isEmpty ? EmptyDropDown() : DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedDiagnosisItem == null - ? model.diagnosisTypeList.keys.first - : selectedDiagnosisItem, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - if (newValue != null) - setState(() { - selectedDiagnosisItem = newValue; - }); - }, - items: - model.diagnosisTypeList.keys.map((item) { - return DropdownMenuItem( - child: AppText( - item ?? '', - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedDiagnosisItem == null + ? model.diagnosisTypeList.keys.first + : selectedDiagnosisItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedDiagnosisItem = newValue; + }); + }, + items: + model.diagnosisTypeList.keys.map((item) { + return DropdownMenuItem( + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), ), - value: item, - ); - }).toList(), - ), - ), + ), ], ), ), @@ -310,35 +337,35 @@ class _EnterDiagnosisState extends State { SizedBox( height: 16, ), - InkWell( - onTap: () async { - if (selectedDiagnosis != null) { - SearchDiagnosis? diagnosis = - await model.addToFavoriteDiagnosis(widget.patientInfo, - diagnosis: selectedDiagnosis); - setState(() { - selectedDiagnosis = diagnosis; - }); - } - }, - child: Row( - children: [ - SvgPicture.asset(selectedDiagnosis?.isFavorite == true - ? 'assets/images/svgs/favoriteadded.svg' - : 'assets/images/svgs/favorite.svg'), - SizedBox( - width: 4, - ), - AppText( - TranslationBase.of(context).addToFavorite, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF449BF1), - ), - ], - ), - ) + // InkWell( + // onTap: () async { + // if (selectedDiagnosis != null) { + // SearchDiagnosis? diagnosis = + // await model.addToFavoriteDiagnosis(widget.patientInfo, + // diagnosis: selectedDiagnosis); + // setState(() { + // selectedDiagnosis = diagnosis; + // }); + // } + // }, + // child: Row( + // children: [ + // SvgPicture.asset(selectedDiagnosis?.isFavorite == true + // ? 'assets/images/svgs/favoriteadded.svg' + // : 'assets/images/svgs/favorite.svg'), + // SizedBox( + // width: 4, + // ), + // AppText( + // TranslationBase.of(context).addToFavorite, + // textAlign: TextAlign.start, + // fontWeight: FontWeight.w600, + // fontSize: 10, + // color: Color(0xFF449BF1), + // ), + // ], + // ), + // ) ], ), ), @@ -377,37 +404,65 @@ class _EnterDiagnosisState extends State { ), Expanded( child: AppButton( - title: TranslationBase.of(context).save, - fontWeight: FontWeight.w600, - color: Color(0xFF359846), - onPressed: () async { - selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; - if(selectedDiagnosis == null ){ - DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectedDiagnosis); - return; - } - if(status.isEmpty){ - DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectConditionFirst); - return; - } + title: TranslationBase.of(context).save, + fontWeight: FontWeight.w600, + color: Color(0xFF359846), + onPressed: () async { + selectedDiagnosisItem ??= + model.diagnosisTypeList.keys.first; + if (selectedDiagnosis == null && + filteredSearchController.text.isEmpty) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .selectedDiagnosis); + return; + } + if (status.isEmpty) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .selectConditionFirst); + return; + } - if(remarksController.text.isEmpty){ - DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); - return; - } + if (remarksController.text.isEmpty) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .remarksCanNotBeEmpty); + return; + } - bool result = await model.createDiagnosis( - widget.patientInfo, - selectedDiagnosis, - selectedDiagnosisItem, - status, - remarksController.text, - false); - if (result) { - Navigator.pop(context, result); - } - }, - ), + if (filteredSearchController.text == + widget.diagnosis.selectedDisease && + status == widget.diagnosis.condition && + widget.diagnosis.diagnosisType == + selectedDiagnosisItem && + widget.diagnosis.remarks == + filteredSearchController.text) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .noChangeRecorded); + return; + } + widget.diagnosis.selectedDisease = + filteredSearchController.text; + widget.diagnosis.selectedCategoryCode = + selectedDiagnosis?.selectedCategoryCode ?? ''; + widget.diagnosis.selectedIcdCode = + selectedDiagnosis?.selectedIcdCode ?? ''; + widget.diagnosis.selectedChapterCode = + selectedDiagnosis?.selectedChapterCode ?? ''; + widget.diagnosis.selectedSectionCode = + selectedDiagnosis?.selectedSectionCode ?? ''; + widget.diagnosis.condition = status; + widget.diagnosis.diagnosisType = + selectedDiagnosisItem; + + bool result = + await model.editDiagnosis(widget.diagnosis); + if (result) { + Navigator.pop(context, result); + } + }), ), ], ), @@ -416,7 +471,7 @@ class _EnterDiagnosisState extends State { ), ), ), - ), - ); + ); + }); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 0ecac958..be205dfa 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -35,6 +35,7 @@ class _EnterDiagnosisState extends State { bool showAllDiagnosis = true; String status = ''; String? selectedDiagnosisItem; + String? selectedDiagnosisItemValue; TextEditingController remarksController = TextEditingController(); Timer? _tTimer; SOAPViewModel? model; @@ -265,6 +266,7 @@ class _EnterDiagnosisState extends State { if (newValue != null) setState(() { selectedDiagnosisItem = newValue; + selectedDiagnosisItemValue = model.diagnosisTypeList[newValue]; }); }, items: @@ -375,6 +377,8 @@ class _EnterDiagnosisState extends State { color: Color(0xFF359846), onPressed: () async { selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; + selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; + if(selectedDiagnosis == null ){ DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectedDiagnosis); return; @@ -392,7 +396,7 @@ class _EnterDiagnosisState extends State { bool result = await model.createDiagnosis( widget.patientInfo, selectedDiagnosis, - selectedDiagnosisItem, + selectedDiagnosisItemValue, status, remarksController.text, false); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart index b60845bb..48b6032e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; @@ -11,7 +12,13 @@ class AddProgressNote extends StatelessWidget{ @override Widget build(BuildContext context) { return BaseView( + onModelReady: (model){ + WidgetsBinding.instance.addPostFrameCallback((_) async { + model.getClinics(); + }); + }, builder: (_, model, w) => AppScaffold( + isLoading: model.state == ViewState.BusyLocal, isShowAppBar: true, appBar: PatientSearchHeader( title: TranslationBase.of(context).progressNote diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart index d8e699f5..7158bac1 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart @@ -1,5 +1,8 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -7,8 +10,10 @@ import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-cust import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; -List patientState = ["","Stable", "Not Stable", "Not Defined"]; +import '../../../../../../core/model/SOAP/progress_note/Clinic.dart'; +import '../../../../../base/base_view.dart'; class AddProgressNoteDetails extends StatefulWidget { @override @@ -16,37 +21,15 @@ class AddProgressNoteDetails extends StatefulWidget { } class _AddProgressNoteDetailsState extends State { - String selectedItem = "Stable"; + Clinic? selectedItem ; int status = 1; final TextEditingController noteController = TextEditingController(); - @override Widget build(BuildContext context) { - return Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).addProgressNote, - fontSize: 16, - fontWeight: FontWeight.w600, - textAlign: TextAlign.start, - color: Colors.black, - ), - SizedBox( - height: 16, - ), - Material( + ProjectViewModel projectViewModel = Provider.of(context); + return BaseView( + builder: (_, model, w) => Material( shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), side: BorderSide( @@ -61,236 +44,269 @@ class _AddProgressNoteDetailsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - TranslationBase.of(context).patientCondition, - textAlign: TextAlign.start, + TranslationBase.of(context).addProgressNote, + fontSize: 16, fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), + textAlign: TextAlign.start, + color: Colors.black, ), SizedBox( - height: 4, + height: 16, ), - DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem, - iconSize: 25, - elevation: 16, - - onChanged: (newValue) async { - setState(() { - selectedItem = newValue ?? ""; - }); - }, - items: patientState.map((item) { - return DropdownMenuItem( - child: AppText( - item, - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).patientCondition, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), ), - value: item, - ); - }).toList(), - ), - ), - ], - ), - ), - ), - SizedBox( - height: 16, - ), - AppText( - TranslationBase.of(context).progressNoteType, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - fontSize: 11, - ), - SizedBox( - height: 8, - ), - Row( - children: [ - Flexible( - child: InkWell( - onTap: () { - setState(() { - status = 1; - }); - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all(color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 1 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), + SizedBox( + height: 4, + ), + model.clinics.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem == null ? model.clinics.first : selectedItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + setState(() { + selectedItem = newValue; + }); + }, + items: model.clinics.map((item) { + return DropdownMenuItem( + child: AppText( + projectViewModel.isArabic + ? item.clinicNameArabic ?? '' + : item.clinicNameEnglish ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], ), ), - AppText( - TranslationBase.of(context).doctorProgressNote, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', - fontSize: 12, - ), - ], - ), - )), - Flexible( - child: InkWell( - onTap: () { - setState(() { - status = 2; - }); - }, - child: Row( + ), + SizedBox( + height: 16, + ), + AppText( + TranslationBase.of(context).progressNoteType, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + SizedBox( + height: 8, + ), + Row( children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all(color: Colors.grey, width: 1), + Flexible( + child: InkWell( + onTap: () { + setState(() { + status = 1; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: + Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).doctorProgressNote, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + fontSize: 12, + ), + ], ), - child: Container( - decoration: BoxDecoration( - color: status == 2 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, + )), + Flexible( + child: InkWell( + onTap: () { + setState(() { + status = 2; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: Border.all( + color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 2 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).nurseNote, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + fontSize: 12, + ), + ], ), ), ), - AppText( - TranslationBase.of(context).nurseNote, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', - fontSize: 12, - ), ], ), - ), - ), - ], - ), - SizedBox( - height: 24, - ), - Material( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - side: BorderSide( - width: 1, - color: Color(0xFFEFEFEF), - )), - color: Colors.white, - child: Padding( - padding: - const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).speciality, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 11, - color: Color(0xFF2E303A), - ), SizedBox( - height: 4, + height: 24, ), - DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem, - iconSize: 25, - elevation: 16, - - onChanged: (newValue) async { - setState(() { - selectedItem = newValue ?? ""; - }); - }, - items: patientState.map((item) { - return DropdownMenuItem( - child: AppText( - "item", - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).speciality, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, ), - value: item, - ); - }).toList(), + model.clinics.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedItem == null ? model.clinics.first : selectedItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + setState(() { + selectedItem = newValue; + }); + }, + items: model.clinics.map((item) { + return DropdownMenuItem( + child: AppText( + projectViewModel.isArabic + ? item.clinicNameArabic ?? '' + : item.clinicNameEnglish ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), ), ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).addYourNote, + controller: noteController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 4, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 16, + ), + Row( + children: [ + SvgPicture.asset( + 'assets/images/svgs/save_as_draft.svg'), + SizedBox( + width: 4, + ), + AppText( + TranslationBase.of(context).saveAsDraft, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 10, + color: Color(0xFF449BF1), + ), + ], + ) ], ), ), - ), - SizedBox( - height: 16, - ), - AppTextFieldCustom( - hintText: TranslationBase.of(context).addYourNote, - controller: noteController, - inputType: TextInputType.multiline, - maxLines: 25, - minLines: 4, - hasBorder: true, - onClick: () {}, - onChanged: (value) {}, - onFieldSubmitted: () {}, - ), - SizedBox( - height: 16, - ), - Row( - children: [ - SvgPicture.asset('assets/images/svgs/save_as_draft.svg'), - SizedBox( - width: 4, - ), - AppText( - TranslationBase.of(context).saveAsDraft, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF449BF1), - ), - ], - ) - ], - ), - ), - ); + )); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index e9304c61..4daed7e3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex =2; + int _currentIndex = 3; List myAllergiesList = []; List myHistoryList = []; @@ -97,19 +97,19 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ - UpdateAssessmentPage( + UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState, + sOAPViewModel: model, + changeStateFun: changeStateFun, ), - UpdatePlanPageVidaPlus( + UpdateAssessmentPage( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState, - sOAPViewModel: model, - changeStateFun: changeStateFun, ), UpdateObjectivePageVidaPlus( changePageViewIndex: changePageViewIndex, diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 658ebb0e..9d952a1e 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1947,6 +1947,8 @@ class TranslationBase { String get remarksCanNotBeEmpty => localizedValues['remarksCanNotBeEmpty']![locale.languageCode]!; String get selectedDiagnosis => localizedValues['selectedDiagnosis']![locale.languageCode]!; String get selectConditionFirst => localizedValues['selectConditionFirst']![locale.languageCode]!; + String get editDiagnosis => localizedValues['editDiagnosis']![locale.languageCode]!; + String get noChangeRecorded => localizedValues['noChangeRecorded']![locale.languageCode]!; } From 70114b8f192e28b696512d4492462dd4e2288ddd Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 10:51:56 +0300 Subject: [PATCH 42/76] WD: reverting the value of enum --- lib/config/localized_values.dart | 2 +- lib/core/enum/master_lookup_key.dart | 4 ++-- lib/core/service/base/lookup-service.dart | 2 +- .../profile/soap_update/objective/add_examination_page.dart | 2 +- .../profile/soap_update/objective/update_objective_page.dart | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 10820435..3a0b56bd 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1223,7 +1223,7 @@ const Map> localizedValues = { "areYouSureYouWantToDeleteDiagnosis": { "en": "Are you sure you want to delete diagnosis", "ar": "هل أنت متأكد من أنك تريد حذف التشخيص" - } + }, "activate": {"en": "Activate", "ar":"فعل"}, "resolved": {"en": "Resolved", "ar":"تم الحل"}, diff --git a/lib/core/enum/master_lookup_key.dart b/lib/core/enum/master_lookup_key.dart index 514caf56..04608719 100644 --- a/lib/core/enum/master_lookup_key.dart +++ b/lib/core/enum/master_lookup_key.dart @@ -5,7 +5,7 @@ enum MasterKeysService { HistorySocial, HistorySports, HistorySurgical, - PostPhysicalExaminationModel, + PhysicalExamination, AllergySeverity, physiotherapyGoals, DiagnosisCondition, @@ -45,7 +45,7 @@ extension SelectedMasterKeysService on MasterKeysService { case MasterKeysService.HistorySurgical: return 66; break; - case MasterKeysService.PostPhysicalExaminationModel: + case MasterKeysService.PhysicalExamination: return 59; break; case MasterKeysService.AllergySeverity: diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index d7254814..b9f6a69f 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -109,7 +109,7 @@ class LookupService extends BaseService { _historySurgicalList.add(MasterKeyModel.fromJson(v)); }); break; - case MasterKeysService.PostPhysicalExaminationModel: + case MasterKeysService.PhysicalExamination: _physicalExaminationList.clear(); entryList.forEach((v) { _physicalExaminationList.add(MasterKeyModel.fromJson(v)); diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart index 238f8dd8..7be4b062 100644 --- a/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/add_examination_page.dart @@ -38,7 +38,7 @@ class _AddExaminationPageState extends State { if (model.physicalExaminationList.length == 0) { WidgetsBinding.instance.addPostFrameCallback((_) async { await model.getMasterLookup( - MasterKeysService.PostPhysicalExaminationModel, + MasterKeysService.PhysicalExamination, ); }); } diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index d9d4ed1b..b44c35db 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -63,11 +63,11 @@ class _UpdateObjectivePageState extends State implements Ob await model.getPatientPhysicalExam(widget.patientInfo); if (model.patientPhysicalExamList.isNotEmpty) { if (model.physicalExaminationList.length == 0) { - await model.getMasterLookup(MasterKeysService.PostPhysicalExaminationModel); + await model.getMasterLookup(MasterKeysService.PhysicalExamination); } model.patientPhysicalExamList.forEach((element) { MasterKeyModel? examMaster = model.getOneMasterKey( - masterKeys: MasterKeysService.PostPhysicalExaminationModel, + masterKeys: MasterKeysService.PhysicalExamination, id: element.examId, ); MySelectedExamination tempEam = SoapUtils.generateMySelectedExamination( From 01a735af61196413118071ccd971099acf4ab0b9 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Sun, 1 Dec 2024 11:03:39 +0300 Subject: [PATCH 43/76] setupid added --- lib/core/service/patient_medical_file/soap/SOAP_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 179e766e..a5b01ac7 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -396,7 +396,7 @@ class SOAPService extends LookupService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: {"allergyId": allergyId}); + }, body: {"allergyId": allergyId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID)}); } From f5abe9a6db77a8d64668d7e7b483e7900b6fd810 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 11:08:43 +0300 Subject: [PATCH 44/76] WD: screen placement changing --- .../update_soap_index_vida_plus.dart | 28 +++++++++---------- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 14e5903d..884a779a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -32,7 +32,7 @@ class UpdateSoapIndexVidaPlus extends StatefulWidget { class _UpdateSoapIndexVidaPlusState extends State with TickerProviderStateMixin { PageController? _controller; - int _currentIndex = 3; + int _currentIndex = 0; List myAllergiesList = []; List myHistoryList = []; @@ -97,14 +97,11 @@ class _UpdateSoapIndexVidaPlusState extends State }, scrollDirection: Axis.horizontal, children: [ - UpdatePlanPageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState, - sOAPViewModel: model, - changeStateFun: changeStateFun, - ), + UpdateSubjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), UpdateAssessmentPage( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, @@ -116,12 +113,15 @@ class _UpdateSoapIndexVidaPlusState extends State currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState), + UpdatePlanPageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState, + sOAPViewModel: model, + changeStateFun: changeStateFun, + ), - UpdateSubjectivePageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState), ], ), ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index ab8bc62a..e026f689 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,7 +15,7 @@ import maps_launcher import path_provider_foundation import shared_preferences_foundation import speech_to_text_macos -import sqflite +import sqflite_darwin import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { From ad29dd41f44c29862e81bec8fdabf471b01825a6 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 11:33:06 +0300 Subject: [PATCH 45/76] WD: screen placement changing --- .../update_soap_index_vida_plus.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 884a779a..81c87e49 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -102,17 +102,17 @@ class _UpdateSoapIndexVidaPlusState extends State currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState), + UpdateObjectivePageVidaPlus( + changePageViewIndex: changePageViewIndex, + currentIndex: _currentIndex, + patientInfo: patient, + changeLoadingState: changeLoadingState), UpdateAssessmentPage( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, patientInfo: patient, changeLoadingState: changeLoadingState, ), - UpdateObjectivePageVidaPlus( - changePageViewIndex: changePageViewIndex, - currentIndex: _currentIndex, - patientInfo: patient, - changeLoadingState: changeLoadingState), UpdatePlanPageVidaPlus( changePageViewIndex: changePageViewIndex, currentIndex: _currentIndex, From 3af6248d135b6d369c5a6e24f1e9eff5508fe7e8 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 15:54:50 +0300 Subject: [PATCH 46/76] WD: SETUP ID ADDED --- .../soap/SOAP_service.dart | 272 +++++++++--------- 1 file changed, 130 insertions(+), 142 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 9c4b83ba..1c8e66cf 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -67,10 +67,12 @@ class SOAPService extends LookupService { List hopiDetails = []; List patientChiefComplaintListVidaPlus = []; List searchChiefComplaintListVidaPlus = []; - List episodeByChiefComplaintListVidaPlus = []; + List episodeByChiefComplaintListVidaPlus = + []; List getHomeMedicationList = []; List getSearchCurrentMedication = []; - List getSearchCurrentMedicationDetails = []; + List getSearchCurrentMedicationDetails = + []; List patientPreviousDiagnosisList = []; List patientDiagnosisList = []; List favoriteDiagnosisDetailsList = []; @@ -412,24 +414,25 @@ class SOAPService extends LookupService { }, body: request); } - Future getEditAllergies(int allergyId) async { hasError = false; await baseAppClient.post(GET_EDIT_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - print("Success"); - searchAllergiesList.clear(); - - response['List_SearchAllergies']['resultData'].forEach((v) { - searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: {"allergyId": allergyId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID)}); - } + print("Success"); + searchAllergiesList.clear(); + response['List_SearchAllergies']['resultData'].forEach((v) { + searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: { + "allergyId": allergyId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) + }); + } Future searchAllergies(String searchKey) async { hasError = false; @@ -481,7 +484,7 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); + DrAppToastMsg.showSuccesToast("Allergies Saved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -492,10 +495,8 @@ class SOAPService extends LookupService { Future resolveAllergies( PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { - /*changed request parameters based on the vida plus requested */ - var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); List? reaction = allergy.patientsAllergyReactionsDTOs!; @@ -519,7 +520,7 @@ class SOAPService extends LookupService { "allergyTypeName": allergy.allergyTypeName, "assessmentId": 0, "isActive": allergy.isActivePatientsAllergy, - "patientsAllergyReactionsDTOs":reactionRequest, + "patientsAllergyReactionsDTOs": reactionRequest, "dbCRUDOperation": 2, "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, @@ -532,7 +533,7 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(RESOLVE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Resolved Successfully"); + DrAppToastMsg.showSuccesToast("Resolved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -543,10 +544,9 @@ class SOAPService extends LookupService { Future updateAllergies( PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { - var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); List? reaction = - allergy.patientsAllergyReactionsDTOs!; + allergy.patientsAllergyReactionsDTOs!; List? reactionRequest = []; reaction.forEach((value) { reactionRequest.add(AllergyReactionDTOs( @@ -568,7 +568,7 @@ class SOAPService extends LookupService { "assessmentId": 0, "isActive": allergy.isActivePatientsAllergy, "isActivePatientsAllergy": allergy.isActivePatientsAllergy, - "patientsAllergyReactionsDTOs":reactionRequest, + "patientsAllergyReactionsDTOs": reactionRequest, "dbCRUDOperation": 2, "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, @@ -583,7 +583,7 @@ class SOAPService extends LookupService { await baseAppClient.post(UPDATE_ALLERGIES, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("Allergies Updated Successfully"); + DrAppToastMsg.showSuccesToast("Allergies Updated Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -608,7 +608,7 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(CREATE_HOPI, onSuccess: (dynamic response, int statusCode) { - DrAppToastMsg.showSuccesToast("History Saved Successfully"); + DrAppToastMsg.showSuccesToast("History Saved Successfully"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -645,7 +645,8 @@ class SOAPService extends LookupService { patientChiefComplaintListVidaPlus.clear(); response['ListChiefComplaintDetails']['resultData'].forEach((v) { - patientChiefComplaintListVidaPlus.add(GetChiefComplaintVidaPlus.fromJson(v)); + patientChiefComplaintListVidaPlus + .add(GetChiefComplaintVidaPlus.fromJson(v)); }); }, onFailure: (String error, int statusCode) { hasError = true; @@ -770,9 +771,11 @@ class SOAPService extends LookupService { PatiantInformtion patient, String patientProblemRevisionID, ) async { + print('the setup id is ${await sharedPref.getString(DOCTOR_SETUP_ID)}'); Map request = { "patientProblemRevisionId": patientProblemRevisionID, - "ProjectID": patient.projectId + "ProjectID": patient.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; auditDiagnosislist.clear(); @@ -858,13 +861,15 @@ class SOAPService extends LookupService { // "patientId": patientInfo.patientId, // "problemId": problemId, // "deletedRemarks": deletedRemarks, - // "ProjectID": patientInfo.projectId + // "ProjectID": patientInfo.projectId, + // "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) //todo just for the test as the create diagnosis is still not working "patientProblemId": 13691, "patientId": 70010986, "problemId": 41698, "deletedRemarks": "kethees test", - "ProjectID": 313 + "ProjectID": 313, + "setupId": 105 }; hasError = false; patientPreviousDiagnosisList.clear(); @@ -924,7 +929,8 @@ class SOAPService extends LookupService { "pomrId": patientInfo.pomrId, "hospitalId": patientInfo.projectId, "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "ProjectID": patientInfo.projectId + "ProjectID": patientInfo.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; patientPhysicalExaminationList.clear(); @@ -948,6 +954,7 @@ class SOAPService extends LookupService { Map request = { "ProjectID": patientInfo.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), "listCreatPhysicalExam": jsonListOfPhysicalExamination }; hasError = false; @@ -1190,6 +1197,7 @@ class SOAPService extends LookupService { "appointmentId": diagnosis.appointmentId, "problemId": diagnosis.problemId, "diagnosisType": diagnosis.diagnosisType, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; var success = false; await baseAppClient.post(RESOLVE_DIAGNOSIS, @@ -1212,13 +1220,12 @@ class SOAPService extends LookupService { } Future getClinic() async { - Map request = {}; + Map request = {}; var success = false; await baseAppClient.post(GET_CLINIC, onSuccess: (dynamic response, int statusCode) { - response['ListDoctorClinics'].forEach((v) => - v['categories'].forEach( - (cat) => clinicsList.add(Clinic.fromJson(cat)))); + response['ListDoctorClinics'].forEach((v) => v['categories'] + .forEach((cat) => clinicsList.add(Clinic.fromJson(cat)))); success = false; }, onFailure: (String error, int statusCode) { success = false; @@ -1229,59 +1236,57 @@ class SOAPService extends LookupService { return success; } - - continueEpisodeVidaPlus( PatiantInformtion patient, List chiefComplaint) async { - List> chiefComplaintList=[]; + List> chiefComplaintList = []; - chiefComplaint.forEach((action){ - action.chiefComplains!.forEach((action2){ - chiefComplaintList.add({"chiefComplain": action2.chiefComplain,"chiefComplainTemplateId": action!.chiefComplainTemplateId}); + chiefComplaint.forEach((action) { + action.chiefComplains!.forEach((action2) { + chiefComplaintList.add({ + "chiefComplain": action2.chiefComplain, + "chiefComplainTemplateId": action!.chiefComplainTemplateId + }); }); }); Map request = { "appointmentId": patient.appointmentNo, "projectId": patient.projectId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "chiefComplain":chiefComplaintList - + "chiefComplain": chiefComplaintList }; hasError = false; await baseAppClient.post(CONTINUE_EPISODE_VP, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - updateChiefComplaintVidaPlus( - PatiantInformtion patient, GetChiefComplaintVidaPlus chiefComplaint) async { + updateChiefComplaintVidaPlus(PatiantInformtion patient, + GetChiefComplaintVidaPlus chiefComplaint) async { Map request = { "AppointmentNo": patient.appointmentNo, "pomrId": patient.pomrId, "PatientMRN": patient.patientMRN, - "PatientName":patient.firstName! + ' '+ patient.lastName! , - "addedChiefComplaintCreateDtos": [ - - ], - "removedChiefComplaintIds":[chiefComplaint.chiefComplainId] + "PatientName": patient.firstName! + ' ' + patient.lastName!, + "addedChiefComplaintCreateDtos": [], + "removedChiefComplaintIds": [chiefComplaint.chiefComplainId] }; hasError = false; await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - DrAppToastMsg.showErrorToast(response['List_UpdateChiefComplaint']['message']); - }, onFailure: (String error, int statusCode) { - - hasError = true; - super.error = error; - }, body: request); + print("Success"); + DrAppToastMsg.showErrorToast( + response['List_UpdateChiefComplaint']['message']); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - episodeByChiefComplaint( - PatiantInformtion patient) async { + + episodeByChiefComplaint(PatiantInformtion patient) async { Map request = { "patientId": patient.patientId, "clinicId": patient.clinicId, @@ -1289,120 +1294,103 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(EPISODE_BY_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - episodeByChiefComplaintListVidaPlus.clear(); - - response['EpisodeByChiefcomplaint']['resultData'].forEach((v) { - episodeByChiefComplaintListVidaPlus.add(EpisodeByChiefComplaintVidaPlus.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + episodeByChiefComplaintListVidaPlus.clear(); + + response['EpisodeByChiefcomplaint']['resultData'].forEach((v) { + episodeByChiefComplaintListVidaPlus + .add(EpisodeByChiefComplaintVidaPlus.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - getHomeMedication( - PatiantInformtion patient) async { + getHomeMedication(PatiantInformtion patient) async { Map request = { "patientId": patient.patientId, }; hasError = false; await baseAppClient.post(GET_HOME_MEDICATION, onSuccess: (dynamic response, int statusCode) { - getHomeMedicationList.clear(); - response['ListHomeMedication']['resultData'].forEach((v) { - getHomeMedicationList.add(GetHomeMedicationList.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + getHomeMedicationList.clear(); + response['ListHomeMedication']['resultData'].forEach((v) { + getHomeMedicationList.add(GetHomeMedicationList.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - searchCurrentMedication( - String query - ) async { - Map request = { - "SearchKey": query - }; + searchCurrentMedication(String query) async { + Map request = {"SearchKey": query}; hasError = false; await baseAppClient.post(SEARCH_CURRENT_MEDICATION, onSuccess: (dynamic response, int statusCode) { - getSearchCurrentMedication.clear(); - response['ListFormulatorySearch']['resultData'].forEach((v) { - getSearchCurrentMedication.add(GetSearchCurrentMedication.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + getSearchCurrentMedication.clear(); + response['ListFormulatorySearch']['resultData'].forEach((v) { + getSearchCurrentMedication.add(GetSearchCurrentMedication.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - - getCurrentMedicationDetails( - String id - ) async { - Map request = { - "genericFormularyId": id - }; + getCurrentMedicationDetails(String id) async { + Map request = {"genericFormularyId": id}; hasError = false; await baseAppClient.post(SEARCH_CURRENT_MEDICATION_DETAILS, onSuccess: (dynamic response, int statusCode) { - getSearchCurrentMedicationDetails.clear(); - response['ListFormularyMaster']['resultData'].forEach((v) { - getSearchCurrentMedicationDetails.add(GetSearchCurrentMedicationDetails.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: request); + getSearchCurrentMedicationDetails.clear(); + response['ListFormularyMaster']['resultData'].forEach((v) { + getSearchCurrentMedicationDetails + .add(GetSearchCurrentMedicationDetails.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } - removeCurrentMedicationVidaPlus( - String medicationID) async { - Map request = { - - "homeMedicationId":medicationID - }; + removeCurrentMedicationVidaPlus(String medicationID) async { + Map request = {"homeMedicationId": medicationID}; hasError = false; await baseAppClient.post(REMOVE_CURRENT_MEDICATION, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - - hasError = true; - super.error = error; - }, body: request); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); } addCurrentMedicationVidaPlus( Map request, PatiantInformtion patientInfo) async { - var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); - Map genericRequest ={ - "patientId": patientInfo.patientId, - "patientPomrId": patientInfo.pomrId, - "hospitalId": patientInfo.projectId, - "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "clinicGroupId": patientInfo.clinicGroupId, - "clinicId": patientInfo.clinicId, - "appointmentId": patientInfo.appointmentNo, - "created_by": patientInfo.doctorId, - "loginUserId": doctorProfile['List_MemberInformation'][0]['MemberID'], - }; + Map genericRequest = { + "patientId": patientInfo.patientId, + "patientPomrId": patientInfo.pomrId, + "hospitalId": patientInfo.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "clinicGroupId": patientInfo.clinicGroupId, + "clinicId": patientInfo.clinicId, + "appointmentId": patientInfo.appointmentNo, + "created_by": patientInfo.doctorId, + "loginUserId": doctorProfile['List_MemberInformation'][0]['MemberID'], + }; Map finalRequest = {} ..addAll(request) ..addAll(genericRequest); hasError = false; await baseAppClient.post(ADD_CURRENT_MEDICATION, - onSuccess: (dynamic response, int statusCode) { - - }, onFailure: (String error, int statusCode) { - - hasError = true; - super.error = error; - }, body: finalRequest); + onSuccess: (dynamic response, int statusCode) {}, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: finalRequest); } } - From f7ed4b6c68ad1e17e2bf334c31ac9eaaf8c05ae1 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 1 Dec 2024 15:57:33 +0300 Subject: [PATCH 47/76] WD: SETUP ID ADDED --- .../service/patient_medical_file/soap/SOAP_service.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 1c8e66cf..dbcc2149 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -397,7 +397,8 @@ class SOAPService extends LookupService { Future patientAllergies(PatiantInformtion patientInfo) async { Map request = { "patientId": patientInfo.patientMRN, - "ProjectID": patientInfo.projectId + "ProjectID": patientInfo.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; await baseAppClient.post(PATIENT_ALLERGIES, @@ -448,7 +449,10 @@ class SOAPService extends LookupService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: {"AllergyName": searchKey}); + }, body: { + "AllergyName": searchKey, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) + }); } Future addAllergies( From 772ab2504bfac36a579d33939e42dbe84acd81d0 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 4 Dec 2024 15:13:50 +0300 Subject: [PATCH 48/76] WD: small fixes and favorite api added. --- lib/config/config.dart | 4 + lib/config/localized_values.dart | 4 + .../patient_previous_diagnosis.dart | 12 +- lib/core/model/SOAP/progress_note/Clinic.dart | 8 +- .../SOAP/progress_note/PatientCondition.dart | 11 + .../soap/SOAP_service.dart | 215 +++++++++---- lib/core/viewModel/SOAP_view_model.dart | 174 ++++++++--- .../assessment/update_assessment_page.dart | 2 +- .../assessment/widget/current_diagnosis.dart | 60 +++- .../assessment/widget/edit_diagnosis.dart | 43 ++- .../assessment/widget/enter_diagnosis.dart | 2 + .../assessment/widget/favotite_diagnosis.dart | 106 ++++--- .../assessment/widget/previous_diagnosis.dart | 1 + .../widget/previous_diagnosis_item.dart | 135 ++++---- .../plan/update_plan_page_vida_plus.dart | 12 +- .../plan/widget/add_progress_note.dart | 289 +++++++++++++++++- .../widget/add_progress_note_details.dart | 156 ++++------ .../subjective/allergies/add_allergies.dart | 53 +--- ..._key_checkbox_search_allergies_widget.dart | 213 +++++++------ .../allergies/reactions_selection.dart | 23 +- .../update_present_illness.dart | 6 +- .../update_soap_index_vida_plus.dart | 8 +- .../widgets/SoapDetailItem.dart | 6 +- .../translations_delegate_base_utils.dart | 5 + .../text_fields/app-textfield-custom.dart | 7 + 25 files changed, 1060 insertions(+), 495 deletions(-) create mode 100644 lib/core/model/SOAP/progress_note/PatientCondition.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 03581d63..fe7d9b43 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -363,6 +363,10 @@ const REMOVE_CURRENT_MEDICATION = 'Services/DoctorApplication.svc/REST/DeleteHom const ADD_CURRENT_MEDICATION = 'Services/DoctorApplication.svc/REST/AddHomeMedication'; +const CREATE_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/PostProgressNote'; + +const GET_PATIENT_CLINIC = 'Services/DoctorApplication.svc/REST/GetPatientConditionProgress'; + var selectedPatientType = 1; //*********change value to decode json from Dropdown ************ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 3a0b56bd..fca9679f 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1226,5 +1226,9 @@ const Map> localizedValues = { }, "activate": {"en": "Activate", "ar":"فعل"}, "resolved": {"en": "Resolved", "ar":"تم الحل"}, + "diagnosisAlreadyDeleted": {"en": "Diagnosis Already Deleted", "ar":"تم حذف التشخيص بالفعل"}, + "diagnosisAlreadyResolved": {"en": "Diagnosis Already Resolved", "ar":"تم حل التشخيص بالفعل"}, + "selectReaction": {"en": "Select Reaction", "ar":"حدد رد الفعل"}, + "progressNoteCanNotBeEmpty": {"en": "Progress Note Can Not Be Empty", "ar":"ملاحظة التقدم لا يمكن أن تكون فارغة"}, }; diff --git a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart index c4fc3b71..63419958 100644 --- a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart @@ -111,14 +111,14 @@ class PatientPreviousDiagnosis { Map toJson() { return { 'active': active, - 'admissionId': admissionId, - 'admissionRequestId': admissionRequestId, + 'admissionId': admissionId ?? 0, + 'admissionRequestId': admissionRequestId ?? 0, 'appointmentId': appointmentId, 'approvedBy': approvedBy, 'approvedOn': approvedOn, - 'assessmentId': assessmentId, - 'chiefComplainId': chiefComplainId, - 'clinicGroupId': clinicGroupId, + 'assessmentId': assessmentId ?? 0, + 'chiefComplainId': chiefComplainId ?? 0, + 'clinicGroupId': clinicGroupId ?? 0, 'clinicId': clinicId, 'condition': condition, 'createdBy': createdBy, @@ -129,7 +129,7 @@ class PatientPreviousDiagnosis { 'deletedRemarks': deletedRemarks, 'diagnosisType': diagnosisType, 'doctorId': doctorId, - 'episodeId': episodeId, + 'episodeId': episodeId ?? 0, 'hospitalGroupId': hospitalGroupId, 'hospitalId': hospitalId, 'icdCodeDetailsDto': icdCodeDetailsDto, diff --git a/lib/core/model/SOAP/progress_note/Clinic.dart b/lib/core/model/SOAP/progress_note/Clinic.dart index 70f56492..2e452990 100644 --- a/lib/core/model/SOAP/progress_note/Clinic.dart +++ b/lib/core/model/SOAP/progress_note/Clinic.dart @@ -1,11 +1,11 @@ -class Clinic { +class SOAPClinic { int? clinicGroupID; String? clinicGroupName; int? clinicID; String? clinicNameArabic; String? clinicNameEnglish; - Clinic({ + SOAPClinic({ this.clinicGroupID, this.clinicGroupName, this.clinicID, @@ -13,8 +13,8 @@ class Clinic { this.clinicNameEnglish, }); - factory Clinic.fromJson(Map json) { - return Clinic( + factory SOAPClinic.fromJson(Map json) { + return SOAPClinic( clinicGroupID: json['clinicGroupID'], clinicGroupName: json['clinicGroupName'], clinicID: json['clinicID'], diff --git a/lib/core/model/SOAP/progress_note/PatientCondition.dart b/lib/core/model/SOAP/progress_note/PatientCondition.dart new file mode 100644 index 00000000..c082c501 --- /dev/null +++ b/lib/core/model/SOAP/progress_note/PatientCondition.dart @@ -0,0 +1,11 @@ +class PatientCondition{ + String? code; + int? id; + String? name; + + PatientCondition.fromJson(Map json){ + name = json['name'] ?? ''; + id = json['id'] ?? -1; + code = json['code'] ?? ''; + } +} \ No newline at end of file diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index dbcc2149..a7aecb5e 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -39,6 +39,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_ex import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/Clinic.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/PatientCondition.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; @@ -80,7 +81,8 @@ class SOAPService extends LookupService { List searchDiagnosisList = []; List patientPhysicalExaminationList = []; List generalSpeciality = []; - List clinicsList = []; + List clinicsList = []; + List patientConditionList = []; Map> specialityDetails = {}; Map diagnosisTypeList = {}; Map conditionTypeList = {}; @@ -447,6 +449,7 @@ class SOAPService extends LookupService { searchAllergiesList.add(AllergiesListVidaPlus.fromJson(v)); }); }, onFailure: (String error, int statusCode) { + searchAllergiesList.clear(); hasError = true; super.error = error; }, body: { @@ -610,13 +613,16 @@ class SOAPService extends LookupService { ..addAll(request) ..addAll(req); hasError = false; + bool success = false; await baseAppClient.post(CREATE_HOPI, onSuccess: (dynamic response, int statusCode) { DrAppToastMsg.showSuccesToast("History Saved Successfully"); + success = true; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; }, body: finalRequest); + return success; } getHopi(PatiantInformtion patient) async { @@ -706,7 +712,7 @@ class SOAPService extends LookupService { "diseaseCode": diagnosis, }; hasError = false; - searchDiagnosisList.clear(); + clearSearchResult(); await baseAppClient.post(SEARCH_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { @@ -714,12 +720,17 @@ class SOAPService extends LookupService { .forEach((v) => searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); _processData(); }, onFailure: (String error, int statusCode) { - searchChiefComplaintListVidaPlus.clear(); + clearSearchResult(); hasError = true; super.error = error; }, body: request); } + clearSearchResult(){ + searchDiagnosisList.clear(); + icdVersionList.clear(); + } + void _processData() { Set icdVersions = {}; for (var item in searchDiagnosisList) { @@ -797,21 +808,21 @@ class SOAPService extends LookupService { getPreviousDiagnosis(PatiantInformtion patient) async { Map request = { - // "HospitalGroupID": await sharedPref.getString(DOCTOR_SETUP_ID), //setup - // "hospitalId": patient.projectId, - // "patientId": patient.patientId, - // "patientPomrId": patient.pomrId, - // "startRow": 0, - // "endRow": 1000, - // "ProjectID": patient.projectId - //todo just for the test as the create diagnosis is still not working - "HospitalGroupID": 105, - "hospitalId": 313, - "patientId": 70010976, - "patientPomrId": 8414, + "HospitalGroupID": await sharedPref.getString(DOCTOR_SETUP_ID), //setup + "hospitalId": patient.projectId, + "patientId": patient.patientId, + "patientPomrId": patient.pomrId, "startRow": 0, - "endRow": 2, - "ProjectID": 313 + "endRow": 1000, + "ProjectID": patient.projectId + //todo just for the test as the create diagnosis is still not working + // "HospitalGroupID": 105, + // "hospitalId": 313, + // "patientId": 70010976, + // "patientPomrId": 8414, + // "startRow": 0, + // "endRow": 2, + // "ProjectID": 313 }; hasError = false; patientPreviousDiagnosisList.clear(); @@ -829,21 +840,21 @@ class SOAPService extends LookupService { getDiagnosis(PatiantInformtion patient) async { Map request = { - "hospitalGroupId": 105, - "hospitalId": 313, - "patientId": 70023498, - "patientPomrId": 9907, - "startRow": 0, - "endRow": 10, - "isSelected": true, - "ProjectID": 313 - // "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), - // "hospitalId": patient.projectId, - // "patientId": patient.patientId, - // "patientPomrId": patient.pomrId, + // "hospitalGroupId": 105, + // "hospitalId": 313, + // "patientId": 70023498, + // "patientPomrId": 9907, // "startRow": 0, - // "endRow": 1000000, - // "ProjectID": patient.projectId + // "endRow": 10, + // "isSelected": true, + // "ProjectID": 313 + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "hospitalId": patient.projectId, + "patientId": patient.patientId, + "patientPomrId": patient.pomrId, + "startRow": 0, + "endRow": 1000000, + "ProjectID": patient.projectId }; hasError = false; await baseAppClient.post(GET_LIST_OF_DIAGNOSIS, @@ -861,31 +872,33 @@ class SOAPService extends LookupService { removeDiagnosis(PatiantInformtion patientInfo, String? patientProblemId, String? problemId, String? deletedRemarks) async { Map request = { - // "patientProblemId": patientProblemId, - // "patientId": patientInfo.patientId, - // "problemId": problemId, - // "deletedRemarks": deletedRemarks, - // "ProjectID": patientInfo.projectId, - // "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) + "patientProblemId": patientProblemId, + "patientId": patientInfo.patientId, + "problemId": problemId, + "deletedRemarks": deletedRemarks, + "ProjectID": patientInfo.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) //todo just for the test as the create diagnosis is still not working - "patientProblemId": 13691, - "patientId": 70010986, - "problemId": 41698, - "deletedRemarks": "kethees test", - "ProjectID": 313, - "setupId": 105 + // "patientProblemId": 13691, + // "patientId": 70010986, + // "problemId": 41698, + // "deletedRemarks": "kethees test", + // "ProjectID": 313, + // "setupId": 105 }; hasError = false; + var success = false; patientPreviousDiagnosisList.clear(); await baseAppClient.post(REMOVE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { DrAppToastMsg.showSuccesToast(response['ListDiagnosisRemove']['message']); - //todo get the current diagnosis after the delete if it is successful + success = true; }, onFailure: (String error, int statusCode) { patientPreviousDiagnosisList.clear(); hasError = true; super.error = error; }, body: request); + return success; } favoriteDiagnosis( @@ -1011,7 +1024,6 @@ class SOAPService extends LookupService { }; hasError = false; var isFavoriteAdded = false; - favoriteDiagnosisDetailsList.clear(); await baseAppClient.post(ADD_TO_FAVORITE_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) { var result = response['ListDiagnosisAddFavourite']['resultData']; @@ -1024,7 +1036,6 @@ class SOAPService extends LookupService { response['ListDiagnosisAddFavourite']['message']); } }, onFailure: (String error, int statusCode) { - favoriteDiagnosisDetailsList.clear(); hasError = true; isFavoriteAdded = false; super.error = error; @@ -1033,7 +1044,7 @@ class SOAPService extends LookupService { return isFavoriteAdded; } - convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, + Future convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { Map request = { "patientProblemRevisionId": diagnosis.patientProblemRevisionId, @@ -1050,18 +1061,21 @@ class SOAPService extends LookupService { "ProjectID": paitientInfo.projectId }; hasError = false; - var addedToFavorite = false; + var success = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, - onSuccess: (dynamic response, int statusCode) { + onSuccess: (dynamic response, int statusCode) async { var result = response['ContinuePreviousEpisode']['resultData']; if ((result as List).isEmpty) { DrAppToastMsg.showErrorToast( response['ContinuePreviousEpisode']['message']); + } else { + success = true; } }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; }, body: request); + return success; } Future getProgressNoteNew(PatiantInformtion patientInformation) async { @@ -1170,6 +1184,88 @@ class SOAPService extends LookupService { return success; } + Future createDiagnosisFromFavorite( + PatiantInformtion patient, + FavoriteDiseaseDetails? searchDiagnosis, + String? diagnosisType, + String conditionType, + String remarks, + bool isNew) async { + Map? user = await sharedPref.getObj(LOGGED_IN_USER); + var request = { + "pomrId": patient.pomrId, + "appointmentId": patient.appointmentNo, + "clinicGroupId": patient.clinicGroupId, + "clinicId": patient.clinicId, + "patientId": patient.patientId, + "hospitalId": searchDiagnosis!.hospitalId, + "hospitalGroupId": searchDiagnosis.hospitalGroupId, + "diagnosisType": diagnosisType, + "condition": conditionType, + "remarks": remarks, + "icdType": searchDiagnosis.icdType, + // "icdVersion": searchDiagnosis.icdVersion, + "icdSubVersion": searchDiagnosis.icdSubVersion, + "isNew": isNew, + "specificationId": searchDiagnosis.specificationId, + "selectedDisease": searchDiagnosis.diseases, + "diseasesCode": searchDiagnosis.diseasesCode, + "diseasesId": searchDiagnosis.diseasesId, + "selectedIcdCode": searchDiagnosis.icdId, + "selectedCategoryCode": searchDiagnosis.categoryCode, + "selectedSectionCode": searchDiagnosis.sectionCode, + "selectedChapterCode": searchDiagnosis.chapterCode, + // "selectedNandaCode": searchDiagnosis.selectedNandaCode, + "isResolved": false, + "doctorId": patient.doctorId, + "doctorCode": user?['List_MemberInformation'][0]['MemberID'], + "ProjectID": patient.projectId, + "codeRange": searchDiagnosis.codeRange + }; + var success = false; + await baseAppClient.post(CREATE_DIAGNOSIS, + onSuccess: (dynamic response, int statusCode) { + DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + success = true; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + + Future createProgressNote(PatiantInformtion patient, String? clinicID, + String conditionType, String note, ) async { + Map request = { + "planNote": note, + "PatientMRN": patient.patientMRN, + "EpisodeID": patient.episodeNo, + "CreatedByName": patient.doctorName, + "CreatedBy": patient.doctorId, + "Speciality": clinicID, + "ProgressNotesTypes": "DOCTOR_NOTE", + "PatientCondition": conditionType, + "ProjectID": patient.projectId + }; + var success = false; + await baseAppClient.post(CREATE_PROGRESS_NOTE, + onSuccess: (dynamic response, int statusCode) { + if (response['ListCreateProgressNote'] != null) { + DrAppToastMsg.showSuccesToast( + response['ListCreateProgressNote']['message']); + success = true; + } + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async { var request = diagnosis.toJson(); var success = false; @@ -1228,8 +1324,25 @@ class SOAPService extends LookupService { var success = false; await baseAppClient.post(GET_CLINIC, onSuccess: (dynamic response, int statusCode) { - response['ListDoctorClinics'].forEach((v) => v['categories'] - .forEach((cat) => clinicsList.add(Clinic.fromJson(cat)))); + response['ListDoctorClinics'] + .forEach((v) => clinicsList.add(SOAPClinic.fromJson(v))); + success = false; + }, onFailure: (String error, int statusCode) { + success = false; + hasError = true; + super.error = error; + }, body: request); + + return success; + } + + Future getPatientCondition() async { + Map request = {}; + var success = false; + await baseAppClient.post(GET_PATIENT_CLINIC, + onSuccess: (dynamic response, int statusCode) { + response['ListPatientConditionProgress']['resultData'].forEach((v) => v['PATIENT_CONDITION'].forEach( + (item) => patientConditionList.add(PatientCondition.fromJson(item)))); success = false; }, onFailure: (String error, int statusCode) { success = false; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 310c6949..1248fa88 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -36,6 +36,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_e import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/Clinic.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/PatientCondition.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; @@ -148,10 +149,9 @@ class SOAPViewModel extends BaseViewModel { List get getChiefComplaintListVidaPlus => _SOAPService.patientChiefComplaintListVidaPlus; - - List get episodeByChiefComplaintListVidaPlus => - _SOAPService.episodeByChiefComplaintListVidaPlus; - + List + get episodeByChiefComplaintListVidaPlus => + _SOAPService.episodeByChiefComplaintListVidaPlus; List get patientPhysicalExaminationList => _SOAPService.patientPhysicalExaminationList; @@ -159,20 +159,22 @@ class SOAPViewModel extends BaseViewModel { List get auditDiagnosislist => _SOAPService.auditDiagnosislist; + List get patientConditionList => + _SOAPService.patientConditionList; + List? mainSpecialityList = null; List speciality = []; List get progressNote => _SOAPService.patientProgressNoteListVidaPlus; - List get clinics => - _SOAPService.clinicsList; + + List get clinics => _SOAPService.clinicsList; Map> get specialityDetails => _SOAPService.specialityDetails; int? get episodeID => _SOAPService.episodeID; - bool get showAudit => _SOAPService.showAuditBottomSheet; bool get isPrescriptionOrder => _SOAPService.isPrescriptionOrder; @@ -195,18 +197,15 @@ class SOAPViewModel extends BaseViewModel { List? get allMedicationList => _prescriptionService.allMedicationList; - List? get getHomeMedicationList => _SOAPService.getHomeMedicationList; - List? get getMedicationListVP => _SOAPService.getSearchCurrentMedication; - - List? get getSearchCurrentMedicationDetails => - _SOAPService.getSearchCurrentMedicationDetails; - + List? + get getSearchCurrentMedicationDetails => + _SOAPService.getSearchCurrentMedicationDetails; late SubjectiveCallBack subjectiveCallBack; @@ -997,7 +996,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - getEditAllergiesVidaPlus(int AllergyID ) async { + getEditAllergiesVidaPlus(int AllergyID) async { setState(ViewState.BusyLocal); await _SOAPService.getEditAllergies(AllergyID); if (_SOAPService.hasError) { @@ -1039,7 +1038,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - updateAllergies( PatientAllergiesVidaPlus request, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); @@ -1051,14 +1049,17 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - saveHopi(Map req, PatiantInformtion patientInfo) async { + Future saveHopi( + Map req, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); - await _SOAPService.saveHopi(req, patientInfo); + bool result = await _SOAPService.saveHopi(req, patientInfo); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); + + return result; } getHopi(PatiantInformtion patientInfo) async { @@ -1100,7 +1101,9 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } - updateChiefComplaint(PatiantInformtion patientInfo, GetChiefComplaintVidaPlus CC) async { + + updateChiefComplaint( + PatiantInformtion patientInfo, GetChiefComplaintVidaPlus CC) async { setState(ViewState.BusyLocal); await _SOAPService.updateChiefComplaintVidaPlus(patientInfo, CC); if (_SOAPService.hasError) { @@ -1109,6 +1112,7 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + episodeByChiefComplaint(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.episodeByChiefComplaint(patientInfo); @@ -1118,7 +1122,9 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } - createCCByEpisode(PatiantInformtion patientInfo, List chiefComplaint) async { + + createCCByEpisode( + PatiantInformtion patientInfo, List chiefComplaint) async { setState(ViewState.BusyLocal); await _SOAPService.continueEpisodeVidaPlus(patientInfo, chiefComplaint); if (_SOAPService.hasError) { @@ -1127,6 +1133,7 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + getHomeMedication(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.getHomeMedication(patientInfo); @@ -1137,7 +1144,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - searchCurrentMedication(String searchQuery) async{ + searchCurrentMedication(String searchQuery) async { setState(ViewState.BusyLocal); await _SOAPService.searchCurrentMedication(searchQuery); if (_SOAPService.hasError) { @@ -1147,7 +1154,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - getCurrentMedicationDetails(String id) async{ + getCurrentMedicationDetails(String id) async { setState(ViewState.BusyLocal); await _SOAPService.getCurrentMedicationDetails(id); if (_SOAPService.hasError) { @@ -1157,7 +1164,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - removeCurrentMedication(String id) async{ + removeCurrentMedication(String id) async { setState(ViewState.BusyLocal); await _SOAPService.removeCurrentMedicationVidaPlus(id); if (_SOAPService.hasError) { @@ -1167,7 +1174,7 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - addCurrentMedication(request, PatiantInformtion patientInfo) async{ + addCurrentMedication(request, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.addCurrentMedicationVidaPlus(request, patientInfo); if (_SOAPService.hasError) { @@ -1178,7 +1185,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - searchDiagnosis(PatiantInformtion patientInfo, String searchQuery) async { setState(ViewState.BusyLocal); await _SOAPService.searchDiagnosis(patientInfo, searchQuery); @@ -1189,7 +1195,13 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + clearSearchResult() { + _SOAPService.clearSearchResult(); + notifyListeners(); + } + getConditionAndType(PatiantInformtion patientInfo) async { + clearSearchResult(); setState(ViewState.BusyLocal); await _SOAPService.getDiagnosisType(patientInfo); await _SOAPService.getConditionType(patientInfo); @@ -1250,14 +1262,19 @@ class SOAPViewModel extends BaseViewModel { } void removeDiagnosis( - PatiantInformtion patientInfo, { - String? patientProblemId, - String? problemId, - String? deletedRemarks, - }) async { + PatiantInformtion patientInfo, + PatientPreviousDiagnosis currentDiagnosisItem, + String remarks, + ) async { setState(ViewState.BusyLocal); - await _SOAPService.removeDiagnosis( - patientInfo, patientProblemId, problemId, deletedRemarks); + var result = await _SOAPService.removeDiagnosis( + patientInfo, + currentDiagnosisItem.patientProblemId?.toString(), + currentDiagnosisItem.problemId?.toString(), + remarks); + if (result) { + await getCurrentDiagnosisList(patientInfo); + } if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1286,14 +1303,11 @@ class SOAPViewModel extends BaseViewModel { Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); Map? user = await sharedPref.getObj(LOGGED_IN_USER); var userID = user?['List_MemberInformation'][0]['MemberID']; - bool result = await _SOAPService.addToFavoriteDiagnosis( - patientInfo, - profile?['DoctorName'] ?? '', - diagnosis?.diseasesBCode ?? '', - userID); + bool result = await _SOAPService.addToFavoriteDiagnosis(patientInfo, + profile?['DoctorName'] ?? '', diagnosis?.diseasesBCode ?? '', userID); // if (diagnosis != null) { - diagnosis?.isFavorite = result; + diagnosis?.isFavorite = result; // searchDiagnosisList[index] = diagnosis; // } @@ -1308,7 +1322,9 @@ class SOAPViewModel extends BaseViewModel { void convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, PatientPreviousDiagnosis diagnosis) async { setState(ViewState.BusyLocal); - await _SOAPService.convertPreviousDiagnosisCurrent(paitientInfo, diagnosis); + var result = await _SOAPService.convertPreviousDiagnosisCurrent( + paitientInfo, diagnosis); + if (result) await getPreviousPatientDetails(paitientInfo); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1374,7 +1390,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - void toggleShowBottomSheetValue(bool status) { _SOAPService.showAuditBottomSheet = status; } @@ -1408,6 +1423,43 @@ class SOAPViewModel extends BaseViewModel { return result; } + Future createDiagnosisFromFavorite( + PatiantInformtion patientInformation, + FavoriteDiseaseDetails? searchDiagnosis, + String? diagnosisType, + String conditionType, + String remarks, + bool isNew) async { + setState(ViewState.BusyLocal); + bool result = await _SOAPService.createDiagnosisFromFavorite( + patientInformation, + searchDiagnosis, + diagnosisType, + conditionType, + remarks, + isNew); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + + return result; + } + + Future createProgressNote(PatiantInformtion patient, String? clinicID, + String conditionType, String note) async { + setState(ViewState.BusyLocal); + bool result = await _SOAPService.createProgressNote( + patient, clinicID, conditionType, note); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + + return result; + } Future editDiagnosis(PatientPreviousDiagnosis diagnosis) async { setState(ViewState.BusyLocal); @@ -1420,9 +1472,13 @@ class SOAPViewModel extends BaseViewModel { return result; } - Future resolveDiagnosis(PatientPreviousDiagnosis diagnosis) async { + Future resolveDiagnosis( + PatientPreviousDiagnosis diagnosis, PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); bool result = await _SOAPService.resolveDiagnosis(diagnosis); + if (result) { + await getCurrentDiagnosisList(patientInfo); + } if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); @@ -1464,4 +1520,42 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + + getPatientConditionList() async { + setState(ViewState.BusyLocal); + await _SOAPService.getPatientCondition(); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + + /** + * function that checks if all the mandatory data is obtained from the subjective + * page + * @return [true] if the data is correctly inserted [false] if the data is incomplete + */ + bool isSubjectiveAssesmentCompleted() { + return getChiefComplaintListVidaPlus.isNotEmpty && + getHopiDetails.isNotEmpty && + patientAllergiesVidaPlus.isNotEmpty; + } + + bool isPhysicalExaminationAdded() { + return patientPhysicalExaminationList.isNotEmpty; + } + + bool isDiagnosticsAdded() { + return diagnosisList.isNotEmpty; + } + + bool isProgressAdded() { + return progressNote.isNotEmpty; + } + + void clearAllergy() { + _SOAPService.searchAllergiesList.clear(); + notifyListeners(); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart index e22cc6ff..347deec6 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -103,7 +103,7 @@ class _UpdateAssessmentPageState extends State }, child: Column(children: [ SizedBox( - height: 20, + height: 10, ), SizedBox( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index e88f2612..59a171b8 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plu import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; @@ -98,7 +99,7 @@ class _CurrentDiagnosisState extends State { remarks: widget.currentDiagnosisItems[index].remarks ?? '', - onSoapDetailActionClicked: (action) async{ + onSoapDetailActionClicked: (action) async { switch (action) { case SoapDetailItemActions.AUDIT: model.getAuditOfDiagnosis( @@ -113,26 +114,48 @@ class _CurrentDiagnosisState extends State { context, FadePage( page: EditDiagnosis( - patientInfo: widget.patientInfo, diagnosis: widget.currentDiagnosisItems[index], - ))); + patientInfo: widget.patientInfo, + diagnosis: widget + .currentDiagnosisItems[index], + ))); if (result) { - model.getCurrentDiagnosisList(widget.patientInfo); + model.getCurrentDiagnosisList( + widget.patientInfo); } break; case SoapDetailItemActions.RESOLVE: - bool result = await model.resolveDiagnosis(widget.currentDiagnosisItems[index]); + if (widget.currentDiagnosisItems[index] + .resolved == + true) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyResolved); + } + bool result = await model.resolveDiagnosis( + widget.currentDiagnosisItems[index], + widget.patientInfo); if (result) { - model.getCurrentDiagnosisList(widget.patientInfo); + model.getCurrentDiagnosisList( + widget.patientInfo); } - break; + break; case SoapDetailItemActions.REMOVE: - showConfirmationDialog(context, - "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", - () { - widget.model - .removeDiagnosis(widget.patientInfo); - }); + if (widget.currentDiagnosisItems[index] + .status == + "Deleted") { + DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + return; + } + showConfirmationDialog(context, + "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", + (remarks) { + widget.model.removeDiagnosis( + widget.patientInfo, + widget.currentDiagnosisItems[index], + remarks); + }); + case SoapDetailItemActions.CHANGE_STATUS: // TODO: Handle this case. default: @@ -150,7 +173,7 @@ class _CurrentDiagnosisState extends State { } showConfirmationDialog( - BuildContext context, String message, Function okFunction) { + BuildContext context, String message, Function(String) okFunction) { return showDialog( context: context, barrierDismissible: true, // user must tap button! @@ -209,7 +232,14 @@ class _CurrentDiagnosisState extends State { Expanded( child: AppButton( onPressed: () { - okFunction(); + if (deleteController.text.isEmpty) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .remarksCanNotBeEmpty); + return; + ; + } + okFunction(deleteController.text); Navigator.of(context).pop(); }, title: TranslationBase.of(context).delete, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index fcb2cc05..63b178b8 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -49,7 +49,7 @@ class _EditDiagnosisState extends State { void initState() { super.initState(); filteredSearchController.text = widget.diagnosis.selectedDisease ?? ''; - filteredSearchController.text = widget.diagnosis.remarks ?? ''; + remarksController.text = widget.diagnosis.remarks ?? ''; status = widget.diagnosis.condition ?? ''; selectedDiagnosisItemValue = widget.diagnosis?.diagnosisType ?? ''; } @@ -58,12 +58,15 @@ class _EditDiagnosisState extends State { if (_tTimer != null) { _tTimer!.cancel(); } + if(text.isEmpty) return; + _tTimer = Timer(Duration(milliseconds: 500), () { _onStopped(text); }); } void _onStopped(String searchText) async { + FocusScope.of(context).unfocus(); await model?.searchDiagnosis(widget.patientInfo, searchText); } @@ -236,7 +239,7 @@ class _EditDiagnosisState extends State { ), child: Container( decoration: BoxDecoration( - color: status == + color: status.toLowerCase() == model.conditionTypeList[index] .toLowerCase() ? HexColor("#D02127") @@ -433,11 +436,11 @@ class _EditDiagnosisState extends State { if (filteredSearchController.text == widget.diagnosis.selectedDisease && - status == widget.diagnosis.condition && + status.toLowerCase() == widget.diagnosis.condition?.toLowerCase() && widget.diagnosis.diagnosisType == - selectedDiagnosisItem && + selectedDiagnosisItemValue && widget.diagnosis.remarks == - filteredSearchController.text) { + remarksController.text) { DrAppToastMsg.showErrorToast( TranslationBase.of(context) .noChangeRecorded); @@ -445,17 +448,25 @@ class _EditDiagnosisState extends State { } widget.diagnosis.selectedDisease = filteredSearchController.text; - widget.diagnosis.selectedCategoryCode = - selectedDiagnosis?.selectedCategoryCode ?? ''; - widget.diagnosis.selectedIcdCode = - selectedDiagnosis?.selectedIcdCode ?? ''; - widget.diagnosis.selectedChapterCode = - selectedDiagnosis?.selectedChapterCode ?? ''; - widget.diagnosis.selectedSectionCode = - selectedDiagnosis?.selectedSectionCode ?? ''; - widget.diagnosis.condition = status; - widget.diagnosis.diagnosisType = - selectedDiagnosisItem; + widget.diagnosis.remarks = + remarksController.text; + + if(selectedDiagnosis != null ) { + widget.diagnosis.selectedCategoryCode = + selectedDiagnosis?.selectedCategoryCode ?? + ''; + widget.diagnosis.selectedIcdCode = + selectedDiagnosis?.selectedIcdCode ?? ''; + widget.diagnosis.selectedChapterCode = + selectedDiagnosis?.selectedChapterCode ?? + ''; + widget.diagnosis.selectedSectionCode = + selectedDiagnosis?.selectedSectionCode ?? + ''; + widget.diagnosis.condition = status; + widget.diagnosis.diagnosisType = + selectedDiagnosisItem; + } bool result = await model.editDiagnosis(widget.diagnosis); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index be205dfa..c7f93308 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -45,12 +45,14 @@ class _EnterDiagnosisState extends State { if (_tTimer != null) { _tTimer!.cancel(); } + if(text.isEmpty) return; _tTimer = Timer(Duration(milliseconds: 500), () { _onStopped(text); }); } void _onStopped(String searchText) async { + FocusScope.of(context).unfocus(); await model?.searchDiagnosis(widget.patientInfo, searchText); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index 71e82650..7a08886b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -2,12 +2,14 @@ import 'dart:async'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/assessment/FavoriteDiseaseDetails.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/diagnosis_type.dart'; import 'package:doctor_app_flutter/core/model/SOAP/assessment/search_diagnosis.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -33,8 +35,9 @@ class _FavoriteDiagnosisState extends State { TextEditingController(); bool showAllDiagnosis = true; String status = ''; - String? selectedItem; - String? selectedFavorite; + String? selectedDiagnosisItem; + String? selectedDiagnosisItemValue; + FavoriteDiseaseDetails? selectedFavorite; TextEditingController remarksController = TextEditingController(); Timer? _tTimer; SOAPViewModel? model; @@ -106,7 +109,7 @@ class _FavoriteDiagnosisState extends State { model.favoriteDiagnosisDetails.isEmpty ? EmptyDropDown() : DropdownButtonHideUnderline( - child: DropdownButton( + child: DropdownButton( dropdownColor: Colors.white, iconEnabledColor: Colors.black, icon: Icon(Icons.keyboard_arrow_down), @@ -114,7 +117,6 @@ class _FavoriteDiagnosisState extends State { itemHeight: null, value: selectedFavorite == null ? model.favoriteDiagnosisDetails.first - .diseases : selectedFavorite, iconSize: 25, elevation: 16, @@ -135,7 +137,7 @@ class _FavoriteDiagnosisState extends State { fontWeight: FontWeight.normal, textAlign: TextAlign.left, ), - value: item.diseases, + value: item, ); }).toList(), ), @@ -355,42 +357,39 @@ class _FavoriteDiagnosisState extends State { model.diagnosisTypeList.isEmpty ? EmptyDropDown() : DropdownButtonHideUnderline( - child: DropdownButton( - itemHeight: null, - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem == null - ? model.diagnosisTypeList.keys.first - : selectedItem, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - if (newValue != null) - setState(() { - selectedItem = newValue; - }); - }, - items: model.diagnosisTypeList.keys - .map((item) { - return DropdownMenuItem( - child: Padding( - padding: const EdgeInsets.all(8.0), - child: AppText( - item ?? '', - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, - ), - ), - value: item, - ); - }).toList(), + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedDiagnosisItem == null + ? model.diagnosisTypeList.keys.first + : selectedDiagnosisItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + if (newValue != null) + setState(() { + selectedDiagnosisItem = newValue; + selectedDiagnosisItemValue = model.diagnosisTypeList[newValue]; + }); + }, + items: + model.diagnosisTypeList.keys.map((item) { + return DropdownMenuItem( + child: AppText( + item ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, ), - ), + value: item, + ); + }).toList(), + ), + ), ], ), ), @@ -452,7 +451,32 @@ class _FavoriteDiagnosisState extends State { title: TranslationBase.of(context).save, fontWeight: FontWeight.w600, color: Color(0xFF359846), - onPressed: () async {}, + onPressed: () async { + selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; + selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; + selectedFavorite ??=model.favoriteDiagnosisDetails.first; + + if(status.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).selectConditionFirst); + return; + } + + if(remarksController.text.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); + return; + } + + bool result = await model.createDiagnosisFromFavorite( + widget.patientInfo, + selectedFavorite, + selectedDiagnosisItemValue, + status, + remarksController.text, + false); + if (result) { + Navigator.pop(context, result); + } + }, ), ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 20a30c2f..39b0295c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -50,6 +50,7 @@ class PreviousDiagnosis extends StatelessWidget { status: diagnosisItems[index].status ?? '', condition: diagnosisItems[index].condition ?? '', remarks: diagnosisItems[index].remarks ?? '', + isPreviousAddedToCurrent:diagnosisItems[index].visitWisePatientDiagnoses == true , onSoapDetailActionClicked: (action) { switch (action) { case SoapDetailItemActions.AUDIT: diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart index 0b83fc8f..81e1837b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart @@ -13,6 +13,7 @@ class PreviousDiagnosisItem extends StatelessWidget { final String condition; final String status; final String remarks; + final bool isPreviousAddedToCurrent; final OnSoapDetailActionClicked onSoapDetailActionClicked; const PreviousDiagnosisItem( @@ -21,80 +22,82 @@ class PreviousDiagnosisItem extends StatelessWidget { required this.condition, required this.remarks, required this.onSoapDetailActionClicked, - required this.status}); + required this.status, + required this.isPreviousAddedToCurrent}); @override Widget build(BuildContext context) { return Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 8), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ // Stack( // children: [ - Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + title, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.bold, + ), + SizedBox( + height: 4, + ), + Row( children: [ AppText( - title, + "${TranslationBase.of(context).condition}:", color: Color(0XFF2B353E), - fontSize: 12, - fontWeight: FontWeight.bold, + fontSize: 10, + fontWeight: FontWeight.w500, ), - SizedBox(height: 4,), - Row( - children: [ - AppText( - "${TranslationBase.of(context).condition}:", - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - SizedBox( - width: 4, - ), - AppText( - condition, - color: Color(0xffD02127), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - ], + SizedBox( + width: 4, + ), + AppText( + condition, + color: Color(0xffD02127), + fontSize: 10, + fontWeight: FontWeight.w500, ), ], ), - ), - Status(status: status), - - ], + ], + ), ), - Visibility( - visible: remarks.isNotEmpty, - child: Column( - children: [ - SizedBox( - height: 8, - ), - AppText( - remarks, - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w400, - ), - ], - )) + Status(status: status), ], ), - // Align( - // alignment: Alignment.topRight, child: Status(status: status)) - // ], + Visibility( + visible: remarks.isNotEmpty, + child: Column( + children: [ + SizedBox( + height: 8, + ), + AppText( + remarks, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w400, + ), + ], + )) + ], + ), + // Align( + // alignment: Alignment.topRight, child: Status(status: status)) + // ], // ), SizedBox( height: 16, @@ -120,15 +123,23 @@ class PreviousDiagnosisItem extends StatelessWidget { width: 187, height: 27, child: Material( - color: HexColor("#D02127"), - shape: RoundedRectangleBorder(borderRadius:BorderRadius.circular(5.0)) , + color: isPreviousAddedToCurrent + ? Color(0xffEAEAEA) + : HexColor("#D02127"), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5.0)), child: InkWell( - onTap: () { - onSoapDetailActionClicked( - SoapDetailItemActions.CHANGE_STATUS); - }, - child:Center(child: AppText( TranslationBase.of(context).makeCurrentDiagnosis, color: Colors.white,)), - ), + onTap: () { + if (!isPreviousAddedToCurrent) // to make it clickable if it has not been added to the current diagnosis + onSoapDetailActionClicked( + SoapDetailItemActions.CHANGE_STATUS); + }, + child: Center( + child: AppText( + TranslationBase.of(context).makeCurrentDiagnosis, + color: Colors.white, + )), + ), ), ) ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index ff8e2bd0..1d971c0a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -145,7 +145,7 @@ class _UpdatePlanPageVidaPlusState extends State title: TranslationBase.of(context) .addProgressNote, onAddSoapItemClicked: () { - navigateToAddPlan(); + navigateToAddPlan(model); }), SizedBox( height: 16, @@ -385,11 +385,15 @@ class _UpdatePlanPageVidaPlusState extends State //todo handle the next event here } - void navigateToAddPlan() { - Navigator.push( + void navigateToAddPlan(SOAPViewModel model) async{ + bool result = await Navigator.push( context, FadePage( - page: AddProgressNote(), + page: AddProgressNote(information: widget.patientInfo,), )); + + if(result){ + model.getProgressNote(widget.patientInfo); + } } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart index 48b6032e..ab92d4d8 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart @@ -1,20 +1,49 @@ + +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/Clinic.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/PatientCondition.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; +import 'package:provider/provider.dart'; + +class AddProgressNote extends StatefulWidget{ + final PatiantInformtion information; + + const AddProgressNote({super.key, required this.information}); + @override + State createState() => _AddProgressNoteState(); +} + +class _AddProgressNoteState extends State { + SOAPClinic? selectedClinicItem; + + PatientCondition? selectedPatientConditionItem; + + int status = 1; + final TextEditingController noteController = TextEditingController(); -class AddProgressNote extends StatelessWidget{ @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + return BaseView( onModelReady: (model){ WidgetsBinding.instance.addPostFrameCallback((_) async { model.getClinics(); + model.getPatientConditionList(); }); }, builder: (_, model, w) => AppScaffold( @@ -26,7 +55,251 @@ class AddProgressNote extends StatelessWidget{ body: Padding( padding: const EdgeInsets.all(20.0), child: SingleChildScrollView( - child: AddProgressNoteDetails(), + child: Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).addProgressNote, + fontSize: 16, + fontWeight: FontWeight.w600, + textAlign: TextAlign.start, + color: Colors.black, + ), + SizedBox( + height: 16, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).patientCondition, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.patientConditionList.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: + selectedPatientConditionItem == null + ? model.patientConditionList.first + : selectedPatientConditionItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + setState(() { + selectedPatientConditionItem = + newValue; + }); + }, + items: model.patientConditionList + .map((item) { + return DropdownMenuItem( + child: AppText( + item.name ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + SizedBox( + height: 16, + ), + AppText( + TranslationBase.of(context).progressNoteType, + fontWeight: FontWeight.bold, + fontFamily: 'Poppins', + fontSize: 11, + ), + SizedBox( + height: 8, + ), + Row( + children: [ + Flexible( + child: InkWell( + onTap: () { + setState(() { + status = 1; + }); + }, + child: Row( + children: [ + Container( + padding: EdgeInsets.all(2.0), + margin: EdgeInsets.symmetric(horizontal: 6), + width: 20, + height: 20, + decoration: BoxDecoration( + color: Colors.white, + shape: BoxShape.circle, + border: + Border.all(color: Colors.grey, width: 1), + ), + child: Container( + decoration: BoxDecoration( + color: status == 1 + ? HexColor("#D02127") + : Colors.white, + shape: BoxShape.circle, + ), + ), + ), + AppText( + TranslationBase.of(context).doctorProgressNote, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + fontSize: 12, + ), + ], + ), + )), + ], + ), + SizedBox( + height: 24, + ), + Material( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + side: BorderSide( + width: 1, + color: Color(0xFFEFEFEF), + )), + color: Colors.white, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16.0, vertical: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + TranslationBase.of(context).speciality, + textAlign: TextAlign.start, + fontWeight: FontWeight.w600, + fontSize: 11, + color: Color(0xFF2E303A), + ), + SizedBox( + height: 4, + ), + model.clinics.isEmpty + ? EmptyDropDown() + : DropdownButtonHideUnderline( + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedClinicItem == null + ? model.clinics.first + : selectedClinicItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + setState(() { + selectedClinicItem = newValue; + }); + }, + items: model.clinics.map((item) { + return DropdownMenuItem( + child: AppText( + projectViewModel.isArabic + ? item.clinicNameArabic ?? '' + : item.clinicNameEnglish ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), + ), + ), + ], + ), + ), + ), + SizedBox( + height: 16, + ), + AppTextFieldCustom( + hintText: TranslationBase.of(context).addYourNote, + controller: noteController, + inputType: TextInputType.multiline, + maxLines: 25, + minLines: 4, + hasBorder: true, + onClick: () {}, + onChanged: (value) {}, + onFieldSubmitted: () {}, + ), + SizedBox( + height: 16, + ), + // Row( + // children: [ + // SvgPicture.asset( + // 'assets/images/svgs/save_as_draft.svg'), + // SizedBox( + // width: 4, + // ), + // AppText( + // TranslationBase.of(context).saveAsDraft, + // textAlign: TextAlign.start, + // fontWeight: FontWeight.w600, + // fontSize: 10, + // color: Color(0xFF449BF1), + // ), + // ], + // ) + ], + ), + ), + ), ), ), bottomNavigationBar: Material( @@ -56,9 +329,16 @@ class AddProgressNote extends StatelessWidget{ fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { - Navigator.pop(context); + selectedPatientConditionItem ??= model.patientConditionList.first; + selectedClinicItem ??= model.clinics.first; + if(noteController.text.isEmpty){ + DrAppToastMsg.showErrorToast(TranslationBase.of(context).progressNoteCanNotBeEmpty); + return; + } + bool result = await model.createProgressNote(widget.information, selectedClinicItem?.clinicID?.toString(), selectedPatientConditionItem?.code ?? '',noteController.text ); + Navigator.pop(context, result); }, ), @@ -68,5 +348,4 @@ class AddProgressNote extends StatelessWidget{ ), ); } - } \ No newline at end of file diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart index 7158bac1..24af94c9 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note_details.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/progress_note/PatientCondition.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_dropdown.dart'; @@ -21,7 +22,10 @@ class AddProgressNoteDetails extends StatefulWidget { } class _AddProgressNoteDetailsState extends State { - Clinic? selectedItem ; + SOAPClinic? selectedClinicItem; + + PatientCondition? selectedPatientConditionItem; + int status = 1; final TextEditingController noteController = TextEditingController(); @@ -77,28 +81,31 @@ class _AddProgressNoteDetailsState extends State { SizedBox( height: 4, ), - model.clinics.isEmpty + model.patientConditionList.isEmpty ? EmptyDropDown() : DropdownButtonHideUnderline( - child: DropdownButton( + child: DropdownButton( dropdownColor: Colors.white, iconEnabledColor: Colors.black, icon: Icon(Icons.keyboard_arrow_down), isExpanded: true, - value: selectedItem == null ? model.clinics.first : selectedItem, + value: + selectedPatientConditionItem == null + ? model.patientConditionList.first + : selectedPatientConditionItem, iconSize: 25, elevation: 16, onChanged: (newValue) async { setState(() { - selectedItem = newValue; + selectedPatientConditionItem = + newValue; }); }, - items: model.clinics.map((item) { + items: model.patientConditionList + .map((item) { return DropdownMenuItem( child: AppText( - projectViewModel.isArabic - ? item.clinicNameArabic ?? '' - : item.clinicNameEnglish ?? '', + item.name ?? '', fontSize: 14, letterSpacing: -0.96, color: AppGlobal.appTextColor, @@ -166,45 +173,6 @@ class _AddProgressNoteDetailsState extends State { ], ), )), - Flexible( - child: InkWell( - onTap: () { - setState(() { - status = 2; - }); - }, - child: Row( - children: [ - Container( - padding: EdgeInsets.all(2.0), - margin: EdgeInsets.symmetric(horizontal: 6), - width: 20, - height: 20, - decoration: BoxDecoration( - color: Colors.white, - shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, width: 1), - ), - child: Container( - decoration: BoxDecoration( - color: status == 2 - ? HexColor("#D02127") - : Colors.white, - shape: BoxShape.circle, - ), - ), - ), - AppText( - TranslationBase.of(context).nurseNote, - fontWeight: FontWeight.w600, - fontFamily: 'Poppins', - fontSize: 12, - ), - ], - ), - ), - ), ], ), SizedBox( @@ -237,36 +205,38 @@ class _AddProgressNoteDetailsState extends State { model.clinics.isEmpty ? EmptyDropDown() : DropdownButtonHideUnderline( - child: DropdownButton( - dropdownColor: Colors.white, - iconEnabledColor: Colors.black, - icon: Icon(Icons.keyboard_arrow_down), - isExpanded: true, - value: selectedItem == null ? model.clinics.first : selectedItem, - iconSize: 25, - elevation: 16, - onChanged: (newValue) async { - setState(() { - selectedItem = newValue; - }); - }, - items: model.clinics.map((item) { - return DropdownMenuItem( - child: AppText( - projectViewModel.isArabic - ? item.clinicNameArabic ?? '' - : item.clinicNameEnglish ?? '', - fontSize: 14, - letterSpacing: -0.96, - color: AppGlobal.appTextColor, - fontWeight: FontWeight.normal, - textAlign: TextAlign.left, + child: DropdownButton( + dropdownColor: Colors.white, + iconEnabledColor: Colors.black, + icon: Icon(Icons.keyboard_arrow_down), + isExpanded: true, + value: selectedClinicItem == null + ? model.clinics.first + : selectedClinicItem, + iconSize: 25, + elevation: 16, + onChanged: (newValue) async { + setState(() { + selectedClinicItem = newValue; + }); + }, + items: model.clinics.map((item) { + return DropdownMenuItem( + child: AppText( + projectViewModel.isArabic + ? item.clinicNameArabic ?? '' + : item.clinicNameEnglish ?? '', + fontSize: 14, + letterSpacing: -0.96, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.normal, + textAlign: TextAlign.left, + ), + value: item, + ); + }).toList(), ), - value: item, - ); - }).toList(), - ), - ), + ), ], ), ), @@ -288,22 +258,22 @@ class _AddProgressNoteDetailsState extends State { SizedBox( height: 16, ), - Row( - children: [ - SvgPicture.asset( - 'assets/images/svgs/save_as_draft.svg'), - SizedBox( - width: 4, - ), - AppText( - TranslationBase.of(context).saveAsDraft, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 10, - color: Color(0xFF449BF1), - ), - ], - ) + // Row( + // children: [ + // SvgPicture.asset( + // 'assets/images/svgs/save_as_draft.svg'), + // SizedBox( + // width: 4, + // ), + // AppText( + // TranslationBase.of(context).saveAsDraft, + // textAlign: TextAlign.start, + // fontWeight: FontWeight.w600, + // fontSize: 10, + // color: Color(0xFF449BF1), + // ), + // ], + // ) ], ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index 6b9f7b0b..7fd7bde3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -38,12 +39,15 @@ class _AddAllergiesState extends State { @override Widget build(BuildContext context) { return BaseView( + onModelReady: (model){ + WidgetsBinding.instance.addPostFrameCallback((_) { + model.clearAllergy(); + }); + }, builder: (_, model, w) => AppScaffold( - isShowAppBar: true, - + isLoading: model.state == ViewState.BusyLocal, appBar: PatientSearchHeader( - title: TranslationBase.of(context).addAllergies), body: MasterKeyCheckboxSearchAllergiesWidget( model: model, @@ -61,47 +65,4 @@ class _AddAllergiesState extends State { )), ); } -// -// isServiceSelected(MasterKeyModel masterKey) { -// Iterable allergy = -// myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); -// if (allergy.length > 0) { -// return true; -// } -// return false; -// } -// -// removeAllergyFromLocalList(MasterKeyModel masterKey) { -// myAllergiesListLocal.removeWhere((element) => element.selectedAllergy!.id == masterKey.id); -// } -// -// MySelectedAllergy getSelectedAllergy(MasterKeyModel masterKey) { -// Iterable allergy = -// myAllergiesListLocal.where((element) => masterKey.id == element.selectedAllergy!.id && masterKey.typeId == element.selectedAllergy!.typeId && element.isChecked); -// if (allergy.length > 0) { -// return allergy.first; -// } -// return MySelectedAllergy(); -// } -// -// addAllergyLocally(AllergiesListVidaPlus mySelectedAllergy) { -// if (mySelectedAllergy.selectedAllergy == null) { -// Utils.showErrorToast(TranslationBase.of(context).requiredMsg); -// } else { -// setState(() { -// List allergy = -// // ignore: missing_return -// myAllergiesListLocal.where((element) => mySelectedAllergy.selectedAllergy!.id == element.selectedAllergy!.id).toList(); -// -// if (allergy.isEmpty) { -// myAllergiesListLocal.add(mySelectedAllergy); -// } else { -// allergy.first.selectedAllergy = mySelectedAllergy.selectedAllergy; -// allergy.first.selectedAllergySeverity = mySelectedAllergy.selectedAllergySeverity; -// allergy.first.remark = mySelectedAllergy.remark; -// allergy.first.isChecked = mySelectedAllergy.isChecked; -// } -// }); -// } -// } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index 10370c01..3ee99a12 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -15,132 +15,151 @@ import '../../../../../../core/model/patient/patiant_info_model.dart'; import '../../../../../../widgets/transitions/fade_page.dart'; import '../../objective/widget/EmptyExamination.dart'; - class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { final SOAPViewModel model; final String? buttonName; final String? hintSearchText; final PatientAllergiesVidaPlus? myAllergiesList; final PatiantInformtion patientInfo; - MasterKeyCheckboxSearchAllergiesWidget( - {Key? key, - required this.model, - this.myAllergiesList, - required this.patientInfo, - this.buttonName, - this.hintSearchText, - }) - : super(key: key); + MasterKeyCheckboxSearchAllergiesWidget({ + Key? key, + required this.model, + this.myAllergiesList, + required this.patientInfo, + this.buttonName, + this.hintSearchText, + }) : super(key: key); @override - _MasterKeyCheckboxSearchAllergiesWidgetState createState() => _MasterKeyCheckboxSearchAllergiesWidgetState(); + _MasterKeyCheckboxSearchAllergiesWidgetState createState() => + _MasterKeyCheckboxSearchAllergiesWidgetState(); } -class _MasterKeyCheckboxSearchAllergiesWidgetState extends State { +class _MasterKeyCheckboxSearchAllergiesWidgetState + extends State { // List items = []; -bool loading =false; + bool loading = false; TextEditingController filteredSearchController = TextEditingController(); @override void initState() { - super.initState(); } @override Widget build(BuildContext context) { - return Column( - children: [ - - Expanded( - child: Container( - - margin: EdgeInsets.all(20), - height: Utils.getTextFieldHeight(), - child: Center( - child: Container( - decoration: BoxDecoration(borderRadius: BorderRadius.circular(12)), - child: Column( - children: [ - AppTextFieldCustom( - - hintText: TranslationBase.of(context).selectAllergy, - isTextFieldHasSuffix: true, - hasBorder: true, - controller: filteredSearchController, - onChanged: (value) { - // filterSearchResults(value); - }, - onFieldSubmitted: () { - - }, - - suffixIcon: IconButton( - icon: Icon( - Icons.search, - color: Color(0xff2B353E - ), - size: 30, - ), - onPressed: () { - loading =true; - widget.model.searchAllergies(filteredSearchController.text); - - }, - ), - ), - // DividerWithSpacesAround(), - SizedBox( - height: 10, - ), - Expanded( - child: RoundedContainer( - width:MediaQuery.of(context).size.width , - height: MediaQuery.of(context).size.height * 0.60, - child: widget.model.state == ViewState.Idle - ? ListView.builder( - itemCount: widget.model.searchAllergiesVidaPlus.length, - itemBuilder: (context, index) { - loading =false; - return ListTile(title: AppText(widget.model.searchAllergiesVidaPlus[index].allergyName!), trailing: TextButton.icon(icon: SvgPicture.asset("assets/images/svgs/add-square.svg", color: Color(0xffD02127),), style: ButtonStyle(iconColor: WidgetStateProperty.all(Color(0xffD02127)), ), onPressed: (){ - - openReaction(widget.model, widget.model.searchAllergiesVidaPlus[index]); - - }, label: AppText(TranslationBase.of(context).add, fontSize:12, color:Color(0xffD02127) ,), - ), - ); - - }, - ) - : widget.model.state == ViewState.BusyLocal ? Center(child: CircularProgressIndicator()) :Center(child: EmptyWidget(TranslationBase.of(context).noDataAvailable)) - + return Column( + children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(20), + height: Utils.getTextFieldHeight(), + child: Center( + child: Container( + decoration: + BoxDecoration(borderRadius: BorderRadius.circular(12)), + child: Column( + children: [ + AppTextFieldCustom( + hintText: TranslationBase.of(context).selectAllergy, + isTextFieldHasSuffix: true, + hasBorder: true, + controller: filteredSearchController, + onChanged: (value) { + // filterSearchResults(value); + }, + onFieldSubmitted: () { + }, + onEditingComplete: (){ + loading = true; + if(filteredSearchController.text.isNotEmpty) { + widget.model + .searchAllergies(filteredSearchController.text); + } + }, + suffixIcon: IconButton( + icon: Icon( + Icons.search, + color: Color(0xff2B353E), + size: 30, ), + onPressed: () { + loading = true; + widget.model + .searchAllergies(filteredSearchController.text); + }, ), - ], - ), + ), + // DividerWithSpacesAround(), + SizedBox( + height: 10, + ), + Expanded( + child: RoundedContainer( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.60, + child: widget.model.searchAllergiesVidaPlus.isEmpty + ? Center( + child: EmptyWidget( + TranslationBase.of(context) + .noDataAvailable)) + : ListView.builder( + itemCount: widget + .model.searchAllergiesVidaPlus.length, + itemBuilder: (context, index) { + loading = false; + return ListTile( + title: AppText(widget + .model + .searchAllergiesVidaPlus[index] + .allergyName!), + trailing: TextButton.icon( + icon: SvgPicture.asset( + "assets/images/svgs/add-square.svg", + color: Color(0xffD02127), + ), + style: ButtonStyle( + iconColor: + WidgetStateProperty.all< + Color>(Color(0xffD02127)), + ), + onPressed: () { + openReaction( + widget.model, + widget.model + .searchAllergiesVidaPlus[ + index]); + }, + label: AppText( + TranslationBase.of(context).add, + fontSize: 12, + color: Color(0xffD02127), + ), + ), + ); + }, + ) + ), + ), + ], ), ), ), ), - - ], - + ), + ], ); } -openReaction(model, AllergiesListVidaPlus mySelectedAllergy){ - Navigator.of(context).pop(); - Navigator.push( - context, - FadePage( - page:ReactionsSelectionAllergiesWidget( - model:model, - mySelectedAllergy: mySelectedAllergy, - patientInfo: widget.patientInfo - ) - - )); + openReaction(model, AllergiesListVidaPlus mySelectedAllergy) { + Navigator.of(context).pop(); + Navigator.push( + context, + FadePage( + page: ReactionsSelectionAllergiesWidget( + model: model, + mySelectedAllergy: mySelectedAllergy, + patientInfo: widget.patientInfo))); } - } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 8ac3c13b..9dac5c7a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; @@ -56,9 +57,7 @@ class _ReactionsSelectionAllergiesWidgetState builder: (_, model, w) => AppScaffold( isLoading: loading, appBar: PatientSearchHeader( - title: widget.mySelectedAllergy != null - ? widget.mySelectedAllergy!.allergyName - : widget.editSelectedAllergy!.allergyName), + title: TranslationBase.of(context).selectReaction), body: Column( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -66,7 +65,7 @@ class _ReactionsSelectionAllergiesWidgetState widget.mySelectedAllergy != null ? Expanded( child: RoundedContainer( - margin: EdgeInsets.only(top:10, left: 15, right: 15, bottom: 10), + margin: EdgeInsets.only(top:6, left: 15, right: 15, bottom: 6), child: ListView.builder( itemCount: widget.mySelectedAllergy! .allergyReactionDTOs!.length, @@ -108,11 +107,12 @@ class _ReactionsSelectionAllergiesWidgetState .allergyReactionName!), children: [ Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, children: [ Expanded( + child: ListTile( + contentPadding: EdgeInsets.zero , + title: Row( mainAxisSize: MainAxisSize.min, children: [ @@ -147,6 +147,7 @@ class _ReactionsSelectionAllergiesWidgetState ))), Expanded( child: ListTile( + contentPadding: EdgeInsets.zero , title: Row( children: [ Radio( @@ -180,6 +181,8 @@ class _ReactionsSelectionAllergiesWidgetState ))), Expanded( child: ListTile( + contentPadding: EdgeInsets.zero , + title: Row( children: [ Radio( @@ -215,7 +218,7 @@ class _ReactionsSelectionAllergiesWidgetState ) ], ), - Divider(), + // Divider(), ]); }, ))) @@ -263,6 +266,8 @@ class _ReactionsSelectionAllergiesWidgetState children: [ Expanded( child: ListTile( + contentPadding: EdgeInsets.zero , + title: Row( mainAxisSize: MainAxisSize.min, children: [ @@ -305,6 +310,8 @@ class _ReactionsSelectionAllergiesWidgetState ))), Expanded( child: ListTile( + contentPadding: EdgeInsets.zero , + title: Row( children: [ Radio( @@ -346,6 +353,8 @@ class _ReactionsSelectionAllergiesWidgetState ))), Expanded( child: ListTile( + contentPadding: EdgeInsets.zero , + title: Row( children: [ Radio( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart index 6938ec87..e9f00bdd 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart @@ -253,7 +253,11 @@ class UpdatePresentIllnessState extends State { "hpiTakenOtherText": otherController.text, "hpiTakenFamilyText": familyController.text, }; - await model!.saveHopi(request, widget.patientInfo!); + bool result = await model!.saveHopi(request, widget.patientInfo!); + if(result){ + getHopi(model); + } + GifLoaderDialogUtils.hideDialog(context); } getHopi(SOAPViewModel model) async{ diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 81c87e49..21df4f06 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -174,10 +174,10 @@ class _UpdateSoapIndexVidaPlusState extends State child: AppButton( title: TranslationBase.of(context).next, fontWeight: FontWeight.w600, + disabled: !model.isSubjectiveAssesmentCompleted(), color: Colors.red[700]!, onPressed: () async { changePageViewIndex(1); - //model.nextOnSubjectPage(model); }, ), ); @@ -217,7 +217,7 @@ class _UpdateSoapIndexVidaPlusState extends State // height: SizeConfig.heightMultiplier! * // (SizeConfig.isHeightVeryShort ? 8 : 6), // padding: 10, - disabled: model.state == ViewState.BusyLocal, + disabled: model.state == ViewState.BusyLocal || !model.isPhysicalExaminationAdded(), onPressed: () async { changePageViewIndex(2); // await model.nextOnObjectivePage(model); @@ -254,7 +254,7 @@ class _UpdateSoapIndexVidaPlusState extends State title: TranslationBase.of(context).next, fontWeight: FontWeight.w600, color: Colors.red[700]!, - disabled: model.state == ViewState.BusyLocal, + disabled: model.state == ViewState.BusyLocal || !model.isDiagnosticsAdded(), onPressed: () async { changePageViewIndex(3); }, @@ -292,7 +292,7 @@ class _UpdateSoapIndexVidaPlusState extends State : TranslationBase.of(context).finish, fontWeight: FontWeight.w600, color: Colors.red[700]!, - disabled: model.progressNoteText.isEmpty, + disabled: !model.isProgressAdded(), onPressed: () async { changePageViewIndex(3); // model.nextOnPlanPage(model); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index 034c2976..0e391584 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -10,6 +10,7 @@ class SoapDetailItem extends StatelessWidget { final String condition; final String status; final String remarks; + final bool showActions; final OnSoapDetailActionClicked onSoapDetailActionClicked; const SoapDetailItem( @@ -18,7 +19,8 @@ class SoapDetailItem extends StatelessWidget { required this.condition, required this.remarks, required this.onSoapDetailActionClicked, - required this.status}); + required this.status, + this.showActions = true}); @override Widget build(BuildContext context) { @@ -112,7 +114,7 @@ class SoapDetailItem extends StatelessWidget { onSoapDetailActionClicked(SoapDetailItemActions.AUDIT), child: SoapDetailItemActionsView( icon: 'assets/images/svgs/audit.svg', - fontColor: Color(0XFF359846), + fontColor: Color(0XFF2B353E), text: TranslationBase.of(context).audit, ), ), diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 9589e220..3fa6f0c4 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1952,6 +1952,11 @@ class TranslationBase { String get activate => localizedValues['activate']![locale.languageCode]!; String get resolved => localizedValues['resolved']![locale.languageCode]!; + String get selectReaction => localizedValues['selectReaction']![locale.languageCode]!; + String get progressNoteCanNotBeEmpty => localizedValues['progressNoteCanNotBeEmpty']![locale.languageCode]!; + String get diagnosisAlreadyResolved => localizedValues['diagnosisAlreadyResolved']![locale.languageCode]!; + String get diagnosisAlreadyDeleted => localizedValues['diagnosisAlreadyDeleted']![locale.languageCode]!; + } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index 3d386a27..93aef94d 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -27,6 +27,7 @@ class AppTextFieldCustom extends StatefulWidget { final List? inputFormatters; final Function(String? value) onChanged; final Function() onFieldSubmitted; + final VoidCallback? onEditingComplete; final String? validationError; final bool isPrscription; @@ -57,6 +58,7 @@ class AppTextFieldCustom extends StatefulWidget { this.focus = false, this.isSearchTextField = false, required this.onFieldSubmitted, + this.onEditingComplete }); @override @@ -161,6 +163,10 @@ class _AppTextFieldCustomState extends State { } }, child: TextFormField( + textInputAction: TextInputAction.search, + onEditingComplete: (){ + widget.onEditingComplete?.call(); + }, textAlign: projectViewModel.isArabic ? TextAlign.right : TextAlign.left, @@ -192,6 +198,7 @@ class _AppTextFieldCustomState extends State { } setState(() {}); }, + onFieldSubmitted: widget.onFieldSubmitted(), obscureText: widget.isSecure), From 4bb68778dc2ef29b7cee1fa96a6bb27bb1ef0635 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Wed, 4 Dec 2024 15:55:12 +0300 Subject: [PATCH 49/76] allergies changes --- .../soap/SOAP_service.dart | 18 ++++++++++++++-- lib/core/viewModel/SOAP_view_model.dart | 4 ++-- .../patient_profile_screen.dart | 2 +- .../allergies/update_allergies_widget.dart | 21 ++++++++++++++++++- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index dbcc2149..826ca410 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -456,13 +456,15 @@ class SOAPService extends LookupService { } Future addAllergies( - AllergiesListVidaPlus allergy, PatiantInformtion patientInfo) async { + AllergiesListVidaPlus allergy, PatiantInformtion patientInfo, bool isNoKnown) async { + if(!isNoKnown){ allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; value.pomrid = int.parse(patientInfo.pomrId!); value.allergyReactionMappingID = 1; }); +} var request = { "patientsAllergyRevisionID": allergy.allergyRevisionID, "patientMRN": patientInfo.patientMRN, @@ -481,9 +483,21 @@ class SOAPService extends LookupService { "dbCRUDOperation": 1, "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, - "allergyTypeID": allergy.allergyTypeID + "allergyTypeID": allergy.allergyTypeID, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; + if(isNoKnown){ + request['isAllergy'] ='NO_KNOWN_ALLERGIES'; + request['allergyName'] = "No Known Allergies"; + request['userType'] ='DOCTOR'; + request['allergyTypeID'] = request['allergyID'] = 0; + request['isActive'] = true; + request['remarks'] =""; + request['isActivePatientsAllergy'] =true; + request['patientsAllergyReactionsDTOs'] =[]; + } + hasError = false; await baseAppClient.post(POST_ALLERGIES, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 310c6949..fd5e4262 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1018,9 +1018,9 @@ class SOAPViewModel extends BaseViewModel { } addAllergies( - AllergiesListVidaPlus request, PatiantInformtion patientInfo) async { + AllergiesListVidaPlus request, PatiantInformtion patientInfo, {bool isNoKnown =false}) async { setState(ViewState.BusyLocal); - await _SOAPService.addAllergies(request, patientInfo); + await _SOAPService.addAllergies(request, patientInfo, isNoKnown); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 7b49ea34..588a9b13 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -302,7 +302,7 @@ class _PatientProfileScreenState extends State with Single }); }else { Navigator.of(context).pushNamed( - UPDATE_EPISODE_VIDA_PLUS, arguments: { + UPDATE_EPISODE, arguments: { 'patient': patient }); } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 11f79794..82c6a943 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; @@ -73,7 +74,12 @@ class _UpdateAllergiesWidgetState extends State { activeColor: Colors.red, onChanged: (value) { noKnownAllergies = value!; - setState(() {}); + if(value){ + setNoKnownAllergy(model); + } + setState(() { + + }); }, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, @@ -269,4 +275,17 @@ class _UpdateAllergiesWidgetState extends State { }); }); } + + setNoKnownAllergy(SOAPViewModel model) async { + GifLoaderDialogUtils.showMyDialog(context); + AllergiesListVidaPlus request= AllergiesListVidaPlus(); + + + await model!.addAllergies(request, widget.patientInfo, isNoKnown: true); + await model!.getAllergiesVidaPlus(widget.patientInfo); + setState(() { + + }); + GifLoaderDialogUtils.hideDialog(context); + } } From 629bab2b44226a8f02495834cad7074c53c5387f Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 5 Dec 2024 10:38:16 +0300 Subject: [PATCH 50/76] WD: Physical examination screen changes and create progress note changes. --- .../soap/SOAP_service.dart | 2 +- .../assessment/add_diagnosis.dart | 18 ++-- .../assessment/update_assessment_page.dart | 24 +++--- .../assessment/widget/edit_diagnosis.dart | 15 +++- .../assessment/widget/enter_diagnosis.dart | 25 ++++-- .../assessment/widget/favotite_diagnosis.dart | 1 + .../objective/list_of_examination.dart | 1 + .../plan/widget/ProgressNoteItem.dart | 9 +- .../plan/widget/list_of_notes.dart | 2 +- .../widgets/SoapDetailItem.dart | 85 ++++++++++--------- 10 files changed, 104 insertions(+), 78 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 949fe0ff..c2ded5ba 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1255,7 +1255,7 @@ class SOAPService extends LookupService { Map request = { "planNote": note, "PatientMRN": patient.patientMRN, - "EpisodeID": patient.episodeNo, + "EpisodeID": patient.pomrId, "CreatedByName": patient.doctorName, "CreatedBy": patient.doctorId, "Speciality": clinicID, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart index d7399d58..49740fe4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/add_diagnosis.dart @@ -62,21 +62,23 @@ class _AddDiagnosisState extends State controller: _tabController, tabs: [ Tab( - child: AppText( + child: Text( TranslationBase.of(context).mappedDiagnosis, - color: Color(0xFF6D6D6D), - fontSize: 14, - fontWeight: FontWeight.w600, - letterSpacing: -0.56, + style:TextStyle( + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56, + ) ), ), Tab( - child: AppText( + child: Text( TranslationBase.of(context).favoriteDiagnosis, - color: Color(0xFF6D6D6D), + style: TextStyle(color: Color(0xFF6D6D6D), fontSize: 14, fontWeight: FontWeight.w600, - letterSpacing: -0.56, + letterSpacing: -0.56,) ), ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart index 347deec6..91121ece 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -107,31 +107,33 @@ class _UpdateAssessmentPageState extends State ), SizedBox( - height: 56, + height: 64, child: TabBar( indicatorColor: Color(0xFFD02127), unselectedLabelColor: Color(0xFF6D6D6D), labelColor: Color(0xFF2B353E), tabs: [ Tab( - child: AppText( + child: Text( TranslationBase.of(context) .currentDiagnosis, + style: TextStyle( color: Color(0xFF6D6D6D), fontSize: 14, fontWeight: FontWeight.w600, - letterSpacing: -0.56, + letterSpacing: -0.56,) ), ), Tab( - child: AppText( - TranslationBase.of(context) - .previousDiagnosis, - color: Color(0xFF6D6D6D), - fontSize: 14, - fontWeight: FontWeight.w600, - letterSpacing: -0.56, - ), + child: Text( + TranslationBase.of(context) + .previousDiagnosis, + style: TextStyle( + color: Color(0xFF6D6D6D), + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.56,) + ) ) ], controller: _tabController, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index 63b178b8..1ceea811 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -127,16 +127,25 @@ class _EditDiagnosisState extends State { ); }, onChanged: (value) { - if (value != null) _onTextChanged(value); + + }, + onFieldSubmitted: () { + + }, + onEditingComplete: (){ + if(filteredSearchController.text.isEmpty) return; + _onStopped(filteredSearchController.text); }, - onFieldSubmitted: () {}, suffixIcon: IconButton( icon: Icon( Icons.search, color: Color(0xff2B353E), size: 30, ), - onPressed: () {}, + onPressed: () { + if(filteredSearchController.text.isEmpty) return; + _onStopped(filteredSearchController.text); + }, ), ), Positioned( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index c7f93308..ea870eb9 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -42,13 +42,13 @@ class _EnterDiagnosisState extends State { SearchDiagnosis? selectedDiagnosis; void _onTextChanged(String text) { - if (_tTimer != null) { - _tTimer!.cancel(); - } - if(text.isEmpty) return; - _tTimer = Timer(Duration(milliseconds: 500), () { - _onStopped(text); - }); + // if (_tTimer != null) { + // _tTimer!.cancel(); + // } + // if(text.isEmpty) return; + // _tTimer = Timer(Duration(milliseconds: 500), () { + // _onStopped(text); + // }); } void _onStopped(String searchText) async { @@ -94,16 +94,23 @@ class _EnterDiagnosisState extends State { ); }, onChanged: (value) { - if (value != null) _onTextChanged(value); + }, onFieldSubmitted: () {}, + onEditingComplete: (){ + if(filteredSearchController.text.isEmpty) return; + _onStopped(filteredSearchController.text); + }, suffixIcon: IconButton( icon: Icon( Icons.search, color: Color(0xff2B353E), size: 30, ), - onPressed: () {}, + onPressed: () { + if(filteredSearchController.text.isEmpty) return; + _onStopped(filteredSearchController.text); + }, ), ), Positioned( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index 7a08886b..1756aa38 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -66,6 +66,7 @@ class _FavoriteDiagnosisState extends State { }); }, builder: (_, model, w) => AppScaffold( + isShowAppBar: false, body: SingleChildScrollView( child: Padding( padding: diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart index 38f716c7..4f7ae541 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -29,6 +29,7 @@ class ListOfExamination extends StatelessWidget { /// the action is [SoapDetailItemActions] }, status: 'active', + showActions: false, ), separatorBuilder: (_, __) => Divider(), itemCount: listOfSelection.length), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart index 09e6d6a3..cbabae2b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart @@ -7,14 +7,15 @@ class ProgressNoteItem extends StatelessWidget { final String type; final String speciality; final String Notes; - final String status; + // final String status; const ProgressNoteItem( {super.key, required this.type, required this.speciality, required this.Notes, - required this.status}); + // required this.status + }); @override Widget build(BuildContext context) => Column( @@ -68,8 +69,8 @@ class ProgressNoteItem extends StatelessWidget { ), ], ), - Align( - alignment: Alignment.topRight, child: Status(status: status)) + // Align( + // alignment: Alignment.topRight, child: Status(status: status)) ], ), SizedBox( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart index d74ab0c3..1f5d2c81 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart @@ -12,7 +12,7 @@ class ListOfNotes extends StatelessWidget{ child: ListView.separated( physics: NeverScrollableScrollPhysics(), shrinkWrap: true, - itemBuilder: (_, index) =>ProgressNoteItem(type: 'Doctor Note', speciality: "Internal Medicine", Notes: "Some lines of note for the progress ", status: "stable"), + itemBuilder: (_, index) =>ProgressNoteItem(type: notes[index].progressNotesTypesName ?? '', speciality: notes[index].specialityName ?? '', Notes: notes[index].progressNote?? ''), separatorBuilder: (_, __) => Divider(), itemCount: notes.length), ); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index 0e391584..3ba16bef 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -84,51 +84,54 @@ class SoapDetailItem extends StatelessWidget { SizedBox( height: 16, ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => - onSoapDetailActionClicked(SoapDetailItemActions.EDIT), - child: SoapDetailItemActionsView( - icon: 'assets/images/svgs/edit.svg', - fontColor: Color(0XFF2B353E), - text: TranslationBase.of(context).edit, + Visibility( + visible: showActions, + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.EDIT), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/edit.svg', + fontColor: Color(0XFF2B353E), + text: TranslationBase.of(context).edit, + ), ), - ), - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => - onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE), - child: SoapDetailItemActionsView( - icon: 'assets/images/svgs/resolve.svg', - fontColor: Color(0XFF359846), - text: TranslationBase.of(context).resolve, + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/resolve.svg', + fontColor: Color(0XFF359846), + text: TranslationBase.of(context).resolve, + ), ), - ), - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => - onSoapDetailActionClicked(SoapDetailItemActions.AUDIT), - child: SoapDetailItemActionsView( - icon: 'assets/images/svgs/audit.svg', - fontColor: Color(0XFF2B353E), - text: TranslationBase.of(context).audit, + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.AUDIT), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/audit.svg', + fontColor: Color(0XFF2B353E), + text: TranslationBase.of(context).audit, + ), ), - ), - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () => - onSoapDetailActionClicked(SoapDetailItemActions.REMOVE), - child: SoapDetailItemActionsView( - icon: 'assets/images/svgs/delete.svg', - fontColor: Color(0XFFD02127), - text: TranslationBase.of(context).delete, + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => + onSoapDetailActionClicked(SoapDetailItemActions.REMOVE), + child: SoapDetailItemActionsView( + icon: 'assets/images/svgs/delete.svg', + fontColor: Color(0XFFD02127), + text: TranslationBase.of(context).delete, + ), ), - ), - ], + ], + ), ) ], ), From 9fcef3107f9022e05b35571459bfc821e8f7afbd Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Thu, 5 Dec 2024 11:44:05 +0300 Subject: [PATCH 51/76] fixes --- .../allergy/get_allergies_list_vida_plus.dart | 2 +- .../get_patient_allergies_list_vida_plus.dart | 2 +- .../patient_medical_file/soap/SOAP_service.dart | 15 ++++++++++----- .../subjective/allergies/reactions_selection.dart | 5 +++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart index 5a7fedd2..4fcae8ab 100644 --- a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -94,7 +94,7 @@ class AllergyReactionDTOs { this.pomrid, this.patientID, this.allergyReactionMappingID, - this.severity + this.severity =1 }); AllergyReactionDTOs.fromJson(Map json) { diff --git a/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart index d2e30e4e..ce84f58b 100644 --- a/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_patient_allergies_list_vida_plus.dart @@ -91,7 +91,7 @@ class PatientsAllergyReactionsDTOs { this.patientID, this.patientsAllergyReactionRevisionID, this.pomrId, - this.severity, + this.severity =1, this.isSelected, this.reactionSelection }); diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 949fe0ff..dd43153a 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -465,6 +465,7 @@ class SOAPService extends LookupService { value.patientID = patientInfo.patientMRN; value.pomrid = int.parse(patientInfo.pomrId!); value.allergyReactionMappingID = 1; + value.severity = value.severity ?? 1; }); } @@ -487,7 +488,6 @@ class SOAPService extends LookupService { "allergyID": allergy.allergyID, "allergyName": allergy.allergyName, "allergyTypeID": allergy.allergyTypeID, - "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; if(isNoKnown){ @@ -510,7 +510,8 @@ class SOAPService extends LookupService { hasError = true; super.error = error; }, body: { - "listProgNotePatientAllergyDiseaseVM": [request] + "listProgNotePatientAllergyDiseaseVM": [request], + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }); } @@ -686,9 +687,11 @@ class SOAPService extends LookupService { "appointmentNo": patient.appointmentNo, "pomrId": patient.pomrId, "patientMRN": patient.patientMRN, - "chiefComplaint": cheifComplaint + "chiefComplaint": cheifComplaint, + } - ] + ], + "setupId":await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; await baseAppClient.post(POST_CHIEF_COMPLAINT_VP, @@ -1403,7 +1406,8 @@ class SOAPService extends LookupService { "PatientMRN": patient.patientMRN, "PatientName": patient.firstName! + ' ' + patient.lastName!, "addedChiefComplaintCreateDtos": [], - "removedChiefComplaintIds": [chiefComplaint.chiefComplainId] + "removedChiefComplaintIds": [chiefComplaint.chiefComplainId], + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), }; hasError = false; await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, @@ -1421,6 +1425,7 @@ class SOAPService extends LookupService { Map request = { "patientId": patient.patientId, "clinicId": patient.clinicId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), }; hasError = false; await baseAppClient.post(EPISODE_BY_CHIEF_COMPLAINT, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 9dac5c7a..6f4f348c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/utils/extenstions_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -128,7 +129,7 @@ class _ReactionsSelectionAllergiesWidgetState groupValue: widget .mySelectedAllergy! .allergyReactionDTOs![index] - .severity, + .severity ?? 1, onChanged: (value) { widget .mySelectedAllergy! @@ -521,7 +522,7 @@ class _ReactionsSelectionAllergiesWidgetState allergyReactionMappingID:i.allergyReactionMappingID, allergyReactionID:i.allergyReactionID, allergyReactionName: i.allergyReactionName, - severity:i.severity, + severity:i.severity ??1 )); } From ec7bd327c852b0dd8f89cbcf9d72f8f3974860ef Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 5 Dec 2024 12:49:12 +0300 Subject: [PATCH 52/76] WD: Previous Chief complaint resolutions. --- lib/core/model/SOAP/get_hopi_details.dart | 6 + .../soap/SOAP_service.dart | 23 ++ lib/core/viewModel/SOAP_view_model.dart | 11 + .../chief_complaint/AddChiefComplaints.dart | 4 +- .../widgets/complaint_items.dart | 57 ++--- .../widgets/listOfComplaints.dart | 200 ++++++++++-------- .../widgets/previous_cheif_complaints.dart | 147 +++++++++---- .../update_present_illness.dart | 2 + 8 files changed, 286 insertions(+), 164 deletions(-) diff --git a/lib/core/model/SOAP/get_hopi_details.dart b/lib/core/model/SOAP/get_hopi_details.dart index 4783587e..eadf19ba 100644 --- a/lib/core/model/SOAP/get_hopi_details.dart +++ b/lib/core/model/SOAP/get_hopi_details.dart @@ -8,6 +8,8 @@ class GetHopiDetails { bool? isHpiTakenFamily; bool? isHpiTakenOther; bool? isHpiTakenPatient; + String? hpiTakenFamilyText; + String? hpiTakenOtherText; String? loginUserId; int? patientId; int? patientPomrId; @@ -39,6 +41,8 @@ class GetHopiDetails { loginUserId = json['loginUserId']; patientId = json['patientId']; patientPomrId = json['patientPomrId']; + hpiTakenFamilyText = json['hpiTakenFamilyText']; + hpiTakenOtherText = json['hpiTakenOtherText']; } Map toJson() { @@ -55,6 +59,8 @@ class GetHopiDetails { data['loginUserId'] = this.loginUserId; data['patientId'] = this.patientId; data['patientPomrId'] = this.patientPomrId; + data['hpiTakenFamilyText'] = this.hpiTakenFamilyText; + data['hpiTakenOtherText'] = this.hpiTakenOtherText; return data; } } diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 1c45580c..f20df2b0 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1398,6 +1398,29 @@ class SOAPService extends LookupService { }, body: request); } + continueEpisodeVidaPlusFromPrevious( + PatiantInformtion patient, ChiefComplains chiefComplaint, String chiefComplainTemplateId) async { + List> chiefComplaintList = []; + var listofComplain = { + chiefComplaint.chiefComplain :chiefComplainTemplateId + }; + + Map request = { + "appointmentId": patient.appointmentNo, + "projectId": patient.projectId, + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "chiefComplain":listofComplain + }; + hasError = false; + await baseAppClient.post(CONTINUE_EPISODE_VP, + onSuccess: (dynamic response, int statusCode) { + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: request); + } + updateChiefComplaintVidaPlus(PatiantInformtion patient, GetChiefComplaintVidaPlus chiefComplaint) async { Map request = { diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 4b149e7c..7a6baa46 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1134,6 +1134,17 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } + continueEpisodeVidaPlusFromPrevious( + PatiantInformtion patient, ChiefComplains chiefComplaint, String chiefComplainTemplateId) async { + setState(ViewState.BusyLocal); + await _SOAPService.continueEpisodeVidaPlusFromPrevious(patient, chiefComplaint,chiefComplainTemplateId ); + if (_SOAPService.hasError) { + error = _SOAPService.error; + setState(ViewState.ErrorLocal); + } else + setState(ViewState.Idle); + } + getHomeMedication(PatiantInformtion patientInfo) async { setState(ViewState.BusyLocal); await _SOAPService.getHomeMedication(patientInfo); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index 480882e6..8e61432a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -73,8 +73,8 @@ class _AddChiefComplaintState extends State { SizedBox(height: 16,), PreviousChiefComplaints( model.episodeByChiefComplaintListVidaPlus, - (List chiefComplaint){ - createCCByEpisode(model, chiefComplaint); + (ChiefComplains , String){ + addChiefComplaint(model, ChiefComplains.chiefComplain??'', context); }, ) ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index 2bda8432..a91707aa 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -18,18 +18,19 @@ class ComplaintItems extends StatefulWidget { class _ComplaintItemsState extends State { @override Widget build(BuildContext context) { - return Stack(children: [ Container( - padding: const EdgeInsets.all(5.0), + return Container( + padding: const EdgeInsets.all(5.0), + + margin:const EdgeInsets.all(5.0) , + alignment: Alignment.center, + decoration: BoxDecoration( + color: Color(0xffEAEAEA), + borderRadius: BorderRadius.circular( + 5, + )), + child: Row(children: [ SizedBox( width: 120, - height: 40, - margin:const EdgeInsets.all(5.0) , - alignment: Alignment.center, - decoration: BoxDecoration( - color: Color(0xffEAEAEA), - borderRadius: BorderRadius.circular( - 5, - )), - child:Text( + child: Text( widget.complaint.chiefComplain!, style: TextStyle( overflow: TextOverflow.ellipsis, @@ -41,23 +42,25 @@ class _ComplaintItemsState extends State { maxLines: 1, softWrap: false, textAlign: TextAlign.center, - )), - widget.isDeletable ? Positioned( - top:0, - bottom: 0, - right: 10, - child: InkWell( - onTap: () { - widget.onCrossClicked(widget.complaint); - }, - child: Icon( - Icons.close, - size: 18, - color: Color(0xFFD02127), + ), + ), + widget.isDeletable ? Positioned( + top:0, + bottom: 0, + right: 10, + child: InkWell( + onTap: () { + widget.onCrossClicked(widget.complaint); + }, + child: Icon( + Icons.close, + size: 18, + color: Color(0xFFD02127), + ), ), - ), - ) :SizedBox() - ],); + ) :SizedBox() + ],), + ); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart index ba83eff7..5ca2912d 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/listOfComplaints.dart @@ -19,102 +19,116 @@ class ListOfComplaintsItem extends StatelessWidget { @override Widget build(BuildContext context) { - return Column( - mainAxisSize: MainAxisSize.min, + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - - AppText( - name, - fontWeight: FontWeight.w600, - fontSize: 16, - textAlign: TextAlign.start, - color: Color(0xFF2E303A), - textOverflow: TextOverflow.ellipsis, - - ), - - SizedBox( - height: 4, - ), - Row( - children: [ - AppText( - TranslationBase.of(context).createdBy, - fontWeight: FontWeight.w400, - fontSize: 15, - color: Color(0xFF2E303A), - textAlign: TextAlign.start, - ), - SizedBox( - width: 4, - ), - Container( - width: MediaQuery.of(context).size.width * 0.32, - - child: AppText( - createdBy, - fontWeight: FontWeight.w400, - fontSize: 12, - textAlign: TextAlign.start, - textOverflow: TextOverflow.ellipsis, - color: Color(0xFF2E303A), - ), - ) - ], - ), - SizedBox( - height: 5, - ), - Row( - children: [ - AppText( - TranslationBase.of(context).createdOn, - fontWeight: FontWeight.w400, - textAlign: TextAlign.start, - fontSize: 15, - color: Color(0xFF2E303A), - ), - SizedBox( - width: 4, - ), - Container( - width: MediaQuery.of(context).size.width * 0.32, - - child:AppText( - createdAt, - fontWeight: FontWeight.w400, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + Text( + name, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 16, + color: Color(0xFF2E303A), + overflow: TextOverflow.clip), + ), + SizedBox( + height: 4, + ), + Row( + children: [ + Text(TranslationBase.of(context).createdBy, textAlign: TextAlign.start, - fontSize: 12, - textOverflow: TextOverflow.ellipsis, - color: Color(0xFF2E303A), - allowExpand: false, - maxLines: 1, - )), - ], - ) - ], - ), - - SizedBox( - width: 77, - height: 27, - child: AppButton( - title: TranslationBase.of(context).select, - hPadding: 8, - color: Color(0xFFD02127), - fontColor: Colors.white, - onPressed: () { - onSendClick(); - }, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFF2E303A), + )), + SizedBox( + width: 4, + ), + Expanded( + child: Text(createdBy, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 12, + overflow: TextOverflow.ellipsis, + color: Color(0xFF2E303A), + )), + ), + ], ), - ), - ], + // Row( + // children: [ + // Expanded( + // child: AppText( + // TranslationBase.of(context).createdBy, + // fontWeight: FontWeight.w400, + // fontSize: 15, + // color: Color(0xFF2E303A), + // textAlign: TextAlign.start, + // ), + // ), + // SizedBox( + // width: 4, + // ), + // AppText( + // createdBy, + // fontWeight: FontWeight.w400, + // fontSize: 12, + // textAlign: TextAlign.start, + // textOverflow: TextOverflow.ellipsis, + // color: Color(0xFF2E303A), + // ) + // ], + // ), + SizedBox( + height: 5, + ), + Row( + children: [ + Text(TranslationBase.of(context).createdOn, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFF2E303A), + )), + SizedBox( + width: 4, + ), + Expanded( + child: Text(createdAt, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w400, + fontSize: 12, + overflow: TextOverflow.ellipsis, + color: Color(0xFF2E303A), + )), + ), + ], + ) + ], + ), + ), + SizedBox( + width: 77, + height: 27, + child: AppButton( + title: TranslationBase.of(context).select, + hPadding: 8, + color: Color(0xFFD02127), + fontColor: Colors.white, + onPressed: () { + onSendClick(); + }, + ), ), ], ); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart index 4662dd90..ba51f1d0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart @@ -6,11 +6,15 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; import 'package:quiver/time.dart'; - class PreviousChiefComplaints extends StatelessWidget { - final List complaints; - final Function(List)? onSendClicked; - PreviousChiefComplaints(this.complaints,this.onSendClicked, {super.key,}); + final List complaints; + final Function(ChiefComplains , String)? onSendClicked; + + PreviousChiefComplaints( + this.complaints, + this.onSendClicked, { + super.key, + }); @override Widget build(BuildContext context) { @@ -28,13 +32,13 @@ class PreviousChiefComplaints extends StatelessWidget { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - TranslationBase.of(context).previousChiefCompaints, - textAlign: TextAlign.start, - fontWeight: FontWeight.w600, - fontSize: 16, - color: Color(0xFF2E303A), - ), + Text(TranslationBase.of(context).previousChiefCompaints, + textAlign: TextAlign.start, + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 16, + color: Color(0xFF2E303A), + )), SizedBox( height: 16, ), @@ -49,43 +53,102 @@ class PreviousChiefComplaints extends StatelessWidget { height: 10, ), Flexible( - child: ListView.separated( + child: ListView.builder( shrinkWrap: true, - separatorBuilder: (context, index2) => Divider(), itemCount: complaints.length, + physics: NeverScrollableScrollPhysics(), itemBuilder: (context, index) { - return complaints[index].patientPomrs!.isNotEmpty ? ListOfComplaintsItem( - name: getChildValue(complaints[index].patientPomrs!, 1), - createdBy: getChildValue(complaints[index].patientPomrs!,2), - createdAt: getChildValue(complaints[index].patientPomrs!, 3), - onSendClick: () { - onSendClicked!(complaints[index].patientPomrs!); - }) :SizedBox(); - }) - - - - - - ) + return ListView.builder( + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + itemCount: + complaints[index].patientPomrs?.length ?? 0, + itemBuilder: (context, pomrID) { + return ListView.separated( + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + itemCount: complaints[index] + .patientPomrs?[pomrID] + .chiefComplains + ?.length ?? + 0, + separatorBuilder: (context, _) => Column( + children: [ + SizedBox(height: 10,), + Divider(), + SizedBox(height: 10,), + ], + ), + itemBuilder: (context, cheifComplainIndex) { + return ListOfComplaintsItem( + name: complaints[index] + .patientPomrs![pomrID] + .chiefComplains?[ + cheifComplainIndex] + .chiefComplain ?? + '', + // createdBy: getChildValue(complaints[index].patientPomrs!,2), + createdBy: complaints[index] + .patientPomrs![pomrID] + .chiefComplains?[ + cheifComplainIndex] + .createdBy ?? + '', + createdAt: complaints[index] + .patientPomrs![pomrID] + .chiefComplains?[ + cheifComplainIndex] + .createdOn ?? + '', + onSendClick: () { + onSendClicked!( + complaints[index] + .patientPomrs![pomrID] + .chiefComplains![ + cheifComplainIndex] + ,complaints[index] + .patientPomrs?[pomrID].chiefComplainTemplateId?.toString() ??''); + }); + }); + // return Column( + // children: complaints[index].patientPomrs![pomrID].chiefComplains?.map((element)=>ListOfComplaintsItem( + // name: element.chiefComplain ?? '', + // // createdBy: getChildValue(complaints[index].patientPomrs!,2), + // createdBy: element.createdBy ?? '', + // createdAt: element.createdOn ?? '', + // onSendClick: () { + // onSendClicked!(complaints[index].patientPomrs!); + // })).toList()??[], + // ); + }, + ); + // return complaints[index].patientPomrs!.isNotEmpty ? ListOfComplaintsItem( + // name: getChildValue(complaints[index].patientPomrs!, 1), + // createdBy: getChildValue(complaints[index].patientPomrs!,2), + // createdAt: getChildValue(complaints[index].patientPomrs!, 3), + // onSendClick: () { + // onSendClicked!(complaints[index].patientPomrs!); + // }) :SizedBox(); + })) ], ), )); } -String getChildValue(List? patientPomrs, int key) { - List value = []; - patientPomrs!.forEach((element) { - if(key ==1) { - element.chiefComplains!.forEach((element2) { - value.add(element2.chiefComplain!); - }); - }else if(key ==2) { - value.add(element.doctorName!); - }else { - value.add(element.createdOn!); - } - }); - return value.join(" "); -} + String getChildValue(List? patientPomrs, int key) { + List value = []; + patientPomrs!.forEach((element) { + if (key == 1) { + element.chiefComplains!.forEach((element2) { + value.add(element2.chiefComplain!); + }); + } else if (key == 2) { + value.add(element.doctorName!); + } else { + value.add(element.createdOn!); + } + }); + + return value.join(" "); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart index e9f00bdd..70fb1250 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart @@ -267,6 +267,8 @@ class UpdatePresentIllnessState extends State { setData(SOAPViewModel model){ if(model.getHopiDetails.isNotEmpty) { patientController.text = model.getHopiDetails[0].hpi!; + familyController.text = model.getHopiDetails[0].hpiTakenFamilyText!; + otherController.text = model.getHopiDetails[0].hpiTakenOtherText!; isOtherSelected = model.getHopiDetails[0].isHpiTakenOther!; isFamilySelected = model.getHopiDetails[0].isHpiTakenFamily!; isPatientSelected = model.getHopiDetails[0].isHpiTakenPatient!; From 48f67dc532864c04a5d1f70fd5e12e544dbf41c5 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 8 Dec 2024 11:01:37 +0300 Subject: [PATCH 53/76] WD: small changes regarding appointment id as null --- .../model/SOAP/assessment/patient_previous_diagnosis.dart | 2 +- .../service/patient_medical_file/soap/SOAP_service.dart | 2 +- .../assessment/widget/edit_diagnosis.dart | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart index 63419958..99a50bf6 100644 --- a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart @@ -113,7 +113,7 @@ class PatientPreviousDiagnosis { 'active': active, 'admissionId': admissionId ?? 0, 'admissionRequestId': admissionRequestId ?? 0, - 'appointmentId': appointmentId, + 'appointmentId': appointmentId ?? 0, 'approvedBy': approvedBy, 'approvedOn': approvedOn, 'assessmentId': assessmentId ?? 0, diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index f20df2b0..1c40631e 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1311,7 +1311,7 @@ class SOAPService extends LookupService { "patientId": diagnosis.patientId, "doctorId": diagnosis.doctorId, "pomrId": diagnosis.pomrId, - "appointmentId": diagnosis.appointmentId, + "appointmentId": diagnosis.appointmentId ?? 0, "problemId": diagnosis.problemId, "diagnosisType": diagnosis.diagnosisType, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index 1ceea811..fd06b942 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -311,6 +311,7 @@ class _EditDiagnosisState extends State { if (newValue != null) setState(() { selectedDiagnosisItem = newValue; + selectedDiagnosisItemValue = model.diagnosisTypeList[newValue]; }); }, items: @@ -459,6 +460,9 @@ class _EditDiagnosisState extends State { filteredSearchController.text; widget.diagnosis.remarks = remarksController.text; + widget.diagnosis.condition = status; + widget.diagnosis.diagnosisType = + selectedDiagnosisItemValue; if(selectedDiagnosis != null ) { widget.diagnosis.selectedCategoryCode = @@ -472,9 +476,6 @@ class _EditDiagnosisState extends State { widget.diagnosis.selectedSectionCode = selectedDiagnosis?.selectedSectionCode ?? ''; - widget.diagnosis.condition = status; - widget.diagnosis.diagnosisType = - selectedDiagnosisItem; } bool result = From 5da6083c9109d44b88f872772b1182cbdf2da0b2 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 8 Dec 2024 13:52:26 +0300 Subject: [PATCH 54/76] WD: Flutter errors removed and parent widget issue resolved --- .../assessment/widget/enter_diagnosis.dart | 56 ++++---- .../chief_complaint/AddChiefComplaints.dart | 3 +- .../widgets/ComplaintSelection.dart | 8 +- .../widgets/complaint_items.dart | 21 ++- .../medication/update_medication_widget.dart | 123 ++++++++---------- 5 files changed, 97 insertions(+), 114 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index ea870eb9..28e67a93 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -113,35 +113,33 @@ class _EnterDiagnosisState extends State { }, ), ), - Positioned( - child: Material( - elevation: 4.0, // Optional: for shadow effect - child: ConstrainedBox( - constraints: BoxConstraints(minHeight: 0, maxHeight: 300), - child: ListView.builder( - shrinkWrap: true, - itemCount: model.icdVersionList.length, - itemBuilder: (context, index) { - return ListTile( - title: InkWell( - child: AppText(model.icdVersionList[index]), - onTap: () { - setState( - () { - selectedDiagnosis = - model.findTheDiagnosisItem( - model.icdVersionList[index]); - filteredSearchController.text = - model.icdVersionList[index]; - model.searchDiagnosisList.clear(); - model.icdVersionList.clear(); - }, - ); - }, - ), - ); - }, - ), + Material( + elevation: 4.0, // Optional: for shadow effect + child: ConstrainedBox( + constraints: BoxConstraints(minHeight: 0, maxHeight: 300), + child: ListView.builder( + shrinkWrap: true, + itemCount: model.icdVersionList.length, + itemBuilder: (context, index) { + return ListTile( + title: InkWell( + child: AppText(model.icdVersionList[index]), + onTap: () { + setState( + () { + selectedDiagnosis = + model.findTheDiagnosisItem( + model.icdVersionList[index]); + filteredSearchController.text = + model.icdVersionList[index]; + model.searchDiagnosisList.clear(); + model.icdVersionList.clear(); + }, + ); + }, + ), + ); + }, ), ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index 8e61432a..c6826dbc 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -104,7 +104,8 @@ class _AddChiefComplaintState extends State { }); } episodeByChiefComplaint(SOAPViewModel model) async{ - await model.episodeByChiefComplaint(widget.patientInfo); + WidgetsBinding.instance.addPostFrameCallback((_) async{ + await model.episodeByChiefComplaint(widget.patientInfo);}); } createCCByEpisode(model, List chiefComplaint) async{ diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index fa801b4c..f209ed4b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -281,8 +281,9 @@ class _ComplaintSelectionState extends State { ),) ],), - Stack(children: [ - Positioned(child:Material( + Padding( + padding: const EdgeInsets.all(8.0), + child: Material( elevation: 4.0, // Optional: for shadow effect child: ConstrainedBox( @@ -304,7 +305,8 @@ class _ComplaintSelectionState extends State { widget.onSave!(cc!); searchController.text =''; })); - }))))]), + }))), + ), SizedBox( height: 43, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart index a91707aa..3fa49ba4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart @@ -44,19 +44,14 @@ class _ComplaintItemsState extends State { textAlign: TextAlign.center, ), ), - widget.isDeletable ? Positioned( - top:0, - bottom: 0, - right: 10, - child: InkWell( - onTap: () { - widget.onCrossClicked(widget.complaint); - }, - child: Icon( - Icons.close, - size: 18, - color: Color(0xFFD02127), - ), + widget.isDeletable ? InkWell( + onTap: () { + widget.onCrossClicked(widget.complaint); + }, + child: Icon( + Icons.close, + size: 18, + color: Color(0xFFD02127), ), ) :SizedBox() ],), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart index 91cfd08c..a0882796 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/medication/update_medication_widget.dart @@ -17,6 +17,7 @@ import 'add_medication.dart'; class UpdateMedicationWidget extends StatefulWidget { final PatiantInformtion patientInfo; + UpdateMedicationWidget({ Key? key, required this.patientInfo, @@ -33,77 +34,63 @@ class _UpdateMedicationWidgetState extends State { Widget build(BuildContext context) { return BaseView( onModelReady: (model) async { - model.getHomeMedication(widget.patientInfo); + WidgetsBinding.instance.addPostFrameCallback((_) { + model.getHomeMedication(widget.patientInfo); + }); }, - builder: (_, model, w) => - Column( - children: [ - AddSoapItem( - title: "${TranslationBase - .of(context) - .addMedication}", - onAddSoapItemClicked: () { - Navigator.push( - context, - FadePage( - page: AddMedication( - patientInfo: widget.patientInfo, - addMedicationFun:(){ - - } - ) - - )); - // openMedicationList(context); - }, - ), - SizedBox( - height: 20, - ), - ListView( - padding: EdgeInsets.all(10), - shrinkWrap: true, - physics: NeverScrollableScrollPhysics(), - children: model.getHomeMedicationList!.map((medication) { - return ListTile( - trailing: TextButton.icon( - onPressed: () { - removeMedication(medication, model); - }, - icon: SvgPicture.asset( - "assets/images/svgs/delete.svg", - height: 18, - color: Color(0xffD02127), - ), - label: AppText( - TranslationBase.of(context) - .remove, - fontSize: 12, - color: Color(0xffD02127))), - title: - - AppText( - medication.prescribedItemName!, - fontSize: 12, - fontWeight: FontWeight.w800, - letterSpacing: -0.48, - ), - subtitle: AppText( - '${medication.doseQuantity!} - ${ medication.frequencyString!}', - fontSize: 10, - + builder: (_, model, w) => Column(children: [ + AddSoapItem( + title: "${TranslationBase.of(context).addMedication}", + onAddSoapItemClicked: () { + Navigator.push( + context, + FadePage( + page: AddMedication( + patientInfo: widget.patientInfo, + addMedicationFun: () {}))); + // openMedicationList(context); + }, + ), + SizedBox( + height: 20, + ), + ListView( + padding: EdgeInsets.all(10), + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + children: model.getHomeMedicationList!.map((medication) { + return ListTile( + trailing: TextButton.icon( + onPressed: () { + removeMedication(medication, model); + }, + icon: SvgPicture.asset( + "assets/images/svgs/delete.svg", + height: 18, + color: Color(0xffD02127), ), - ); - }).toList()), - - - ] - )); + label: AppText(TranslationBase.of(context).remove, + fontSize: 12, color: Color(0xffD02127))), + title: AppText( + medication.prescribedItemName!, + fontSize: 12, + fontWeight: FontWeight.w800, + letterSpacing: -0.48, + ), + subtitle: AppText( + '${medication.doseQuantity!} - ${medication.frequencyString!}', + fontSize: 10, + ), + ); + }).toList()), + ])); } - removeMedication(GetHomeMedicationList medication, SOAPViewModel model) async{ + + removeMedication( + GetHomeMedicationList medication, SOAPViewModel model) async { GifLoaderDialogUtils.showMyDialog(context); - await model.removeCurrentMedication(medication.id!); - await model.getHomeMedication(widget.patientInfo); - GifLoaderDialogUtils.hideDialog(context); + await model.removeCurrentMedication(medication.id!); + await model.getHomeMedication(widget.patientInfo); + GifLoaderDialogUtils.hideDialog(context); } } From c69ada4aa19d836427b53f45bccee0e5a8cabf3b Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 8 Dec 2024 15:21:11 +0300 Subject: [PATCH 55/76] WD: release build issues resolution --- .../assessment/widget/edit_diagnosis.dart | 56 +++++++++---------- lib/utils/exception_report.dart | 20 +++---- pubspec.yaml | 2 +- 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index fd06b942..1d3bf402 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -148,35 +148,33 @@ class _EditDiagnosisState extends State { }, ), ), - Positioned( - child: Material( - elevation: 4.0, // Optional: for shadow effect - child: ConstrainedBox( - constraints: BoxConstraints(minHeight: 0, maxHeight: 300), - child: ListView.builder( - shrinkWrap: true, - itemCount: model.icdVersionList.length, - itemBuilder: (context, index) { - return ListTile( - title: InkWell( - child: AppText(model.icdVersionList[index]), - onTap: () { - setState( - () { - selectedDiagnosis = - model.findTheDiagnosisItem( - model.icdVersionList[index]); - filteredSearchController.text = - model.icdVersionList[index]; - model.searchDiagnosisList.clear(); - model.icdVersionList.clear(); - }, - ); - }, - ), - ); - }, - ), + Material( + elevation: 4.0, // Optional: for shadow effect + child: ConstrainedBox( + constraints: BoxConstraints(minHeight: 0, maxHeight: 300), + child: ListView.builder( + shrinkWrap: true, + itemCount: model.icdVersionList.length, + itemBuilder: (context, index) { + return ListTile( + title: InkWell( + child: AppText(model.icdVersionList[index]), + onTap: () { + setState( + () { + selectedDiagnosis = + model.findTheDiagnosisItem( + model.icdVersionList[index]); + filteredSearchController.text = + model.icdVersionList[index]; + model.searchDiagnosisList.clear(); + model.icdVersionList.clear(); + }, + ); + }, + ), + ); + }, ), ), ), diff --git a/lib/utils/exception_report.dart b/lib/utils/exception_report.dart index 480ddbe7..2e039703 100644 --- a/lib/utils/exception_report.dart +++ b/lib/utils/exception_report.dart @@ -1,4 +1,4 @@ -import 'package:cloud_firestore/cloud_firestore.dart'; +// import 'package:cloud_firestore/cloud_firestore.dart'; void postFailureResponse({ required dynamic doctorId, @@ -7,13 +7,13 @@ void postFailureResponse({ required String response, required String exception, }) async { - Map data = { - "url" : url, - "request" : request, - "response" : response, - "exception" : exception - }; - final firestore = FirebaseFirestore.instance; - final collectionRef = firestore.collection(doctorId.toString()); - await collectionRef.doc(DateTime.now().toIso8601String()).set(data); + // Map data = { + // "url" : url, + // "request" : request, + // "response" : response, + // "exception" : exception + // }; + // final firestore = FirebaseFirestore.instance; + // final collectionRef = firestore.collection(doctorId.toString()); + // await collectionRef.doc(DateTime.now().toIso8601String()).set(data); } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index c9edd783..26234141 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -76,7 +76,7 @@ dependencies: # Firebase firebase_messaging: ^14.7.5 firebase_analytics : ^10.7.1 - cloud_firestore: ^4.15.8 +# cloud_firestore: ^4.15.8 #GIF image # flutter_gifimage: ^1.0.1 From 09480bc994b8a8f19ced4b09b89b3a72970b148f Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Sun, 8 Dec 2024 16:14:06 +0300 Subject: [PATCH 56/76] WD: button name change and action on vida screen. --- .../steper/steps_widget.dart | 87 +++++++++---------- .../assessment/widget/enter_diagnosis.dart | 2 +- .../assessment/widget/favotite_diagnosis.dart | 2 +- .../update_soap_index_vida_plus.dart | 10 +-- 4 files changed, 48 insertions(+), 53 deletions(-) diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart index e2f21a7a..5c9e103e 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/steper/steps_widget.dart @@ -209,52 +209,49 @@ class StepsWidget extends StatelessWidget { Positioned( top: circleTop, right: 0, - child: InkWell( - onTap: () => index >= 3 ? changeCurrentTab!(4) : null, - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Container( - width: circleHeight, - height: circleHeight, - decoration: BoxDecoration( - border: index == 3 - ? Border.all(color: Color(0xFFCC9B14), width: 2) - : index > 3 - ? null - : Border.all(color: Color(0xFFCCCCCC), width: 0.75), - shape: BoxShape.circle, - color: index == 3 - ? Color(0xFFCC9B14) - : index > 3 - ? AppGlobal.appGreenColor - : Color(0xFFCCCCCC), - ), - child: Center( - child: Icon( - FontAwesomeIcons.check, - size: 20, - color: Colors.white, - )), - ), - SizedBox( - height: 5, - ), - Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - StepDetailsWidget( - stepLabel: "Plan", - marginLeft: 30, - ), - StatusLabel( - selectedStepId: index, - stepId: 3, - ), - ], + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + width: circleHeight, + height: circleHeight, + decoration: BoxDecoration( + border: index == 3 + ? Border.all(color: Color(0xFFCC9B14), width: 2) + : index > 3 + ? null + : Border.all(color: Color(0xFFCCCCCC), width: 0.75), + shape: BoxShape.circle, + color: index == 3 + ? Color(0xFFCC9B14) + : index > 3 + ? AppGlobal.appGreenColor + : Color(0xFFCCCCCC), ), - ], - ), + child: Center( + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), + ), + SizedBox( + height: 5, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + StepDetailsWidget( + stepLabel: "Plan", + marginLeft: 30, + ), + StatusLabel( + selectedStepId: index, + stepId: 3, + ), + ], + ), + ], ), ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 28e67a93..42a649d3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -365,7 +365,7 @@ class _EnterDiagnosisState extends State { children: [ Expanded( child: AppButton( - title: TranslationBase.of(context).previous, + title: TranslationBase.of(context).cancelSmall, color: Colors.grey[300]!, fontColor: Colors.black, fontWeight: FontWeight.w600, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index 1756aa38..c65d145e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -435,7 +435,7 @@ class _FavoriteDiagnosisState extends State { children: [ Expanded( child: AppButton( - title: TranslationBase.of(context).previous, + title: TranslationBase.of(context).cancelSmall, color: Colors.grey[300]!, fontColor: Colors.black, fontWeight: FontWeight.w600, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 21df4f06..315021a7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -287,15 +288,12 @@ class _UpdateSoapIndexVidaPlusState extends State ), Expanded( child: AppButton( - title: model.isAddProgress - ? TranslationBase.of(context).next - : TranslationBase.of(context).finish, + title: TranslationBase.of(context).submit, fontWeight: FontWeight.w600, - color: Colors.red[700]!, + color: AppGlobal.appGreenColor, disabled: !model.isProgressAdded(), onPressed: () async { - changePageViewIndex(3); - // model.nextOnPlanPage(model); + Navigator.pop(context); }, ), ), From 5ecee030527627b01b268b5766bf3b32c4d92004 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 10 Dec 2024 11:39:52 +0300 Subject: [PATCH 57/76] WD: Add any input typed as chief complaint --- .../widgets/ComplaintSelection.dart | 67 +++++++++++++------ 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index f209ed4b..6c0a8690 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -259,28 +259,51 @@ class _ComplaintSelectionState extends State { textAlign: TextAlign.start, ), ), - SizedBox(height: 8,), - Row(children: [ - Expanded(child: Padding( - padding: EdgeInsets.only(left: 10,right: 10), - child: - - TextFormField( - autofocus: true, - controller: searchController, - decoration: InputDecoration( - hintText: '', - border: InputBorder.none, - isCollapsed: true, - suffixIcon: model.state == ViewState.BusyLocal ?Transform.scale( - scale: 0.5, - child: CircularProgressIndicator(strokeWidth: 2,) ,): SizedBox() - ), - onChanged: _onTextChanged,) - - ),) - - ],), + SizedBox( + height: 8, + ), + Row( + children: [ + Expanded( + child: Padding( + padding: EdgeInsets.only(left: 10, right: 10), + child: TextFormField( + autofocus: true, + controller: searchController, + textInputAction: TextInputAction.done, + decoration: InputDecoration( + hintText: '', + border: InputBorder.none, + isCollapsed: true, + suffixIcon: model.state == ViewState.BusyLocal + ? Transform.scale( + scale: 0.5, + child: CircularProgressIndicator( + strokeWidth: 2, + ), + ) + :(searchController.text.isNotEmpty) ?IconButton( + icon: Icon( + Icons.save_as_outlined, + color: Colors.red, + size: 25, + ), + onPressed: () { + if(searchController.text.isNotEmpty) { + widget.onSave?.call(searchController.text); + } + }): SizedBox.shrink(), + ), + onChanged: _onTextChanged, + onEditingComplete: (){ + if(searchController.text.isNotEmpty) { + widget.onSave?.call(searchController.text); + } + }, + )), + ) + ], + ), Padding( padding: const EdgeInsets.all(8.0), child: Material( From 8f05d526f6c878b501f8b894978c33bc260db1e9 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 12 Dec 2024 17:02:26 +0300 Subject: [PATCH 58/76] WD: Changes of apis and flows performed. 1. diagnosis restricted for operation after the resolution or deletion of diagnosis. 2. pomrid in episode api. --- lib/client/base_app_client.dart | 12 +- lib/config/config.dart | 2 +- .../soap/SOAP_service.dart | 150 +++++++++++------- lib/core/viewModel/SOAP_view_model.dart | 5 +- .../assessment/widget/current_diagnosis.dart | 21 +++ .../widgets/ComplaintSelection.dart | 2 + 6 files changed, 128 insertions(+), 64 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 6794d92d..cdf2db2d 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/service/NavigationService.dart'; import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart'; +import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/exception_report.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:flutter/cupertino.dart'; @@ -165,8 +166,15 @@ class BaseAppClient { } else onSuccess(parsed, statusCode); } else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); + if(body['DoctorID'] !=null ) { + + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: getError(parsed)); + } onFailure(getError(parsed), statusCode); } } diff --git a/lib/config/config.dart b/lib/config/config.dart index fe7d9b43..2b86c78d 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -326,7 +326,7 @@ const FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisGetFavo const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAddFavourite'; -const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/ContinuePreviousEpisode'; +const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/CreateDiagnosis'; const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchPhysicalExam'; diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 1c40631e..bd51681b 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -458,17 +458,16 @@ class SOAPService extends LookupService { }); } - Future addAllergies( - AllergiesListVidaPlus allergy, PatiantInformtion patientInfo, bool isNoKnown) async { - if(!isNoKnown){ - allergy.allergyReactionDTOs!.forEach((value) { - value.patientID = patientInfo.patientMRN; - value.pomrid = int.parse(patientInfo.pomrId!); - value.allergyReactionMappingID = 1; - value.severity = value.severity ?? 1; - }); - -} + Future addAllergies(AllergiesListVidaPlus allergy, + PatiantInformtion patientInfo, bool isNoKnown) async { + if (!isNoKnown) { + allergy.allergyReactionDTOs!.forEach((value) { + value.patientID = patientInfo.patientMRN; + value.pomrid = int.parse(patientInfo.pomrId!); + value.allergyReactionMappingID = 1; + value.severity = value.severity ?? 1; + }); + } var request = { "patientsAllergyRevisionID": allergy.allergyRevisionID, "patientMRN": patientInfo.patientMRN, @@ -490,15 +489,15 @@ class SOAPService extends LookupService { "allergyTypeID": allergy.allergyTypeID, }; - if(isNoKnown){ - request['isAllergy'] ='NO_KNOWN_ALLERGIES'; + if (isNoKnown) { + request['isAllergy'] = 'NO_KNOWN_ALLERGIES'; request['allergyName'] = "No Known Allergies"; - request['userType'] ='DOCTOR'; - request['allergyTypeID'] = request['allergyID'] = 0; + request['userType'] = 'DOCTOR'; + request['allergyTypeID'] = request['allergyID'] = 0; request['isActive'] = true; - request['remarks'] =""; - request['isActivePatientsAllergy'] =true; - request['patientsAllergyReactionsDTOs'] =[]; + request['remarks'] = ""; + request['isActivePatientsAllergy'] = true; + request['patientsAllergyReactionsDTOs'] = []; } hasError = false; @@ -688,10 +687,9 @@ class SOAPService extends LookupService { "pomrId": patient.pomrId, "patientMRN": patient.patientMRN, "chiefComplaint": cheifComplaint, - } ], - "setupId":await sharedPref.getString(DOCTOR_SETUP_ID) + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID) }; hasError = false; await baseAppClient.post(POST_CHIEF_COMPLAINT_VP, @@ -737,13 +735,13 @@ class SOAPService extends LookupService { .forEach((v) => searchDiagnosisList.add(SearchDiagnosis.fromJson(v))); _processData(); }, onFailure: (String error, int statusCode) { - clearSearchResult(); + clearSearchResult(); hasError = true; super.error = error; }, body: request); } - clearSearchResult(){ + clearSearchResult() { searchDiagnosisList.clear(); icdVersionList.clear(); } @@ -865,7 +863,7 @@ class SOAPService extends LookupService { // "endRow": 10, // "isSelected": true, // "ProjectID": 313 - "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "hospitalId": patient.projectId, "patientId": patient.patientId, "patientPomrId": patient.pomrId, @@ -1046,11 +1044,17 @@ class SOAPService extends LookupService { var result = response['ListDiagnosisAddFavourite']['resultData']; isFavoriteAdded = true; if ((result is List) && (result as List).isEmpty) { + if(response['ListDiagnosisAddFavourite']['message'] != null) DrAppToastMsg.showErrorToast( response['ListDiagnosisAddFavourite']['message']); + + else DrAppToastMsg.showErrorToast("Unable to Add"); } else { + if(response['ListDiagnosisAddFavourite']['message'] != null) DrAppToastMsg.showSuccesToast( response['ListDiagnosisAddFavourite']['message']); + else DrAppToastMsg.showErrorToast("Diagnosis Added To Favorite"); + } }, onFailure: (String error, int statusCode) { hasError = true; @@ -1061,33 +1065,45 @@ class SOAPService extends LookupService { return isFavoriteAdded; } - Future convertPreviousDiagnosisCurrent(PatiantInformtion paitientInfo, - PatientPreviousDiagnosis diagnosis) async { + Future convertPreviousDiagnosisCurrent( + PatiantInformtion patient, PatientPreviousDiagnosis diagnosis) async { + Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { - "patientProblemRevisionId": diagnosis.patientProblemRevisionId, - "patientId": paitientInfo.patientId, - "doctorId": paitientInfo.doctorId, - "pomrId": paitientInfo.pomrId, - "appointmentId": paitientInfo.appointmentNo, - "createdBy": diagnosis.createdBy, - "hospitalId": diagnosis.hospitalId, - "hospitalGroupId": diagnosis.hospitalGroupId, - "clinicGroupId": diagnosis.clinicGroupId, - "clinicId": diagnosis.clinicId, - "isSelected": true, - "ProjectID": paitientInfo.projectId + "pomrId": patient.pomrId, + "appointmentId": patient.appointmentNo, + "clinicGroupId": patient.clinicGroupId, + "clinicId": patient.clinicId, + "patientId": patient.patientId, + "hospitalId": patient.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "diagnosisType": diagnosis.diagnosisType, + "condition": diagnosis.condition, + "remarks": diagnosis.remarks, + "icdType": diagnosis.icdType, + // "icdVersion": searchDiagnosis.icdVersion, + "icdSubVersion": diagnosis.icdSubVersion, + "isNew": false, + "specificationId": diagnosis.problemId, + "selectedDisease": diagnosis.selectedDisease, + // "diseasesCode": diagnosis.visitWisePatientDiagnoses?.last.diseasesCode, + // "diseasesId": searchDiagnosis.diseasesId, + "selectedIcdCode": diagnosis.selectedIcdCode, + "selectedCategoryCode": diagnosis.selectedCategoryCode, + "selectedSectionCode": diagnosis.selectedSectionCode, + "selectedChapterCode": diagnosis.selectedChapterCode, + // "selectedNandaCode": diagnosis.selectedNandaCode, + "isResolved": false, + "doctorId": patient.doctorId, + "doctorCode": user?['List_MemberInformation'][0]['MemberID'], + "ProjectID": patient.projectId, + // "codeRange": searchDiagnosis.codeRange }; hasError = false; var success = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) async { - var result = response['ContinuePreviousEpisode']['resultData']; - if ((result as List).isEmpty) { - DrAppToastMsg.showErrorToast( - response['ContinuePreviousEpisode']['message']); - } else { - success = true; - } + DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + success = true; }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -1163,12 +1179,12 @@ class SOAPService extends LookupService { "clinicGroupId": patient.clinicGroupId, "clinicId": patient.clinicId, "patientId": patient.patientId, - "hospitalId": searchDiagnosis!.hospitalId, - "hospitalGroupId": searchDiagnosis.hospitalGroupId, + "hospitalId": patient.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "diagnosisType": diagnosisType, "condition": conditionType, "remarks": remarks, - "icdType": searchDiagnosis.icdType, + "icdType": searchDiagnosis!.icdType, // "icdVersion": searchDiagnosis.icdVersion, "icdSubVersion": searchDiagnosis.icdSubVersion, "isNew": isNew, @@ -1215,12 +1231,12 @@ class SOAPService extends LookupService { "clinicGroupId": patient.clinicGroupId, "clinicId": patient.clinicId, "patientId": patient.patientId, - "hospitalId": searchDiagnosis!.hospitalId, - "hospitalGroupId": searchDiagnosis.hospitalGroupId, + "hospitalId": patient.projectId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "diagnosisType": diagnosisType, "condition": conditionType, "remarks": remarks, - "icdType": searchDiagnosis.icdType, + "icdType": searchDiagnosis!.icdType, // "icdVersion": searchDiagnosis.icdVersion, "icdSubVersion": searchDiagnosis.icdSubVersion, "isNew": isNew, @@ -1253,8 +1269,12 @@ class SOAPService extends LookupService { return success; } - Future createProgressNote(PatiantInformtion patient, String? clinicID, - String conditionType, String note, ) async { + Future createProgressNote( + PatiantInformtion patient, + String? clinicID, + String conditionType, + String note, + ) async { Map request = { "planNote": note, "PatientMRN": patient.patientMRN, @@ -1326,6 +1346,14 @@ class SOAPService extends LookupService { success = true; return; } + if(response['ValidatinErrorsCSI']!= null){ + if(response['ValidatinErrorsCSI']['errors']!= null && (response['ValidatinErrorsCSI']['errors'] as List).isNotEmpty ){ + if(response['ValidatinErrorsCSI']['errors']['Validations']!= null && (response['ValidatinErrorsCSI']['errors']['Validations'] as List).isNotEmpty ) { + if((response['ValidatinErrorsCSI']['errors']['Validations'] as List).first!['Error'] != null ) + DrAppToastMsg.showErrorToast((response['ValidatinErrorsCSI']['errors']['Validations'] as List).first!['Error']); + + }} + } success = false; }, onFailure: (String error, int statusCode) { success = false; @@ -1358,8 +1386,9 @@ class SOAPService extends LookupService { var success = false; await baseAppClient.post(GET_PATIENT_CLINIC, onSuccess: (dynamic response, int statusCode) { - response['ListPatientConditionProgress']['resultData'].forEach((v) => v['PATIENT_CONDITION'].forEach( - (item) => patientConditionList.add(PatientCondition.fromJson(item)))); + response['ListPatientConditionProgress']['resultData'].forEach((v) => + v['PATIENT_CONDITION'].forEach((item) => + patientConditionList.add(PatientCondition.fromJson(item)))); success = false; }, onFailure: (String error, int statusCode) { success = false; @@ -1398,18 +1427,18 @@ class SOAPService extends LookupService { }, body: request); } - continueEpisodeVidaPlusFromPrevious( - PatiantInformtion patient, ChiefComplains chiefComplaint, String chiefComplainTemplateId) async { + continueEpisodeVidaPlusFromPrevious(PatiantInformtion patient, + ChiefComplains chiefComplaint, String chiefComplainTemplateId) async { List> chiefComplaintList = []; var listofComplain = { - chiefComplaint.chiefComplain :chiefComplainTemplateId + chiefComplaint.chiefComplain: chiefComplainTemplateId }; Map request = { "appointmentId": patient.appointmentNo, "projectId": patient.projectId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "chiefComplain":listofComplain + "chiefComplain": listofComplain }; hasError = false; await baseAppClient.post(CONTINUE_EPISODE_VP, @@ -1430,7 +1459,7 @@ class SOAPService extends LookupService { "PatientName": patient.firstName! + ' ' + patient.lastName!, "addedChiefComplaintCreateDtos": [], "removedChiefComplaintIds": [chiefComplaint.chiefComplainId], - "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), }; hasError = false; await baseAppClient.post(UPDATE_CHIEF_COMPLAINT, @@ -1448,7 +1477,8 @@ class SOAPService extends LookupService { Map request = { "patientId": patient.patientId, "clinicId": patient.clinicId, - "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), + "pomrId":patient.pomrId }; hasError = false; await baseAppClient.post(EPISODE_BY_CHIEF_COMPLAINT, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 7a6baa46..46100664 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1335,7 +1335,10 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.BusyLocal); var result = await _SOAPService.convertPreviousDiagnosisCurrent( paitientInfo, diagnosis); - if (result) await getPreviousPatientDetails(paitientInfo); + if (result) { + await getPreviousPatientDetails(paitientInfo); + await getCurrentDiagnosisList(paitientInfo); + } if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 59a171b8..8e04c292 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -110,6 +110,21 @@ class _CurrentDiagnosisState extends State { ''); break; case SoapDetailItemActions.EDIT: + if (widget.currentDiagnosisItems[index] + .status == + "Deleted") { + DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + return; + } + + if (widget.currentDiagnosisItems[index] + .resolved == + true) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyResolved); + } + bool result = await Navigator.push( context, FadePage( @@ -124,6 +139,12 @@ class _CurrentDiagnosisState extends State { } break; case SoapDetailItemActions.RESOLVE: + if (widget.currentDiagnosisItems[index] + .status == + "Deleted") { + DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + return; + } if (widget.currentDiagnosisItems[index] .resolved == true) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart index 6c0a8690..871537d5 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart @@ -291,6 +291,7 @@ class _ComplaintSelectionState extends State { onPressed: () { if(searchController.text.isNotEmpty) { widget.onSave?.call(searchController.text); + searchController.text =''; } }): SizedBox.shrink(), ), @@ -298,6 +299,7 @@ class _ComplaintSelectionState extends State { onEditingComplete: (){ if(searchController.text.isNotEmpty) { widget.onSave?.call(searchController.text); + searchController.text =''; } }, )), From fd4dacee831c28f6de152f8e51bf159c12e9d65c Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 16 Dec 2024 10:57:46 +0300 Subject: [PATCH 59/76] WD: error handling and request changes --- lib/client/base_app_client.dart | 542 +++++++++++------- .../soap/SOAP_service.dart | 7 +- 2 files changed, 326 insertions(+), 223 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index cdf2db2d..5747ccb4 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -25,11 +25,11 @@ class BaseAppClient { //TODO change the post fun to nun static when you change all service post(String endPoint, {Map? body, - required Function(dynamic response, int statusCode) onSuccess, - required Function(String error, int statusCode) onFailure, - bool isAllowAny = false, - bool isLiveCare = false, - bool isFallLanguage = false}) async { + required Function(dynamic response, int statusCode) onSuccess, + required Function(String error, int statusCode) onFailure, + bool isAllowAny = false, + bool isLiveCare = false, + bool isFallLanguage = false}) async { String url; if (isLiveCare) url = BASE_URL_LIVE_CARE + endPoint; @@ -46,7 +46,9 @@ class BaseAppClient { if (body == null || body['DoctorID'] == null) { body!['DoctorID'] = doctorProfile.doctorID; } - if (body['DoctorID'] == "") body['DoctorID'] = doctorProfile.doctorID; // changed from null; because create update episode not working + if (body['DoctorID'] == "") + body['DoctorID'] = doctorProfile + .doctorID; // changed from null; because create update episode not working if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID; if (body['ProjectID'] == null) { body['ProjectID'] = doctorProfile.projectID; @@ -62,8 +64,8 @@ class BaseAppClient { body['SetupID'] = body.containsKey('SetupID') ? body['SetupID'] != null - ? body['SetupID'] - : await sharedPref.getString(DOCTOR_SETUP_ID) + ? body['SetupID'] + : await sharedPref.getString(DOCTOR_SETUP_ID) : await sharedPref.getString(DOCTOR_SETUP_ID); if (body['EditedBy'] == '') { @@ -92,16 +94,21 @@ class BaseAppClient { body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA; if (body['VidaAuthTokenID'] == null) { - body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID); + body['VidaAuthTokenID'] = + await sharedPref.getString(VIDA_AUTH_TOKEN_ID); } if (body['VidaRefreshTokenID'] == null) { - body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); + body['VidaRefreshTokenID'] = + await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); } int? projectID = await sharedPref.getInt(PROJECT_ID); if (projectID == 2 || projectID == 3) body['PatientOutSA'] = true; - else if ((body.containsKey('facilityId') && body['facilityId'] == 2 || body['facilityId'] == 3) || body['ProjectID'] == 2 || body['ProjectID'] == 3) + else if ((body.containsKey('facilityId') && body['facilityId'] == 2 || + body['facilityId'] == 3) || + body['ProjectID'] == 2 || + body['ProjectID'] == 3) body['PatientOutSA'] = true; else body['PatientOutSA'] = false; @@ -128,29 +135,47 @@ class BaseAppClient { var asd = json.encode(body); var asd2; if (await Utils.checkConnection()) { - final response = await http.post(Uri.parse(url), body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}); + final response = await http.post(Uri.parse(url), + body: json.encode(body), + headers: { + 'Content-Type': 'application/json', + 'Accept': 'application/json' + }); final int statusCode = response.statusCode; if (statusCode < 200 || statusCode >= 400) { onFailure(Utils.generateContactAdminMsg(), statusCode); - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: "$statusCode"); + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: "$statusCode"); } else { var parsed = json.decode(response.body.toString()); if (parsed['ErrorType'] == 4) { - helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']); + helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], + parsed['AndroidLink'], parsed['IOSLink']); } if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) { if (body['OTP_SendType'] != null) { - if(parsed['ErrorCode'] =='699'){ - onSuccess(parsed, statusCode); - }else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); - onFailure(getError(parsed), statusCode); - } + if (parsed['ErrorCode'] == '699') { + onSuccess(parsed, statusCode); + } else { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: getError(parsed)); + onFailure(getError(parsed), statusCode); + } } else if (!isAllowAny) { - await Provider.of(AppGlobal.CONTEX, listen: false).logout(); + await Provider.of(AppGlobal.CONTEX, + listen: false) + .logout(); //todo nofailure is placed here and but have to handle the response here as well Utils.showErrorToast('Your session expired Please login again'); locator().pushNamedAndRemoveUntil(ROOT); @@ -160,25 +185,38 @@ class BaseAppClient { } } else if (parsed['MessageStatus'] == 1) { if (!parsed['IsAuthenticated']) { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: getError(parsed)); onFailure(getError(parsed), statusCode); } else onSuccess(parsed, statusCode); } else { - if(body['DoctorID'] !=null ) { - - postFailureResponse( - doctorId: body['DoctorID'], - url: url, - request: json.encode(body), - response: response.body, - exception: getError(parsed)); + final validations = parsed['ValidationErrorsCSI']?['errors']?['Validations']; + + if (validations is List && validations.isNotEmpty) { + final error = validations.first['Error']; + if (error != null) { + onFailure(error, statusCode); + return; + } + } + if (body['DoctorID'] != null) { + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: getError(parsed)); + } + onFailure(getError(parsed), statusCode); } - onFailure(getError(parsed), statusCode); } - } - } else { + } else { onFailure('Please Check The Internet Connection', -1); } } catch (e) { @@ -187,202 +225,264 @@ class BaseAppClient { } } - postPatient(String endPoint, - {Map? body, - required Function(dynamic response, int statusCode) onSuccess, - required Function(String error, int statusCode) onFailure, - PatiantInformtion? patient, - bool isExternal = false}) async { + postPatient(String endPoint, + {Map? body, + required Function(dynamic response, int statusCode) onSuccess, + required Function(String error, int statusCode) onFailure, + PatiantInformtion? patient, + bool isExternal = false}) async { String url = BASE_URL + endPoint; try { - Map headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}; - - String? token = await sharedPref.getString(TOKEN); - Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); - - if (profile != null) { - DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); - if (body!['DoctorID'] == null) { - body['DoctorID'] = doctorProfile.doctorID; - } - } - if (body!['DoctorID'] == 0) { - body['DoctorID'] = null; - } - var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en'); - body['SetupID'] = body!.containsKey('SetupID') - ? body['SetupID'] != null - ? body['SetupID'] - : await sharedPref.getString(DOCTOR_SETUP_ID) - : await sharedPref.getString(DOCTOR_SETUP_ID); - - body['VersionID'] = VERSION_ID; - body['Channel'] = CHANNEL; - body['LanguageID'] = languageID == 'ar' ? 1 : 2; - - body['IPAdress'] = "10.20.10.20"; - body['generalid'] = GENERAL_ID; - body['PatientOutSA'] = body.containsKey('PatientOutSA') - ? body['PatientOutSA'] != null - ? body['PatientOutSA'] - : PATIENT_OUT_SA_PATIENT_REQ - : PATIENT_OUT_SA_PATIENT_REQ; - - if (body.containsKey('isDentalAllowedBackend')) { - body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend') - ? body['isDentalAllowedBackend'] != null - ? body['isDentalAllowedBackend'] - : IS_DENTAL_ALLOWED_BACKEND - : IS_DENTAL_ALLOWED_BACKEND; - } - - body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2; - - body['PatientType'] = body.containsKey('PatientType') - ? body['PatientType'] != null - ? body['PatientType'] - : patient!.patientType != null - ? patient.patientType - : PATIENT_TYPE - : PATIENT_TYPE; - - body['PatientTypeID'] = body.containsKey('PatientTypeID') - ? body['PatientTypeID'] != null - ? body['PatientTypeID'] - : patient!.patientType != null - ? patient.patientType - : PATIENT_TYPE_ID - : PATIENT_TYPE_ID; - - body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] ?? token : token; - body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN; - - body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it - body['SessionID'] = SESSION_ID; //getSe - - int? projectID = await sharedPref.getInt(PROJECT_ID); - if (projectID == 2 || projectID == 3) - body['PatientOutSA'] = true; - else - body['PatientOutSA'] = false; - - // if(!body.containsKey('ProjectID')) { - // if (projectID != null) { - // body['ProjectID'] = 313; - // } else { - // body['ProjectID'] = 0; - // } - // } - - // body['DoctorID'] = 24; //3844083 - // body['TokenID'] = "@dm!n"; - - print("URL : $url"); - print("Body : ${json.encode(body)}"); - var asd = json.encode(body); - var asd2; - if (await Utils.checkConnection()) { - final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers); - final int statusCode = response.statusCode; - print("statusCode :$statusCode"); - if (statusCode < 200 || statusCode >= 400 || json == null) { - onFailure('Error While Fetching data', statusCode); - } else { - // var parsed = json.decode(response.body.toString()); - var parsed = json.decode(utf8.decode(response.bodyBytes)); - if (parsed['Response_Message'] != null) { - onSuccess(parsed, statusCode); - } else { - if (parsed['ErrorType'] == 4) { - helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']); - } - if (parsed['IsAuthenticated'] == null) { - if (parsed['isSMSSent'] == true) { - onSuccess(parsed, statusCode); - } else if (parsed['MessageStatus'] == 1) { - onSuccess(parsed, statusCode); - } else if (parsed['Result'] == 'OK') { - onSuccess(parsed, statusCode); - } else { - if (parsed != null) { - onSuccess(parsed, statusCode); - } else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: getError(parsed)); - onFailure(getError(parsed), statusCode); - } - } - } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) { - onSuccess(parsed, statusCode); - } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) { - if (parsed['SameClinicApptList'] != null) { - onSuccess(parsed, statusCode); - } else { - if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) { - if (parsed['ErrorSearchMsg'] == null) { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: "Server Error found with no available message"); - - onFailure("Server Error found with no available message", statusCode); - } else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['ErrorSearchMsg']); - onFailure(parsed['ErrorSearchMsg'], statusCode); - } - } else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']); - onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); - } - } - } else { - if (parsed['SameClinicApptList'] != null) { - onSuccess(parsed, statusCode); - } else { - if (parsed['message'] != null) { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['message'] ); - - onFailure(parsed['message'] ?? parsed['message'], statusCode); - } else { - if(body['DoctorID'] !=null ) - postFailureResponse(doctorId:body['DoctorID'], url:url , request: json.encode(body), response: response.body, exception: parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']); + Map headers = { + 'Content-Type': 'application/json', + 'Accept': 'application/json' + }; + + String? token = await sharedPref.getString(TOKEN); + Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); + + if (profile != null) { + DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); + if (body!['DoctorID'] == null) { + body['DoctorID'] = doctorProfile.doctorID; + } + } + if (body!['DoctorID'] == 0) { + body['DoctorID'] = null; + } + var languageID = + await sharedPref.getStringWithDefaultValue(APP_Language, 'en'); + body['SetupID'] = body!.containsKey('SetupID') + ? body['SetupID'] != null + ? body['SetupID'] + : await sharedPref.getString(DOCTOR_SETUP_ID) + : await sharedPref.getString(DOCTOR_SETUP_ID); + + body['VersionID'] = VERSION_ID; + body['Channel'] = CHANNEL; + body['LanguageID'] = languageID == 'ar' ? 1 : 2; + + body['IPAdress'] = "10.20.10.20"; + body['generalid'] = GENERAL_ID; + body['PatientOutSA'] = body.containsKey('PatientOutSA') + ? body['PatientOutSA'] != null + ? body['PatientOutSA'] + : PATIENT_OUT_SA_PATIENT_REQ + : PATIENT_OUT_SA_PATIENT_REQ; + + if (body.containsKey('isDentalAllowedBackend')) { + body['isDentalAllowedBackend'] = + body.containsKey('isDentalAllowedBackend') + ? body['isDentalAllowedBackend'] != null + ? body['isDentalAllowedBackend'] + : IS_DENTAL_ALLOWED_BACKEND + : IS_DENTAL_ALLOWED_BACKEND; + } - onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); - } - } - } - } - } - } else { - onFailure('Please Check The Internet Connection', -1); - } + body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2; + + body['PatientType'] = body.containsKey('PatientType') + ? body['PatientType'] != null + ? body['PatientType'] + : patient!.patientType != null + ? patient.patientType + : PATIENT_TYPE + : PATIENT_TYPE; + + body['PatientTypeID'] = body.containsKey('PatientTypeID') + ? body['PatientTypeID'] != null + ? body['PatientTypeID'] + : patient!.patientType != null + ? patient.patientType + : PATIENT_TYPE_ID + : PATIENT_TYPE_ID; + + body['TokenID'] = + body.containsKey('TokenID') ? body['TokenID'] ?? token : token; + body['PatientID'] = body['PatientID'] != null + ? body['PatientID'] + : patient!.patientId ?? patient.patientMRN; + + body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it + body['SessionID'] = SESSION_ID; //getSe + + int? projectID = await sharedPref.getInt(PROJECT_ID); + if (projectID == 2 || projectID == 3) + body['PatientOutSA'] = true; + else + body['PatientOutSA'] = false; + + // if(!body.containsKey('ProjectID')) { + // if (projectID != null) { + // body['ProjectID'] = 313; + // } else { + // body['ProjectID'] = 0; + // } + // } + + // body['DoctorID'] = 24; //3844083 + // body['TokenID'] = "@dm!n"; + + print("URL : $url"); + print("Body : ${json.encode(body)}"); + var asd = json.encode(body); + var asd2; + if (await Utils.checkConnection()) { + final response = await http.post(Uri.parse(url.trim()), + body: json.encode(body), headers: headers); + final int statusCode = response.statusCode; + print("statusCode :$statusCode"); + if (statusCode < 200 || statusCode >= 400 || json == null) { + onFailure('Error While Fetching data', statusCode); + } else { + // var parsed = json.decode(response.body.toString()); + var parsed = json.decode(utf8.decode(response.bodyBytes)); + if (parsed['Response_Message'] != null) { + onSuccess(parsed, statusCode); + } else { + if (parsed['ErrorType'] == 4) { + helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], + parsed['AndroidLink'], parsed['IOSLink']); + } + if (parsed['IsAuthenticated'] == null) { + if (parsed['isSMSSent'] == true) { + onSuccess(parsed, statusCode); + } else if (parsed['MessageStatus'] == 1) { + onSuccess(parsed, statusCode); + } else if (parsed['Result'] == 'OK') { + onSuccess(parsed, statusCode); + } else { + if (parsed != null) { + onSuccess(parsed, statusCode); + } else { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: getError(parsed)); + onFailure(getError(parsed), statusCode); + } + } + } else if (parsed['MessageStatus'] == 1 || + parsed['SMSLoginRequired'] == true) { + onSuccess(parsed, statusCode); + } else if (parsed['MessageStatus'] == 2 && + parsed['IsAuthenticated']) { + if (parsed['SameClinicApptList'] != null) { + onSuccess(parsed, statusCode); + } else { + if (parsed['message'] == null && + parsed['ErrorEndUserMessage'] == null) { + if (parsed['ErrorSearchMsg'] == null) { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: + "Server Error found with no available message"); + + onFailure("Server Error found with no available message", + statusCode); + } else { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: parsed['ErrorSearchMsg']); + onFailure(parsed['ErrorSearchMsg'], statusCode); + } + } else { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: parsed['message'] ?? + parsed['ErrorEndUserMessage'] ?? + parsed['ErrorMessage']); + onFailure( + parsed['message'] ?? + parsed['ErrorEndUserMessage'] ?? + parsed['ErrorMessage'], + statusCode); + } + } + } else { + if (parsed['SameClinicApptList'] != null) { + onSuccess(parsed, statusCode); + } else { + if (parsed['message'] != null) { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: parsed['message']); + + onFailure(parsed['message'] ?? parsed['message'], statusCode); + } else { + if (body['DoctorID'] != null) + postFailureResponse( + doctorId: body['DoctorID'], + url: url, + request: json.encode(body), + response: response.body, + exception: parsed['ErrorEndUserMessage'] ?? + parsed['ErrorMessage']); + + onFailure( + parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], + statusCode); + } + } + } + } + } + } else { + onFailure('Please Check The Internet Connection', -1); + } } catch (e) { - print(e); - onFailure(e.toString(), -1); + print(e); + onFailure(e.toString(), -1); + } } - } - String getError(parsed) { + String getError(parsed) { //TODO change this fun String? error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']; if (parsed["ValidationErrors"] != null) { - error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n"; - - if (parsed["ValidationErrors"]["ValidationErrors"] != null && parsed["ValidationErrors"]["ValidationErrors"].length != 0) { - for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) { - error = error! + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n"; - } - } + error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n"; + + if (parsed["ValidationErrors"]["ValidationErrors"] != null && + parsed["ValidationErrors"]["ValidationErrors"].length != 0) { + for (var i = 0; + i < parsed["ValidationErrors"]["ValidationErrors"].length; + i++) { + error = error! + + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + + "\n"; + } + } } if (error == null || error == "null" || error == "null\n") { - return Utils.generateContactAdminMsg(); + return Utils.generateContactAdminMsg(); } return error; - } + } - get({required String endPoint, required Function(dynamic response, int statusCode) onSuccess, required Function(String error, int statusCode) onFailure}) async { + get( + {required String endPoint, + required Function(dynamic response, int statusCode) onSuccess, + required Function(String error, int statusCode) onFailure}) async { String token = await sharedPref.getString(TOKEN); String url = DOCTOR_ROTATION + endPoint + '&token=' + token; print(url); @@ -390,10 +490,10 @@ class BaseAppClient { final int statusCode = response.statusCode; if (statusCode < 200 || statusCode >= 400) { - onFailure(Utils.generateContactAdminMsg(), statusCode); + onFailure(Utils.generateContactAdminMsg(), statusCode); } else { - var parsed = json.decode(response.body.toString()); - onSuccess(parsed, statusCode); + var parsed = json.decode(response.body.toString()); + onSuccess(parsed, statusCode); + } } } -} diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index bd51681b..a18fe7d1 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1122,10 +1122,10 @@ class SOAPService extends LookupService { "ProjectID": patientInformation.projectId }; hasError = false; + patientProgressNoteListVidaPlus.clear(); await baseAppClient.post(GET_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { print("Success"); - patientProgressNoteListVidaPlus.clear(); response['ListProgressNote']['resultData'].forEach((v) { v['data'].forEach((progressNote) { patientProgressNoteListVidaPlus @@ -1237,6 +1237,7 @@ class SOAPService extends LookupService { "condition": conditionType, "remarks": remarks, "icdType": searchDiagnosis!.icdType, + "selectedIcdCode": searchDiagnosis.diseasesCode, // "icdVersion": searchDiagnosis.icdVersion, "icdSubVersion": searchDiagnosis.icdSubVersion, "isNew": isNew, @@ -1244,7 +1245,7 @@ class SOAPService extends LookupService { "selectedDisease": searchDiagnosis.diseases, "diseasesCode": searchDiagnosis.diseasesCode, "diseasesId": searchDiagnosis.diseasesId, - "selectedIcdCode": searchDiagnosis.icdId, + // "selectedIcdCode": searchDiagnosis.icdId, "selectedCategoryCode": searchDiagnosis.categoryCode, "selectedSectionCode": searchDiagnosis.sectionCode, "selectedChapterCode": searchDiagnosis.chapterCode, @@ -1357,6 +1358,8 @@ class SOAPService extends LookupService { success = false; }, onFailure: (String error, int statusCode) { success = false; + DrAppToastMsg.showErrorToast(error); + hasError = true; super.error = error; }, body: request); From 4de8cb45544336486885c80f9f7459ca201f2f52 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 16 Dec 2024 10:58:58 +0300 Subject: [PATCH 60/76] WD:hopi details clear before making a call. --- .../soap/SOAP_service.dart | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index a18fe7d1..406eb9e6 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -645,10 +645,9 @@ class SOAPService extends LookupService { "pomrId": patient.pomrId, }; hasError = false; + hopiDetails.clear(); await baseAppClient.post(HOPI_DETAILS, onSuccess: (dynamic response, int statusCode) { - hopiDetails.clear(); - response['DetailHOPI']['resultData'].forEach((v) { hopiDetails.add(GetHopiDetails.fromJson(v)); }); @@ -1044,17 +1043,17 @@ class SOAPService extends LookupService { var result = response['ListDiagnosisAddFavourite']['resultData']; isFavoriteAdded = true; if ((result is List) && (result as List).isEmpty) { - if(response['ListDiagnosisAddFavourite']['message'] != null) - DrAppToastMsg.showErrorToast( - response['ListDiagnosisAddFavourite']['message']); - - else DrAppToastMsg.showErrorToast("Unable to Add"); + if (response['ListDiagnosisAddFavourite']['message'] != null) + DrAppToastMsg.showErrorToast( + response['ListDiagnosisAddFavourite']['message']); + else + DrAppToastMsg.showErrorToast("Unable to Add"); } else { - if(response['ListDiagnosisAddFavourite']['message'] != null) - DrAppToastMsg.showSuccesToast( - response['ListDiagnosisAddFavourite']['message']); - else DrAppToastMsg.showErrorToast("Diagnosis Added To Favorite"); - + if (response['ListDiagnosisAddFavourite']['message'] != null) + DrAppToastMsg.showSuccesToast( + response['ListDiagnosisAddFavourite']['message']); + else + DrAppToastMsg.showErrorToast("Diagnosis Added To Favorite"); } }, onFailure: (String error, int statusCode) { hasError = true; @@ -1347,13 +1346,21 @@ class SOAPService extends LookupService { success = true; return; } - if(response['ValidatinErrorsCSI']!= null){ - if(response['ValidatinErrorsCSI']['errors']!= null && (response['ValidatinErrorsCSI']['errors'] as List).isNotEmpty ){ - if(response['ValidatinErrorsCSI']['errors']['Validations']!= null && (response['ValidatinErrorsCSI']['errors']['Validations'] as List).isNotEmpty ) { - if((response['ValidatinErrorsCSI']['errors']['Validations'] as List).first!['Error'] != null ) - DrAppToastMsg.showErrorToast((response['ValidatinErrorsCSI']['errors']['Validations'] as List).first!['Error']); - - }} + if (response['ValidatinErrorsCSI'] != null) { + if (response['ValidatinErrorsCSI']['errors'] != null && + (response['ValidatinErrorsCSI']['errors'] as List).isNotEmpty) { + if (response['ValidatinErrorsCSI']['errors']['Validations'] != null && + (response['ValidatinErrorsCSI']['errors']['Validations'] as List) + .isNotEmpty) { + if ((response['ValidatinErrorsCSI']['errors']['Validations'] + as List) + .first!['Error'] != + null) + DrAppToastMsg.showErrorToast((response['ValidatinErrorsCSI'] + ['errors']['Validations'] as List) + .first!['Error']); + } + } } success = false; }, onFailure: (String error, int statusCode) { @@ -1481,7 +1488,7 @@ class SOAPService extends LookupService { "patientId": patient.patientId, "clinicId": patient.clinicId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "pomrId":patient.pomrId + "pomrId": patient.pomrId }; hasError = false; await baseAppClient.post(EPISODE_BY_CHIEF_COMPLAINT, From e87a0a4dd6679983e0122217f5dfb741d6b3f187 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 16 Dec 2024 16:56:12 +0300 Subject: [PATCH 61/76] WD: jira issues of vida rectified --- lib/config/config.dart | 2 +- .../CreatePhysicalExamination.dart | 4 +- .../soap/SOAP_service.dart | 42 ++++++------------- .../assessment/widget/current_diagnosis.dart | 2 + .../assessment/widget/previous_diagnosis.dart | 2 +- 5 files changed, 19 insertions(+), 33 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 2b86c78d..fe7d9b43 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -326,7 +326,7 @@ const FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisGetFavo const ADD_TO_FAVORITE_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/DiagnosisAddFavourite'; -const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/CreateDiagnosis'; +const MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS = 'Services/DoctorApplication.svc/REST/ContinuePreviousEpisode'; const SEARCH_PHYSICAL_EXAMINATION = 'Services/DoctorApplication.svc/REST/SearchPhysicalExam'; diff --git a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart index ac77890d..268dfa42 100644 --- a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart +++ b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart @@ -6,7 +6,7 @@ class CreatePhysicalExamination { String? pomrid; // paitient int? patientID; // paitint bool? isClinicPhysicalExamination; // it will be told - int? physicalExaminationSystemID; // category id + dynamic? physicalExaminationSystemID; // category id String? physicalExaminationDescription; // name of the category int? specialityID; // id of the specialitiy id dynamic selectedOptions; // it will also be told but it could be sent as null @@ -59,7 +59,7 @@ extension ConvertCategoryToCreatePhysicalExamination on Category { CreatePhysicalExamination createPhysicalExaminationFromCategory() => CreatePhysicalExamination() ..physicalExaminationDescription = this.name - ..physicalExaminationSystemID = this.categoryId + ..physicalExaminationSystemID = this.id ..physicalExaminationCondition = this.selectedCondition ..remark = this.remarksController.text ..selected = false diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 406eb9e6..a247473b 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -663,10 +663,9 @@ class SOAPService extends LookupService { "pomrId": patient.pomrId, }; hasError = false; + patientChiefComplaintListVidaPlus.clear(); await baseAppClient.post(GET_CHIEF_COMPLAINT_VP, onSuccess: (dynamic response, int statusCode) { - patientChiefComplaintListVidaPlus.clear(); - response['ListChiefComplaintDetails']['resultData'].forEach((v) { patientChiefComplaintListVidaPlus .add(GetChiefComplaintVidaPlus.fromJson(v)); @@ -1068,40 +1067,25 @@ class SOAPService extends LookupService { PatiantInformtion patient, PatientPreviousDiagnosis diagnosis) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); Map request = { - "pomrId": patient.pomrId, - "appointmentId": patient.appointmentNo, - "clinicGroupId": patient.clinicGroupId, - "clinicId": patient.clinicId, + "patientProblemRevisionId": diagnosis.patientProblemRevisionId, "patientId": patient.patientId, - "hospitalId": patient.projectId, - "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "diagnosisType": diagnosis.diagnosisType, - "condition": diagnosis.condition, - "remarks": diagnosis.remarks, - "icdType": diagnosis.icdType, - // "icdVersion": searchDiagnosis.icdVersion, - "icdSubVersion": diagnosis.icdSubVersion, - "isNew": false, - "specificationId": diagnosis.problemId, - "selectedDisease": diagnosis.selectedDisease, - // "diseasesCode": diagnosis.visitWisePatientDiagnoses?.last.diseasesCode, - // "diseasesId": searchDiagnosis.diseasesId, - "selectedIcdCode": diagnosis.selectedIcdCode, - "selectedCategoryCode": diagnosis.selectedCategoryCode, - "selectedSectionCode": diagnosis.selectedSectionCode, - "selectedChapterCode": diagnosis.selectedChapterCode, - // "selectedNandaCode": diagnosis.selectedNandaCode, - "isResolved": false, "doctorId": patient.doctorId, - "doctorCode": user?['List_MemberInformation'][0]['MemberID'], - "ProjectID": patient.projectId, - // "codeRange": searchDiagnosis.codeRange + "pomrId": patient.pomrId, + "appointmentId": diagnosis.appointmentId, + "createdBy": patient.doctorId, + "hospitalId": patient.projectId, + "hospitalGroupId": diagnosis.hospitalGroupId, + "clinicGroupId": diagnosis.clinicGroupId ?? patient.clinicGroupId, + "clinicId": diagnosis.clinicId, + "isSelected": true, + "ProjectID": patient.projectId }; hasError = false; var success = false; await baseAppClient.post(MAKE_PREVIOUS_AS_CURRENT_DIAGNOSIS, onSuccess: (dynamic response, int statusCode) async { - DrAppToastMsg.showSuccesToast(response['CreatDiagnosis']['message']); + DrAppToastMsg.showSuccesToast( + response['ContinuePreviousEpisode']['message']); success = true; }, onFailure: (String error, int statusCode) { hasError = true; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 8e04c292..8eb85576 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -123,6 +123,7 @@ class _CurrentDiagnosisState extends State { DrAppToastMsg.showErrorToast( TranslationBase.of(context) .diagnosisAlreadyResolved); + return; } bool result = await Navigator.push( @@ -151,6 +152,7 @@ class _CurrentDiagnosisState extends State { DrAppToastMsg.showErrorToast( TranslationBase.of(context) .diagnosisAlreadyResolved); + return; } bool result = await model.resolveDiagnosis( widget.currentDiagnosisItems[index], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 39b0295c..78376dda 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -50,7 +50,7 @@ class PreviousDiagnosis extends StatelessWidget { status: diagnosisItems[index].status ?? '', condition: diagnosisItems[index].condition ?? '', remarks: diagnosisItems[index].remarks ?? '', - isPreviousAddedToCurrent:diagnosisItems[index].visitWisePatientDiagnoses == true , + isPreviousAddedToCurrent:diagnosisItems[index].visitWiseSelected == true , onSoapDetailActionClicked: (action) { switch (action) { case SoapDetailItemActions.AUDIT: From 126c084ef1bd59a7a1b851f94613d903314c6534 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 17 Dec 2024 11:07:14 +0300 Subject: [PATCH 62/76] WD: delete option stoped after it is resolved. --- .../assessment/widget/current_diagnosis.dart | 8 ++ .../widgets/SoapDetailItem.dart | 97 ++++++++++--------- 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index 8eb85576..a43a070c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -169,6 +169,14 @@ class _CurrentDiagnosisState extends State { "Deleted") { DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); return; + } + if (widget.currentDiagnosisItems[index] + .resolved == + true) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyResolved); + return; } showConfirmationDialog(context, "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index 3ba16bef..df5b8c20 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -29,56 +29,57 @@ class SoapDetailItem extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Stack( + Row( children: [ - Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - title, - color: Color(0XFF2B353E), - fontSize: 12, - fontWeight: FontWeight.bold, - ), - Row( - children: [ - AppText( - "${TranslationBase.of(context).condition}:", - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - SizedBox( - width: 4, - ), - AppText( - condition, - color: Color(0xffD02127), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - ], - ), - Visibility( - visible: remarks.isNotEmpty, - child: Column( - children: [ - SizedBox( - height: 8, - ), - AppText( - remarks, - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w400, - ), - ], - )) - ], + Expanded( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + title, + color: Color(0XFF2B353E), + fontSize: 12, + fontWeight: FontWeight.bold, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).condition}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + condition, + color: Color(0xffD02127), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + Visibility( + visible: remarks.isNotEmpty, + child: Column( + children: [ + SizedBox( + height: 8, + ), + AppText( + remarks, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w400, + ), + ], + )) + ], + ), ), - Align( - alignment: Alignment.topRight, child: Status(status: status)) + Status(status: status) ], ), SizedBox( From 6e42e50f704c832226b210ffce2c690268dbfe2e Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 17 Dec 2024 12:10:14 +0300 Subject: [PATCH 63/76] WD: resolve attribute changed --- .../soap/SOAP_service.dart | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index a247473b..875cbc31 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1325,27 +1325,11 @@ class SOAPService extends LookupService { onSuccess: (dynamic response, int statusCode) { if (response['ListDiagnosisResolve'] != null && response['ListDiagnosisResolve']['resultData'] != null && - (response['ListVisitWisePatientDiagnosis']['resultData'] as List) + (response['ListDiagnosisResolve']['resultData'] as List) .isNotEmpty) { success = true; return; } - if (response['ValidatinErrorsCSI'] != null) { - if (response['ValidatinErrorsCSI']['errors'] != null && - (response['ValidatinErrorsCSI']['errors'] as List).isNotEmpty) { - if (response['ValidatinErrorsCSI']['errors']['Validations'] != null && - (response['ValidatinErrorsCSI']['errors']['Validations'] as List) - .isNotEmpty) { - if ((response['ValidatinErrorsCSI']['errors']['Validations'] - as List) - .first!['Error'] != - null) - DrAppToastMsg.showErrorToast((response['ValidatinErrorsCSI'] - ['errors']['Validations'] as List) - .first!['Error']); - } - } - } success = false; }, onFailure: (String error, int statusCode) { success = false; From 8f12c3da1702efe907e09a145abee34db60afbcc Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Tue, 17 Dec 2024 15:43:46 +0300 Subject: [PATCH 64/76] WD: resolve attribute changed --- lib/core/service/patient_medical_file/soap/SOAP_service.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 875cbc31..972b8a99 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1328,9 +1328,7 @@ class SOAPService extends LookupService { (response['ListDiagnosisResolve']['resultData'] as List) .isNotEmpty) { success = true; - return; } - success = false; }, onFailure: (String error, int statusCode) { success = false; DrAppToastMsg.showErrorToast(error); From 248c55f75dcfd191f52654871bdf95bf59243302 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 18 Dec 2024 19:46:58 +0300 Subject: [PATCH 65/76] WD: data mapping and request handling --- .../allergy/get_allergies_list_vida_plus.dart | 2 +- .../episode_by_chief_complaint_vidaplus.dart | 4 ++ .../CreatePhysicalExamination.dart | 2 +- .../soap/SOAP_service.dart | 52 ++++++++++++++----- lib/core/viewModel/SOAP_view_model.dart | 9 ++++ .../assessment/update_assessment_page.dart | 1 + .../assessment/widget/current_diagnosis.dart | 42 +++++++++------ .../assessment/widget/edit_diagnosis.dart | 51 +++++++++--------- .../objective/list_of_examination.dart | 4 +- .../chief_complaint/AddChiefComplaints.dart | 5 +- .../widgets/previous_cheif_complaints.dart | 4 +- macos/Flutter/GeneratedPluginRegistrant.swift | 4 +- 12 files changed, 111 insertions(+), 69 deletions(-) diff --git a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart index 4fcae8ab..09a4d3cc 100644 --- a/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart +++ b/lib/core/model/SOAP/allergy/get_allergies_list_vida_plus.dart @@ -73,7 +73,7 @@ class AllergyReactionDTOs { int? allergyReactionID; String? allergyReactionName; int? allergyReactionRevisionID; - int? hospitalGroupID; + dynamic? hospitalGroupID; int? hospitalID; bool? isActive; bool? isSelected =false; diff --git a/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart b/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart index 3494289f..13005c9e 100644 --- a/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart +++ b/lib/core/model/SOAP/chief_complaint/episode_by_chief_complaint_vidaplus.dart @@ -175,6 +175,8 @@ class ChiefComplains { int? patientId; String? patientName; int? patientPomrId; + int? chiefComplainTemplateId; + ChiefComplains( {this.appointmentId, @@ -200,6 +202,7 @@ class ChiefComplains { ChiefComplains.fromJson(Map json) { appointmentId = json['appointmentId']; chiefComplain = json['chiefComplain']; + chiefComplainTemplateId = json['chiefComplainTemplateId']; chiefComplainId = json['chiefComplainId']; clinicId = json['clinicId']; createdBy = json['createdBy']; @@ -235,6 +238,7 @@ class ChiefComplains { data['hospitalId'] = this.hospitalId; data['loginUserId'] = this.loginUserId; data['modifiedBy'] = this.modifiedBy; + data['chiefComplainTemplateId'] = this.chiefComplainTemplateId; data['modifiedId'] = this.modifiedId; data['modifiedOn'] = this.modifiedOn; data['patientId'] = this.patientId; diff --git a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart index 268dfa42..7a60cd06 100644 --- a/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart +++ b/lib/core/model/SOAP/physical_exam/CreatePhysicalExamination.dart @@ -58,12 +58,12 @@ class CreatePhysicalExamination { extension ConvertCategoryToCreatePhysicalExamination on Category { CreatePhysicalExamination createPhysicalExaminationFromCategory() => CreatePhysicalExamination() + ..isChecked = true ..physicalExaminationDescription = this.name ..physicalExaminationSystemID = this.id ..physicalExaminationCondition = this.selectedCondition ..remark = this.remarksController.text ..selected = false - ..isChecked = false ..specialityID = this.specialityId ..patientID = this.paitientId ..pomrid = this.pomrId diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 972b8a99..405a55f9 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -86,6 +86,7 @@ class SOAPService extends LookupService { Map> specialityDetails = {}; Map diagnosisTypeList = {}; Map conditionTypeList = {}; + Map conditionTypeMapWithIdAsKey = {}; List icdVersionList = []; bool showAuditBottomSheet = false; @@ -460,6 +461,8 @@ class SOAPService extends LookupService { Future addAllergies(AllergiesListVidaPlus allergy, PatiantInformtion patientInfo, bool isNoKnown) async { + var hospitalGroudpId = await sharedPref.getString(DOCTOR_SETUP_ID); + if (!isNoKnown) { allergy.allergyReactionDTOs!.forEach((value) { value.patientID = patientInfo.patientMRN; @@ -468,6 +471,11 @@ class SOAPService extends LookupService { value.severity = value.severity ?? 1; }); } + allergy.allergyReactionDTOs?.forEach((value) { + value.hospitalGroupID = hospitalGroudpId; + value.hospitalID = patientInfo.projectId; + }); + var request = { "patientsAllergyRevisionID": allergy.allergyRevisionID, "patientMRN": patientInfo.patientMRN, @@ -519,16 +527,18 @@ class SOAPService extends LookupService { /*changed request parameters based on the vida plus requested */ var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); + var hospitalGroudpId = await sharedPref.getString(DOCTOR_SETUP_ID); + List? reaction = allergy.patientsAllergyReactionsDTOs!; List? reactionRequest = []; - reaction.forEach((value) { + reaction.forEach((value) async { reactionRequest.add(AllergyReactionDTOs( patientID: patientInfo.patientMRN, pomrid: int.parse(patientInfo.pomrId!), - hospitalGroupID: value.hospitalGroupID, + hospitalGroupID: hospitalGroudpId, allergyReactionMappingID: 0, - hospitalID: value.hospitalID, + hospitalID: patientInfo.projectId, isActive: value.isActive, allergyReactionID: value.allergyReactionID, allergyReactionName: value.allergyReactionName, @@ -566,6 +576,7 @@ class SOAPService extends LookupService { Future updateAllergies( PatientAllergiesVidaPlus allergy, PatiantInformtion patientInfo) async { var doctorProfile = await sharedPref.getObj(LOGGED_IN_USER); + var hospitalGroudpId = await sharedPref.getString(DOCTOR_SETUP_ID); List? reaction = allergy.patientsAllergyReactionsDTOs!; List? reactionRequest = []; @@ -573,9 +584,9 @@ class SOAPService extends LookupService { reactionRequest.add(AllergyReactionDTOs( patientID: patientInfo.patientMRN, pomrid: int.parse(patientInfo.pomrId!), - hospitalGroupID: value.hospitalGroupID, + hospitalGroupID: hospitalGroudpId, allergyReactionMappingID: 0, - hospitalID: value.hospitalID, + hospitalID: patientInfo.projectId, isActive: value.isActive, allergyReactionID: value.allergyReactionID, allergyReactionName: value.allergyReactionName, @@ -788,6 +799,9 @@ class SOAPService extends LookupService { response['ListDiagnosisCondition']['resultData'] .forEach((v) => conditionTypeList[v['itemName']] = v['id']); ; + response['ListDiagnosisCondition']['resultData'] + .forEach((v) => conditionTypeMapWithIdAsKey[v['id']] = v['itemName']); + ; }, onFailure: (String error, int statusCode) { searchChiefComplaintListVidaPlus.clear(); hasError = true; @@ -1071,10 +1085,10 @@ class SOAPService extends LookupService { "patientId": patient.patientId, "doctorId": patient.doctorId, "pomrId": patient.pomrId, - "appointmentId": diagnosis.appointmentId, + "appointmentId": patient.appointmentNo, "createdBy": patient.doctorId, "hospitalId": patient.projectId, - "hospitalGroupId": diagnosis.hospitalGroupId, + "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "clinicGroupId": diagnosis.clinicGroupId ?? patient.clinicGroupId, "clinicId": diagnosis.clinicId, "isSelected": true, @@ -1156,6 +1170,8 @@ class SOAPService extends LookupService { String remarks, bool isNew) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); + var mappedConditionValue = conditionTypeList[conditionType] ?? ''; + var request = { "pomrId": patient.pomrId, "appointmentId": patient.appointmentNo, @@ -1165,7 +1181,7 @@ class SOAPService extends LookupService { "hospitalId": patient.projectId, "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "diagnosisType": diagnosisType, - "condition": conditionType, + "condition": mappedConditionValue, "remarks": remarks, "icdType": searchDiagnosis!.icdType, // "icdVersion": searchDiagnosis.icdVersion, @@ -1208,6 +1224,7 @@ class SOAPService extends LookupService { String remarks, bool isNew) async { Map? user = await sharedPref.getObj(LOGGED_IN_USER); + var mappedConditionValue = conditionTypeList[conditionType] ?? ''; var request = { "pomrId": patient.pomrId, "appointmentId": patient.appointmentNo, @@ -1217,10 +1234,11 @@ class SOAPService extends LookupService { "hospitalId": patient.projectId, "hospitalGroupId": await sharedPref.getString(DOCTOR_SETUP_ID), "diagnosisType": diagnosisType, - "condition": conditionType, + "condition": mappedConditionValue, "remarks": remarks, "icdType": searchDiagnosis!.icdType, "selectedIcdCode": searchDiagnosis.diseasesCode, + "selectedNandaCode": searchDiagnosis.diseasesCode, // "icdVersion": searchDiagnosis.icdVersion, "icdSubVersion": searchDiagnosis.icdSubVersion, "isNew": isNew, @@ -1325,8 +1343,7 @@ class SOAPService extends LookupService { onSuccess: (dynamic response, int statusCode) { if (response['ListDiagnosisResolve'] != null && response['ListDiagnosisResolve']['resultData'] != null && - (response['ListDiagnosisResolve']['resultData'] as List) - .isNotEmpty) { + (response['ListDiagnosisResolve']['resultData'] as List).isNotEmpty) { success = true; } }, onFailure: (String error, int statusCode) { @@ -1360,6 +1377,7 @@ class SOAPService extends LookupService { Future getPatientCondition() async { Map request = {}; var success = false; + patientConditionList.clear(); await baseAppClient.post(GET_PATIENT_CLINIC, onSuccess: (dynamic response, int statusCode) { response['ListPatientConditionProgress']['resultData'].forEach((v) => @@ -1383,7 +1401,9 @@ class SOAPService extends LookupService { action.chiefComplains!.forEach((action2) { chiefComplaintList.add({ "chiefComplain": action2.chiefComplain, - "chiefComplainTemplateId": action!.chiefComplainTemplateId + "chiefComplainTemplateId": action2.chiefComplainTemplateId ?? + action.chiefComplainTemplateId ?? + '' }); }); }); @@ -1391,7 +1411,11 @@ class SOAPService extends LookupService { "appointmentId": patient.appointmentNo, "projectId": patient.projectId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "chiefComplain": chiefComplaintList + "chiefComplain": chiefComplaintList, + 'EpisodeID': chiefComplaint.first.episodeId, + 'pomrId': patient.pomrId, + 'doctorId': patient.doctorId, + 'patientId': patient.patientId }; hasError = false; await baseAppClient.post(CONTINUE_EPISODE_VP, @@ -1414,7 +1438,7 @@ class SOAPService extends LookupService { "appointmentId": patient.appointmentNo, "projectId": patient.projectId, "setupId": await sharedPref.getString(DOCTOR_SETUP_ID), - "chiefComplain": listofComplain + "chiefComplain": listofComplain, }; hasError = false; await baseAppClient.post(CONTINUE_EPISODE_VP, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 46100664..12324692 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1572,4 +1572,13 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.searchAllergiesList.clear(); notifyListeners(); } + + String? getConditionValue(String key){ + print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); + return _SOAPService.conditionTypeMapWithIdAsKey[key.trim()]; + } + String? getConditionID(String key){ + print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); + return _SOAPService.conditionTypeList[key.trim()]; + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart index 91121ece..fd6f85ee 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/update_assessment_page.dart @@ -69,6 +69,7 @@ class _UpdateAssessmentPageState extends State mySelectedAssessmentList.clear(); WidgetsBinding.instance.addPostFrameCallback((_) async { widget.changeLoadingState(true); + model.getConditionAndType(widget.patientInfo); model.getPreviousPatientDetails(widget.patientInfo); model.getCurrentDiagnosisList(widget.patientInfo); widget.changeLoadingState(false); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index a43a070c..dfe432ef 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -93,8 +93,10 @@ class _CurrentDiagnosisState extends State { status: widget.currentDiagnosisItems[index].status ?? '', - condition: widget - .currentDiagnosisItems[index].condition ?? + condition: model.getConditionValue(widget + .currentDiagnosisItems[index] + .condition ?? + '') ?? '', remarks: widget.currentDiagnosisItems[index].remarks ?? @@ -111,14 +113,16 @@ class _CurrentDiagnosisState extends State { break; case SoapDetailItemActions.EDIT: if (widget.currentDiagnosisItems[index] - .status == + .status == "Deleted") { - DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyDeleted); return; } if (widget.currentDiagnosisItems[index] - .resolved == + .resolved == true) { DrAppToastMsg.showErrorToast( TranslationBase.of(context) @@ -141,9 +145,11 @@ class _CurrentDiagnosisState extends State { break; case SoapDetailItemActions.RESOLVE: if (widget.currentDiagnosisItems[index] - .status == + .status == "Deleted") { - DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyDeleted); return; } if (widget.currentDiagnosisItems[index] @@ -167,25 +173,27 @@ class _CurrentDiagnosisState extends State { if (widget.currentDiagnosisItems[index] .status == "Deleted") { - DrAppToastMsg.showErrorToast(TranslationBase.of(context).diagnosisAlreadyDeleted); + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .diagnosisAlreadyDeleted); return; } if (widget.currentDiagnosisItems[index] - .resolved == + .resolved == true) { DrAppToastMsg.showErrorToast( TranslationBase.of(context) .diagnosisAlreadyResolved); return; } - showConfirmationDialog(context, - "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", - (remarks) { - widget.model.removeDiagnosis( - widget.patientInfo, - widget.currentDiagnosisItems[index], - remarks); - }); + showConfirmationDialog(context, + "${TranslationBase.of(context).delete} ${TranslationBase.of(context).diagnosis}", + (remarks) { + widget.model.removeDiagnosis( + widget.patientInfo, + widget.currentDiagnosisItems[index], + remarks); + }); case SoapDetailItemActions.CHANGE_STATUS: // TODO: Handle this case. diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index 1d3bf402..a4af47f0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -50,7 +50,6 @@ class _EditDiagnosisState extends State { super.initState(); filteredSearchController.text = widget.diagnosis.selectedDisease ?? ''; remarksController.text = widget.diagnosis.remarks ?? ''; - status = widget.diagnosis.condition ?? ''; selectedDiagnosisItemValue = widget.diagnosis?.diagnosisType ?? ''; } @@ -76,22 +75,24 @@ class _EditDiagnosisState extends State { this.model = model; WidgetsBinding.instance.addPostFrameCallback((_) { model.getConditionAndType(widget.patientInfo); + status = + model.getConditionValue(widget.diagnosis.condition ?? '') ?? ''; }); }, builder: (_, model, w) { if (selectedDiagnosisItem == null && model.diagnosisTypeList.isNotEmpty) { - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) { - setState(() { - selectedDiagnosisItem = model.diagnosisTypeList.keys.firstWhere( + WidgetsBinding.instance.addPostFrameCallback((_) { + if (mounted) { + setState(() { + selectedDiagnosisItem = model.diagnosisTypeList.keys.firstWhere( (k) => - model.diagnosisTypeList[k] == selectedDiagnosisItemValue, - orElse: () => ''); - if (selectedDiagnosisItem?.isEmpty == true) - selectedDiagnosisItem = null; + model.diagnosisTypeList[k] == selectedDiagnosisItemValue, + orElse: () => ''); + if (selectedDiagnosisItem?.isEmpty == true) + selectedDiagnosisItem = null; + }); + } }); } - }); - } return AppScaffold( isLoading: model.state == ViewState.BusyLocal, isShowAppBar: true, @@ -126,14 +127,10 @@ class _EditDiagnosisState extends State { }, ); }, - onChanged: (value) { - - }, - onFieldSubmitted: () { - - }, - onEditingComplete: (){ - if(filteredSearchController.text.isEmpty) return; + onChanged: (value) {}, + onFieldSubmitted: () {}, + onEditingComplete: () { + if (filteredSearchController.text.isEmpty) return; _onStopped(filteredSearchController.text); }, suffixIcon: IconButton( @@ -143,7 +140,7 @@ class _EditDiagnosisState extends State { size: 30, ), onPressed: () { - if(filteredSearchController.text.isEmpty) return; + if (filteredSearchController.text.isEmpty) return; _onStopped(filteredSearchController.text); }, ), @@ -309,7 +306,8 @@ class _EditDiagnosisState extends State { if (newValue != null) setState(() { selectedDiagnosisItem = newValue; - selectedDiagnosisItemValue = model.diagnosisTypeList[newValue]; + selectedDiagnosisItemValue = + model.diagnosisTypeList[newValue]; }); }, items: @@ -444,7 +442,9 @@ class _EditDiagnosisState extends State { if (filteredSearchController.text == widget.diagnosis.selectedDisease && - status.toLowerCase() == widget.diagnosis.condition?.toLowerCase() && + status.toLowerCase() == + widget.diagnosis.condition + ?.toLowerCase() && widget.diagnosis.diagnosisType == selectedDiagnosisItemValue && widget.diagnosis.remarks == @@ -456,13 +456,12 @@ class _EditDiagnosisState extends State { } widget.diagnosis.selectedDisease = filteredSearchController.text; - widget.diagnosis.remarks = - remarksController.text; - widget.diagnosis.condition = status; + widget.diagnosis.remarks = remarksController.text; + widget.diagnosis.condition = model.getConditionID(status); widget.diagnosis.diagnosisType = selectedDiagnosisItemValue; - if(selectedDiagnosis != null ) { + if (selectedDiagnosis != null) { widget.diagnosis.selectedCategoryCode = selectedDiagnosis?.selectedCategoryCode ?? ''; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart index 4f7ae541..6e0eedab 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -36,9 +36,9 @@ class ListOfExamination extends StatelessWidget { ); } - String? getCondition(int condition, BuildContext context) => condition ==0 + String? getCondition(int condition, BuildContext context) => condition == 1 ? TranslationBase.of(context).normal - : condition == 1 + : condition == 2 ? TranslationBase.of(context).abnormal : TranslationBase.of(context).notExamined; } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index c6826dbc..fc551363 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -73,8 +73,9 @@ class _AddChiefComplaintState extends State { SizedBox(height: 16,), PreviousChiefComplaints( model.episodeByChiefComplaintListVidaPlus, - (ChiefComplains , String){ - addChiefComplaint(model, ChiefComplains.chiefComplain??'', context); + (chiefComplains , String){ + var listOfChiefComplaint = [chiefComplains]; + createCCByEpisode(model,listOfChiefComplaint ); }, ) ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart index ba51f1d0..0754e234 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/previous_cheif_complaints.dart @@ -8,7 +8,7 @@ import 'package:quiver/time.dart'; class PreviousChiefComplaints extends StatelessWidget { final List complaints; - final Function(ChiefComplains , String)? onSendClicked; + final Function(PatientPomrs , String)? onSendClicked; PreviousChiefComplaints( this.complaints, @@ -104,8 +104,6 @@ class PreviousChiefComplaints extends StatelessWidget { onSendClicked!( complaints[index] .patientPomrs![pomrID] - .chiefComplains![ - cheifComplainIndex] ,complaints[index] .patientPomrs?[pomrID].chiefComplainTemplateId?.toString() ??''); }); diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index e026f689..d34e9318 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,6 @@ import FlutterMacOS import Foundation -import cloud_firestore import connectivity_macos import firebase_analytics import firebase_core @@ -15,11 +14,10 @@ import maps_launcher import path_provider_foundation import shared_preferences_foundation import speech_to_text_macos -import sqflite_darwin +import sqflite import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) From ed603c426870733ebdffc43b278d1540c363e5f4 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 18 Dec 2024 20:19:06 +0300 Subject: [PATCH 66/76] WD: Chief complaint template id issue resolved. --- .../soap/SOAP_service.dart | 11 ++- lib/core/viewModel/SOAP_view_model.dart | 9 +- .../chief_complaint/AddChiefComplaints.dart | 82 ++++++++++--------- 3 files changed, 59 insertions(+), 43 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 405a55f9..4c55f3e7 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -684,6 +684,7 @@ class SOAPService extends LookupService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; + DrAppToastMsg.showErrorToast(error); }, body: request); } @@ -1393,7 +1394,7 @@ class SOAPService extends LookupService { return success; } - continueEpisodeVidaPlus( + Future continueEpisodeVidaPlus( PatiantInformtion patient, List chiefComplaint) async { List> chiefComplaintList = []; @@ -1407,6 +1408,7 @@ class SOAPService extends LookupService { }); }); }); + bool success = false; Map request = { "appointmentId": patient.appointmentNo, "projectId": patient.projectId, @@ -1420,11 +1422,16 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(CONTINUE_EPISODE_VP, onSuccess: (dynamic response, int statusCode) { - print("Success"); + if ((response['ContinueEpisode']['resultData'] != null && + (response['ContinueEpisode']['resultData'] as List).isNotEmpty)) { + success = true; + } }, onFailure: (String error, int statusCode) { hasError = true; + DrAppToastMsg.showErrorToast(error); super.error = error; }, body: request); + return success; } continueEpisodeVidaPlusFromPrevious(PatiantInformtion patient, diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 12324692..965e984f 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1123,15 +1123,20 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - createCCByEpisode( + Future createCCByEpisode( PatiantInformtion patientInfo, List chiefComplaint) async { setState(ViewState.BusyLocal); - await _SOAPService.continueEpisodeVidaPlus(patientInfo, chiefComplaint); + var result = await _SOAPService.continueEpisodeVidaPlus(patientInfo, chiefComplaint); + if(result){ + await getChiefComplaint(patientInfo); + } if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); + + return result; } continueEpisodeVidaPlusFromPrevious( diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart index fc551363..7f94935f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart @@ -19,33 +19,30 @@ class AddChiefComplaint extends StatefulWidget { final String? thirdField; final PatiantInformtion patientInfo; - const AddChiefComplaint({super.key, - required this.complaints, - required this.selectedType, - this.firstField, - this.secondField, - this.thirdField, - required this.patientInfo - }); + const AddChiefComplaint( + {super.key, + required this.complaints, + required this.selectedType, + this.firstField, + this.secondField, + this.thirdField, + required this.patientInfo}); @override State createState() => _AddChiefComplaintState(); } - -class _AddChiefComplaintState extends State { +class _AddChiefComplaintState extends State { @override Widget build(BuildContext context) { return BaseView( - onModelReady: (model){ + onModelReady: (model) { episodeByChiefComplaint(model); }, builder: (_, model, w) => AppScaffold( isShowAppBar: true, - appBar: PatientSearchHeader( - title: TranslationBase.of(context).addChiefComplaint - ), + title: TranslationBase.of(context).addChiefComplaint), body: Padding( padding: const EdgeInsets.all(20.0), child: SingleChildScrollView( @@ -57,27 +54,29 @@ class _AddChiefComplaintState extends State { complaints: widget.complaints, selectedType: widget.selectedType, firstField: widget.firstField, - secondField:widget. secondField, + secondField: widget.secondField, thirdField: widget.thirdField, searchData: model.searchChiefComplaintList, - onSearch:(String value){ + onSearch: (String value) { searchChiefComplaint(model, value); }, - onSave: (String chiefComplaint){ - addChiefComplaint(model, chiefComplaint, context); - }, - onCrossClicked: (GetChiefComplaintVidaPlus chiefComplaint){ + onSave: (String chiefComplaint) { + addChiefComplaint(model, chiefComplaint, context); + }, + onCrossClicked: (GetChiefComplaintVidaPlus chiefComplaint) { updateChiefComplaint(model, chiefComplaint, context); }, ), - SizedBox(height: 16,), + SizedBox( + height: 16, + ), PreviousChiefComplaints( - model.episodeByChiefComplaintListVidaPlus, - (chiefComplains , String){ - var listOfChiefComplaint = [chiefComplains]; - createCCByEpisode(model,listOfChiefComplaint ); - }, - ) + model.episodeByChiefComplaintListVidaPlus, + (chiefComplains, String) { + var listOfChiefComplaint = [chiefComplains]; + createCCByEpisode(model, listOfChiefComplaint); + }, + ) ], ), ), @@ -85,34 +84,39 @@ class _AddChiefComplaintState extends State { ), ); } - addChiefComplaint(SOAPViewModel model, String CC, BuildContext context) async{ + + addChiefComplaint( + SOAPViewModel model, String CC, BuildContext context) async { GifLoaderDialogUtils.showMyDialog(context); await model.saveChiefComplaint(widget.patientInfo, CC); await model.getChiefComplaint(widget.patientInfo); GifLoaderDialogUtils.hideDialog(context); } - searchChiefComplaint(SOAPViewModel model, String CC) async{ - await model.searchChiefComplaint(widget.patientInfo, CC); + searchChiefComplaint(SOAPViewModel model, String CC) async { + await model.searchChiefComplaint(widget.patientInfo, CC); } - updateChiefComplaint(SOAPViewModel model, GetChiefComplaintVidaPlus cc, BuildContext context) async{ + + updateChiefComplaint(SOAPViewModel model, GetChiefComplaintVidaPlus cc, + BuildContext context) async { GifLoaderDialogUtils.showMyDialog(context); await model.updateChiefComplaint(widget.patientInfo, cc); await model.getChiefComplaint(widget.patientInfo); GifLoaderDialogUtils.hideDialog(context); - setState(() { + setState(() {}); + } + episodeByChiefComplaint(SOAPViewModel model) async { + WidgetsBinding.instance.addPostFrameCallback((_) async { + await model.episodeByChiefComplaint(widget.patientInfo); }); } - episodeByChiefComplaint(SOAPViewModel model) async{ - WidgetsBinding.instance.addPostFrameCallback((_) async{ - await model.episodeByChiefComplaint(widget.patientInfo);}); - } - createCCByEpisode(model, List chiefComplaint) async{ + createCCByEpisode(model, List chiefComplaint) async { GifLoaderDialogUtils.showMyDialog(context); - await model.createCCByEpisode(widget.patientInfo, chiefComplaint); + var result = + await model.createCCByEpisode(widget.patientInfo, chiefComplaint); GifLoaderDialogUtils.hideDialog(context); - Navigator.of(context).pop(); + if (result) Navigator.of(context).pop(); } } From ced8e7976fba0709218df82f37ebf5de58e4c1ab Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:20:52 +0300 Subject: [PATCH 67/76] WD: remarks made non_mandatory if condition is normal --- .../model/SOAP/physical_exam/Category.dart | 1 + .../add_details_to_examination_vida_plus.dart | 71 ++++++++++++------- .../objective/widget/examination_items.dart | 2 + 3 files changed, 50 insertions(+), 24 deletions(-) diff --git a/lib/core/model/SOAP/physical_exam/Category.dart b/lib/core/model/SOAP/physical_exam/Category.dart index 975af7c4..26542d27 100644 --- a/lib/core/model/SOAP/physical_exam/Category.dart +++ b/lib/core/model/SOAP/physical_exam/Category.dart @@ -39,6 +39,7 @@ class Category { bool isSelected = false; TextEditingController remarksController = TextEditingController(); int selectedCondition = -1; + String selectedConditionName = ""; String? pomrId; int? paitientId; int? userID; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index 6abbdb52..86d0bf15 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -18,6 +18,7 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../../../../core/model/SOAP/physical_exam/Category.dart'; import '../../../../../core/viewModel/project_view_model.dart'; class AddDetailsToExaminationVidaPlus extends StatefulWidget { @@ -25,9 +26,7 @@ class AddDetailsToExaminationVidaPlus extends StatefulWidget { final PatiantInformtion patientInfo; const AddDetailsToExaminationVidaPlus( - {super.key, - this.mySelectedExamination, - required this.patientInfo}); + {super.key, this.mySelectedExamination, required this.patientInfo}); @override State createState() => @@ -44,10 +43,11 @@ class _AddDetailsToExaminationVidaPlusState ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) async { - WidgetsBinding.instance.addPostFrameCallback((_) async { - widget.mySelectedExamination?.forEach((value) => - model.getSpecialityDetails( - value.name ?? '', value.id, widget.patientInfo));}); + WidgetsBinding.instance.addPostFrameCallback((_) async { + widget.mySelectedExamination?.forEach((value) => + model.getSpecialityDetails( + value.name ?? '', value.id, widget.patientInfo)); + }); }, builder: (_, model, w) => AppScaffold( isShowAppBar: true, @@ -68,9 +68,10 @@ class _AddDetailsToExaminationVidaPlusState headerTitle: title, onTap: () { setState(() { - if(currentlyExpanded == title) { + if (currentlyExpanded == title) { currentlyExpanded = ''; - }else currentlyExpanded = title; + } else + currentlyExpanded = title; }); }, child: ExaminationItems( @@ -115,26 +116,48 @@ class _AddDetailsToExaminationVidaPlusState fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { - var listOfSelectedCategory = model.getListOfSelectedCategory(); - if(listOfSelectedCategory.isEmpty){ - DrAppToastMsg.showErrorToast(TranslationBase.of(context).kindlySelectCategory); + var listOfSelectedCategory = + model.getListOfSelectedCategory(); + + + if (listOfSelectedCategory.isEmpty) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .kindlySelectCategory); return; } - if(listOfSelectedCategory.any((value) => value.remarksController.text.isEmpty)){ + /* if (listOfSelectedCategory.any((value) { + return value.remarksController.text.isEmpty && value.conditionsList?.firstWhere((item){ + return item.conditionName == value.selectedCondition; + }).conditionCode?.toLowerCase() == TranslationBase.of(context).normal.toLowerCase(); + })) { + DrAppToastMsg.showErrorToast( + TranslationBase.of(context) + .remarksCanNotBeEmpty); + return; + }*/ + if(listOfSelectedCategory.any((value) { + print('the value is ${value.selectedConditionName}'); + return value.remarksController.text.isEmpty == true && value.selectedConditionName.isNotEmpty &&value.selectedConditionName != TranslationBase.of(context).normal.toLowerCase(); })) { DrAppToastMsg.showErrorToast(TranslationBase.of(context).remarksCanNotBeEmpty); return; } - var result = await model.postPhysicalExamination(widget.patientInfo,listOfSelectedCategory); - if(result){ - model.getPhysicalExamination(widget.patientInfo); - Navigator.popUntil(context, ((route) { - if (route.settings.name == UPDATE_EPISODE_VIDA_PLUS) { - return true; - } else { - return false; - } - })); - } + var result = + await model.postPhysicalExamination( + widget.patientInfo, + listOfSelectedCategory); + if (result) { + model.getPhysicalExamination( + widget.patientInfo); + Navigator.popUntil(context, ((route) { + if (route.settings.name == + UPDATE_EPISODE_VIDA_PLUS) { + return true; + } else { + return false; + } + })); + } }, ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart index 088b3845..126e84e1 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart @@ -97,6 +97,8 @@ class _ExaminationItemsState extends State { itemBuilder: (context, currentIndex) => InkWell( onTap: () { setState(() { + value + .selectedConditionName = value.conditionsList?[currentIndex].conditionCode?? ''; value .selectedCondition = int.parse(value From 9e60920399331431a22129aa91bb2ed056126d71 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:22:13 +0300 Subject: [PATCH 68/76] WD: display diagnosis type on diagnosis item --- lib/core/viewModel/SOAP_view_model.dart | 4 +++ .../assessment/widget/current_diagnosis.dart | 5 +++ .../widgets/SoapDetailItem.dart | 32 +++++++++++++++++-- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 965e984f..f086dfab 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1582,6 +1582,10 @@ class SOAPViewModel extends BaseViewModel { print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); return _SOAPService.conditionTypeMapWithIdAsKey[key.trim()]; } + + String? getDiagnosisTypeValue(String key){ + return _SOAPService.diagnosisTypeTypeMapWithIdAsKey[key.trim()]; + } String? getConditionID(String key){ print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); return _SOAPService.conditionTypeList[key.trim()]; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart index dfe432ef..80fc5906 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/current_diagnosis.dart @@ -98,6 +98,11 @@ class _CurrentDiagnosisState extends State { .condition ?? '') ?? '', + type: model.getDiagnosisTypeValue(widget + .currentDiagnosisItems[index] + .diagnosisType ?? + '') ?? + '', remarks: widget.currentDiagnosisItems[index].remarks ?? '', diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index df5b8c20..d4d9a4b0 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -10,6 +10,7 @@ class SoapDetailItem extends StatelessWidget { final String condition; final String status; final String remarks; + final String? type; final bool showActions; final OnSoapDetailActionClicked onSoapDetailActionClicked; @@ -20,6 +21,7 @@ class SoapDetailItem extends StatelessWidget { required this.remarks, required this.onSoapDetailActionClicked, required this.status, + this.type, this.showActions = true}); @override @@ -61,6 +63,28 @@ class SoapDetailItem extends StatelessWidget { ), ], ), + Visibility( + visible: type?.isNotEmpty == true, + child: Row( + children: [ + AppText( + "${TranslationBase.of(context).diagnoseType}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + type ?? '', + color: Color(0xff359846), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + ), Visibility( visible: remarks.isNotEmpty, child: Column( @@ -180,14 +204,16 @@ class Status extends StatelessWidget { borderRadius: BorderRadius.circular(3), ), // color: Color(0xFF359846), - color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + color: (status.toLowerCase() == 'active' || + status.toLowerCase() == 'stable') ? Color(0xFFD8E8DB) : Color(0x98d02127), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), child: AppText( status, - color: (status.toLowerCase() == 'active' || status.toLowerCase() == 'stable') + color: (status.toLowerCase() == 'active' || + status.toLowerCase() == 'stable') ? Color(0xFF359846) : Colors.white, fontSize: 8, @@ -197,4 +223,4 @@ class Status extends StatelessWidget { } } -enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE,CHANGE_STATUS } +enum SoapDetailItemActions { EDIT, RESOLVE, AUDIT, REMOVE, CHANGE_STATUS } From 707a98cb1881e796e0520b363b7959ff5d79bb70 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:23:40 +0300 Subject: [PATCH 69/76] WD: diagnosis type displayed on previous diagnosis --- .../assessment/widget/previous_diagnosis.dart | 105 ++++++++++-------- .../widget/previous_diagnosis_item.dart | 2 + 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 78376dda..1df5714c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -28,68 +28,77 @@ class PreviousDiagnosis extends StatelessWidget { ); return BaseView( - onModelReady: (model) async {}, - builder: (_, model, w) { - if(model.showAudit){ - WidgetsBinding.instance.addPostFrameCallback((_){ - showAuditBottomSheet(context,model.auditDiagnosislist,model.toggleShowBottomSheetValue); - model.toggleShowBottomSheetValue(false); - }); - } + onModelReady: (model) async {}, + builder: (_, model, w) { + if (model.showAudit) { + WidgetsBinding.instance.addPostFrameCallback((_) { + showAuditBottomSheet(context, model.auditDiagnosislist, + model.toggleShowBottomSheetValue); + model.toggleShowBottomSheetValue(false); + }); + } - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - Flexible( - child: ListView.separated( - itemBuilder: (_, index) { - return PreviousDiagnosisItem( - title: diagnosisItems[index].selectedDisease ?? '', - status: diagnosisItems[index].status ?? '', - condition: diagnosisItems[index].condition ?? '', - remarks: diagnosisItems[index].remarks ?? '', - isPreviousAddedToCurrent:diagnosisItems[index].visitWiseSelected == true , - onSoapDetailActionClicked: (action) { - switch (action) { - case SoapDetailItemActions.AUDIT: - model.getAuditOfDiagnosis( - patientInfo, - diagnosisItems[index] - .patientProblemRevisionId - ?.toString() ?? - ''); - break; - case SoapDetailItemActions.CHANGE_STATUS: - model.convertPreviousDiagnosisCurrent(patientInfo, diagnosisItems[index]); - default: - } + return Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: ListView.separated( + itemBuilder: (_, index) { + return PreviousDiagnosisItem( + title: diagnosisItems[index].selectedDisease ?? '', + status: diagnosisItems[index].status ?? '', + condition: diagnosisItems[index].condition ?? '', + remarks: diagnosisItems[index].remarks ?? '', + type: model.getDiagnosisTypeValue( + diagnosisItems[index].diagnosisType ?? '') ?? + '', + isPreviousAddedToCurrent: + diagnosisItems[index].visitWiseSelected == true, + onSoapDetailActionClicked: (action) { + switch (action) { + case SoapDetailItemActions.AUDIT: + model.getAuditOfDiagnosis( + patientInfo, + diagnosisItems[index] + .patientProblemRevisionId + ?.toString() ?? + ''); + break; + case SoapDetailItemActions.CHANGE_STATUS: + model.convertPreviousDiagnosisCurrent( + patientInfo, diagnosisItems[index]); + default: + } + }, + ); }, - ); - }, - separatorBuilder: (_, index) => Divider(), - itemCount: diagnosisItems.length), - ) - ], - ), - );} - ); + separatorBuilder: (_, index) => Divider(), + itemCount: diagnosisItems.length), + ) + ], + ), + ); + }); } void showAuditBottomSheet( BuildContext context, - List diagnosis, void Function(bool status) toggleShowBottomSheetValue, + List diagnosis, + void Function(bool status) toggleShowBottomSheetValue, ) { showModalBottomSheet( isDismissible: true, context: context, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(20), topRight: Radius.circular(20))), builder: (_) { return AuditListBottomSheet( auditList: diagnosis, ); }, - ).then((value)=>toggleShowBottomSheetValue(false)); + ).then((value) => toggleShowBottomSheetValue(false)); } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart index 81e1837b..1bab8dcf 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis_item.dart @@ -13,6 +13,7 @@ class PreviousDiagnosisItem extends StatelessWidget { final String condition; final String status; final String remarks; + final String? type; final bool isPreviousAddedToCurrent; final OnSoapDetailActionClicked onSoapDetailActionClicked; @@ -23,6 +24,7 @@ class PreviousDiagnosisItem extends StatelessWidget { required this.remarks, required this.onSoapDetailActionClicked, required this.status, + this.type, required this.isPreviousAddedToCurrent}); @override From 1353f48f7e6bb2b75b510a0d66f559e125607342 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:24:22 +0300 Subject: [PATCH 70/76] WD: date time doctor name and patient condition displayed on ProgressNoteItem.dart --- .../soap/SOAP_service.dart | 14 +- lib/core/viewModel/SOAP_view_model.dart | 10 ++ .../plan/update_plan_page_vida_plus.dart | 8 +- .../plan/widget/ProgressNoteItem.dart | 161 ++++++++++++------ .../plan/widget/list_of_notes.dart | 33 ++-- 5 files changed, 157 insertions(+), 69 deletions(-) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 4c55f3e7..b186f58d 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -84,7 +84,9 @@ class SOAPService extends LookupService { List clinicsList = []; List patientConditionList = []; Map> specialityDetails = {}; + Map patientConditionMap = {}; Map diagnosisTypeList = {}; + Map diagnosisTypeTypeMapWithIdAsKey = {}; Map conditionTypeList = {}; Map conditionTypeMapWithIdAsKey = {}; List icdVersionList = []; @@ -783,7 +785,10 @@ class SOAPService extends LookupService { await baseAppClient.post(DIAGNOSIS_TYPE, onSuccess: (dynamic response, int statusCode) { response['ListDiagnosisTypeModel']['resultData'] - .forEach((v) => diagnosisTypeList[v['name']] = v['diagnosisType']); + .forEach((v) { + diagnosisTypeList[v['name']] = v['diagnosisType']; + diagnosisTypeTypeMapWithIdAsKey[v['diagnosisType']] = v['name']; + }); }, onFailure: (String error, int statusCode) { searchChiefComplaintListVidaPlus.clear(); hasError = true; @@ -1379,11 +1384,14 @@ class SOAPService extends LookupService { Map request = {}; var success = false; patientConditionList.clear(); + patientConditionMap.clear(); await baseAppClient.post(GET_PATIENT_CLINIC, onSuccess: (dynamic response, int statusCode) { response['ListPatientConditionProgress']['resultData'].forEach((v) => - v['PATIENT_CONDITION'].forEach((item) => - patientConditionList.add(PatientCondition.fromJson(item)))); + v['PATIENT_CONDITION'].forEach((item) { + patientConditionList.add(PatientCondition.fromJson(item)); + patientConditionMap[item['code']]= item['name']; + })); success = false; }, onFailure: (String error, int statusCode) { success = false; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index f086dfab..aaf137ad 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1413,6 +1413,11 @@ class SOAPViewModel extends BaseViewModel { _SOAPService.showAuditBottomSheet = status; } + + getProgressNoteAndCondition(PatiantInformtion information) async{ + getPatientConditionList(); + getProgressNote(information); + } getProgressNote(PatiantInformtion patientInformation) async { setState(ViewState.BusyLocal); await _SOAPService.getProgressNoteNew(patientInformation); @@ -1590,4 +1595,9 @@ class SOAPViewModel extends BaseViewModel { print('the value is ${_SOAPService.conditionTypeMapWithIdAsKey[key.trim()]}'); return _SOAPService.conditionTypeList[key.trim()]; } + + String? getPatientConditionValue(String key){ + + return _SOAPService.patientConditionMap[key.trim()]; + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart index 1d971c0a..db343091 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/update_plan_page_vida_plus.dart @@ -1,4 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/core/enum/view_state.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; @@ -103,15 +104,14 @@ class _UpdatePlanPageVidaPlusState extends State widget.sOAPViewModel.setPlanCallBack(this); WidgetsBinding.instance.addPostFrameCallback((_) async { widget.changeLoadingState(true); - - model.getProgressNote(widget.patientInfo); + model.getProgressNoteAndCondition(widget.patientInfo); widget.changeLoadingState(false); - }); }, builder: (_, model, w) => AppScaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, isShowAppBar: false, + isLoading: model.state == ViewState.BusyLocal, body: SingleChildScrollView( physics: ScrollPhysics(), child: Center( @@ -160,7 +160,7 @@ class _UpdatePlanPageVidaPlusState extends State ), } else ...{ Divider(), - ListOfNotes(notes: model.progressNote) + ListOfNotes(notes: model.progressNote, model: model,) } // if (mySelectedExamination.isEmpty) ...{ diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart index cbabae2b..cadf51a3 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart @@ -2,75 +2,128 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plu import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; + class ProgressNoteItem extends StatelessWidget { final String type; final String speciality; final String Notes; - // final String status; + final String patientCondition; + final String doctorName; + final String modifiedOn; const ProgressNoteItem( {super.key, required this.type, required this.speciality, required this.Notes, - // required this.status + required this.patientCondition, + required this.doctorName, + required this.modifiedOn, }); @override Widget build(BuildContext context) => Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Stack( + Row( children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - AppText( - "${TranslationBase.of(context).type}:", - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - SizedBox( - width: 4, - ), - AppText( - type, - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - ], - ), - SizedBox( - height: 8, - ), - Row( - children: [ - AppText( - "${TranslationBase.of(context).speciality}:", - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - SizedBox( - width: 4, - ), - AppText( - speciality, - color: Color(0XFF2B353E), - fontSize: 10, - fontWeight: FontWeight.w500, - ), - ], - ), - ], + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + AppText( + "${TranslationBase.of(context).type}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + type, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + SizedBox( + height: 4, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).speciality}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + speciality, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + SizedBox( + height: 4, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).doctorName}:", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + doctorName, + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + SizedBox( + height: 4, + ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).dateTime}", + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + SizedBox( + width: 4, + ), + AppText( + getDateAndTime(modifiedOn), + color: Color(0XFF2B353E), + fontSize: 10, + fontWeight: FontWeight.w500, + ), + ], + ), + ], + ), ), - // Align( - // alignment: Alignment.topRight, child: Status(status: status)) + Visibility( + visible: patientCondition.isNotEmpty, + child: Status(status: patientCondition)) ], ), SizedBox( @@ -84,4 +137,10 @@ class ProgressNoteItem extends StatelessWidget { ), ], ); + + String getDateAndTime(String dateTime) { + if (dateTime.isEmpty) return ''; + DateTime now = DateTime.now(); + return DateFormat('dd/MM/yyyy hh:mm a').format(now); + } } diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart index 1f5d2c81..03700f6f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/list_of_notes.dart @@ -1,20 +1,31 @@ import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/progress_note/progress_note.dart'; +import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/plan/widget/ProgressNoteItem.dart'; import 'package:flutter/material.dart'; -class ListOfNotes extends StatelessWidget{ +class ListOfNotes extends StatelessWidget { final List notes; + final SOAPViewModel model; + + const ListOfNotes({super.key, required this.notes, required this.model}); - const ListOfNotes({super.key, required this.notes}); @override Widget build(BuildContext context) => Flexible( - child: ListView.separated( - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemBuilder: (_, index) =>ProgressNoteItem(type: notes[index].progressNotesTypesName ?? '', speciality: notes[index].specialityName ?? '', Notes: notes[index].progressNote?? ''), - separatorBuilder: (_, __) => Divider(), - itemCount: notes.length), - ); - -} \ No newline at end of file + child: ListView.separated( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (_, index) => ProgressNoteItem( + type: notes[index].progressNotesTypesName ?? '', + speciality: notes[index].specialityName ?? '', + Notes: notes[index].progressNote ?? '', + patientCondition: model.getPatientConditionValue( + notes[index].patientCondition ?? '') ?? + '', + doctorName: notes[index].userFullName ?? '', + modifiedOn: notes[index].modifiedOn ?? '', + ), + separatorBuilder: (_, __) => Divider(), + itemCount: notes.length), + ); +} From 4143a365374e707cee79cbe1c2e121812115a2f0 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Mon, 23 Dec 2024 11:59:07 +0300 Subject: [PATCH 71/76] WD: error added for the hopi api --- lib/core/service/patient_medical_file/soap/SOAP_service.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index b186f58d..a1cfd751 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -647,6 +647,7 @@ class SOAPService extends LookupService { success = true; }, onFailure: (String error, int statusCode) { hasError = true; + DrAppToastMsg.showErrorToast(error); super.error = error; }, body: finalRequest); return success; From 6f91040bb1a08c73c8429c3cd5d6038d5f06d769 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 23 Dec 2024 12:43:29 +0300 Subject: [PATCH 72/76] updates --- lib/screens/live_care/panding_list.dart | 2 +- lib/screens/patients/register_patient/VerifyMethodPage.dart | 2 +- lib/widgets/data_display/list/flexible_container.dart | 2 +- lib/widgets/dialog/AskPermissionDialog.dart | 2 +- lib/widgets/shared/user-guid/custom_validation_error.dart | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/screens/live_care/panding_list.dart b/lib/screens/live_care/panding_list.dart index d14e1bb3..b5c6b914 100644 --- a/lib/screens/live_care/panding_list.dart +++ b/lib/screens/live_care/panding_list.dart @@ -59,7 +59,7 @@ class _LiveCarePandingListState extends State { ? Center( child: Text( _liveCareProvider.errorMsg, - style: TextStyle(color: Theme.of(context).errorColor), + style: TextStyle(color: Colors.red), ), ) : Column( diff --git a/lib/screens/patients/register_patient/VerifyMethodPage.dart b/lib/screens/patients/register_patient/VerifyMethodPage.dart index 45359dea..9e9659cd 100644 --- a/lib/screens/patients/register_patient/VerifyMethodPage.dart +++ b/lib/screens/patients/register_patient/VerifyMethodPage.dart @@ -434,7 +434,7 @@ class _ActivationPageState extends State { ), focusedErrorBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), - borderSide: BorderSide(color: Theme.of(context).errorColor), + borderSide: BorderSide(color: Colors.red), ), ); } diff --git a/lib/widgets/data_display/list/flexible_container.dart b/lib/widgets/data_display/list/flexible_container.dart index 4e4d63b3..7bd95a5b 100644 --- a/lib/widgets/data_display/list/flexible_container.dart +++ b/lib/widgets/data_display/list/flexible_container.dart @@ -34,7 +34,7 @@ class FlexibleContainer extends StatelessWidget { child: ClipRRect( borderRadius: BorderRadius.circular(8.0), child: Material( - color: Theme.of(context).backgroundColor, + // color: Theme.of(context).backgroundColor, child: Container( padding: padding, width: double.infinity, diff --git a/lib/widgets/dialog/AskPermissionDialog.dart b/lib/widgets/dialog/AskPermissionDialog.dart index 8b7eacb3..3c3d74ba 100644 --- a/lib/widgets/dialog/AskPermissionDialog.dart +++ b/lib/widgets/dialog/AskPermissionDialog.dart @@ -70,7 +70,7 @@ class _AskPermissionDialogState extends State { height: MediaQuery.of(context).size.height / 6, ), AppButton( - fontColor: Theme.of(context).backgroundColor, + // fontColor: Theme.of(context).backgroundColor, color: Colors.red[700]!, title: "Turn On Camera, Microphone", onPressed: () async { diff --git a/lib/widgets/shared/user-guid/custom_validation_error.dart b/lib/widgets/shared/user-guid/custom_validation_error.dart index 6154255d..b4517861 100644 --- a/lib/widgets/shared/user-guid/custom_validation_error.dart +++ b/lib/widgets/shared/user-guid/custom_validation_error.dart @@ -23,7 +23,7 @@ class CustomValidationError extends StatelessWidget { margin: EdgeInsets.symmetric(horizontal: 3), child: AppText( error, - color: Theme.of(context).errorColor, + color: Colors.red, fontSize: 14, ), ), From c4328e9cbc6fb64831535cde1751fb56ed8753ca Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 26 Dec 2024 11:52:47 +0300 Subject: [PATCH 73/76] WD: Doctor Name Added in the response of audit diagnosis and displayed on bottom sheet --- lib/core/model/SOAP/assessment/audit_diagnosis.dart | 2 ++ .../soap_update_vida_plus/assessment/widget/audit_item.dart | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/core/model/SOAP/assessment/audit_diagnosis.dart b/lib/core/model/SOAP/assessment/audit_diagnosis.dart index ac7abbdc..f98205dc 100644 --- a/lib/core/model/SOAP/assessment/audit_diagnosis.dart +++ b/lib/core/model/SOAP/assessment/audit_diagnosis.dart @@ -6,6 +6,7 @@ class AuditDiagnosis { String? deletedBy; String? deletedOn; String? deletedRemarks; + String? doctorName; String? diagnosisType; bool? isEventIdentifiedExternally; bool? isResolved; @@ -23,6 +24,7 @@ class AuditDiagnosis { createdOn = json['createdOn']; deletedBy = json['deletedBy']; deletedOn = json['deletedOn']; + doctorName = json['doctorName']; deletedRemarks = json['deletedRemarks']; diagnosisType = json['diagnosisType']; isEventIdentifiedExternally = json['isEventIdentifiedExternally']; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart index 3fc197f7..79a7e297 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/audit_item.dart @@ -20,7 +20,7 @@ class AuditItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ AppText( - auditDiagnosis.createdBy ?? '', + auditDiagnosis.doctorName ?? '', fontWeight: FontWeight.w600, fontSize: 12, color: Color(0xFF2B353E), From fbd0143d50aeb53ed790984cd957898acb337388 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Wed, 1 Jan 2025 10:56:05 +0300 Subject: [PATCH 74/76] WD: Displayed Allergy status along side its name. --- lib/config/localized_values.dart | 1 + .../allergies/update_allergies_widget.dart | 23 +++++++++++++++---- .../widgets/SoapDetailItem.dart | 17 ++++++++++---- .../translations_delegate_base_utils.dart | 1 + 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index fca9679f..10f97042 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1225,6 +1225,7 @@ const Map> localizedValues = { "ar": "هل أنت متأكد من أنك تريد حذف التشخيص" }, "activate": {"en": "Activate", "ar":"فعل"}, + "stable": {"en": "Stable", "ar":"مستقر"}, "resolved": {"en": "Resolved", "ar":"تم الحل"}, "diagnosisAlreadyDeleted": {"en": "Diagnosis Already Deleted", "ar":"تم حذف التشخيص بالفعل"}, "diagnosisAlreadyResolved": {"en": "Diagnosis Already Resolved", "ar":"تم حل التشخيص بالفعل"}, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 82c6a943..755e49a6 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_al import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/utils.dart'; @@ -102,11 +103,23 @@ class _UpdateAllergiesWidgetState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - selectedAllergy.allergyName!, - fontSize: 12, - fontWeight: FontWeight.w800, - letterSpacing: -0.48, + Row( + children: [ + Expanded( + child: AppText( + selectedAllergy.allergyName!, + fontSize: 12, + fontWeight: FontWeight.w800, + letterSpacing: -0.48, + ), + ), + SizedBox( + width: 8, + ), + Status( + status: (selectedAllergy.isActivePatientsAllergy == true ) ? TranslationBase.of(context).active : TranslationBase.of(context).resolved, + ) + ], ), selectedAllergy.patientsAllergyReactionsDTOs! .isNotEmpty && diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index d4d9a4b0..26b2d8f2 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -204,16 +204,23 @@ class Status extends StatelessWidget { borderRadius: BorderRadius.circular(3), ), // color: Color(0xFF359846), - color: (status.toLowerCase() == 'active' || - status.toLowerCase() == 'stable') + color: (status.toLowerCase() == + TranslationBase.of(context).active.toLowerCase() || + status.toLowerCase() == + TranslationBase.of(context).stable.toLowerCase()) ? Color(0xFFD8E8DB) - : Color(0x98d02127), + : (status.toLowerCase() == + TranslationBase.of(context).resolved.toLowerCase()) + ? Colors.lightBlue + : Color(0x98d02127), child: Padding( padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6), child: AppText( status, - color: (status.toLowerCase() == 'active' || - status.toLowerCase() == 'stable') + color: (status.toLowerCase() == + TranslationBase.of(context).active.toLowerCase() || + status.toLowerCase() == + TranslationBase.of(context).stable.toLowerCase()) ? Color(0xFF359846) : Colors.white, fontSize: 8, diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 3fa6f0c4..eba08a2a 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1185,6 +1185,7 @@ class TranslationBase { localizedValues['onlyOfftimeHoliday']![locale.languageCode]!; String get active => localizedValues['active']![locale.languageCode]!; + String get stable => localizedValues['stable']![locale.languageCode]!; String get hold => localizedValues['hold']![locale.languageCode]!; From ed50e72426577a119024e7369a2400713286bbc7 Mon Sep 17 00:00:00 2001 From: "taha.alam" Date: Thu, 2 Jan 2025 13:31:28 +0300 Subject: [PATCH 75/76] WD: no chief complain view added and hardcoded string removed. --- .../objective/list_of_examination.dart | 2 +- .../chief_complaint/chief_complaints.dart | 40 ++++++++++--------- .../widgets/empty_complaints.dart | 1 + 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart index 6e0eedab..082221f5 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/list_of_examination.dart @@ -28,7 +28,7 @@ class ListOfExamination extends StatelessWidget { ///todo handle the event as per the actiion /// the action is [SoapDetailItemActions] }, - status: 'active', + status: TranslationBase.of(context).active, showActions: false, ), separatorBuilder: (_, __) => Divider(), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart index 3297a83b..732fb50f 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/chief_complaints.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjecti import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/AddChiefComplaints.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/add_soap_item.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/complaint_items.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart'; @@ -50,24 +51,27 @@ class UpdateChiefComplaints extends StatelessWidget { title: TranslationBase.of(context).addChiefComplaint, ), SizedBox(height: 16), - Container(width: MediaQuery.of(context).size.width, - height: 40, - child: - ListView.builder( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemCount: model.getChiefComplaintListVidaPlus.length, - itemBuilder: (_, index) => - ComplaintItems( - complaint: model.getChiefComplaintListVidaPlus[index]!, - onCrossClicked: (complaints) { - - }) - - )), - - ]), - )); + if (model.getChiefComplaintListVidaPlus.isEmpty) ...{ + SizedBox( + width: MediaQuery.sizeOf(context).width, + child: EmptyComplaints(), + ) + } else ...{ + Container( + width: MediaQuery.of(context).size.width, + height: 40, + child: ListView.builder( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: + model.getChiefComplaintListVidaPlus.length, + itemBuilder: (_, index) => ComplaintItems( + complaint: model + .getChiefComplaintListVidaPlus[index]!, + onCrossClicked: (complaints) {}))), + } + ]), + )); } getChiefComplaints(SOAPViewModel model){ model.getChiefComplaint(patientInfo); diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart index 1c8d4802..44412e8d 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/empty_complaints.dart @@ -16,6 +16,7 @@ class EmptyComplaints extends StatelessWidget{ TranslationBase.of(context).noComplaintsFound, fontSize: 12, fontWeight: FontWeight.w400, + textAlign: TextAlign.center, color: Color(0xFFADADAD), ) ], From b8ae0cf7d0bab766e883756683c22cb5e7a6d396 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 6 Jan 2025 10:56:28 +0300 Subject: [PATCH 76/76] Update to stores VersionID 9.4, VIDA 4 episode changes --- android/app/build.gradle | 2 +- android/build.gradle | 13 ++++ ios/Runner/AppDelegate.swift | 2 +- lib/config/config.dart | 6 +- lib/core/viewModel/project_view_model.dart | 18 +++++ lib/screens/home/home_screen.dart | 44 ++++++------ lib/screens/procedures/procedure_screen.dart | 74 +++++++------------- lib/utils/utils.dart | 10 +++ pubspec.yaml | 4 +- 9 files changed, 98 insertions(+), 75 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e87052e9..2b7f59f8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -59,7 +59,7 @@ android { buildTypes { release { // TODO: Add your own signing config for the release build. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } debug { diff --git a/android/build.gradle b/android/build.gradle index 98c26f7a..6d2ee078 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,6 +27,19 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} +// to here subprojects { project.evaluationDependsOn(':app') } diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 8ebd4235..34cf8386 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -4,7 +4,7 @@ import OpenTok // Created by Mohammad Aljammal & Elham Rababah on 24/06/20. // Copyright © 2020 Cloud. All rights reserved. -@UIApplicationMain +@main @objc class AppDelegate: FlutterAppDelegate ,ICallProtocol { var result: FlutterResult? diff --git a/lib/config/config.dart b/lib/config/config.dart index 9effc423..6f1b3387 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -7,9 +7,9 @@ const ONLY_DATE = "[0-9/]"; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://webservices.hmg.com/'; @@ -399,7 +399,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 9.3; +const VERSION_ID = 9.4; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/viewModel/project_view_model.dart b/lib/core/viewModel/project_view_model.dart index 123482d7..608dca2e 100644 --- a/lib/core/viewModel/project_view_model.dart +++ b/lib/core/viewModel/project_view_model.dart @@ -37,8 +37,12 @@ class ProjectViewModel with ChangeNotifier { List _vidaPlusProjectListModel = []; + List _vidaPlusInPatientsProjectListModel = []; + List get vidaPlusProjectList => _vidaPlusProjectListModel; + List get vidaPlusInPatientsProjectListModel => _vidaPlusInPatientsProjectListModel; + ProjectViewModel() { loadSharedPrefLanguage(); @@ -63,6 +67,11 @@ class ProjectViewModel with ChangeNotifier { notifyListeners(); } + setVidaPlusInPatientProjectList(List vidaPlusInPatientProjectListModelInput) { + _vidaPlusInPatientsProjectListModel = vidaPlusInPatientProjectListModelInput; + notifyListeners(); + } + void loadSharedPrefLanguage() async { currentLanguage = await sharedPref.getString(APP_Language); _appLocale = Locale(currentLanguage ?? 'en'); @@ -117,6 +126,15 @@ class ProjectViewModel with ChangeNotifier { }); setVidaPlusProjectList(_vidaPlusProjectListModel); } + + _vidaPlusInPatientsProjectListModel.clear(); + if (response['ProjectListHMCForDoctorAppInPatient'].length != 0) { + response['ProjectListHMCForDoctorAppInPatient'].forEach((item) { + _vidaPlusInPatientsProjectListModel.add(VidaPlusProjectListModel.fromJson(item)); + }); + setVidaPlusInPatientProjectList(_vidaPlusInPatientsProjectListModel); + } + localRes = response; }, onFailure: (String error, int statusCode) { throw error; diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 491efdd1..e3709e3f 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -289,7 +289,7 @@ class _HomeScreenState extends State { List homePatientsCardsWidget(DashboardViewModel model, projectsProvider) { colorIndex = 0; - List backgroundColors =[]; + List backgroundColors = []; backgroundColors.add(LinearGradient(begin: Alignment(-1.0, -2.0), end: Alignment(1.0, 2.0), colors: [ AppGlobal.appRedColor, Color(0xFFAD3B3B), @@ -301,9 +301,9 @@ class _HomeScreenState extends State { backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [Color(0xFF71787E), AppGlobal.appTextColor])); List backgroundIconColors = []; backgroundIconColors.add(Colors.white12); - backgroundIconColors.add( Colors.white38); + backgroundIconColors.add(Colors.white38); backgroundIconColors.add(Colors.white10); - List textColors =[]; + List textColors = []; textColors.add(Colors.white); textColors.add(Color(0xFF353E47)); textColors.add(Colors.white); @@ -364,24 +364,28 @@ class _HomeScreenState extends State { )); changeColorIndex(); - patientCards.add(HomePatientCard( - gradient: backgroundColors[colorIndex], - backgroundIconColor: backgroundIconColors[colorIndex], - cardIcon: DoctorApp.inpatient, - textColor: textColors[colorIndex], - text: TranslationBase.of(context).myInPatient, - onTap: () { - Navigator.push( - context, - FadePage( - page: InPatientScreen( - specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider.doctorClinicsList[0].clinicID), + if (!Utils.isVidaPlusInPatientProject(projectsProvider, model.doctorProfile!.projectID!)) { + patientCards.add(HomePatientCard( + gradient: backgroundColors[colorIndex], + backgroundIconColor: backgroundIconColors[colorIndex], + cardIcon: DoctorApp.inpatient, + textColor: textColors[colorIndex], + text: TranslationBase + .of(context) + .myInPatient, + onTap: () { + Navigator.push( + context, + FadePage( + page: InPatientScreen( + specialClinic: model.getSpecialClinic(clinicId ?? projectsProvider.doctorClinicsList[0].clinicID), + ), ), - ), - ); - }, - )); - changeColorIndex(); + ); + }, + )); + changeColorIndex(); + } //TODO Keep commented // patientCards.add(HomePatientCard( // gradient: backgroundColors[colorIndex], diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 447de6f9..2cf35779 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -39,16 +39,10 @@ class ProcedureScreen extends StatelessWidget { bool isInpatient = routeArgs['isInpatient']; return BaseView( onModelReady: (model) { - model.getProcedure( - mrn: patient.patientId, - patientType: patientType, - appointmentNo: patient.appointmentNo); + model.getProcedure(mrn: patient.patientId, patientType: patientType, appointmentNo: patient.appointmentNo); model.isPrincipalCovered(patient: patient); - }, - - builder: (BuildContext context, ProcedureViewModel model, Widget? child) => - AppScaffold( + builder: (BuildContext context, ProcedureViewModel model, Widget? child) => AppScaffold( isShowAppBar: true, backgroundColor: Colors.grey[100]!, baseViewModel: model, @@ -64,23 +58,16 @@ class ProcedureScreen extends StatelessWidget { SizedBox( height: 12, ), - if ((model.procedureList.length == 0 && - patient.patientStatusType != 43) || - patient.patientStatusType != null && - patient.patientStatusType == 43) + if ((model.procedureList.length == 0 && patient.patientStatusType != 43) || patient.patientStatusType != null && patient.patientStatusType == 43) ServiceTitle( title: TranslationBase.of(context).orderTestOr, subTitle: TranslationBase.of(context).procedure, ), - if ((patient.patientStatusType != null && - patient.patientStatusType == 43) || - (isFromLiveCare && patient.appointmentNo != null)) + if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null)) AddNewOrder( onTap: () async { GifLoaderDialogUtils.showMyDialog(context); - await model.getProcedureTemplate( - categoryID: ProcedureType.PROCEDURE.getCategoryId(), - isLocalBusy: true); + await model.getProcedureTemplate(categoryID: ProcedureType.PROCEDURE.getCategoryId(), isLocalBusy: true); GifLoaderDialogUtils.hideDialog(context); Navigator.push( @@ -96,9 +83,17 @@ class ProcedureScreen extends StatelessWidget { }, label: TranslationBase.of(context).addMoreProcedure, ), - - !model.isPrincipalCovered_ ? Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: Colors.red, textAlign: TextAlign.center, )) :SizedBox(), - SizedBox(height: 20,), + !model.isPrincipalCovered_ + ? Center( + child: AppText( + TranslationBase.of(context).principalCoveredOrNot, + color: Colors.red, + textAlign: TextAlign.center, + )) + : SizedBox(), + SizedBox( + height: 20, + ), if (model.procedureList.isNotEmpty) ListView.builder( scrollDirection: Axis.vertical, @@ -107,45 +102,28 @@ class ProcedureScreen extends StatelessWidget { physics: BouncingScrollPhysics(), itemBuilder: (BuildContext ctxt, int index) { return ProcedureCard( - categoryID: model - .procedureList[0].entityList![index].categoryID, + categoryID: model.procedureList[0].entityList![index].categoryID, entityList: model.procedureList[0].entityList![index], onTap: () { - if (model.procedureList[0].entityList![index] - .categoryID == - 2 || - model.procedureList[0].entityList![index] - .categoryID == - 4) + if (model.procedureList[0].entityList![index].categoryID == 2 || model.procedureList[0].entityList![index].categoryID == 4) updateProcedureForm( context, model: model, patient: patient, - remarks: model.procedureList[0] - .entityList![index].remarks!, - orderType: model.procedureList[0] - .entityList![index].orderType - .toString(), - orderNo: model.procedureList[0] - .entityList![index].orderNo!, - procedureName: model.procedureList[0] - .entityList![index].procedureName!, - categoreId: model.procedureList[0] - .entityList![index].categoryID - .toString(), - procedureId: model.procedureList[0] - .entityList![index].procedureId!, - limetNo: model.procedureList[0] - .entityList![index].lineItemNo!, + remarks: model.procedureList[0].entityList![index].remarks!, + orderType: model.procedureList[0].entityList![index].orderType.toString(), + orderNo: model.procedureList[0].entityList![index].orderNo!, + procedureName: model.procedureList[0].entityList![index].procedureName!, + categoreId: model.procedureList[0].entityList![index].categoryID.toString(), + procedureId: model.procedureList[0].entityList![index].procedureId!, + limetNo: model.procedureList[0].entityList![index].lineItemNo!, ); }, patient: patient, doctorID: model.doctorProfile?.doctorID, ); }), - if (model.state == ViewState.ErrorLocal || - (model.procedureList.isNotEmpty && - model.procedureList[0].entityList!.isEmpty)) + if (model.state == ViewState.ErrorLocal || (model.procedureList.isNotEmpty && model.procedureList[0].entityList!.isEmpty)) Center( child: ErrorMessage( error: TranslationBase.of(context).noDataAvailable, diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 148474f0..1db194da 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -349,4 +349,14 @@ class Utils { }); return isVidaPlus; } + + static bool isVidaPlusInPatientProject(ProjectViewModel projectViewModel, int projectID) { + bool isVidaPlusInPatientProject = false; + projectViewModel.vidaPlusInPatientsProjectListModel.forEach((element) { + if (element.projectID == projectID) { + isVidaPlusInPatientProject = true; + } + }); + return isVidaPlusInPatientProject; + } } diff --git a/pubspec.yaml b/pubspec.yaml index 45856f38..760c31a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.4.16+1 +version: 1.4.17+1 environment: @@ -57,7 +57,7 @@ dependencies: barcode_scan2: ^4.3.0 # permissions permission_handler: ^11.1.0 - device_info: ^2.0.2 +# device_info: ^2.0.2 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.