From 37d4dfffa2f1db6a176060b87c37508c075bb45b Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 15 Nov 2021 16:23:29 +0200 Subject: [PATCH] all discharge summary --- lib/config/config.dart | 12 +- .../profile/discharge_summary_servive.dart | 29 +- .../profile/discharge_summary_view_model.dart | 19 + .../GetDischargeSummaryResModel.dart | 112 +++--- .../all_discharge_summary.dart | 100 +++-- .../discharge_Summary_widget.dart | 374 ++++++++++++++---- .../discharge_summary/discharge_summary.dart | 18 +- .../pending_discharge_summary.dart | 5 +- .../pending_orders/pending_orders_screen.dart | 72 +++- 9 files changed, 532 insertions(+), 209 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 2afbe5ac..0511f1cd 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -346,7 +346,6 @@ const GET_MEDICATION_FOR_IN_PATIENT = const GET_EPISODE_FOR_INPATIENT = "/Services/DoctorApplication.svc/REST/DoctorApp_GetEpisodeForInpatient"; - ///Operation Details Services const GET_RESERVATIONS = @@ -377,12 +376,15 @@ const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION = "Services/Authentication.svc/REST/SendActivationCodebyOTPNotificationTypeForRegistration"; const CHECK_ACTIVATION_CODE_FOR_PATIENT = "Services/Authentication.svc/REST/CheckActivationCode"; -const PATIENT_REGISTRATION = "Services/Authentication.svc/REST/PatientRegistration"; -const GET_PATIENT_INFO= "Services/NHIC.svc/REST/GetPatientInfo"; - +const PATIENT_REGISTRATION = + "Services/Authentication.svc/REST/PatientRegistration"; +const GET_PATIENT_INFO = "Services/NHIC.svc/REST/GetPatientInfo"; /// Discharge Summary -const GET_PENDING_DISCHARGE_SUMMARY = "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingDischargeSummary"; +const GET_PENDING_DISCHARGE_SUMMARY = + "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingDischargeSummary"; +const GET_ALL_DISCHARGE_SUMMARY = + "Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary"; var selectedPatientType = 1; diff --git a/lib/core/service/patient/profile/discharge_summary_servive.dart b/lib/core/service/patient/profile/discharge_summary_servive.dart index daea1b42..12de09ac 100644 --- a/lib/core/service/patient/profile/discharge_summary_servive.dart +++ b/lib/core/service/patient/profile/discharge_summary_servive.dart @@ -10,18 +10,41 @@ import 'package:doctor_app_flutter/models/operation_report/get_reservations_requ class DischargeSummaryService extends BaseService { List _pendingDischargeSummaryList = []; - List get pendingDischargeSummaryList => _pendingDischargeSummaryList; + List get pendingDischargeSummaryList => + _pendingDischargeSummaryList; + + List _allDischargeSummaryList = []; + List get allDischargeSummaryList => + _allDischargeSummaryList; Future getPendingDischargeSummary( {GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async { - hasError = false; await baseAppClient.post(GET_PENDING_DISCHARGE_SUMMARY, onSuccess: (dynamic response, int statusCode) { _pendingDischargeSummaryList.clear(); response['List_PendingDischargeSummary'].forEach( (v) { - _pendingDischargeSummaryList.add(GetDischargeSummaryResModel.fromJson(v)); + _pendingDischargeSummaryList + .add(GetDischargeSummaryResModel.fromJson(v)); + }, + ); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getDischargeSummaryReqModel.toJson()); + } + + Future getAllDischargeSummary( + {GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async { + hasError = false; + await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY, + onSuccess: (dynamic response, int statusCode) { + _pendingDischargeSummaryList.clear(); + response['List_DischargeSummary'].forEach( + (v) { + _pendingDischargeSummaryList + .add(GetDischargeSummaryResModel.fromJson(v)); }, ); }, onFailure: (String error, int statusCode) { diff --git a/lib/core/viewModel/profile/discharge_summary_view_model.dart b/lib/core/viewModel/profile/discharge_summary_view_model.dart index 29910570..9db5a6dd 100644 --- a/lib/core/viewModel/profile/discharge_summary_view_model.dart +++ b/lib/core/viewModel/profile/discharge_summary_view_model.dart @@ -15,6 +15,10 @@ class DischargeSummaryViewModel extends BaseViewModel { _dischargeSummaryService.pendingDischargeSummaryList; + List get allDisChargeSummaryList => + _dischargeSummaryService.allDischargeSummaryList; + + Future getPendingDischargeSummary({int patientId, int admissionNo, }) async { GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId ); hasError = false; @@ -28,4 +32,19 @@ class DischargeSummaryViewModel extends BaseViewModel { } } + + + Future getAllDischargeSummary({int patientId, int admissionNo, }) async { + GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId ); + hasError = false; + setState(ViewState.Busy); + await _dischargeSummaryService.getAllDischargeSummary(getDischargeSummaryReqModel: getDischargeSummaryReqModel); + if (_dischargeSummaryService.hasError) { + error = _dischargeSummaryService.error; + setState(ViewState.ErrorLocal); + } else { + setState(ViewState.Idle); + } + } + } diff --git a/lib/models/discharge_summary/GetDischargeSummaryResModel.dart b/lib/models/discharge_summary/GetDischargeSummaryResModel.dart index 006ac6a2..0be29e50 100644 --- a/lib/models/discharge_summary/GetDischargeSummaryResModel.dart +++ b/lib/models/discharge_summary/GetDischargeSummaryResModel.dart @@ -28,69 +28,69 @@ class GetDischargeSummaryResModel { int editedBy; String editedOn; bool isPatientDied; - Null isMedicineApproved; - Null isOpenBillDischarge; - Null activatedDate; - Null activatedBy; - Null lAMA; - Null patientCodition; - Null others; - Null reconciliationInstruction; + dynamic isMedicineApproved; + dynamic isOpenBillDischarge; + dynamic activatedDate; + dynamic activatedBy; + dynamic lAMA; + dynamic patientCodition; + dynamic others; + dynamic reconciliationInstruction; String dischargeInstructions; String reason; - Null dischargeDisposition; - Null hospitalID; + dynamic dischargeDisposition; + dynamic hospitalID; String createdByName; - Null createdByNameN; + dynamic createdByNameN; String editedByName; - Null editedByNameN; + dynamic editedByNameN; GetDischargeSummaryResModel( {this.setupID, - this.projectID, - this.dischargeNo, - this.dischargeDate, - this.admissionNo, - this.assessmentNo, - this.patientType, - this.patientID, - this.clinicID, - this.doctorID, - this.finalDiagnosis, - this.persentation, - this.pastHistory, - this.planOfCare, - this.investigations, - this.followupPlan, - this.conditionOnDischarge, - this.significantFindings, - this.planedProcedure, - this.daysStayed, - this.remarks, - this.eRCare, - this.status, - this.isActive, - this.createdBy, - this.createdOn, - this.editedBy, - this.editedOn, - this.isPatientDied, - this.isMedicineApproved, - this.isOpenBillDischarge, - this.activatedDate, - this.activatedBy, - this.lAMA, - this.patientCodition, - this.others, - this.reconciliationInstruction, - this.dischargeInstructions, - this.reason, - this.dischargeDisposition, - this.hospitalID, - this.createdByName, - this.createdByNameN, - this.editedByName, - this.editedByNameN}); + this.projectID, + this.dischargeNo, + this.dischargeDate, + this.admissionNo, + this.assessmentNo, + this.patientType, + this.patientID, + this.clinicID, + this.doctorID, + this.finalDiagnosis, + this.persentation, + this.pastHistory, + this.planOfCare, + this.investigations, + this.followupPlan, + this.conditionOnDischarge, + this.significantFindings, + this.planedProcedure, + this.daysStayed, + this.remarks, + this.eRCare, + this.status, + this.isActive, + this.createdBy, + this.createdOn, + this.editedBy, + this.editedOn, + this.isPatientDied, + this.isMedicineApproved, + this.isOpenBillDischarge, + this.activatedDate, + this.activatedBy, + this.lAMA, + this.patientCodition, + this.others, + this.reconciliationInstruction, + this.dischargeInstructions, + this.reason, + this.dischargeDisposition, + this.hospitalID, + this.createdByName, + this.createdByNameN, + this.editedByName, + this.editedByNameN}); GetDischargeSummaryResModel.fromJson(Map json) { setupID = json['SetupID']; 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 0ae7bf04..fcec04c4 100644 --- a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart @@ -1,66 +1,94 @@ -import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/profile/discharge_summary_view_model.dart'; +import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; -import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; +import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/material.dart'; import 'discharge_Summary_widget.dart'; - class AllDischargeSummary extends StatefulWidget { final Function changeCurrentTab; + final PatiantInformtion patient; - const AllDischargeSummary({Key key, this.changeCurrentTab}) : super(key: key); + const AllDischargeSummary({this.changeCurrentTab, this.patient}); @override _AllDischargeSummaryState createState() => _AllDischargeSummaryState(); } class _AllDischargeSummaryState extends State { - int pageIndex = 1; @override Widget build(BuildContext context) { return BaseView( onModelReady: (model) { - model.getPendingDischargeSummary(); + model.getAllDischargeSummary( + patientId: widget.patient.patientId, + admissionNo: int.parse(widget.patient.admissionNo), + ); }, builder: (_, model, w) => AppScaffold( baseViewModel: model, isShowAppBar: false, - body: model.pendingDischargeSummaryList.isEmpty - ?ErrorMessage(error: TranslationBase.of(context).noItem)// DrAppEmbeddedError(error: TranslationBase.of(context).noItem) - : Column( - children: [ - Expanded( - child: Container( - padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), - child: ListView.builder( - scrollDirection: Axis.vertical, - itemCount: model.pendingDischargeSummaryList.length, - shrinkWrap: true, - itemBuilder: (BuildContext ctxt, int index) { - return Column( - children: [ - InkWell( - child: DischargeSummaryWidget( - dischargeSummary: model - .pendingDischargeSummaryList[index]), - ), - - ], - ); - }), - ), - ), - ], - ), + body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) + model.pendingDischargeSummaryList.isEmpty + ? ErrorMessage( + error: TranslationBase.of(context).noDataAvailable) + : Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( + children: [ + AppText( + TranslationBase.of(context).discharge, + fontSize: 15.0, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', + ), + ], + ), + Row( + children: [ + AppText( + TranslationBase.of(context).summary, + fontSize: 25.0, + fontWeight: FontWeight.w700, + ), + ], + ), + ], + ), + ), + Expanded( + child: Container( + padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), + child: ListView.builder( + scrollDirection: Axis.vertical, + itemCount: + model.pendingDischargeSummaryList.length, + shrinkWrap: true, + itemBuilder: (BuildContext ctxt, int index) { + return Column( + children: [ + InkWell( + child: DischargeSummaryWidget( + dischargeSummary: + model.pendingDischargeSummaryList[ + 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 f4c67442..88f150e5 100644 --- a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart +++ b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart @@ -1,19 +1,17 @@ -import 'package:doctor_app_flutter/config/config.dart'; 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/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/discharge_summary/GetDischargeSummaryResModel.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; +import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; class DischargeSummaryWidget extends StatefulWidget { final GetDischargeSummaryResModel dischargeSummary; @@ -26,27 +24,54 @@ class DischargeSummaryWidget extends StatefulWidget { } class _DischargeSummaryWidgetState extends State { + bool isCardExpanded = true; @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return Container( - child: CardWithBgWidget( - bgColor:Colors.transparent, - hasBorder: false, - widget: Container( - child: InkWell( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( + return Column( + children: [ + Container( + width: double.infinity, + 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( + Radius.circular(10.0), + ), + border: Border.all(color: Colors.grey[200], width: 0.5), + ), + child: Padding( + padding: EdgeInsets.all(15.0), + child: HeaderBodyExpandableNotifier( + headerWidget: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Column( - crossAxisAlignment: CrossAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - AppDateUtils.getDateTimeFromServerFormat( + CustomRow( + label: TranslationBase.of(context).doctorName + ": ", + value: widget.dischargeSummary.doctorID.toString() ?? + "".toString(), + isCopyable: false, + ), + CustomRow( + label: TranslationBase.of(context).branch + ": ", + value: widget.dischargeSummary.projectID.toString() ?? + "".toString(), + isCopyable: false, + ), + CustomRow( + label: TranslationBase.of(context).clinicName + ": ", + value: widget.dischargeSummary.clinicID.toString() ?? + "".toString(), + isCopyable: false, + ), + CustomRow( + label: TranslationBase.of(context).dischargeDate + ": ", + value: AppDateUtils.getDateTimeFromServerFormat( widget.dischargeSummary.createdOn) .day .toString() + @@ -62,61 +87,149 @@ class _DischargeSummaryWidgetState extends State { widget.dischargeSummary.createdOn) .year .toString(), - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, + isCopyable: false, ), - AppText( - AppDateUtils.getDateTimeFromServerFormat( - widget.dischargeSummary.createdOn) - .hour - .toString() + - ":" + - AppDateUtils.getDateTimeFromServerFormat( - widget.dischargeSummary.createdOn) - .minute - .toString(), - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - ) + ], + ), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + InkWell( + onTap: () { + setState(() { + isCardExpanded = !isCardExpanded; + }); + }, + child: Icon(isCardExpanded + ? EvaIcons.arrowUp + : EvaIcons.arrowDown)) ], ), ], ), - SizedBox( - height: 20, - ), - - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, + bodyWidget: Row( children: [ - SizedBox( - width: 20, - ), Column( - crossAxisAlignment: CrossAxisAlignment.start, children: [ - // SizedBox(height: 10,), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CustomRow( - label: TranslationBase.of(context).fileNumber, - value: widget.dischargeSummary.patientID.toString(), - isCopyable:false, - ), - SizedBox( - height: 8, - ), + SizedBox( + height: 15.0, + ), + AppText("More Details"), + SizedBox( + height: 15.0, + ), + Container( + width: MediaQuery.of(context).size.width * 0.5, + child: RichText( + maxLines: 3, + overflow: TextOverflow.ellipsis, + text: new TextSpan( + style: new TextStyle( + fontSize: 1.3 * SizeConfig.textMultiplier, + color: Color(0xFF575757)), + children: [ + new TextSpan( + text: "Past History" + ": ", + style: TextStyle( + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 2.8, + color: Color(0xFF575757), + //TranslationBase.of(context).doctorResponse + " : ", + )), + new TextSpan( + text: Helpers.parseHtmlString( + widget.dischargeSummary.pastHistory), + style: TextStyle( + fontFamily: 'Poppins', + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 3, + color: Color(0xFF2E303A), + fontWeight: FontWeight.w700, + )), ], ), - ], + ), + ), + SizedBox( + height: 5.0, + ), + Container( + width: MediaQuery.of(context).size.width * 0.5, + child: RichText( + maxLines: 3, + overflow: TextOverflow.ellipsis, + text: new TextSpan( + style: new TextStyle( + fontSize: 1.3 * SizeConfig.textMultiplier, + color: Color(0xFF575757)), + children: [ + new TextSpan( + text: "Investigations" + ": ", + style: TextStyle( + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 2.8, + color: Color(0xFF575757), + //TranslationBase.of(context).doctorResponse + " : ", + )), + new TextSpan( + text: Helpers.parseHtmlString( + widget.dischargeSummary.investigations ?? + ""), + style: TextStyle( + fontFamily: 'Poppins', + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 3, + color: Color(0xFF2E303A), + fontWeight: FontWeight.w700, + )), + ], + ), + ), + ), + SizedBox( + height: 5.0, + ), + Container( + width: MediaQuery.of(context).size.width * 0.5, + child: RichText( + maxLines: 3, + overflow: TextOverflow.ellipsis, + text: new TextSpan( + style: new TextStyle( + fontSize: 1.3 * SizeConfig.textMultiplier, + color: Color(0xFF575757)), + children: [ + new TextSpan( + text: "Condition On Discharge" + ": ", + style: TextStyle( + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 2.8, + color: Color(0xFF575757), + //TranslationBase.of(context).doctorResponse + " : ", + )), + new TextSpan( + text: Helpers.parseHtmlString(widget + .dischargeSummary.conditionOnDischarge), + style: TextStyle( + fontFamily: 'Poppins', + fontSize: SizeConfig + .getTextMultiplierBasedOnWidth() * + 3, + color: Color(0xFF2E303A), + fontWeight: FontWeight.w700, + )), + ], + ), + ), + ), + SizedBox( + height: 5.0, ), - Container( width: MediaQuery.of(context).size.width * 0.5, child: RichText( @@ -128,9 +241,7 @@ class _DischargeSummaryWidgetState extends State { color: Color(0xFF575757)), children: [ new TextSpan( - text: - TranslationBase.of(context).requestType + - ": ", + text: "Planed Procedure" + ": ", style: TextStyle( fontSize: SizeConfig .getTextMultiplierBasedOnWidth() * @@ -139,8 +250,8 @@ class _DischargeSummaryWidgetState extends State { //TranslationBase.of(context).doctorResponse + " : ", )), new TextSpan( - text: - "${widget.dischargeSummary.dischargeInstructions}", + text: Helpers.parseHtmlString( + widget.dischargeSummary.planedProcedure), style: TextStyle( fontFamily: 'Poppins', fontSize: SizeConfig @@ -157,15 +268,130 @@ class _DischargeSummaryWidgetState extends State { ) ], ), - // Container( - // alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, - // child: Icon(FontAwesomeIcons.arrowRight, - // size: 20, color: Colors.black),) - ], + isExpand: isCardExpanded, + // widget: Container( + // child: InkWell( + // child: Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // children: [], + // ), + // SizedBox( + // height: 20, + // ), + // + // Row( + // crossAxisAlignment: CrossAxisAlignment.start, + // mainAxisAlignment: MainAxisAlignment.start, + // children: [ + // SizedBox( + // width: 20, + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // // SizedBox(height: 10,), + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // Column( + // crossAxisAlignment: CrossAxisAlignment.start, + // children: [ + // CustomRow( + // label: TranslationBase.of(context) + // .fileNumber, + // value: widget.dischargeSummary.patientID + // .toString(), + // isCopyable: false, + // ), + // SizedBox( + // height: 8, + // ), + // ], + // ), + // ], + // ), + // + // Container( + // width: MediaQuery.of(context).size.width * 0.5, + // child: RichText( + // maxLines: 3, + // overflow: TextOverflow.ellipsis, + // text: new TextSpan( + // style: new TextStyle( + // fontSize: 1.3 * SizeConfig.textMultiplier, + // color: Color(0xFF575757)), + // children: [ + // new TextSpan( + // text: TranslationBase.of(context) + // .requestType + + // ": ", + // style: TextStyle( + // fontSize: SizeConfig + // .getTextMultiplierBasedOnWidth() * + // 2.8, + // color: Color(0xFF575757), + // //TranslationBase.of(context).doctorResponse + " : ", + // )), + // new TextSpan( + // text: Helpers.parseHtmlString(widget + // .dischargeSummary.pastHistory), + // style: TextStyle( + // fontFamily: 'Poppins', + // fontSize: SizeConfig + // .getTextMultiplierBasedOnWidth() * + // 3, + // color: Color(0xFF2E303A), + // fontWeight: FontWeight.w700, + // )), + // ], + // ), + // ), + // ), + // ], + // ) + // ], + // ), + // Column( + // crossAxisAlignment: CrossAxisAlignment.end, + // children: [ + // AppText( + // AppDateUtils.getDateTimeFromServerFormat( + // widget.dischargeSummary.createdOn) + // .day + // .toString() + + // " " + + // AppDateUtils.getMonth( + // AppDateUtils.getDateTimeFromServerFormat( + // widget.dischargeSummary.createdOn) + // .month) + // .toString() + // .substring(0, 3) + + // ' ' + + // AppDateUtils.getDateTimeFromServerFormat( + // widget.dischargeSummary.createdOn) + // .year + // .toString(), + // fontFamily: 'Poppins', + // fontWeight: FontWeight.w600, + // ), + // ], + // ), + // // Container( + // // alignment: projectViewModel.isArabic?Alignment.centerLeft:Alignment.centerRight, + // // child: Icon(FontAwesomeIcons.arrowRight, + // // size: 20, color: Colors.black),) + // ], + // ), + // // onTap: onTap, + // )), + ), ), - // onTap: onTap, - )), - ), + ), + ], ); } } diff --git a/lib/screens/patients/profile/discharge_summary/discharge_summary.dart b/lib/screens/patients/profile/discharge_summary/discharge_summary.dart index 1625d7bb..31935fcf 100644 --- a/lib/screens/patients/profile/discharge_summary/discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/discharge_summary.dart @@ -1,18 +1,9 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:doctor_app_flutter/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_repaly_chat.dart'; -import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.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/dr_app_circular_progress_Indeicator.dart'; -import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; -import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -23,7 +14,8 @@ import 'pending_discharge_summary.dart'; class DischargeSummaryPage extends StatefulWidget { final Function changeCurrentTab; - const DischargeSummaryPage({Key key, this.changeCurrentTab}) : super(key: key); + const DischargeSummaryPage({Key key, this.changeCurrentTab}) + : super(key: key); @override _DoctorReplyScreenState createState() => _DoctorReplyScreenState(); @@ -125,8 +117,10 @@ class _DoctorReplyScreenState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ - PendingDischargeSummary(patient:patient ,), - AllDischargeSummary(), + PendingDischargeSummary( + patient: patient, + ), + AllDischargeSummary(patient: patient), ], ), ), diff --git a/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart b/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart index 3981163e..ef70020a 100644 --- a/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart @@ -33,9 +33,8 @@ class _PendingDischargeSummaryState extends State { return BaseView( onModelReady: (model) { model.getPendingDischargeSummary( - patientId: widget.patient.patientId, - admissionNo: int.parse(widget.patient.admissionNo), - + patientId: widget.patient.patientId, + admissionNo: int.parse(widget.patient.admissionNo), ); }, builder: (_, model, w) => AppScaffold( diff --git a/lib/screens/patients/profile/pending_orders/pending_orders_screen.dart b/lib/screens/patients/profile/pending_orders/pending_orders_screen.dart index a03ca3c5..e9e4f8b2 100644 --- a/lib/screens/patients/profile/pending_orders/pending_orders_screen.dart +++ b/lib/screens/patients/profile/pending_orders/pending_orders_screen.dart @@ -36,28 +36,60 @@ class PendingOrdersScreen extends StatelessWidget { model.pendingOrdersList.length == 0 ? DrAppEmbeddedError( error: TranslationBase.of(context).noDataAvailable) - : Container( - child: ListView.builder( - itemCount: model.pendingOrdersList.length, - itemBuilder: (BuildContext ctxt, int index) { - return Padding( - padding: EdgeInsets.all(8.0), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(10.0), + : Column( + children: [ + Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + children: [ + Row( + children: [ + AppText( + TranslationBase.of(context).pending, + fontSize: 15.0, + fontWeight: FontWeight.w600, + fontFamily: 'Poppins', ), - border: Border.all( - color: Color(0xFF707070), width: 0.30), - ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: - AppText(model.pendingOrdersList[index].notes), - ), + ], ), - ); - })), + Row( + children: [ + AppText( + TranslationBase.of(context).orders, + fontSize: 25.0, + fontWeight: FontWeight.w700, + ), + ], + ), + ], + ), + ), + Container( + child: ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + itemCount: model.pendingOrdersList.length, + itemBuilder: (BuildContext ctxt, int index) { + return Padding( + padding: EdgeInsets.all(8.0), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.all( + Radius.circular(10.0), + ), + border: Border.all( + color: Color(0xFF707070), width: 0.30), + ), + child: Padding( + padding: EdgeInsets.all(8.0), + child: AppText( + model.pendingOrdersList[index].notes), + ), + ), + ); + })), + ], + ), ), ); }