From f6d30178bfe75c7ef41b8885746681876e64746f Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 24 Aug 2020 10:37:36 +0300 Subject: [PATCH] done medical report --- lib/config/config.dart | 1 + lib/core/model/reports/Reports.dart | 76 ++++--- .../model/reports/request_report_history.dart | 76 +++++++ lib/core/service/medical/reports_service.dart | 113 ++++++---- .../medical/prescriptions_view_model.dart | 2 +- .../medical/reports_view_model.dart | 143 +++++------- lib/pages/feedback/appointment_history.dart | 4 +- lib/pages/medical/medical_profile_page.dart | 8 +- .../medical/reports/report_home_page.dart | 65 ++++-- .../medical/reports/report_list_widget.dart | 64 ++++++ lib/pages/medical/reports/reports_page.dart | 212 +++++++++++++++++- 11 files changed, 550 insertions(+), 214 deletions(-) create mode 100644 lib/core/model/reports/request_report_history.dart create mode 100644 lib/pages/medical/reports/report_list_widget.dart diff --git a/lib/config/config.dart b/lib/config/config.dart index 257a4684..b3e12498 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -47,6 +47,7 @@ const GET_PATIENT_VITAL_SIGN = '/Doctors.svc/REST/Doctor_GetPatientVitalSign'; ///Reports const REPORTS = '/Doctors.svc/REST/GetPatientMedicalReportStatusInfo'; +const INSERT_REQUEST_FOR_MEDICAL_REPORT = '/Doctors.svc/REST/InsertRequestForMedicalReport'; //const BASE_URL = 'https://hmgwebservices.com/'; // Production Environment diff --git a/lib/core/model/reports/Reports.dart b/lib/core/model/reports/Reports.dart index eb09c0c5..a8a5869d 100644 --- a/lib/core/model/reports/Reports.dart +++ b/lib/core/model/reports/Reports.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; + class Reports { int status; DateTime encounterDate; @@ -31,37 +32,38 @@ class Reports { Reports( {this.status, - this.encounterDate, - this.projectID, - this.invoiceNo, - this.encounterNo, - this.procedureId, - this.requestType, - this.setupId, - this.patientID, - this.doctorID, - this.clinicID, - this.requestDate, - this.isRead, - this.isReadOn, - this.actualDoctorRate, - this.clinicDescription, - this.clinicDescriptionN, - this.docName, - this.docNameN, - this.doctorImageURL, - this.doctorName, - this.doctorNameN, - this.doctorRate, - this.isDoctorAllowVedioCall, - this.isExecludeDoctor, - this.noOfPatientsRate, - this.projectName, - this.projectNameN}); + this.encounterDate, + this.projectID, + this.invoiceNo, + this.encounterNo, + this.procedureId, + this.requestType, + this.setupId, + this.patientID, + this.doctorID, + this.clinicID, + this.requestDate, + this.isRead, + this.isReadOn, + this.actualDoctorRate, + this.clinicDescription, + this.clinicDescriptionN, + this.docName, + this.docNameN, + this.doctorImageURL, + this.doctorName, + this.doctorNameN, + this.doctorRate, + this.isDoctorAllowVedioCall, + this.isExecludeDoctor, + this.noOfPatientsRate, + this.projectName, + this.projectNameN}); Reports.fromJson(Map json) { status = json['Status']; - encounterDate = DateUtil.convertStringToDate(json['EncounterDate']);//json['EncounterDate']; + encounterDate = DateUtil.convertStringToDate( + json['EncounterDate']); //json['EncounterDate']; projectID = json['ProjectID']; invoiceNo = json['InvoiceNo']; encounterNo = json['EncounterNo']; @@ -71,9 +73,11 @@ class Reports { patientID = json['PatientID']; doctorID = json['DoctorID']; clinicID = json['ClinicID']; - requestDate = DateUtil.convertStringToDate(json['RequestDate']);//json['RequestDate']; + requestDate = DateUtil.convertStringToDate( + json['RequestDate']); //json['RequestDate']; isRead = json['IsRead']; - isReadOn =DateUtil.convertStringToDate(json['IsReadOn']); //json['IsReadOn']; + isReadOn = + DateUtil.convertStringToDate(json['IsReadOn']); //json['IsReadOn']; actualDoctorRate = json['ActualDoctorRate']; clinicDescription = json['ClinicDescription']; clinicDescriptionN = json['ClinicDescriptionN']; @@ -124,14 +128,12 @@ class Reports { } } +class ReportsList { + String filterName = ""; + + List reportsList = List(); -class ReportsList{ - String filterName=""; - // int filterName=1; - ListreportsList=List(); - ReportsList({this.filterName,Reports reports}){ + ReportsList({this.filterName, Reports reports}) { reportsList.add(reports); } - - } diff --git a/lib/core/model/reports/request_report_history.dart b/lib/core/model/reports/request_report_history.dart new file mode 100644 index 00000000..f7d02cc5 --- /dev/null +++ b/lib/core/model/reports/request_report_history.dart @@ -0,0 +1,76 @@ +class RequestReportHistory { + int projectID; + int clinicID; + bool isForMedicalReport; + double versionID; + int channel; + int languageID; + String iPAdress; + String generalid; + int patientOutSA; + String sessionID; + bool isDentalAllowedBackend; + int deviceTypeID; + int patientID; + String tokenID; + int patientTypeID; + int patientType; + + RequestReportHistory( + {this.projectID, + this.clinicID, + this.isForMedicalReport, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); + + RequestReportHistory.fromJson(Map json) { + projectID = json['ProjectID']; + clinicID = json['ClinicID']; + isForMedicalReport = json['IsForMedicalReport']; + versionID = json['VersionID']; + channel = json['Channel']; + languageID = json['LanguageID']; + iPAdress = json['IPAdress']; + generalid = json['generalid']; + patientOutSA = json['PatientOutSA']; + sessionID = json['SessionID']; + isDentalAllowedBackend = json['isDentalAllowedBackend']; + deviceTypeID = json['DeviceTypeID']; + patientID = json['PatientID']; + tokenID = json['TokenID']; + patientTypeID = json['PatientTypeID']; + patientType = json['PatientType']; + } + + Map toJson() { + final Map data = new Map(); + data['ProjectID'] = this.projectID; + data['ClinicID'] = this.clinicID; + data['IsForMedicalReport'] = this.isForMedicalReport; + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['LanguageID'] = this.languageID; + data['IPAdress'] = this.iPAdress; + data['generalid'] = this.generalid; + data['PatientOutSA'] = this.patientOutSA; + data['SessionID'] = this.sessionID; + data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; + data['DeviceTypeID'] = this.deviceTypeID; + data['PatientID'] = this.patientID; + data['TokenID'] = this.tokenID; + data['PatientTypeID'] = this.patientTypeID; + data['PatientType'] = this.patientType; + return data; + } +} diff --git a/lib/core/service/medical/reports_service.dart b/lib/core/service/medical/reports_service.dart index 6e965e33..b8e5f426 100644 --- a/lib/core/service/medical/reports_service.dart +++ b/lib/core/service/medical/reports_service.dart @@ -2,21 +2,20 @@ import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/core/model/reports/Reports.dart'; import 'package:diplomaticquarterapp/core/model/reports/request_reports.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; +import 'package:diplomaticquarterapp/pages/feedback/appointment_history.dart'; - - -class ReportsService extends BaseService{ - +class ReportsService extends BaseService { List reportsList = List(); + List appointHistoryList = List(); - RequestReports _requestReports=RequestReports( - isReport: true, - encounterType: 1, - requestType: 1, - versionID: 5.5, - channel: 3, - languageID: 2, - iPAdress: "10.20.10.20", + RequestReports _requestReports = RequestReports( + isReport: true, + encounterType: 1, + requestType: 1, + versionID: 5.5, + channel: 3, + languageID: 2, + iPAdress: "10.20.10.20", generalid: 'Cs2020@2016\$2958', patientOutSA: 0, sessionID: 'KIbLoqkytuKJEWECHQ', @@ -25,42 +24,60 @@ class ReportsService extends BaseService{ patientID: 1231755, tokenID: '@dm!n', patientTypeID: 1, - patientType: 1 - - - ); - Future getReports() async { - hasError = false; - await baseAppClient.post(REPORTS, - onSuccess: (dynamic response, int statusCode) - { - reportsList.clear(); - - response['GetPatientMedicalStatus'].forEach((reports) { - reportsList.add(Reports.fromJson(reports)); - }); - },onFailure: (String error,int statusCode){ - hasError = true; - super.error = error; - },body: _requestReports.toJson()); - - } - - + patientType: 1); + Future getReports() async { + hasError = false; + await baseAppClient.post(REPORTS, + onSuccess: (dynamic response, int statusCode) { + reportsList.clear(); + response['GetPatientMedicalStatus'].forEach((reports) { + reportsList.add(Reports.fromJson(reports)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: _requestReports.toJson()); + } -// Future getPrescriptions() async { -// hasError = false; -// await baseAppClient.post(PRESCRIPTIONS, -// onSuccess: (dynamic response, int statusCode) { -// prescriptionsList.clear(); -// response['PatientPrescriptionList'].forEach((prescriptions) { -// prescriptionsList.add(Prescriptions.fromJson(prescriptions)); -// }); -// }, onFailure: (String error, int statusCode) { -// hasError = true; -// super.error = error; -// }, body: _requestPrescriptions.toJson()); -// } + Future getPatentAppointmentHistory() async { + hasError = false; + Map body = new Map(); + body['IsForMedicalReport'] = true; + await baseAppClient.post(GET_PATIENT_AppointmentHistory, + onSuccess: (dynamic response, int statusCode) { + appointHistoryList = []; + response['AppoimentAllHistoryResultList'].forEach((appoint) { + appointHistoryList.add(AppointmentHistory.fromJson(appoint)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } -} \ No newline at end of file + Future insertRequestForMedicalReport( + AppointmentHistory appointmentHistory) async { + Map body = new Map(); + body['ClinicID'] = appointmentHistory.clinicID; + body['DoctorID'] = appointmentHistory.doctorID; + body['SetupID'] = appointmentHistory.setupID; + body['EncounterNo'] = appointmentHistory.appointmentNo; + body['EncounterType'] = 1;// appointmentHistory.appointmentType; + body['IsActive'] = appointmentHistory.isActiveDoctor; + body['ProjectID'] = appointmentHistory.projectID; + body['Remarks'] = ""; + body['ProcedureId'] = ""; + body['RequestType'] = 1; + body['Source'] = 2; + body['Status'] = 1; + body['CreatedBy'] = 102; + hasError = false; + await baseAppClient.post(INSERT_REQUEST_FOR_MEDICAL_REPORT, + onSuccess: (dynamic response, int statusCode) {}, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } +} diff --git a/lib/core/viewModels/medical/prescriptions_view_model.dart b/lib/core/viewModels/medical/prescriptions_view_model.dart index f67df015..27b954d4 100644 --- a/lib/core/viewModels/medical/prescriptions_view_model.dart +++ b/lib/core/viewModels/medical/prescriptions_view_model.dart @@ -125,7 +125,7 @@ class PrescriptionsViewModel extends BaseViewModel { if (_prescriptionsService.hasError) { error = _prescriptionsService.error; setState(ViewState.ErrorLocal); - AppToast.showSuccessToast(message: error); + AppToast.showErrorToast(message: error); } else { AppToast.showSuccessToast(message: 'A copy has been sent to the e-mail'); setState(ViewState.Idle); diff --git a/lib/core/viewModels/medical/reports_view_model.dart b/lib/core/viewModels/medical/reports_view_model.dart index e0a4d8fb..e0fdfaa3 100644 --- a/lib/core/viewModels/medical/reports_view_model.dart +++ b/lib/core/viewModels/medical/reports_view_model.dart @@ -1,15 +1,10 @@ -//import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart'; - +import 'package:diplomaticquarterapp/pages/feedback/appointment_history.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import '../../../core/enum/reportfilter_type.dart'; import '../../../core/enum/viewstate.dart'; -//import '../../../core/model/prescriptions/Prescriptions.dart'; import '../../../core/model/reports/Reports.dart'; - -//import '../../../core/service/medical/prescriptions_service.dart'; import '../../../core/service/medical/reports_service.dart'; - import '../../../locator.dart'; import '../base_view_model.dart'; @@ -18,35 +13,20 @@ class ReportsViewModel extends BaseViewModel { ReportsService _reportsService = locator(); - List _reportsOrderRequestList = List(); - List _reportsOrderReadyList = List(); - List _reportsOrderCompletedList = List(); - List _reportsOrderCanceledList = List(); - - List get reportsList => _reportsService.reportsList; + List reportsOrderRequestList = List(); + List reportsOrderReadyList = List(); + List reportsOrderCompletedList = List(); + List reportsOrderCanceledList = List(); - ///// - List get reportsOrderList { - switch (filterType) { - case ReportFilterType.Requested: - return _reportsOrderRequestList; - break; - - case ReportFilterType.Ready: - return _reportsOrderReadyList; - break; - - case ReportFilterType.Completed: - return _reportsOrderCompletedList; - break; - - default: - return _reportsOrderCanceledList; - } - } + List get appointHistoryList => + _reportsService.appointHistoryList; getReports() async { setState(ViewState.Busy); + reportsOrderRequestList.clear(); + reportsOrderReadyList.clear(); + reportsOrderCompletedList.clear(); + reportsOrderCanceledList.clear(); await _reportsService.getReports(); if (_reportsService.hasError) { error = _reportsService.error; @@ -57,71 +37,48 @@ class ReportsViewModel extends BaseViewModel { } } -//////////////////////// - void _filterList() { - _reportsService.reportsList.forEach((element) { - /// ReportsList list sort Request - List reportsByRequest = _reportsOrderRequestList - .where((elementStatus) => elementStatus.filterName == element.status) - .toList(); - - if (reportsByRequest.length != 0) { - _reportsOrderRequestList[ - _reportsOrderRequestList.indexOf(reportsByRequest[0])] - .reportsList - .add(element); - } else { - _reportsOrderRequestList.add(ReportsList( - filterName: element.clinicDescription, reports: element)); - } - //////// - /// ReportsList list sort Ready - List reportsByReady = _reportsOrderReadyList - .where((elementStatus) => elementStatus.filterName == element.status) - .toList(); - - if (reportsByReady.length != 0) { - _reportsOrderReadyList[ - _reportsOrderReadyList.indexOf(reportsByReady[0])] - .reportsList - .add(element); - } else { - _reportsOrderReadyList.add(ReportsList( - filterName: element.clinicDescription, reports: element)); - } - - /// ReportsList list sort Compleated - List reportsByCompleated = _reportsOrderCompletedList - .where((elementStatus) => elementStatus.filterName == element.status) - .toList(); - - if (reportsByCompleated.length != 0) { - _reportsOrderCompletedList[ - _reportsOrderCompletedList.indexOf(reportsByCompleated[0])] - .reportsList - .add(element); - } else { - _reportsOrderCompletedList.add(ReportsList( - filterName: element.clinicDescription, reports: element)); - } - /// ReportsList list sort Cancelled - List reportsByCancelled = _reportsOrderCanceledList - .where((elementStatus) => elementStatus.filterName == element.status) - .toList(); + getPatentAppointmentHistory() async { + setState(ViewState.Busy); + await _reportsService.getPatentAppointmentHistory(); + if (_reportsService.hasError) { + error = _reportsService.error; + setState(ViewState.Error); + } else { + setState(ViewState.Idle); + } + } - if (reportsByCancelled.length != 0) { - _reportsOrderCanceledList[ - _reportsOrderCanceledList.indexOf(reportsByCompleated[0])] - .reportsList - .add(element); - } else { - _reportsOrderCanceledList.add(ReportsList( - filterName: element.clinicDescription, reports: element)); + void _filterList() { + _reportsService.reportsList.forEach((report) { + switch (report.status) { + case 1: + reportsOrderRequestList.add(report); + break; + case 2: + reportsOrderReadyList.add(report); + break; + case 3: + reportsOrderCompletedList.add(report); + break; + case 4: + reportsOrderCanceledList.add(report); + break; + default: } - //**************************** }); - } -/////////////////////// + + insertRequestForMedicalReport(AppointmentHistory appointmentHistory)async{ + setState(ViewState.Busy); + await _reportsService.insertRequestForMedicalReport(appointmentHistory); + if (_reportsService.hasError) { + error = _reportsService.error; + AppToast.showErrorToast(message: error); + setState(ViewState.ErrorLocal); + } else { + AppToast.showSuccessToast(message: 'The order was send '); + setState(ViewState.Idle); + } + } } diff --git a/lib/pages/feedback/appointment_history.dart b/lib/pages/feedback/appointment_history.dart index cfbd5800..a1dcdd33 100644 --- a/lib/pages/feedback/appointment_history.dart +++ b/lib/pages/feedback/appointment_history.dart @@ -25,7 +25,7 @@ class AppointmentHistory { int confirmedBy; String confirmedOn; int arrivalChangedBy; - String arrivedOn; + DateTime arrivedOn; Null editedBy; Null editedOn; Null doctorName; @@ -159,7 +159,7 @@ class AppointmentHistory { confirmedBy = json['ConfirmedBy']; confirmedOn = json['ConfirmedOn']; arrivalChangedBy = json['ArrivalChangedBy']; - arrivedOn = json['ArrivedOn']; + arrivedOn = DateUtil.convertStringToDate(json['ArrivedOn']); editedBy = json['EditedBy']; editedOn = json['EditedOn']; doctorName = json['DoctorName']; diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index 152780d4..26fe9a89 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -249,10 +249,10 @@ class _MedicalProfilePageState extends State { Expanded( flex: 1, child: InkWell( -// onTap: () { -// Navigator.push( -// context, FadePage(page: InsuranceApproval())); -// }, + onTap: () { + Navigator.push( + context, FadePage(page: HomeReportPage())); + }, child: MedicalProfileItem( title: 'Medical', imagePath: 'insurance_approvals_icon.png', diff --git a/lib/pages/medical/reports/report_home_page.dart b/lib/pages/medical/reports/report_home_page.dart index 10f75b67..8f24d1dd 100644 --- a/lib/pages/medical/reports/report_home_page.dart +++ b/lib/pages/medical/reports/report_home_page.dart @@ -1,22 +1,22 @@ import 'dart:ui'; -import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/reports_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_history.dart'; -import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_page.dart'; - +import 'package:diplomaticquarterapp/pages/medical/reports/report_list_widget.dart'; +import 'package:diplomaticquarterapp/pages/medical/reports/reports_page.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -class HomeRepoertsPage extends StatefulWidget { +class HomeReportPage extends StatefulWidget { @override - _HomeRepoertsPageState createState() => _HomeRepoertsPageState(); + _HomeReportPageState createState() => _HomeReportPageState(); } -class _HomeRepoertsPageState extends State +class _HomeReportPageState extends State with SingleTickerProviderStateMixin { TabController _tabController; @@ -32,15 +32,16 @@ class _HomeRepoertsPageState extends State _tabController.dispose(); } - @override Widget build(BuildContext context) { return BaseView( - onModelReady: (model) =>model.getReports(), //model.getPrescriptions(), + onModelReady: (model) => model.getReports(), //model.getPrescriptions(), builder: (_, model, widget) => AppScaffold( isShowAppBar: true, appBarTitle: 'Request', + baseViewModel: model, //bottomSheet: Container(), + body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( @@ -81,30 +82,28 @@ class _HomeRepoertsPageState extends State indicatorSize: TabBarIndicatorSize.label, indicatorColor: Colors.red[800], labelColor: Theme.of(context).primaryColor, - labelPadding: - EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), unselectedLabelColor: Colors.grey[800], tabs: [ Container( - width: MediaQuery.of(context).size.width * 0.30, + width: MediaQuery.of(context).size.width * 0.22, child: Center( child: Texts('Requested'), ), ), Container( - width: MediaQuery.of(context).size.width * 0.30, + width: MediaQuery.of(context).size.width * 0.22, child: Center( child: Texts('Ready'), ), ), Container( - width: MediaQuery.of(context).size.width * 0.30, + width: MediaQuery.of(context).size.width * 0.22, child: Center( child: Texts('Completed'), ), ), Container( - width: MediaQuery.of(context).size.width * 0.30, + width: MediaQuery.of(context).size.width * 0.22, child: Center( child: Texts('Cancelled'), ), @@ -124,17 +123,39 @@ class _HomeRepoertsPageState extends State physics: BouncingScrollPhysics(), controller: _tabController, children: [ -// PrescriptionsPage(prescriptionsViewModel: model,), -// PrescriptionsHistory() - Icon(Icons.directions_car), - Icon(Icons.directions_transit), - Icon(Icons.directions_bike), - Icon(Icons.directions_bike), + ReportListWidget( + reportList: model.reportsOrderRequestList, + ), + ReportListWidget( + reportList: model.reportsOrderReadyList, + ), + ReportListWidget( + reportList: model.reportsOrderCompletedList, + ), + ReportListWidget( + reportList: model.reportsOrderCanceledList, + ), ], ), - ) + ), + SizedBox(height: 110,) ], ), + bottomSheet: Container( + width: double.infinity, + height: 90, + margin: EdgeInsets.all(8.0), + child: Button( + label: 'Resend order & deliver', + backgroundColor: Colors.grey[800], + onTap: () => Navigator.push( + context, + FadePage( + page: MedicalReports(), + ), + ), + ), + ), ), ), ); diff --git a/lib/pages/medical/reports/report_list_widget.dart b/lib/pages/medical/reports/report_list_widget.dart new file mode 100644 index 00000000..6408074a --- /dev/null +++ b/lib/pages/medical/reports/report_list_widget.dart @@ -0,0 +1,64 @@ +import 'package:diplomaticquarterapp/core/model/reports/Reports.dart'; +import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class ReportListWidget extends StatelessWidget { + final List reportList; + + ReportListWidget({@required this.reportList}); + + @override + Widget build(BuildContext context) { + return Container( + child: ListView.builder( + itemBuilder: (context, index) => Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + width: double.infinity,margin: EdgeInsets.only(left: 8,right: 8,top: 3), + decoration: BoxDecoration( + color: Colors.white, + border: Border.all(color: Colors.white, width: 2), + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all( + Radius.circular(8.0), + )), + child: Row( + children: [ + Expanded( + flex: 1, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: LargeAvatar( + name: reportList[index].doctorName, + url: reportList[index].doctorImageURL, + ), + ), + ), + Expanded( + flex: 4, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(height: 12,), + Texts(reportList[index].projectName), + Texts(reportList[index].clinicDescription), + Texts('invoice No: ${reportList[index].invoiceNo}'), + SizedBox(height: 12,), + + ], + ), + ), + ) + ], + ), + ), + ), + itemCount: reportList.length, + ), + ); + } +} diff --git a/lib/pages/medical/reports/reports_page.dart b/lib/pages/medical/reports/reports_page.dart index bb89a9df..5b64bc4e 100644 --- a/lib/pages/medical/reports/reports_page.dart +++ b/lib/pages/medical/reports/reports_page.dart @@ -1,10 +1,208 @@ -import 'package:diplomaticquarterapp/core/enum/filter_type.dart'; -import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; -import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescription_items_page.dart'; +import 'package:diplomaticquarterapp/core/viewModels/medical/reports_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/pages/feedback/appointment_history.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_expandable_notifier.dart'; +import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/StarRating.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; -import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; \ No newline at end of file +import 'package:flutter/material.dart'; + +class MedicalReports extends StatelessWidget { + @override + Widget build(BuildContext context) { + void confirmBox( + AppointmentHistory model, ReportsViewModel reportsViewModel) { + showDialog( + context: context, + child: ConfirmDialog( + appointmentHistory: model, + onOkSelected: (model) => reportsViewModel.insertRequestForMedicalReport(model), + ), + ); + } + + return BaseView( + onModelReady: (model) => model.getPatentAppointmentHistory(), + builder: (_, model, widget) => AppScaffold( + baseViewModel: model, + isShowAppBar: true, + appBarTitle: 'Medical Reports', + body: ListView.builder( + itemCount: model.appointHistoryList.length, + itemBuilder: (context, index) => Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + width: double.infinity, + margin: EdgeInsets.only(left: 8, right: 8, top: 3), + decoration: BoxDecoration( + color: Colors.white, + border: Border.all(color: Colors.white, width: 2), + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all( + Radius.circular(8.0), + )), + child: Row( + children: [ + Expanded( + flex: 1, + child: Container( + margin: EdgeInsets.only(left: 5, right: 5), + child: LargeAvatar( + width: 50, + height: 50, + name: model.appointHistoryList[index].doctorNameObj, + url: model.appointHistoryList[index].doctorImageURL, + ), + ), + ), + Expanded( + flex: 4, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 12, + ), + Texts(model.appointHistoryList[index].projectName), + Texts(model.appointHistoryList[index].clinicName), + Texts(DateUtil.getMonthDayYearDateFormatted( + model.appointHistoryList[index].appointmentDate)), + StarRating( + totalAverage: model + .appointHistoryList[index].actualDoctorRate + .toDouble(), + forceStars: true), + SizedBox( + height: 12, + ), + ], + ), + ), + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () => + confirmBox(model.appointHistoryList[index], model), + child: Container( + width: 80, + height: 50, + decoration: BoxDecoration( + color: Colors.black54, + border: + Border.all(color: Colors.transparent, width: 2), + shape: BoxShape.rectangle, + borderRadius: BorderRadius.all( + Radius.circular(8.0), + ), + ), + child: Center( + child: Texts( + 'Request', + fontSize: 12, + color: Colors.white, + ), + ), + ), + ), + ), + SizedBox( + width: 12, + ), + ], + ), + ), + ), + ), + ), + ); + } +} + +class ConfirmDialog extends StatefulWidget { + final Function(AppointmentHistory) onOkSelected; + final AppointmentHistory appointmentHistory; + + ConfirmDialog({this.onOkSelected, this.appointmentHistory}); + + @override + _ConfirmDialogState createState() => _ConfirmDialogState(); +} + +class _ConfirmDialogState extends State { + @override + Widget build(BuildContext context) { + return SimpleDialog( + title: Text('Confirm'), + children: [ + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Texts('Request a medical report'), + SizedBox( + height: 5.0, + ), + Divider( + height: 2.5, + color: Colors.grey[500], + ), + SizedBox( + height: 5, + ), + Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () => Navigator.pop(context), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Container( + child: Center( + child: Texts( + 'cancel', + color: Colors.red, + ), + ), + ), + ), + ), + ), + Container( + width: 1, + height: 30, + color: Colors.grey[500], + ), + Expanded( + flex: 1, + child: InkWell( + onTap: () { + widget.onOkSelected(widget.appointmentHistory); + Navigator.pop(context); + }, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Center( + child: Texts( + 'ok', + fontWeight: FontWeight.w400, + ), + ), + ), + ), + ), + ], + ) + ], + ), + ) + ], + ); + } +}