Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

discharge summary card

Browse Source
discharge_report
hussam al-habibeh 3 years ago
parent 37d4dfffa2
commit dfce0d20e2
5 changed files with 50 additions and 141 deletions
Show Stats Download Patch File Download Diff File

5
lib/core/service/patient/profile/discharge_summary_servive.dart
Unescape Escape View File

@ -40,11 +40,10 @@ class DischargeSummaryService extends BaseService {
hasError = false; hasError = false;
await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY, await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_pendingDischargeSummaryList.clear(); _allDischargeSummaryList.clear();
response['List_DischargeSummary'].forEach( response['List_DischargeSummary'].forEach(
(v) { (v) {
_pendingDischargeSummaryList _allDischargeSummaryList.add(GetDischargeSummaryResModel.fromJson(v));
.add(GetDischargeSummaryResModel.fromJson(v));
}, },
); );
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {

11
lib/models/discharge_summary/GetDischargeSummaryResModel.dart
Unescape Escape View File

@ -44,6 +44,8 @@ class GetDischargeSummaryResModel {
dynamic createdByNameN; dynamic createdByNameN;
String editedByName; String editedByName;
dynamic editedByNameN; dynamic editedByNameN;
String clinicName;
String projectName;
GetDischargeSummaryResModel( GetDischargeSummaryResModel(
{this.setupID, {this.setupID,
@ -90,7 +92,9 @@ class GetDischargeSummaryResModel {
this.createdByName, this.createdByName,
this.createdByNameN, this.createdByNameN,
this.editedByName, this.editedByName,
this.editedByNameN}); this.editedByNameN,
this.clinicName,
this.projectName});
GetDischargeSummaryResModel.fromJson(Map<String, dynamic> json) { GetDischargeSummaryResModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];
@ -138,6 +142,8 @@ class GetDischargeSummaryResModel {
createdByNameN = json['CreatedByNameN']; createdByNameN = json['CreatedByNameN'];
editedByName = json['EditedByName']; editedByName = json['EditedByName'];
editedByNameN = json['EditedByNameN']; editedByNameN = json['EditedByNameN'];
clinicName = json['ClinicDescription'];
projectName = json['ProjectName'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -187,6 +193,9 @@ class GetDischargeSummaryResModel {
data['CreatedByNameN'] = this.createdByNameN; data['CreatedByNameN'] = this.createdByNameN;
data['EditedByName'] = this.editedByName; data['EditedByName'] = this.editedByName;
data['EditedByNameN'] = this.editedByNameN; data['EditedByNameN'] = this.editedByNameN;
data['ClinicDescription'] = this.clinicName;
data['ProjectName'] = this.projectName;
return data; return data;
} }
} }

10
lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart
Unescape Escape View File

@ -34,7 +34,7 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
baseViewModel: model, baseViewModel: model,
isShowAppBar: false, isShowAppBar: false,
body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) body: // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
model.pendingDischargeSummaryList.isEmpty model.allDisChargeSummaryList.isEmpty
? ErrorMessage( ? ErrorMessage(
error: TranslationBase.of(context).noDataAvailable) error: TranslationBase.of(context).noDataAvailable)
: Column( : Column(
@ -70,17 +70,15 @@ class _AllDischargeSummaryState extends State<AllDischargeSummary> {
padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
itemCount: itemCount: model.allDisChargeSummaryList.length,
model.pendingDischargeSummaryList.length,
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return Column( return Column(
children: [ children: [
InkWell( InkWell(
child: DischargeSummaryWidget( child: DischargeSummaryWidget(
dischargeSummary: dischargeSummary: model
model.pendingDischargeSummaryList[ .allDisChargeSummaryList[index]),
index]),
), ),
], ],
); );

130
lib/screens/patients/profile/discharge_summary/discharge_Summary_widget.dart
Unescape Escape View File

@ -24,7 +24,7 @@ class DischargeSummaryWidget extends StatefulWidget {
} }
class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> { class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
bool isCardExpanded = true; bool isCardExpanded = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -53,19 +53,20 @@ class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
children: [ children: [
CustomRow( CustomRow(
label: TranslationBase.of(context).doctorName + ": ", label: TranslationBase.of(context).doctorName + ": ",
value: widget.dischargeSummary.doctorID.toString() ?? value:
"".toString(), widget.dischargeSummary.createdByName.toString() ??
"".toString(),
isCopyable: false, isCopyable: false,
), ),
CustomRow( CustomRow(
label: TranslationBase.of(context).branch + ": ", label: TranslationBase.of(context).branch + ": ",
value: widget.dischargeSummary.projectID.toString() ?? value: widget.dischargeSummary.projectName.toString() ??
"".toString(), "".toString(),
isCopyable: false, isCopyable: false,
), ),
CustomRow( CustomRow(
label: TranslationBase.of(context).clinicName + ": ", label: TranslationBase.of(context).clinicName + ": ",
value: widget.dischargeSummary.clinicID.toString() ?? value: widget.dischargeSummary.clinicName.toString() ??
"".toString(), "".toString(),
isCopyable: false, isCopyable: false,
), ),
@ -269,125 +270,6 @@ class _DischargeSummaryWidgetState extends State<DischargeSummaryWidget> {
], ],
), ),
isExpand: isCardExpanded, 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: <TextSpan>[
// 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,
// )),
), ),
), ),
), ),

35
lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart
Unescape Escape View File

@ -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/core/viewModel/profile/discharge_summary_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_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/base/base_view.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.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/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'discharge_Summary_widget.dart'; import 'discharge_Summary_widget.dart';
class PendingDischargeSummary extends StatefulWidget { class PendingDischargeSummary extends StatefulWidget {
@ -43,9 +38,35 @@ class _PendingDischargeSummaryState extends State<PendingDischargeSummary> {
body: model.pendingDischargeSummaryList.isEmpty body: model.pendingDischargeSummaryList.isEmpty
? ErrorMessage( ? ErrorMessage(
error: TranslationBase.of(context) error: TranslationBase.of(context)
.noItem) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem) .noDataAvailable) // DrAppEmbeddedError(error: TranslationBase.of(context).noItem)
: Column( : Column(
children: [ 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( Expanded(
child: Container( child: Container(
padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0), padding: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),

Write Preview
Loading…
Cancel
Save