From 286dbe0a3fdda6b3763178f4b27ddf2b1ae1152a Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 8 Mar 2022 08:47:24 +0300 Subject: [PATCH 1/5] refactor the lab result structure --- lib/core/viewModel/labs_view_model.dart | 4 - lib/routes.dart | 2 +- .../lab_result/LabResultHistoryPage.dart | 163 ------------ .../profile/lab_result/LineChartCurved.dart | 232 ------------------ .../lab_result_history_chart_and_detials.dart | 4 +- .../lab_result_history_details_wideget.dart} | 0 .../line_chart_curved_lab_history.dart} | 0 .../lab_result_chart_and_detials.dart | 63 ----- .../lab_result/lab_result_secreen.dart | 86 ------- .../flow_chart_page.dart} | 12 +- .../lab_result_details_wideget.dart} | 0 .../lab_result_widget.dart} | 37 +-- .../laboratory_result_page.dart | 0 .../laboratory_result_widget.dart | 2 +- .../profile/lab_result/labs_home_page.dart | 13 +- .../all_lab_special_result_page.dart | 4 +- .../special_lab_result_details_page.dart | 0 .../prescription_form_widget.dart | 3 +- 18 files changed, 14 insertions(+), 611 deletions(-) delete mode 100644 lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart delete mode 100644 lib/screens/patients/profile/lab_result/LineChartCurved.dart rename lib/screens/patients/profile/lab_result/{ => history}/lab_result_history_chart_and_detials.dart (95%) rename lib/screens/patients/profile/lab_result/{Lab_Result_history_details_wideget.dart => history/lab_result_history_details_wideget.dart} (100%) rename lib/screens/patients/profile/lab_result/{LineChartCurvedLabHistory.dart => history/line_chart_curved_lab_history.dart} (100%) delete mode 100644 lib/screens/patients/profile/lab_result/lab_result_chart_and_detials.dart delete mode 100644 lib/screens/patients/profile/lab_result/lab_result_secreen.dart rename lib/screens/patients/profile/lab_result/{FlowChartPage.dart => laboratory_result/flow_chart_page.dart} (79%) rename lib/screens/patients/profile/lab_result/{Lab_Result_details_wideget.dart => laboratory_result/lab_result_details_wideget.dart} (100%) rename lib/screens/patients/profile/lab_result/{LabResultWidget.dart => laboratory_result/lab_result_widget.dart} (87%) rename lib/screens/patients/profile/lab_result/{ => laboratory_result}/laboratory_result_page.dart (100%) rename lib/screens/patients/profile/lab_result/{ => laboratory_result}/laboratory_result_widget.dart (99%) rename lib/screens/patients/profile/lab_result/{ => special_result}/all_lab_special_result_page.dart (98%) rename lib/screens/patients/profile/lab_result/{ => special_result}/special_lab_result_details_page.dart (100%) diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 592b9c90..2ddd70d1 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -96,10 +96,6 @@ class LabsViewModel extends BaseViewModel { List labResultLists = List(); - List get labResultListsCoustom { - return labResultLists; - } - getLaboratoryResult( {String projectID, int clinicID, diff --git a/lib/routes.dart b/lib/routes.dart index b4d2c171..b97aece0 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/admission-orders/adm import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/diabetic_chart.dart'; import 'package:doctor_app_flutter/screens/patients/profile/diagnosis/diagnosis_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/discharge_summary/discharge_summary.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/lab_result/all_lab_special_result_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/lab_result/special_result/all_lab_special_result_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/labs_home_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart'; import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportDetailPage.dart'; diff --git a/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart b/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart deleted file mode 100644 index 832af648..00000000 --- a/lib/screens/patients/profile/lab_result/LabResultHistoryPage.dart +++ /dev/null @@ -1,163 +0,0 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; -import 'package:doctor_app_flutter/core/viewModel/labs_view_model.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/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/errors/error_message.dart'; -import 'package:flutter/material.dart'; - -class LabResultHistoryPage extends StatelessWidget { - final PatientLabOrders patientLabOrder; - final String filterName; - final PatiantInformtion patient; - - LabResultHistoryPage({this.patientLabOrder, this.filterName, this.patient}); - -// TODO Elham* UI changes and add translation - @override - Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getPatientLabResultHistoryByDescription( - patientLabOrder: patientLabOrder, - procedureDescription: filterName, - patient: patient), - builder: (context, model, w) => AppScaffold( - isShowAppBar: true, - appBarTitle: filterName, - baseViewModel: model, - body: model.labOrdersResultHistoryList.length > 0 - ? SingleChildScrollView( - child: Column( - children: [ - ...List.generate(model.labOrdersResultHistoryList.length, - (index) { - return Container( - margin: EdgeInsets.symmetric( - vertical: 8.0, horizontal: 16.0), - child: Column( - children: [ - Row( - children: [ - AppText( - TranslationBase.of(context).description, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3, - color: Color(0xFF575757), - fontWeight: FontWeight.w600, - ), - SizedBox( - width: 1, - ), - AppText( - model.labOrdersResultHistoryList[index] - .description, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3.5, - color: Color(0xFF2E303A), - fontWeight: FontWeight.w700, - isCopyable: true, - ), - ], - ), - Row( - children: [ - AppText( - "Reference Range", - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3, - color: Color(0xFF575757), - fontWeight: FontWeight.w600, - ), - SizedBox( - width: 1, - ), - AppText( - model.labOrdersResultHistoryList[index] - .referanceRange, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3.5, - color: Color(0xFF2E303A), - fontWeight: FontWeight.w700, - isCopyable: true, - ), - ], - ), - Row( - children: [ - AppText( - "Result Value", - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3, - color: Color(0xFF575757), - fontWeight: FontWeight.w600, - ), - SizedBox( - width: 1, - ), - AppText( - model.labOrdersResultHistoryList[index] - .resultValue, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3.5, - color: Color(0xFF2E303A), - fontWeight: FontWeight.w700, - isCopyable: true, - ), - ], - ), - Row( - children: [ - AppText( - "Verified On", - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3, - color: Color(0xFF575757), - fontWeight: FontWeight.w600, - ), - SizedBox( - width: 1, - ), - AppText( - model.labOrdersResultHistoryList[index] - .verifiedOn, - fontSize: SizeConfig - .getTextMultiplierBasedOnWidth() * - 3.5, - color: Color(0xFF2E303A), - fontWeight: FontWeight.w700, - isCopyable: true, - ), - ], - ), - Divider( - color: Colors.grey, - height: 0.75, - thickness: 0.75, - ), - SizedBox( - height: 10, - ), - ], - ), - ); - }), - ], - ), - ) - : ErrorMessage( - error: "No data", - ), - ), - ); - } -} diff --git a/lib/screens/patients/profile/lab_result/LineChartCurved.dart b/lib/screens/patients/profile/lab_result/LineChartCurved.dart deleted file mode 100644 index 6e47e466..00000000 --- a/lib/screens/patients/profile/lab_result/LineChartCurved.dart +++ /dev/null @@ -1,232 +0,0 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/utils/date-utils.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; -import 'package:fl_chart/fl_chart.dart'; -import 'package:flutter/material.dart'; - -import '../../../../core/model/labs/LabOrderResult.dart'; - -class LineChartCurved extends StatefulWidget { - final String title; - final List labResult; - - LineChartCurved({this.title, this.labResult}); - - @override - State createState() => LineChartCurvedState(); -} - -class LineChartCurvedState extends State { - bool isShowingMainData; - List xAxixs = List(); - int indexes = 0; - - @override - void initState() { - super.initState(); - getXaxix(); - isShowingMainData = true; - } - - getXaxix() { - indexes = widget.labResult.length ~/ 3.5; - for (int index = 0; index < widget.labResult.length; index++) { - int mIndex = indexes * index; - if (mIndex < widget.labResult.length) { - xAxixs.add(mIndex); - } - } - } - - @override - Widget build(BuildContext context) { - return AspectRatio( - aspectRatio: 1.23, - child: Container( - decoration: const BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(18)), - // color: Colors.white, - ), - child: Stack( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - const SizedBox( - height: 4, - ), - AppText( - widget.title, - fontSize: SizeConfig.textMultiplier * 2.1, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - textAlign: TextAlign.center, - ), - Expanded( - child: Padding( - padding: const EdgeInsets.only(right: 16.0, left: 8.0), - child: LineChart( - sampleData1(), - swapAnimationDuration: const Duration(milliseconds: 250), - ), - ), - ), - const SizedBox( - height: 10, - ), - ], - ), - ], - ), - ), - ); - } - - LineChartData sampleData1() { - return LineChartData( - lineTouchData: LineTouchData( - touchTooltipData: LineTouchTooltipData( - tooltipBgColor: Colors.white, - ), - touchCallback: (LineTouchResponse touchResponse) {}, - handleBuiltInTouches: true, - ), - gridData: FlGridData( - show: true, drawVerticalLine: true, drawHorizontalLine: true), - titlesData: FlTitlesData( - bottomTitles: SideTitles( - showTitles: true, - getTextStyles: (context, value) { - return TextStyle( - color: Colors.black, - fontSize: 10, - ); - }, - margin: 28, - rotateAngle: -65, - getTitles: (value) { - print(value); - DateTime date = AppDateUtils.convertStringToDate( - widget.labResult[value.toInt()].verifiedOnDateTime); - if (widget.labResult.length < 8) { - if (widget.labResult.length > value.toInt()) { - return '${date.day}/ ${date.year}'; - } else - return ''; - } else { - if (value.toInt() == 0) return '${date.day}/ ${date.year}'; - if (value.toInt() == widget.labResult.length - 1) - return '${date.day}/ ${date.year}'; - if (xAxixs.contains(value.toInt())) { - return '${date.day}/ ${date.year}'; - } - } - - return ''; - }, - ), - leftTitles: SideTitles( - showTitles: true, - getTextStyles: (context, value) { - return TextStyle( - color: Colors.black, - fontSize: 10, - ); - }, - getTitles: (value) { - return '${value.toInt()}'; - }, - margin: 8, - //reservedSize: 30, - ), - ), - borderData: FlBorderData( - show: true, - border: const Border( - bottom: BorderSide( - color: Colors.black, - width: 0.5, - ), - left: BorderSide( - color: Colors.black, - ), - right: BorderSide( - color: Colors.black, - ), - top: BorderSide( - color: Colors.transparent, - ), - ), - ), - minX: 0, - maxX: (widget.labResult.length - 1).toDouble(), - maxY: getMaxY() + 2, - minY: getMinY(), - lineBarsData: getData(), - ); - } - - double getMaxY() { - double max = 0; - widget.labResult.forEach((element) { - try { - double resultValueDouble = double.parse(element.resultValue); - if (resultValueDouble > max) max = resultValueDouble; - } catch (e) { - print(e); - } - }); - - return max.roundToDouble(); - } - - double getMinY() { - double min = 0; - try { - min = double.parse(widget.labResult[0].resultValue); - - widget.labResult.forEach((element) { - double resultValueDouble = double.parse(element.resultValue); - if (resultValueDouble < min) min = resultValueDouble; - }); - } catch (e) { - print(e); - } - int value = min.toInt(); - - return value.toDouble(); - } - - List getData() { - List spots = List(); - for (int index = 0; index < widget.labResult.length; index++) { - try { - var resultValueDouble = - double.parse(widget.labResult[index].resultValue); - spots.add(FlSpot(index.toDouble(), resultValueDouble)); - } catch (e) { - print(e); - spots.add(FlSpot(index.toDouble(), 0.0)); - } - } - - final LineChartBarData lineChartBarData1 = LineChartBarData( - spots: spots, - isCurved: true, - colors: [Colors.red], - barWidth: 3, - isStrokeCapRound: true, - curveSmoothness: 0.12, - dotData: FlDotData( - show: false, - ), - belowBarData: BarAreaData( - show: false, - ), - ); - - return [ - lineChartBarData1, - ]; - } -} diff --git a/lib/screens/patients/profile/lab_result/lab_result_history_chart_and_detials.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart similarity index 95% rename from lib/screens/patients/profile/lab_result/lab_result_history_chart_and_detials.dart rename to lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart index 168ff176..474c92bd 100644 --- a/lib/screens/patients/profile/lab_result/lab_result_history_chart_and_detials.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart @@ -4,8 +4,8 @@ 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 'Lab_Result_history_details_wideget.dart'; -import 'LineChartCurvedLabHistory.dart'; +import 'lab_result_history_details_wideget.dart'; +import 'line_chart_curved_lab_history.dart'; class LabResultHistoryChartAndDetails extends StatelessWidget { LabResultHistoryChartAndDetails({ diff --git a/lib/screens/patients/profile/lab_result/Lab_Result_history_details_wideget.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart similarity index 100% rename from lib/screens/patients/profile/lab_result/Lab_Result_history_details_wideget.dart rename to lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart diff --git a/lib/screens/patients/profile/lab_result/LineChartCurvedLabHistory.dart b/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart similarity index 100% rename from lib/screens/patients/profile/lab_result/LineChartCurvedLabHistory.dart rename to lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart diff --git a/lib/screens/patients/profile/lab_result/lab_result_chart_and_detials.dart b/lib/screens/patients/profile/lab_result/lab_result_chart_and_detials.dart deleted file mode 100644 index b58eb9f1..00000000 --- a/lib/screens/patients/profile/lab_result/lab_result_chart_and_detials.dart +++ /dev/null @@ -1,63 +0,0 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.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 'Lab_Result_details_wideget.dart'; -import 'LineChartCurved.dart'; - -class LabResultChartAndDetails extends StatelessWidget { - LabResultChartAndDetails({ - Key key, - @required this.labResult, - @required this.name, - }) : super(key: key); - - final List labResult; - final String name; - - @override - Widget build(BuildContext context) { - return Padding( - padding: const EdgeInsets.all(10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.symmetric(horizontal: 8), - decoration: BoxDecoration( - color: Colors.white, borderRadius: BorderRadius.circular(12)), - child: LineChartCurved( - title: name, - labResult: labResult, - ), - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 8, vertical: 16), - padding: EdgeInsets.only(top: 16, right: 18.0, left: 16.0), - decoration: BoxDecoration( - color: Colors.white, borderRadius: BorderRadius.circular(12)), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).graphDetails, - fontSize: SizeConfig.textMultiplier * 2.1, - fontWeight: FontWeight.bold, - fontFamily: 'Poppins', - ), - SizedBox( - height: 8, - ), - LabResultDetailsWidget( - labResult: labResult.reversed.toList(), - ), - ], - ), - ), - ], - ), - ); - } -} diff --git a/lib/screens/patients/profile/lab_result/lab_result_secreen.dart b/lib/screens/patients/profile/lab_result/lab_result_secreen.dart deleted file mode 100644 index 84ca68be..00000000 --- a/lib/screens/patients/profile/lab_result/lab_result_secreen.dart +++ /dev/null @@ -1,86 +0,0 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; -import 'package:doctor_app_flutter/core/model/patient/lab_orders/lab_orders_res_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/widgets/doctor/lab_result_widget.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/card_with_bgNew_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -class LabResult extends StatefulWidget { - final LabOrdersResModel labOrders; - - LabResult({Key key, this.labOrders}); - - @override - _LabResultState createState() => _LabResultState(); -} - -class _LabResultState extends State { - @override - Widget build(BuildContext context) { - return BaseView( - onModelReady: (model) => model.getLabResult(widget.labOrders), - builder: (_, model, w) => AppScaffold( - baseViewModel: model, - appBarTitle: TranslationBase.of(context).labOrders, - body: model.labResultList.length == 0 - ? DrAppEmbeddedError( - error: TranslationBase.of(context).errorNoLabOrders) - : Container( - margin: EdgeInsets.fromLTRB(SizeConfig.realScreenWidth * 0.05, - 0, SizeConfig.realScreenWidth * 0.05, 0), - child: ListView( - children: [ - CardWithBgWidgetNew( - widget: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).orderNo, - fontSize: 2 * SizeConfig.textMultiplier, - color: Colors.grey[800], - ), - AppText( - ' ${widget.labOrders.orderNo}', - fontSize: 2 * SizeConfig.textMultiplier, - color: Colors.grey[800], - ), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).invoiceNo, - fontSize: 2 * SizeConfig.textMultiplier, - color: Colors.grey[800], - ), - AppText( - ' ${widget.labOrders.invoiceNo}', - fontSize: 2 * SizeConfig.textMultiplier, - color: Colors.grey[800], - ), - ], - ), - ], - ), - ), - CardWithBgWidgetNew( - widget: LabResultWidget( - labResult: model.labResultList, - ), - ) - ], - ), - ), - ), - ); - } -} diff --git a/lib/screens/patients/profile/lab_result/FlowChartPage.dart b/lib/screens/patients/profile/lab_result/laboratory_result/flow_chart_page.dart similarity index 79% rename from lib/screens/patients/profile/lab_result/FlowChartPage.dart rename to lib/screens/patients/profile/lab_result/laboratory_result/flow_chart_page.dart index fc65e777..685478eb 100644 --- a/lib/screens/patients/profile/lab_result/FlowChartPage.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result/flow_chart_page.dart @@ -7,8 +7,8 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../../../widgets/shared/errors/error_message.dart'; -import 'lab_result_history_chart_and_detials.dart'; +import '../../../../../widgets/shared/errors/error_message.dart'; +import '../history/lab_result_history_chart_and_detials.dart'; class FlowChartPage extends StatelessWidget { final PatientLabOrders patientLabOrder; @@ -26,10 +26,6 @@ class FlowChartPage extends StatelessWidget { patientLabOrder: patientLabOrder, procedureDescription: filterName, patient: patient), - // onModelReady: (model) => model.getPatientLabOrdersResults( - // patientLabOrder: patientLabOrder, - // procedure: filterName, - // patient: patient), builder: (context, model, w) => AppScaffold( isShowAppBar: true, appBarTitle: filterName, @@ -41,10 +37,6 @@ class FlowChartPage extends StatelessWidget { name: filterName, labResultHistory: model.labOrdersResultHistoryList, ), - // child: LabResultChartAndDetails( - // name: filterName, - // labResult: model.labOrdersResultsList, - // ), ), ) : Container( diff --git a/lib/screens/patients/profile/lab_result/Lab_Result_details_wideget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart similarity index 100% rename from lib/screens/patients/profile/lab_result/Lab_Result_details_wideget.dart rename to lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart diff --git a/lib/screens/patients/profile/lab_result/LabResultWidget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart similarity index 87% rename from lib/screens/patients/profile/lab_result/LabResultWidget.dart rename to lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart index b89a85b1..8ec84997 100644 --- a/lib/screens/patients/profile/lab_result/LabResultWidget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.dart @@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.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/screens/patients/profile/lab_result/FlowChartPage.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result/flow_chart_page.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/transitions/fade_page.dart'; @@ -50,26 +50,6 @@ class LabResultWidget extends StatelessWidget { ), ], ), - // InkWell( - // onTap: () { - // Navigator.push( - // context, - // FadePage( - // page: FlowChartPage( - // filterName: filterName, - // patientLabOrder: patientLabOrder, - // patient: patient, - // isInpatient: isInpatient, - // ), - // ), - // ); - // }, - // // child: AppText( - // // TranslationBase.of(context).showMoreBtn, - // // textDecoration: TextDecoration.underline, - // // color: Colors.blue, - // // ), - // ), ], ), SizedBox( @@ -148,7 +128,6 @@ class LabResultWidget extends StatelessWidget { padding: EdgeInsets.all(10), child: Center( child: AppText( - /*'${patientLabResultList[index].testCode}\n' +*/ patientLabResultList[index].description, textAlign: TextAlign.center, fontSize: SizeConfig.textMultiplier * 1.8, @@ -168,9 +147,6 @@ class LabResultWidget extends StatelessWidget { decoration: BoxDecoration( shape: BoxShape.circle, color: Colors.red.shade700, - // borderRadius: BorderRadius.all( - // Radius.circular(25.0), - // ), ), child: Icon( patientLabResultList[index] @@ -233,11 +209,6 @@ class LabResultWidget extends StatelessWidget { patient: patient, isInpatient: isInpatient, ), - // page: LabResultHistoryPage( - // filterName: patientLabResultList[index].description, - // patientLabOrder: patientLabOrder, - // patient: patient, - // ), ), ); }, @@ -269,12 +240,6 @@ class LabResultWidget extends StatelessWidget { height: 8, ), Divider(), - // Table( - // border: TableBorder.symmetric( - // inside: BorderSide(width: 2.0, color: Colors.grey[300],style: BorderStyle.solid), - // ), - // children: fullData(patientLabResultList,context), - // ), ], ), ); diff --git a/lib/screens/patients/profile/lab_result/laboratory_result_page.dart b/lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_page.dart similarity index 100% rename from lib/screens/patients/profile/lab_result/laboratory_result_page.dart rename to lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_page.dart diff --git a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart similarity index 99% rename from lib/screens/patients/profile/lab_result/laboratory_result_widget.dart rename to lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart index b41d792d..97d10d88 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result_widget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart @@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/labs_view_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/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/lab_result/LabResultWidget.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result/lab_result_widget.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'; 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 05e86a7f..fde2dfdb 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/viewModel/procedure_View_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/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -68,18 +68,13 @@ class _LabsHomePageState extends State { SizedBox( height: 12, ), - if (model.patientLabOrdersList.isNotEmpty && - patient.patientStatusType != 43) + if ((model.patientLabOrdersList.isNotEmpty && + patient.patientStatusType != 43)|| (patient.patientStatusType != null && + patient.patientStatusType == 43)) ServiceTitle( title: TranslationBase.of(context).lab, subTitle: TranslationBase.of(context).result, ), - if (patient.patientStatusType != null && - patient.patientStatusType == 43) - ServiceTitle( - title:TranslationBase.of(context).lab, - subTitle: TranslationBase.of(context).result, - ), if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null)) diff --git a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart b/lib/screens/patients/profile/lab_result/special_result/all_lab_special_result_page.dart similarity index 98% rename from lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart rename to lib/screens/patients/profile/lab_result/special_result/all_lab_special_result_page.dart index ab05548b..9233b453 100644 --- a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart +++ b/lib/screens/patients/profile/lab_result/special_result/all_lab_special_result_page.dart @@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/viewModel/labs_view_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/screens/base/base_view.dart'; -import 'package:doctor_app_flutter/screens/patients/profile/lab_result/special_lab_result_details_page.dart'; +import 'package:doctor_app_flutter/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; @@ -15,7 +15,7 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../../../../widgets/shared/errors/error_message.dart'; +import '../../../../../widgets/shared/errors/error_message.dart'; class AllLabSpecialResult extends StatefulWidget { const AllLabSpecialResult({Key key}) : super(key: key); diff --git a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart b/lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart similarity index 100% rename from lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart rename to lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart diff --git a/lib/screens/prescription/add_prescription/prescription_form_widget.dart b/lib/screens/prescription/add_prescription/prescription_form_widget.dart index afb70e2e..e498262f 100644 --- a/lib/screens/prescription/add_prescription/prescription_form_widget.dart +++ b/lib/screens/prescription/add_prescription/prescription_form_widget.dart @@ -65,8 +65,7 @@ class _PrescriptionFormWidgetState extends State { bool visibilityPrescriptionForm = false; bool visibilitySearch = true; - final myController = TextEditingController(); - DateTime selectedDate; + DateTime selectedDate = DateTime.now(); int strengthChar; GlobalKey key = new GlobalKey>(); From 7fc52ecad4c527ddcc62d63dd8f4eb154c9f6893 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Tue, 8 Mar 2022 13:12:25 +0300 Subject: [PATCH 2/5] finish fix lab result --- lib/config/localized_values.dart | 2 +- .../history/lab_result_history_details_wideget.dart | 6 ------ .../special_result/special_lab_result_details_page.dart | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 77abcf7e..4225ed6e 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -789,7 +789,7 @@ const Map> localizedValues = { }, "SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"}, "noDataAvailable": { - "en": "No data available", + "en": "Sorry, no data is available", "ar": " لا يوجد بيانات متاحة " }, "show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"}, diff --git a/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart index dacbed44..0c0bb010 100644 --- a/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart @@ -25,12 +25,6 @@ class _VitalSignDetailsWidgetState Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); return Container( - /* decoration: BoxDecoration( - color: Colors.transparent, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10.0), topRight: Radius.circular(10.0)), - border: Border.all(color: Colors.grey, width: 1), - ),*/ margin: EdgeInsets.all(0), child: Container( color: Colors.transparent, diff --git a/lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart b/lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart index fca8fb35..9dacd974 100644 --- a/lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart +++ b/lib/screens/patients/profile/lab_result/special_result/special_lab_result_details_page.dart @@ -59,7 +59,7 @@ class SpecialLabResultDetailsPage extends StatelessWidget { ) : Container( child: ErrorMessage( - error: "No Data", + error: TranslationBase.of(context).noItem, ), ), ], From e9350147761137f7583a9c1bd75432d800aa56b9 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 13 Mar 2022 15:31:29 +0300 Subject: [PATCH 3/5] add todo --- lib/config/config.dart | 2 +- lib/core/service/home/scan_qr_service.dart | 5 ----- .../soap/SOAP_service.dart | 18 +--------------- lib/core/viewModel/SOAP_view_model.dart | 21 ------------------- lib/core/viewModel/scan_qr_view_model.dart | 1 - 5 files changed, 2 insertions(+), 45 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 16628fda..12ec7ca7 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -434,7 +434,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 = 6.5; +const VERSION_ID = 6.7; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/service/home/scan_qr_service.dart b/lib/core/service/home/scan_qr_service.dart index dac56e17..64c02869 100644 --- a/lib/core/service/home/scan_qr_service.dart +++ b/lib/core/service/home/scan_qr_service.dart @@ -11,12 +11,7 @@ class ScanQrService extends BaseService { PatientSearchRequestModel requestModel, bool isMyInpatient) async { hasError = false; await getDoctorProfile(); - - // if (isMyInpatient) { - // requestModel.doctorID = doctorProfile.doctorID; - // } else { requestModel.doctorID = 0; - //} await baseAppClient.post( GET_PATIENT_IN_PATIENT_LIST, 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 b8c187a3..68d7ce83 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -36,23 +36,6 @@ class SOAPService extends LookupService { int episodeID; - Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { - await baseAppClient.post( - GET_ALLERGIES, - onSuccess: (dynamic response, int statusCode) { - allergiesList.clear(); - response['List_Allergies']['entityList'].forEach((v) { - allergiesList.add(MasterKeyModel.fromJson(v)); - }); - }, - onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, - body: getAllergiesRequestModel.toJson(), - ); - } - Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { hasError = false; @@ -229,6 +212,7 @@ class SOAPService extends LookupService { Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async { hasError = false; + ///TODO Elham* change the url constant to get getPatientAllergy await baseAppClient.post(GET_ALLERGIES, onSuccess: (dynamic response, int statusCode) { print("Success"); diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 654906a2..23a49296 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -152,17 +152,6 @@ class SOAPViewModel extends BaseViewModel { nextOnPlanPage(model) { planCallBack.nextFunction(model); } - - Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { - setState(ViewState.Busy); - await _SOAPService.getAllergies(getAllergiesRequestModel); - if (_SOAPService.hasError) { - error = _SOAPService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } - Future getMasterLookup(MasterKeysService masterKeys, {bool isBusyLocal = false}) async { if (isBusyLocal) { @@ -336,16 +325,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientAssessment( - GetAssessmentReqModel getAssessmentReqModel) async { - setState(ViewState.Busy); - await _SOAPService.getPatientAssessment(getAssessmentReqModel); - if (_SOAPService.hasError) { - error = _SOAPService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } Future getMedicationList() async { setState(ViewState.Busy); diff --git a/lib/core/viewModel/scan_qr_view_model.dart b/lib/core/viewModel/scan_qr_view_model.dart index 680d871e..3daf7212 100644 --- a/lib/core/viewModel/scan_qr_view_model.dart +++ b/lib/core/viewModel/scan_qr_view_model.dart @@ -21,7 +21,6 @@ class ScanQrViewModel extends BaseViewModel { setState(ViewState.ErrorLocal); } else { - // setDefaultInPatientList(); setState(ViewState.Idle); } } From 1ca7b285905a02e71c4a906c670a0b3f14fe97c1 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 13 Mar 2022 16:25:41 +0300 Subject: [PATCH 4/5] first step from refactor soap --- lib/core/model/SOAP/Allergy_model.dart | 60 ----------------- .../GetPhysicalExamListResModel.dart | 0 .../GetPhysicalExamReqModel.dart | 0 .../post_physical_exam_request_model.dart | 0 .../GetGetProgressNoteReqModel.dart | 0 .../GetGetProgressNoteResModel.dart | 0 .../post_progress_note_request_model.dart | 0 .../get_allergies_request_model.dart} | 0 .../get_allergies_res_model.dart} | 0 .../post_allergy_request_model.dart | 0 .../get_assessment_req_model.dart} | 0 .../get_assessment_res_model.dart} | 0 .../patch_assessment_req_model.dart} | 0 .../post_assessment_request_model.dart | 0 .../get_chief_complaint_req_model.dart} | 0 .../get_chief_complaint_res_model.dart} | 0 .../post_chief_complaint_request_model.dart | 0 .../{ => history}/GetHistoryReqModel.dart | 0 .../{ => history}/GetHistoryResModel.dart | 0 .../post_histories_request_model.dart | 0 ...untriesModel.dart => countries_model.dart} | 17 ----- .../insurance_approval_request_model.dart | 0 ...OrderResult.dart => lab_order_result.dart} | 0 ...ltHistory.dart => lab_result_history.dart} | 0 .../labs/request_patient_lab_orders.dart | 64 ------------------- lib/core/service/base/lookup-service.dart | 2 +- .../insurance/InsuranceCardService.dart | 2 +- .../lab_order/labs_service.dart | 4 +- .../prescription/medicine_service.dart | 2 +- .../prescription/prescription_service.dart | 6 +- .../soap/SOAP_service.dart | 38 +++++------ .../ucaf/patient-ucaf-service.dart | 4 +- lib/core/viewModel/SOAP_view_model.dart | 37 ++++++----- lib/core/viewModel/labs_view_model.dart | 4 +- lib/core/viewModel/medicine_view_model.dart | 4 +- .../viewModel/patient-ucaf-viewmodel.dart | 4 +- .../prescription/prescription_view_model.dart | 4 +- lib/core/viewModel/procedure_View_model.dart | 2 +- .../UCAF/widgets/diagnosis_widget.dart | 2 +- .../lab_result_history_chart_and_detials.dart | 2 +- .../lab_result_history_details_wideget.dart | 2 +- .../line_chart_curved_lab_history.dart | 2 +- .../lab_result_details_wideget.dart | 2 +- .../assessment/add_assessment_details.dart | 4 +- .../objective/update_objective_page.dart | 2 +- .../soap_update/plan/update_plan_page.dart | 6 +- .../add_drug/drug_to_drug.dart | 2 +- .../prescription_checkout_screen.dart | 2 +- 48 files changed, 69 insertions(+), 211 deletions(-) delete mode 100644 lib/core/model/SOAP/Allergy_model.dart rename lib/core/model/SOAP/{ => PhysicalExam}/GetPhysicalExamListResModel.dart (100%) rename lib/core/model/SOAP/{ => PhysicalExam}/GetPhysicalExamReqModel.dart (100%) rename lib/core/model/SOAP/{ => PhysicalExam}/post_physical_exam_request_model.dart (100%) rename lib/core/model/SOAP/{ => ProgressNote}/GetGetProgressNoteReqModel.dart (100%) rename lib/core/model/SOAP/{ => ProgressNote}/GetGetProgressNoteResModel.dart (100%) rename lib/core/model/SOAP/{ => ProgressNote}/post_progress_note_request_model.dart (100%) rename lib/core/model/SOAP/{get_Allergies_request_model.dart => allergy/get_allergies_request_model.dart} (100%) rename lib/core/model/SOAP/{GetAllergiesResModel.dart => allergy/get_allergies_res_model.dart} (100%) rename lib/core/model/SOAP/{ => allergy}/post_allergy_request_model.dart (100%) rename lib/core/model/SOAP/{GetAssessmentReqModel.dart => assessment/get_assessment_req_model.dart} (100%) rename lib/core/model/SOAP/{GetAssessmentResModel.dart => assessment/get_assessment_res_model.dart} (100%) rename lib/core/model/SOAP/{PatchAssessmentReqModel.dart => assessment/patch_assessment_req_model.dart} (100%) rename lib/core/model/SOAP/{ => assessment}/post_assessment_request_model.dart (100%) rename lib/core/model/SOAP/{ChiefComplaint/GetChiefComplaintReqModel.dart => chief_complaint/get_chief_complaint_req_model.dart} (100%) rename lib/core/model/SOAP/{ChiefComplaint/GetChiefComplaintResModel.dart => chief_complaint/get_chief_complaint_res_model.dart} (100%) rename lib/core/model/SOAP/{ => chief_complaint}/post_chief_complaint_request_model.dart (100%) rename lib/core/model/SOAP/{ => history}/GetHistoryReqModel.dart (100%) rename lib/core/model/SOAP/{ => history}/GetHistoryResModel.dart (100%) rename lib/core/model/SOAP/{ => history}/post_histories_request_model.dart (100%) rename lib/core/model/{countriesModel.dart => countries_model.dart} (98%) rename lib/core/{ => model}/insurance_approval_request_model.dart (100%) rename lib/core/model/labs/{LabOrderResult.dart => lab_order_result.dart} (100%) rename lib/core/model/labs/{LabResultHistory.dart => lab_result_history.dart} (100%) delete mode 100644 lib/core/model/labs/request_patient_lab_orders.dart diff --git a/lib/core/model/SOAP/Allergy_model.dart b/lib/core/model/SOAP/Allergy_model.dart deleted file mode 100644 index f1a498da..00000000 --- a/lib/core/model/SOAP/Allergy_model.dart +++ /dev/null @@ -1,60 +0,0 @@ -class AllergyModel { - int allergyDiseaseId; - String allergyDiseaseName; - int allergyDiseaseType; - int appointmentNo; - int createdBy; - String createdByName; - String createdOn; - int episodeID; - bool isChecked; - bool isUpdatedByNurse; - int severity; - String severityName; - - AllergyModel( - {this.allergyDiseaseId, - this.allergyDiseaseName, - this.allergyDiseaseType, - this.appointmentNo, - this.createdBy, - this.createdByName, - this.createdOn, - this.episodeID, - this.isChecked, - this.isUpdatedByNurse, - this.severity, - this.severityName}); - - AllergyModel.fromJson(Map json) { - allergyDiseaseId = json['allergyDiseaseId']; - allergyDiseaseName = json['allergyDiseaseName']; - allergyDiseaseType = json['allergyDiseaseType']; - appointmentNo = json['appointmentNo']; - createdBy = json['createdBy']; - createdByName = json['createdByName']; - createdOn = json['createdOn']; - episodeID = json['episodeID']; - isChecked = json['isChecked']; - isUpdatedByNurse = json['isUpdatedByNurse']; - severity = json['severity']; - severityName = json['severityName']; - } - - Map toJson() { - final Map data = new Map(); - data['allergyDiseaseId'] = this.allergyDiseaseId; - data['allergyDiseaseName'] = this.allergyDiseaseName; - data['allergyDiseaseType'] = this.allergyDiseaseType; - data['appointmentNo'] = this.appointmentNo; - data['createdBy'] = this.createdBy; - data['createdByName'] = this.createdByName; - data['createdOn'] = this.createdOn; - data['episodeID'] = this.episodeID; - data['isChecked'] = this.isChecked; - data['isUpdatedByNurse'] = this.isUpdatedByNurse; - data['severity'] = this.severity; - data['severityName'] = this.severityName; - return data; - } -} diff --git a/lib/core/model/SOAP/GetPhysicalExamListResModel.dart b/lib/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetPhysicalExamListResModel.dart rename to lib/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart diff --git a/lib/core/model/SOAP/GetPhysicalExamReqModel.dart b/lib/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetPhysicalExamReqModel.dart rename to lib/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart diff --git a/lib/core/model/SOAP/post_physical_exam_request_model.dart b/lib/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_physical_exam_request_model.dart rename to lib/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart diff --git a/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart b/lib/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetGetProgressNoteReqModel.dart rename to lib/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart diff --git a/lib/core/model/SOAP/GetGetProgressNoteResModel.dart b/lib/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetGetProgressNoteResModel.dart rename to lib/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart diff --git a/lib/core/model/SOAP/post_progress_note_request_model.dart b/lib/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_progress_note_request_model.dart rename to lib/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart diff --git a/lib/core/model/SOAP/get_Allergies_request_model.dart b/lib/core/model/SOAP/allergy/get_allergies_request_model.dart similarity index 100% rename from lib/core/model/SOAP/get_Allergies_request_model.dart rename to lib/core/model/SOAP/allergy/get_allergies_request_model.dart diff --git a/lib/core/model/SOAP/GetAllergiesResModel.dart b/lib/core/model/SOAP/allergy/get_allergies_res_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAllergiesResModel.dart rename to lib/core/model/SOAP/allergy/get_allergies_res_model.dart diff --git a/lib/core/model/SOAP/post_allergy_request_model.dart b/lib/core/model/SOAP/allergy/post_allergy_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_allergy_request_model.dart rename to lib/core/model/SOAP/allergy/post_allergy_request_model.dart diff --git a/lib/core/model/SOAP/GetAssessmentReqModel.dart b/lib/core/model/SOAP/assessment/get_assessment_req_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAssessmentReqModel.dart rename to lib/core/model/SOAP/assessment/get_assessment_req_model.dart diff --git a/lib/core/model/SOAP/GetAssessmentResModel.dart b/lib/core/model/SOAP/assessment/get_assessment_res_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAssessmentResModel.dart rename to lib/core/model/SOAP/assessment/get_assessment_res_model.dart diff --git a/lib/core/model/SOAP/PatchAssessmentReqModel.dart b/lib/core/model/SOAP/assessment/patch_assessment_req_model.dart similarity index 100% rename from lib/core/model/SOAP/PatchAssessmentReqModel.dart rename to lib/core/model/SOAP/assessment/patch_assessment_req_model.dart diff --git a/lib/core/model/SOAP/post_assessment_request_model.dart b/lib/core/model/SOAP/assessment/post_assessment_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_assessment_request_model.dart rename to lib/core/model/SOAP/assessment/post_assessment_request_model.dart diff --git a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart similarity index 100% rename from lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart rename to lib/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart diff --git a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart similarity index 100% rename from lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart rename to lib/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart diff --git a/lib/core/model/SOAP/post_chief_complaint_request_model.dart b/lib/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_chief_complaint_request_model.dart rename to lib/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart diff --git a/lib/core/model/SOAP/GetHistoryReqModel.dart b/lib/core/model/SOAP/history/GetHistoryReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetHistoryReqModel.dart rename to lib/core/model/SOAP/history/GetHistoryReqModel.dart diff --git a/lib/core/model/SOAP/GetHistoryResModel.dart b/lib/core/model/SOAP/history/GetHistoryResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetHistoryResModel.dart rename to lib/core/model/SOAP/history/GetHistoryResModel.dart diff --git a/lib/core/model/SOAP/post_histories_request_model.dart b/lib/core/model/SOAP/history/post_histories_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_histories_request_model.dart rename to lib/core/model/SOAP/history/post_histories_request_model.dart diff --git a/lib/core/model/countriesModel.dart b/lib/core/model/countries_model.dart similarity index 98% rename from lib/core/model/countriesModel.dart rename to lib/core/model/countries_model.dart index 89797fab..8628ff6b 100644 --- a/lib/core/model/countriesModel.dart +++ b/lib/core/model/countries_model.dart @@ -1,20 +1,3 @@ -// final List countries = [ -// new Countries( -// name: "Saudi Arabia", name_ar: "المملكة العربية السعودية", code: '966'), -// new Countries( -// name: "United Arab Emirates", -// name_ar: "الإمارات العربية المتحدة", -// code: '971'), -// ]; - -// class Countries { -// final String name; -// final String name_ar; -// final String code; - -// Countries({this.name, this.name_ar, this.code}); -// } - class Countries { String name; String nameAr; diff --git a/lib/core/insurance_approval_request_model.dart b/lib/core/model/insurance_approval_request_model.dart similarity index 100% rename from lib/core/insurance_approval_request_model.dart rename to lib/core/model/insurance_approval_request_model.dart diff --git a/lib/core/model/labs/LabOrderResult.dart b/lib/core/model/labs/lab_order_result.dart similarity index 100% rename from lib/core/model/labs/LabOrderResult.dart rename to lib/core/model/labs/lab_order_result.dart diff --git a/lib/core/model/labs/LabResultHistory.dart b/lib/core/model/labs/lab_result_history.dart similarity index 100% rename from lib/core/model/labs/LabResultHistory.dart rename to lib/core/model/labs/lab_result_history.dart diff --git a/lib/core/model/labs/request_patient_lab_orders.dart b/lib/core/model/labs/request_patient_lab_orders.dart deleted file mode 100644 index 3ee099a5..00000000 --- a/lib/core/model/labs/request_patient_lab_orders.dart +++ /dev/null @@ -1,64 +0,0 @@ -class RequestPatientLabOrders { - 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; - - RequestPatientLabOrders( - {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}); - - RequestPatientLabOrders.fromJson(Map json) { - 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['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/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index f68aa01a..d630f07a 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'base_service.dart'; diff --git a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart index 1fcc4f78..029f3b8c 100644 --- a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart +++ b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/insurance_approval_request_model.dart'; +import 'package:doctor_app_flutter/core/model/insurance_approval_request_model.dart'; import 'package:doctor_app_flutter/core/model/insurance/insurance_approval.dart'; import 'package:doctor_app_flutter/core/model/insurance/insurance_approval_in_patient_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; diff --git a/lib/core/service/patient_medical_file/lab_order/labs_service.dart b/lib/core/service/patient_medical_file/lab_order/labs_service.dart index a7772e4d..e4cb93bf 100644 --- a/lib/core/service/patient_medical_file/lab_order/labs_service.dart +++ b/lib/core/service/patient_medical_file/lab_order/labs_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_request.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; diff --git a/lib/core/service/patient_medical_file/prescription/medicine_service.dart b/lib/core/service/patient_medical_file/prescription/medicine_service.dart index 5d059f99..cd61e783 100644 --- a/lib/core/service/patient_medical_file/prescription/medicine_service.dart +++ b/lib/core/service/patient_medical_file/prescription/medicine_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_List_request_model.dart'; import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_items_request_model.dart'; diff --git a/lib/core/service/patient_medical_file/prescription/prescription_service.dart b/lib/core/service/patient_medical_file/prescription/prescription_service.dart index 4c38ea8c..1b084ada 100644 --- a/lib/core/service/patient_medical_file/prescription/prescription_service.dart +++ b/lib/core/service/patient_medical_file/prescription/prescription_service.dart @@ -14,15 +14,15 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order. import 'package:doctor_app_flutter/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report_enh.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/calculate_box_request_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/item_by_medicine_request_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/search_drug_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/search_drug_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; 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 68d7ce83..0bfdabb8 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1,28 +1,28 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.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/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.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'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart'; import '../../base/lookup-service.dart'; diff --git a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart index 4305dbec..fd7d4830 100644 --- a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart +++ b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart'; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 23a49296..7b42af20 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1,32 +1,31 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.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/PhysicalExam/GetPhysicalExamReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.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'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.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'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/post_progress_note_request_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_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 2ddd70d1..0bb6a797 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index 5f4622a5..440fc03d 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,13 +1,13 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.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/medicine_service.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/procedure/procedure_service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_container.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/core/viewModel/patient-ucaf-viewmodel.dart b/lib/core/viewModel/patient-ucaf-viewmodel.dart index 143690d6..466977a8 100644 --- a/lib/core/viewModel/patient-ucaf-viewmodel.dart +++ b/lib/core/viewModel/patient-ucaf-viewmodel.dart @@ -2,10 +2,10 @@ 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/viewstate.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; diff --git a/lib/core/viewModel/prescription/prescription_view_model.dart b/lib/core/viewModel/prescription/prescription_view_model.dart index e52f16ce..720e7cfd 100644 --- a/lib/core/viewModel/prescription/prescription_view_model.dart +++ b/lib/core/viewModel/prescription/prescription_view_model.dart @@ -8,8 +8,8 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.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/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 21ce023b..ee03c2db 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_special_result.dart'; diff --git a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart index 21c3deab..5ac4555a 100644 --- a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart +++ b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart @@ -1,6 +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/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart index 474c92bd..aea99af0 100644 --- a/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.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/lab_result/history/lab_result_history_details_wideget.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart index 0c0bb010..df213e11 100644 --- a/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart b/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart index cad8c1ea..e07990b9 100644 --- a/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart +++ b/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:fl_chart/fl_chart.dart'; diff --git a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart index 2125e649..82e2dc7f 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 44a4fa73..fe6ca1c1 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -4,9 +4,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/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_assement.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'; 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 d728125e..091eb63f 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 @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/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'; diff --git a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart index c1f7c6b4..cabef7e2 100644 --- a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart +++ b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart @@ -1,11 +1,11 @@ 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/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.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/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/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/screens/base/base_view.dart'; diff --git a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart index 2ce61af0..d26e4848 100644 --- a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart +++ b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart @@ -2,11 +2,11 @@ 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/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-vital-sign-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.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/medicine/medicine_search_screen.dart'; diff --git a/lib/screens/prescription/prescription_checkout_screen.dart b/lib/screens/prescription/prescription_checkout_screen.dart index 86567eff..b6aadb73 100644 --- a/lib/screens/prescription/prescription_checkout_screen.dart +++ b/lib/screens/prescription/prescription_checkout_screen.dart @@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.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/prescription/prescription_text_filed.dart'; From 4e6c940cdf34200fab376fa9d479bf953a0dbef6 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Sun, 13 Mar 2022 17:10:28 +0300 Subject: [PATCH 5/5] fix issues --- .../{GetHistoryReqModel.dart => get_history_req_model.dart} | 0 lib/core/service/patient_medical_file/soap/SOAP_service.dart | 2 +- lib/core/viewModel/SOAP_view_model.dart | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename lib/core/model/SOAP/history/{GetHistoryReqModel.dart => get_history_req_model.dart} (100%) diff --git a/lib/core/model/SOAP/history/GetHistoryReqModel.dart b/lib/core/model/SOAP/history/get_history_req_model.dart similarity index 100% rename from lib/core/model/SOAP/history/GetHistoryReqModel.dart rename to lib/core/model/SOAP/history/get_history_req_model.dart 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 0bfdabb8..d4a23850 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNo 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'; -import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart'; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 7b42af20..388ff6c7 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNo 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'; -import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.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';