From fb7536b10605dffd3b9556eae2804f8a2cd30ec6 Mon Sep 17 00:00:00 2001 From: Amjad Amireh Date: Wed, 3 Jun 2020 10:13:25 +0300 Subject: [PATCH 1/3] svg --- pubspec.lock | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pubspec.lock b/pubspec.lock index 7cf1a612..afe0aa60 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -277,6 +277,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.7" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.4" flutter_test: dependency: "direct dev" description: flutter @@ -462,6 +469,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.6.4" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" pedantic: dependency: transitive description: From c792aa1fc760dec87d85a498529871fafa8f1fb2 Mon Sep 17 00:00:00 2001 From: Amjad Amireh Date: Wed, 3 Jun 2020 13:14:51 +0300 Subject: [PATCH 2/3] Change design patiant profile --- lib/config/config.dart | 4 +- lib/providers/patients_provider.dart | 3 +- lib/providers/referred_patient_provider.dart | 28 +--- .../doctor/my_referred_patient_widget.dart | 145 ++++++------------ lib/widgets/shared/Text.dart | 2 +- .../shared/card_with_bgNew_widget.dart | 14 +- 6 files changed, 72 insertions(+), 124 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 6f094704..f4494a91 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -2,8 +2,8 @@ const MAX_SMALL_SCREEN = 660; const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z]"; const ONLY_DATE = "[0-9/]"; -//const BASE_URL = 'https://hmgwebservices.com/Services/'; -const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; +const BASE_URL = 'https://hmgwebservices.com/Services/'; +//const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems_Region"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient"; diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index 8b84420a..be972ea2 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -25,7 +25,8 @@ import '../util/helpers.dart'; Helpers helpers = Helpers(); -class PatientsProvider with ChangeNotifier { +class PatientsProvider with ChangeNotifier +{ bool isLoading = false; bool isError = false; String error = ''; diff --git a/lib/providers/referred_patient_provider.dart b/lib/providers/referred_patient_provider.dart index 6dfd5e88..dbda8c05 100644 --- a/lib/providers/referred_patient_provider.dart +++ b/lib/providers/referred_patient_provider.dart @@ -1,11 +1,10 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; -//import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; -//import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; -//import 'package:doctor_app_flutter/models/request_add_referred_doctor_remarks.dart'; import 'package:doctor_app_flutter/models/request_my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/verify_referral_doctor_remarks.dart'; + import 'package:flutter/cupertino.dart'; +import '../util/helpers.dart'; class MyReferredPatientProvider with ChangeNotifier { @@ -14,9 +13,8 @@ class MyReferredPatientProvider with ChangeNotifier { bool isLoading = true; bool isError = false; String error = ''; - + Helpers helpers = Helpers(); RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel(); - // RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); VerifyReferralDoctorRemarks _verifyreferraldoctorremarks = VerifyReferralDoctorRemarks(); MyReferredPatientProvider() { getMyReferralPatient(); @@ -49,16 +47,13 @@ class MyReferredPatientProvider with ChangeNotifier { } } - // Future replay( - // String referredDoctorRemarks, MyReferredPatientModel model) async { - Future replay( + + Future verify( MyReferredPatientModel model) async { try { - _verifyreferraldoctorremarks.patientID=model.projectId; _verifyreferraldoctorremarks.admissionNo =model.admissionNo; _verifyreferraldoctorremarks.lineItemNo = model.lineItemNo; - _verifyreferraldoctorremarks.referredDoctorRemarks=model.referredDoctorRemarks; _verifyreferraldoctorremarks.referringDoctor=model.referringDoctor; _verifyreferraldoctorremarks.firstName=model.firstName; @@ -67,15 +62,6 @@ class MyReferredPatientProvider with ChangeNotifier { _verifyreferraldoctorremarks.patientMobileNumber=model.mobileNumber; _verifyreferraldoctorremarks.patientIdentificationID=model.patientIdentificationNo; - - - - - - - - - await BaseAppClient.post( 'DoctorApplication.svc/REST/GtMyReferredPatient', body: _verifyreferraldoctorremarks.toJson(),//_requestAddReferredDoctorRemarks.toJson(), @@ -86,11 +72,11 @@ class MyReferredPatientProvider with ChangeNotifier { notifyListeners(); }, onFailure: (String error, int statusCode) { - throw (error); + helpers.showErrorToast(error); }, ); } catch (error) { - throw error; + helpers.showErrorToast(error); } } } diff --git a/lib/widgets/doctor/my_referred_patient_widget.dart b/lib/widgets/doctor/my_referred_patient_widget.dart index f1aeb03a..f55a191b 100644 --- a/lib/widgets/doctor/my_referred_patient_widget.dart +++ b/lib/widgets/doctor/my_referred_patient_widget.dart @@ -1,9 +1,7 @@ - import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; import 'package:flutter/material.dart'; - import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/providers/referred_patient_provider.dart'; @@ -18,35 +16,24 @@ import 'package:flutter/cupertino.dart'; import 'package:provider/provider.dart'; - - class MyReferredPatientWidget extends StatefulWidget { + final MyReferredPatientModel myReferredPatientModel; -final MyReferredPatientModel myReferredPatientModel; + MyReferredPatientWidget({Key key, this.myReferredPatientModel}); - MyReferredPatientWidget({Key key, this.myReferredPatientModel}); - @override - _MyReferredPatientWidgetState createState() => _MyReferredPatientWidgetState(); - - - + _MyReferredPatientWidgetState createState() => + _MyReferredPatientWidgetState(); } class _MyReferredPatientWidgetState extends State { - bool _showDetails = false; bool _isLoading = false; - final _formKey = GlobalKey(); - String error; TextEditingController answerController; @override void initState() { - - super.initState(); - } @override @@ -58,7 +45,6 @@ class _MyReferredPatientWidgetState extends State { children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ AppText( '${widget.myReferredPatientModel.firstName} ${widget.myReferredPatientModel.lastName}', @@ -86,43 +72,48 @@ class _MyReferredPatientWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Divider(color: Colors.grey), - - // VerticalDivider(color: Colors.black, - // thickness: 2, width: 20, - // indent: 200, - // endIndent: 200,), + Divider(color: Colors.grey), + + // VerticalDivider(color: Colors.black, + // thickness: 2, width: 20, + // indent: 200, + // endIndent: 200,), Row( children: [ Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - 'File No', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - '${widget.myReferredPatientModel.patientId}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], - ), - + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'File No', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferredPatientModel.patientId}', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), Container( - height: SizeConfig.realScreenWidth * .1,//0.1, + height: + SizeConfig.realScreenWidth * .1, //0.1, width: 0.8, color: Colors.grey, margin: EdgeInsets.only(left: 15, right: 15), ), +// VerticalDivider(color:Colors.black,thickness: 1, width: 2, +// indent: 1, +// endIndent: 2,), Expanded( child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ AppText( 'Referral Doctor', @@ -133,10 +124,9 @@ class _MyReferredPatientWidgetState extends State { Texts( widget.myReferredPatientModel .referralDoctorName, - maxLength: 80, - readMore: true, + maxLength: 80, + readMore: true, ), - ], ), ), @@ -255,12 +245,12 @@ class _MyReferredPatientWidgetState extends State { fontWeight: FontWeight.bold, textAlign: TextAlign.start, ), - + SizedBox( height: 5, ), - - Texts( + + Texts( '${widget.myReferredPatientModel.referringDoctorRemarks}', style: "bodyText1", readMore: true, @@ -278,8 +268,8 @@ class _MyReferredPatientWidgetState extends State { SizedBox( height: 5, ), - - Texts( + + Texts( '${widget.myReferredPatientModel.referredDoctorRemarks}', style: "bodyText1", readMore: true, @@ -288,54 +278,19 @@ class _MyReferredPatientWidgetState extends State { SizedBox( height: 5, ), - - SizedBox(height: 10.0), - if (error != null && error.isNotEmpty) - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6.0), - color: Theme.of(context) - .errorColor - .withOpacity(0.06), - ), - padding: EdgeInsets.symmetric( - vertical: 8.0, horizontal: 12.0), - child: Row( - children: [ - Expanded( - child: Texts(error ?? "", - style: "bodyText1", - color: Theme.of(context) - .errorColor)), - ], - ), - ), - SizedBox(height: 10.0), - ], - ), + SizedBox(height: 10.0), Container( width: double.infinity, child: Button( onTap: () async { - final form = _formKey.currentState; - - try { - await Provider.of(context, listen: false).replay(widget.myReferredPatientModel); - - setState(() { - _isLoading = false; - }); - } catch (e) { - setState(() { - error = e.toString(); - _isLoading = false; - }); - } - + await Provider.of( + context, + listen: false) + .verify(widget.myReferredPatientModel); + setState(() { + _isLoading = false; + }); }, title: 'Verify', loading: _isLoading, @@ -351,4 +306,4 @@ class _MyReferredPatientWidgetState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/widgets/shared/Text.dart b/lib/widgets/shared/Text.dart index 76402617..95b55127 100644 --- a/lib/widgets/shared/Text.dart +++ b/lib/widgets/shared/Text.dart @@ -226,7 +226,7 @@ class _TextsState extends State { }, child: Text(hidden ? "Read More" : "Read less", style: _getFontStyle().copyWith( - color: Hexcolor('#515b5d'), + color: Hexcolor('#FF0000'), fontWeight: FontWeight.w800, fontFamily: "WorkSans" ) diff --git a/lib/widgets/shared/card_with_bgNew_widget.dart b/lib/widgets/shared/card_with_bgNew_widget.dart index 20387615..130d1b84 100644 --- a/lib/widgets/shared/card_with_bgNew_widget.dart +++ b/lib/widgets/shared/card_with_bgNew_widget.dart @@ -21,6 +21,7 @@ class CardWithBgWidgetNew extends StatelessWidget { @override Widget build(BuildContext context) { return Container( + //margin: EdgeInsets.symmetric(vertical: 10.0), margin: EdgeInsets.symmetric(vertical: 10.0), width: double.infinity, decoration: BoxDecoration( @@ -33,10 +34,15 @@ class CardWithBgWidgetNew extends StatelessWidget { color: Hexcolor('#FFFFFF'), child: Stack( children: [ - Container( - padding: EdgeInsets.all(10.0), - margin: EdgeInsets.only(left: 10), - child: widget) + Center( + child: Container( + padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10 + // margin: EdgeInsets.only(left: 10), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: widget, + )), + ) ], ), ), From 9b5658c00e1d9ca74950655b346a9bf07d2cf2c2 Mon Sep 17 00:00:00 2001 From: Mohammad ALjammal Date: Wed, 3 Jun 2020 15:21:42 +0300 Subject: [PATCH 3/3] change design My Referral and My Referral Patient --- lib/providers/referral_patient_provider.dart | 3 + lib/providers/referred_patient_provider.dart | 6 +- .../doctor/my_referral_patient_screen.dart | 2 +- .../doctor/my_referred_patient_screen.dart | 2 +- lib/util/dr_app_toast_msg.dart | 4 +- lib/util/helpers.dart | 3 +- lib/widgets/auth/known_user_login.dart | 7 +- lib/widgets/auth/verfiy_account.dart | 3 +- .../doctor/my_referral_patient_widget.dart | 420 +++++++++--------- .../doctor/my_referred_patient_widget.dart | 359 ++++++++------- 10 files changed, 412 insertions(+), 397 deletions(-) diff --git a/lib/providers/referral_patient_provider.dart b/lib/providers/referral_patient_provider.dart index 782bced7..84e27e98 100644 --- a/lib/providers/referral_patient_provider.dart +++ b/lib/providers/referral_patient_provider.dart @@ -2,6 +2,7 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/request_add_referred_doctor_remarks.dart'; import 'package:doctor_app_flutter/models/request_my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; @@ -11,6 +12,8 @@ class MyReferralPatientProvider with ChangeNotifier { bool isLoading = true; bool isError = false; String error = ''; + Helpers helpers = Helpers(); + RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel(); RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); diff --git a/lib/providers/referred_patient_provider.dart b/lib/providers/referred_patient_provider.dart index dbda8c05..9234da69 100644 --- a/lib/providers/referred_patient_provider.dart +++ b/lib/providers/referred_patient_provider.dart @@ -64,7 +64,7 @@ class MyReferredPatientProvider with ChangeNotifier { await BaseAppClient.post( 'DoctorApplication.svc/REST/GtMyReferredPatient', - body: _verifyreferraldoctorremarks.toJson(),//_requestAddReferredDoctorRemarks.toJson(), + body: _verifyreferraldoctorremarks.toJson(), onSuccess: (dynamic body, int statusCode) { listMyReferredPatientModel[ @@ -72,11 +72,11 @@ class MyReferredPatientProvider with ChangeNotifier { notifyListeners(); }, onFailure: (String error, int statusCode) { - helpers.showErrorToast(error); + throw(error); }, ); } catch (error) { - helpers.showErrorToast(error); + throw(error); } } } diff --git a/lib/screens/doctor/my_referral_patient_screen.dart b/lib/screens/doctor/my_referral_patient_screen.dart index e2e10e82..4c95663a 100644 --- a/lib/screens/doctor/my_referral_patient_screen.dart +++ b/lib/screens/doctor/my_referral_patient_screen.dart @@ -19,7 +19,7 @@ class MyReferralPatient extends StatelessWidget { return AppScaffold( showBottomBar: false, showAppDrawer: false, - appBarTitle: TranslationBase.of(context).mySchedule, + appBarTitle: 'My Referral Patient', body: referralPatientProvider.isLoading ? DrAppCircularProgressIndeicator() : referralPatientProvider.isError diff --git a/lib/screens/doctor/my_referred_patient_screen.dart b/lib/screens/doctor/my_referred_patient_screen.dart index dc50d12e..bfed1ef3 100644 --- a/lib/screens/doctor/my_referred_patient_screen.dart +++ b/lib/screens/doctor/my_referred_patient_screen.dart @@ -20,7 +20,7 @@ class MyReferredPatient extends StatelessWidget { return AppScaffold( showBottomBar: false, showAppDrawer: false, - appBarTitle: TranslationBase.of(context).mySchedule, + appBarTitle: 'My Referred Patient', body: referredPatientProvider.isLoading ? DrAppCircularProgressIndeicator() : referredPatientProvider.isError diff --git a/lib/util/dr_app_toast_msg.dart b/lib/util/dr_app_toast_msg.dart index 6fcea99a..fd1baa01 100644 --- a/lib/util/dr_app_toast_msg.dart +++ b/lib/util/dr_app_toast_msg.dart @@ -8,7 +8,7 @@ import 'package:flutter_flexible_toast/flutter_flexible_toast.dart'; ); } - void showSuccesToast(msg) { + static void showSuccesToast(msg) { FlutterFlexibleToast.showToast( message: msg, toastLength: Toast.LENGTH_SHORT, @@ -20,7 +20,7 @@ import 'package:flutter_flexible_toast/flutter_flexible_toast.dart'; } - void showErrorToast(msg) { + static void showErrorToast(msg) { FlutterFlexibleToast.showToast( message: msg, toastLength: Toast.LENGTH_SHORT, diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index 156457ff..e05f0d74 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -7,7 +7,6 @@ import '../util/dr_app_toast_msg.dart'; import 'package:connectivity/connectivity.dart'; -DrAppToastMsg toastMsg = DrAppToastMsg(); /* *@author: Elham Rababah @@ -126,7 +125,7 @@ class Helpers { localMsg = msg.toString(); } - toastMsg.showErrorToast(localMsg); + DrAppToastMsg.showErrorToast(localMsg); } /* diff --git a/lib/widgets/auth/known_user_login.dart b/lib/widgets/auth/known_user_login.dart index 9fcbd105..cda3a0e1 100644 --- a/lib/widgets/auth/known_user_login.dart +++ b/lib/widgets/auth/known_user_login.dart @@ -14,7 +14,6 @@ import '../../util/dr_app_toast_msg.dart'; import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); -DrAppToastMsg toastMsg = DrAppToastMsg(); class KnownUserLogin extends StatefulWidget { @override @@ -80,14 +79,14 @@ class _KnownUserLoginState extends State { 2; //res['SELECTDeviceIMEIbyIMEI_List'][0]['LogInType']; }).catchError((err) { print('${err}'); - toastMsg.showErrorToast(err); + DrAppToastMsg.showErrorToast(err); }); switch (snapshot.connectionState) { case ConnectionState.waiting: return DrAppCircularProgressIndeicator(); default: if (snapshot.hasError) { - toastMsg.showErrorToast('Error: ${snapshot.error}'); + DrAppToastMsg.showErrorToast('Error: ${snapshot.error}'); return Text('Error: ${snapshot.error}'); } else { return Column( @@ -323,6 +322,6 @@ class _KnownUserLoginState extends State { } showErorrMsg(localMsg) { - toastMsg.showErrorToast(localMsg); + DrAppToastMsg.showErrorToast(localMsg); } } diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index 963b26bf..7bf1944f 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -15,7 +15,6 @@ import '../../util/helpers.dart'; import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); -DrAppToastMsg toastMsg = DrAppToastMsg(); Helpers helpers = Helpers(); class VerifyAccount extends StatefulWidget { @@ -63,7 +62,7 @@ class _VerifyAccountState extends State { return DrAppCircularProgressIndeicator(); default: if (snapshot.hasError) { - toastMsg.showErrorToast('Error: ${snapshot.error}'); + DrAppToastMsg.showErrorToast('Error: ${snapshot.error}'); return Text('Error: ${snapshot.error}'); } else { return Form( diff --git a/lib/widgets/doctor/my_referral_patient_widget.dart b/lib/widgets/doctor/my_referral_patient_widget.dart index 433b9593..a2eb5f1d 100644 --- a/lib/widgets/doctor/my_referral_patient_widget.dart +++ b/lib/widgets/doctor/my_referral_patient_widget.dart @@ -1,6 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/providers/referral_patient_provider.dart'; +import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; @@ -42,7 +43,7 @@ class _MyReferralPatientWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ AppText( '${widget.myReferralPatientModel.firstName} ${widget.myReferralPatientModel.lastName}', @@ -67,265 +68,252 @@ class _MyReferralPatientWidgetState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Divider(color: Colors.grey), - Row( - children: [ + SizedBox(height: 5,), + Divider(color: Color(0xFF000000),height: 0.5,), + Table( + border: TableBorder.symmetric(inside: BorderSide(width: 0.5),), + children: [ + TableRow( + children: [ Expanded( - child: Column( + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( 'File No', fontSize: - 1.7 * SizeConfig.textMultiplier, + 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold, ), AppText( '${widget.myReferralPatientModel.referringDoctor}', fontSize: - 1.7 * SizeConfig.textMultiplier, + 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.w300, ) ], ), + ), ), - Container( - height: SizeConfig.realScreenWidth * 0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - 'Referring Doctor', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - widget.myReferralPatientModel - .referringClinicDescription, - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + child: Container( + margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText( + 'Referring Doctor', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + widget.myReferralPatientModel + .referringClinicDescription, + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), - ), - ], + ) + ] ), - - Divider(color: Colors.grey), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: + TableRow( + children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - 'Referring Clinic', - fontSize: + children: [ + AppText( + 'Referring Clinic', + fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - '${widget.myReferralPatientModel.referringClinicDescription}', - fontSize: + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferralPatientModel.referringClinicDescription}', + fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + fontWeight: FontWeight.w300, + ) + ], + ), + ), ), - ), - Container( - height: SizeConfig.realScreenWidth * 0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), - Expanded( - child: Column( - crossAxisAlignment: + Expanded( + child: Container( + margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - 'Frequency', - fontSize: + children: [ + AppText( + 'Frequency', + fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - widget.myReferralPatientModel - .frequencyDescription, - fontSize: + fontWeight: FontWeight.bold, + ), + AppText( + widget.myReferralPatientModel + .frequencyDescription, + fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], - ), - ), - ], + fontWeight: FontWeight.w300, + ) + ], + ), + ), + ) + ] ), - Divider(color: Colors.grey), - Row( - children: [ + TableRow( + children: [ Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Priority', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - '${widget.myReferralPatientModel.priorityDescription}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Priority', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferralPatientModel.priorityDescription}', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), ), - Container( - height: SizeConfig.realScreenWidth * 0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Max Response Time', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - AppText( - Helpers.getDateFormatted(widget - .myReferralPatientModel - .mAXResponseTime), - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + child: Container( + margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Max Response Time', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + Helpers.getDateFormatted(widget + .myReferralPatientModel + .mAXResponseTime), + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), - ), + ) ], ), - Divider(color: Colors.grey), + + ], + ), + Divider(color: Color(0xFF000000),height: 0.5,), + SizedBox( + height: 5, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ AppText( 'Clinic Details and Remarks', fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold, - textAlign: TextAlign.start, - ), - SizedBox( - height: 5, - ), + textAlign: TextAlign.start,), Texts( - '73 years old female known case of HTN and dm on regular medication one day prior the patient had rt sided weakness suddenly and reduced level of conscoiusness no vomting no headache no bluriing of vision no other relevant symptoms.\r\nPMH:No history of similar condition no history of surgey or blood transfusions\r\nCT brain was done apparently effaced left insular cortex', + '${widget.myReferralPatientModel.referringDoctorRemarks}', style: "bodyText1", readMore: true, textAlign: TextAlign.start, - maxLength: 100), - SizedBox( - height: 5, - ), - AppText( - 'Answer/Suggestions', - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - textAlign: TextAlign.start, - ), - SizedBox( - height: 5, - ), - Form( - key: _formKey, - child: TextFields( - maxLines: 2, - minLines: 2, - hintText: 'Answer the patient', - initialValue: widget.myReferralPatientModel.referredDoctorRemarks ?? '', - readOnly: _isLoading, - validator: (value) { - if (value.isEmpty) - return "please enter answer"; - else - return null; - }, - ), - ), - SizedBox(height: 10.0), - if (error != null && error.isNotEmpty) - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6.0), - color: Theme.of(context) - .errorColor - .withOpacity(0.06), - ), - padding: EdgeInsets.symmetric( - vertical: 8.0, horizontal: 12.0), - child: Row( - children: [ - Expanded( - child: Texts(error ?? "", - style: "bodyText1", - color: Theme.of(context) - .errorColor)), - ], - ), - ), - SizedBox(height: 10.0), - ], - ), - SizedBox(height: 10.0), - Container( - width: double.infinity, - child: Button( - onTap: () async { - final form = _formKey.currentState; - if (form.validate()) { - setState(() { - _isLoading = true; - }); - try { - await Provider.of(context, listen: false).replay(answerController.text.toString(), widget.myReferralPatientModel); - setState(() { - _isLoading = false; - }); - } catch (e) { - setState(() { - error = e.toString(); - _isLoading = false; - }); - } - } - }, - title: 'Reply', - loading: _isLoading, - ), - ) + maxLength: 100) ], + ), + SizedBox( + height: 5, + ), + AppText( + 'Answer/Suggestions', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + ), + SizedBox( + height: 5, + ), + Form( + key: _formKey, + child: TextFields( + maxLines: 2, + minLines: 2, + hintText: 'Answer the patient', + fontWeight: FontWeight.normal, + initialValue: widget.myReferralPatientModel.referredDoctorRemarks ?? '', + readOnly: _isLoading, + validator: (value) { + if (value.isEmpty) + return "please enter answer"; + else + return null; + }, + ), + ), + SizedBox(height: 10.0), + SizedBox(height: 10.0), + Container( + width: double.infinity, + margin: EdgeInsets.only(left: 10,right: 10), + child: Button( + onTap: () async { + final form = _formKey.currentState; + if (form.validate()) { + setState(() { + _isLoading = true; + }); + try { + await Provider.of(context, listen: false).replay(answerController.text.toString(), widget.myReferralPatientModel); + setState(() { + _isLoading = false; + }); + DrAppToastMsg.showSuccesToast('Reply Successfully'); + + } catch (e) { + setState(() { + _isLoading = false; + }); + DrAppToastMsg.showErrorToast(e); + } + } + }, + title: 'Reply', + loading: _isLoading, + ), ) ], ), diff --git a/lib/widgets/doctor/my_referred_patient_widget.dart b/lib/widgets/doctor/my_referred_patient_widget.dart index f55a191b..af5ea4f8 100644 --- a/lib/widgets/doctor/my_referred_patient_widget.dart +++ b/lib/widgets/doctor/my_referred_patient_widget.dart @@ -1,5 +1,6 @@ import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; +import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:flutter/material.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; @@ -72,184 +73,204 @@ class _MyReferredPatientWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Divider(color: Colors.grey), - - // VerticalDivider(color: Colors.black, - // thickness: 2, width: 20, - // indent: 200, - // endIndent: 200,), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'File No', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + SizedBox( + height: 5, + ), + Divider( + color: Color(0xFF000000), + height: 0.5, + ), + Table( + border: TableBorder.symmetric( + inside: BorderSide(width: 0.5), + ), + children: [ + TableRow(children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + decoration: BoxDecoration(), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'File No', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferredPatientModel.patientId}', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], ), - AppText( - '${widget.myReferredPatientModel.patientId}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + ), ), - ), - Container( - height: - SizeConfig.realScreenWidth * .1, //0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), -// VerticalDivider(color:Colors.black,thickness: 1, width: 2, -// indent: 1, -// endIndent: 2,), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Referral Doctor', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + Expanded( + child: Container( + margin: EdgeInsets.only( + left: 4, + top: 2.5, + right: 2.5, + bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Referral Doctor', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + Texts( + widget.myReferredPatientModel + .referralDoctorName, + maxLength: 80, + readMore: true, + ), + ], ), - Texts( - widget.myReferredPatientModel - .referralDoctorName, - maxLength: 80, - readMore: true, - ), - ], + ), ), - ), - ], - ), - - Divider(color: Colors.grey), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Referring Clinic', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + ]), + TableRow( + children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Referring Clinic', + fontSize: 1.7 * + SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferredPatientModel.referralClinicDescription}', + fontSize: 1.7 * + SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), - AppText( - '${widget.myReferredPatientModel.referralClinicDescription}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], - ), - ), - Container( - height: SizeConfig.realScreenWidth * 0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Frequency', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + ), + Expanded( + child: Container( + margin: EdgeInsets.only( + left: 4, + top: 2.5, + right: 2.5, + bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Frequency', + fontSize: 1.7 * + SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + widget.myReferredPatientModel + .frequencyDescription, + fontSize: 1.7 * + SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], + ), ), - AppText( - widget.myReferredPatientModel - .frequencyDescription, - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], - ), + ) + ], ), - ], - ), - Divider(color: Colors.grey), - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Priority', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + TableRow(children: [ + Expanded( + child: Container( + margin: EdgeInsets.all(2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Priority', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + '${widget.myReferredPatientModel.priorityDescription}', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], ), - AppText( - '${widget.myReferredPatientModel.priorityDescription}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + ), ), - ), - Container( - height: SizeConfig.realScreenWidth * 0.1, - width: 0.8, - color: Colors.grey, - margin: EdgeInsets.only(left: 15, right: 15), - ), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - 'Max Response Time', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, + Expanded( + child: Container( + margin: EdgeInsets.only( + left: 4, + top: 2.5, + right: 2.5, + bottom: 2.5), + padding: EdgeInsets.all(5), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + AppText( + 'Max Response Time', + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + ), + AppText( + Helpers.getDateFormatted(widget + .myReferredPatientModel + .maxResponseTime), + fontSize: + 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w300, + ) + ], ), - AppText( - Helpers.getDateFormatted(widget - .myReferredPatientModel - .maxResponseTime), - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], - ), - ), + ), + ) + ]) ], ), - Divider(color: Colors.grey), + Divider( + color: Color(0xFF000000), + height: 0.5, + ), + SizedBox( + height: 5, + ), AppText( 'Clinic Details and Remarks', fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold, textAlign: TextAlign.start, ), - SizedBox( height: 5, ), - Texts( '${widget.myReferredPatientModel.referringDoctorRemarks}', style: "bodyText1", @@ -268,7 +289,6 @@ class _MyReferredPatientWidgetState extends State { SizedBox( height: 5, ), - Texts( '${widget.myReferredPatientModel.referredDoctorRemarks}', style: "bodyText1", @@ -278,19 +298,26 @@ class _MyReferredPatientWidgetState extends State { SizedBox( height: 5, ), - SizedBox(height: 10.0), Container( width: double.infinity, child: Button( onTap: () async { - await Provider.of( - context, - listen: false) - .verify(widget.myReferredPatientModel); - setState(() { - _isLoading = false; - }); + try { + setState(() { + _isLoading = true; + }); + await Provider.of(context, listen: false).verify(widget.myReferredPatientModel); + setState(() { + _isLoading = false; + }); + DrAppToastMsg.showSuccesToast('Verify Successfully'); + } catch (e) { + setState(() { + _isLoading = false; + }); + DrAppToastMsg.showErrorToast(e); + } }, title: 'Verify', loading: _isLoading,