From dfce0d20e24f847d35fc83b430a9ba0b639c60a8 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Tue, 16 Nov 2021 14:02:12 +0200 Subject: [PATCH] discharge summary card --- .../profile/discharge_summary_servive.dart | 5 +- .../GetDischargeSummaryResModel.dart | 11 +- .../all_discharge_summary.dart | 10 +- .../discharge_Summary_widget.dart | 130 +----------------- .../pending_discharge_summary.dart | 35 ++++- 5 files changed, 50 insertions(+), 141 deletions(-) diff --git a/lib/core/service/patient/profile/discharge_summary_servive.dart b/lib/core/service/patient/profile/discharge_summary_servive.dart index 12de09ac..a92ef0eb 100644 --- a/lib/core/service/patient/profile/discharge_summary_servive.dart +++ b/lib/core/service/patient/profile/discharge_summary_servive.dart @@ -40,11 +40,10 @@ class DischargeSummaryService extends BaseService { hasError = false; await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY, onSuccess: (dynamic response, int statusCode) { - _pendingDischargeSummaryList.clear(); + _allDischargeSummaryList.clear(); response['List_DischargeSummary'].forEach( (v) { - _pendingDischargeSummaryList - .add(GetDischargeSummaryResModel.fromJson(v)); + _allDischargeSummaryList.add(GetDischargeSummaryResModel.fromJson(v)); }, ); }, onFailure: (String error, int statusCode) { diff --git a/lib/models/discharge_summary/GetDischargeSummaryResModel.dart b/lib/models/discharge_summary/GetDischargeSummaryResModel.dart index 0be29e50..10ddab00 100644 --- a/lib/models/discharge_summary/GetDischargeSummaryResModel.dart +++ b/lib/models/discharge_summary/GetDischargeSummaryResModel.dart @@ -44,6 +44,8 @@ class GetDischargeSummaryResModel { dynamic createdByNameN; String editedByName; dynamic editedByNameN; + String clinicName; + String projectName; GetDischargeSummaryResModel( {this.setupID, @@ -90,7 +92,9 @@ class GetDischargeSummaryResModel { this.createdByName, this.createdByNameN, this.editedByName, - this.editedByNameN}); + this.editedByNameN, + this.clinicName, + this.projectName}); GetDischargeSummaryResModel.fromJson(Map json) { setupID = json['SetupID']; @@ -138,6 +142,8 @@ class GetDischargeSummaryResModel { createdByNameN = json['CreatedByNameN']; editedByName = json['EditedByName']; editedByNameN = json['EditedByNameN']; + clinicName = json['ClinicDescription']; + projectName = json['ProjectName']; } Map toJson() { @@ -187,6 +193,9 @@ class GetDischargeSummaryResModel { data['CreatedByNameN'] = this.createdByNameN; data['EditedByName'] = this.editedByName; data['EditedByNameN'] = this.editedByNameN; + data['ClinicDescription'] = this.clinicName; + data['ProjectName'] = this.projectName; + return data; } } 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 fcec04c4..f29315ae 100644 --- a/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart @@ -34,7 +34,7 @@ class _AllDischargeSummaryState extends State { baseViewModel: model, isShowAppBar: false, body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) - model.pendingDischargeSummaryList.isEmpty + model.allDisChargeSummaryList.isEmpty ? ErrorMessage( error: TranslationBase.of(context).noDataAvailable) : Column( @@ -70,17 +70,15 @@ class _AllDischargeSummaryState extends State { padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), child: ListView.builder( scrollDirection: Axis.vertical, - itemCount: - model.pendingDischargeSummaryList.length, + itemCount: model.allDisChargeSummaryList.length, shrinkWrap: true, itemBuilder: (BuildContext ctxt, int index) { return Column( children: [ InkWell( child: DischargeSummaryWidget( - dischargeSummary: - model.pendingDischargeSummaryList[ - index]), + 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 88f150e5..c1e72f96 100644 --- a/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart +++ b/lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart @@ -24,7 +24,7 @@ class DischargeSummaryWidget extends StatefulWidget { } class _DischargeSummaryWidgetState extends State { - bool isCardExpanded = true; + bool isCardExpanded = false; @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -53,19 +53,20 @@ class _DischargeSummaryWidgetState extends State { children: [ CustomRow( label: TranslationBase.of(context).doctorName + ": ", - value: widget.dischargeSummary.doctorID.toString() ?? - "".toString(), + value: + widget.dischargeSummary.createdByName.toString() ?? + "".toString(), isCopyable: false, ), CustomRow( label: TranslationBase.of(context).branch + ": ", - value: widget.dischargeSummary.projectID.toString() ?? + value: widget.dischargeSummary.projectName.toString() ?? "".toString(), isCopyable: false, ), CustomRow( label: TranslationBase.of(context).clinicName + ": ", - value: widget.dischargeSummary.clinicID.toString() ?? + value: widget.dischargeSummary.clinicName.toString() ?? "".toString(), isCopyable: false, ), @@ -269,125 +270,6 @@ class _DischargeSummaryWidgetState extends State { ], ), 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, - // )), ), ), ), 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 ef70020a..4984999f 100644 --- a/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart +++ b/lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart @@ -1,16 +1,11 @@ -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 PendingDischargeSummary extends StatefulWidget { @@ -43,9 +38,35 @@ class _PendingDischargeSummaryState extends State { body: model.pendingDischargeSummaryList.isEmpty ? ErrorMessage( error: TranslationBase.of(context) - .noItem) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) + .noDataAvailable) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) : 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),