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, + )), + ) ], ), ),