diff --git a/lib/config/config.dart b/lib/config/config.dart index 92291ed3..63d5545f 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -2,7 +2,7 @@ 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 PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; diff --git a/lib/models/my_referred_patient_model.dart b/lib/models/my_referred_patient_model.dart index 4aaef077..9ecfdb2f 100644 --- a/lib/models/my_referred_patient_model.dart +++ b/lib/models/my_referred_patient_model.dart @@ -1,73 +1,18 @@ -/* - *@author: Amjad amireh - *@Date:1/6/2020 - *@param: - *@return: - *@desc: MyReferredPatientModel - */ import 'dart:convert'; + import 'package:doctor_app_flutter/util/helpers.dart'; +MyReferredPatientModel myReferredPatientModelFromJson(String str) => MyReferredPatientModel.fromJson(json.decode(str)); -import 'package:doctor_app_flutter/util/helpers.dart'; +String myReferredPatientModelToJson(MyReferredPatientModel data) => json.encode(data.toJson()); class MyReferredPatientModel { - int projectID; - int lineItemNo; - int doctorID; - int patientID; - String doctorName; - String doctorNameN; - String firstName; - String middleName; - String lastName; - String firstNameN; - String middleNameN; - String lastNameN; - int gender; - String dateofBirth; - String mobileNumber; - String emailAddress; - String patientIdentificationNo; - int patientType; - String admissionNo; - String admissionDate; - String roomID; - String bedID; - String nursingStationID; - String description; - String nationalityName; - String nationalityNameN; - String clinicDescription; - String clinicDescriptionN; - int referralDoctor; - int referringDoctor; - int referralClinic; - int referringClinic; - int referralStatus; - String referralDate; - String referringDoctorRemarks; - String referredDoctorRemarks; - String referralResponseOn; - int priority; - int frequency; - DateTime mAXResponseTime; - String age; - String frequencyDescription; - String genderDescription; - bool isDoctorLate; - bool isDoctorResponse; - String nursingStationName; - String priorityDescription; - String referringClinicDescription; - String referringDoctorName; - - MyReferredPatientModel( - {this.projectID, + MyReferredPatientModel({ + this.projectId, this.lineItemNo, - this.doctorID, - this.patientID, + this.doctorId, + this.patientId, this.doctorName, this.doctorNameN, this.firstName, @@ -84,9 +29,9 @@ class MyReferredPatientModel { this.patientType, this.admissionNo, this.admissionDate, - this.roomID, - this.bedID, - this.nursingStationID, + this.roomId, + this.bedId, + this.nursingStationId, this.description, this.nationalityName, this.nationalityNameN, @@ -103,7 +48,8 @@ class MyReferredPatientModel { this.referralResponseOn, this.priority, this.frequency, - this.mAXResponseTime, + this.maxResponseTime, + this.dischargeDate, this.age, this.frequencyDescription, this.genderDescription, @@ -111,114 +57,165 @@ class MyReferredPatientModel { this.isDoctorResponse, this.nursingStationName, this.priorityDescription, - this.referringClinicDescription, - this.referringDoctorName}); + this.referralClinicDescription, + this.referralDoctorName, + }); - MyReferredPatientModel.fromJson(Map json) { - projectID = json['ProjectID']; - lineItemNo = json['LineItemNo']; - doctorID = json['DoctorID']; - patientID = json['PatientID']; - doctorName = json['DoctorName']; - doctorNameN = json['DoctorNameN']; - firstName = json['FirstName']; - middleName = json['MiddleName']; - lastName = json['LastName']; - firstNameN = json['FirstNameN']; - middleNameN = json['MiddleNameN']; - lastNameN = json['LastNameN']; - gender = json['Gender']; - dateofBirth = json['DateofBirth']; - mobileNumber = json['MobileNumber']; - emailAddress = json['EmailAddress']; - patientIdentificationNo = json['PatientIdentificationNo']; - patientType = json['PatientType']; - admissionNo = json['AdmissionNo']; - admissionDate = json['AdmissionDate']; - roomID = json['RoomID']; - bedID = json['BedID']; - nursingStationID = json['NursingStationID']; - description = json['Description']; - nationalityName = json['NationalityName']; - nationalityNameN = json['NationalityNameN']; - clinicDescription = json['ClinicDescription']; - clinicDescriptionN = json['ClinicDescriptionN']; - referralDoctor = json['ReferralDoctor']; - referringDoctor = json['ReferringDoctor']; - referralClinic = json['ReferralClinic']; - referringClinic = json['ReferringClinic']; - referralStatus = json['ReferralStatus']; - referralDate = json['ReferralDate']; - referringDoctorRemarks = json['ReferringDoctorRemarks']; - referredDoctorRemarks = json['ReferredDoctorRemarks']; - referralResponseOn = json['ReferralResponseOn']; - priority = json['Priority']; - frequency = json['Frequency']; - mAXResponseTime = Helpers.convertStringToDate(json['MAXResponseTime']); - age = json['Age']; - frequencyDescription = json['FrequencyDescription']; - genderDescription = json['GenderDescription']; - isDoctorLate = json['IsDoctorLate']; - isDoctorResponse = json['IsDoctorResponse']; - nursingStationName = json['NursingStationName']; - priorityDescription = json['PriorityDescription']; - referringClinicDescription = json['ReferringClinicDescription']; - referringDoctorName = json['ReferringDoctorName']; - } + int projectId; + int lineItemNo; + int doctorId; + int patientId; + String doctorName; + dynamic doctorNameN; + String firstName; + String middleName; + String lastName; + dynamic firstNameN; + dynamic middleNameN; + dynamic lastNameN; + int gender; + String dateofBirth; + String mobileNumber; + String emailAddress; + String patientIdentificationNo; + int patientType; + String admissionNo; + String admissionDate; + String roomId; + String bedId; + dynamic nursingStationId; + dynamic description; + String nationalityName; + dynamic nationalityNameN; + String clinicDescription; + dynamic clinicDescriptionN; + int referralDoctor; + int referringDoctor; + int referralClinic; + int referringClinic; + int referralStatus; + String referralDate; + String referringDoctorRemarks; + String referredDoctorRemarks; + String referralResponseOn; + int priority; + int frequency; + DateTime maxResponseTime; + dynamic dischargeDate; + String age; + String frequencyDescription; + String genderDescription; + bool isDoctorLate; + bool isDoctorResponse; + String nursingStationName; + String priorityDescription; + String referralClinicDescription; + String referralDoctorName; - Map toJson() { - final Map data = new Map(); - data['ProjectID'] = this.projectID; - data['LineItemNo'] = this.lineItemNo; - data['DoctorID'] = this.doctorID; - data['PatientID'] = this.patientID; - data['DoctorName'] = this.doctorName; - data['DoctorNameN'] = this.doctorNameN; - data['FirstName'] = this.firstName; - data['MiddleName'] = this.middleName; - data['LastName'] = this.lastName; - data['FirstNameN'] = this.firstNameN; - data['MiddleNameN'] = this.middleNameN; - data['LastNameN'] = this.lastNameN; - data['Gender'] = this.gender; - data['DateofBirth'] = this.dateofBirth; - data['MobileNumber'] = this.mobileNumber; - data['EmailAddress'] = this.emailAddress; - data['PatientIdentificationNo'] = this.patientIdentificationNo; - data['PatientType'] = this.patientType; - data['AdmissionNo'] = this.admissionNo; - data['AdmissionDate'] = this.admissionDate; - data['RoomID'] = this.roomID; - data['BedID'] = this.bedID; - data['NursingStationID'] = this.nursingStationID; - data['Description'] = this.description; - data['NationalityName'] = this.nationalityName; - data['NationalityNameN'] = this.nationalityNameN; - data['ClinicDescription'] = this.clinicDescription; - data['ClinicDescriptionN'] = this.clinicDescriptionN; - data['ReferralDoctor'] = this.referralDoctor; - data['ReferringDoctor'] = this.referringDoctor; - data['ReferralClinic'] = this.referralClinic; - data['ReferringClinic'] = this.referringClinic; - data['ReferralStatus'] = this.referralStatus; - data['ReferralDate'] = this.referralDate; - data['ReferringDoctorRemarks'] = this.referringDoctorRemarks; - data['ReferredDoctorRemarks'] = this.referredDoctorRemarks; - data['ReferralResponseOn'] = this.referralResponseOn; - data['Priority'] = this.priority; - data['Frequency'] = this.frequency; - data['MAXResponseTime'] = this.mAXResponseTime; - data['Age'] = this.age; - data['FrequencyDescription'] = this.frequencyDescription; - data['GenderDescription'] = this.genderDescription; - data['IsDoctorLate'] = this.isDoctorLate; - data['IsDoctorResponse'] = this.isDoctorResponse; - data['NursingStationName'] = this.nursingStationName; - data['PriorityDescription'] = this.priorityDescription; - data['ReferringClinicDescription'] = this.referringClinicDescription; - data['ReferringDoctorName'] = this.referringDoctorName; - return data; - } -} + factory MyReferredPatientModel.fromJson(Map json) => MyReferredPatientModel( + projectId: json["ProjectID"], + lineItemNo: json["LineItemNo"], + doctorId: json["DoctorID"], + patientId: json["PatientID"], + doctorName: json["DoctorName"], + doctorNameN: json["DoctorNameN"], + firstName: json["FirstName"], + middleName: json["MiddleName"], + lastName: json["LastName"], + firstNameN: json["FirstNameN"], + middleNameN: json["MiddleNameN"], + lastNameN: json["LastNameN"], + gender: json["Gender"], + dateofBirth: json["DateofBirth"], + mobileNumber: json["MobileNumber"], + emailAddress: json["EmailAddress"], + patientIdentificationNo: json["PatientIdentificationNo"], + patientType: json["PatientType"], + admissionNo: json["AdmissionNo"], + admissionDate: json["AdmissionDate"], + roomId: json["RoomID"], + bedId: json["BedID"], + nursingStationId: json["NursingStationID"], + description: json["Description"], + nationalityName: json["NationalityName"], + nationalityNameN: json["NationalityNameN"], + clinicDescription: json["ClinicDescription"], + clinicDescriptionN: json["ClinicDescriptionN"], + referralDoctor: json["ReferralDoctor"], + referringDoctor: json["ReferringDoctor"], + referralClinic: json["ReferralClinic"], + referringClinic: json["ReferringClinic"], + referralStatus: json["ReferralStatus"], + referralDate: json["ReferralDate"], + referringDoctorRemarks: json["ReferringDoctorRemarks"], + referredDoctorRemarks: json["ReferredDoctorRemarks"], + referralResponseOn: json["ReferralResponseOn"], + priority: json["Priority"], + frequency: json["Frequency"], + maxResponseTime: Helpers.convertStringToDate(json['MAXResponseTime']),//json["MAXResponseTime"], + dischargeDate: json["DischargeDate"], + age: json["Age"], + frequencyDescription: json["FrequencyDescription"], + genderDescription: json["GenderDescription"], + isDoctorLate: json["IsDoctorLate"], + isDoctorResponse: json["IsDoctorResponse"], + nursingStationName: json["NursingStationName"], + priorityDescription: json["PriorityDescription"], + referralClinicDescription: json["ReferralClinicDescription"], + referralDoctorName: json["ReferralDoctorName"], + ); + Map toJson() => { + "ProjectID": projectId, + "LineItemNo": lineItemNo, + "DoctorID": doctorId, + "PatientID": patientId, + "DoctorName": doctorName, + "DoctorNameN": doctorNameN, + "FirstName": firstName, + "MiddleName": middleName, + "LastName": lastName, + "FirstNameN": firstNameN, + "MiddleNameN": middleNameN, + "LastNameN": lastNameN, + "Gender": gender, + "DateofBirth": dateofBirth, + "MobileNumber": mobileNumber, + "EmailAddress": emailAddress, + "PatientIdentificationNo": patientIdentificationNo, + "PatientType": patientType, + "AdmissionNo": admissionNo, + "AdmissionDate": admissionDate, + "RoomID": roomId, + "BedID": bedId, + "NursingStationID": nursingStationId, + "Description": description, + "NationalityName": nationalityName, + "NationalityNameN": nationalityNameN, + "ClinicDescription": clinicDescription, + "ClinicDescriptionN": clinicDescriptionN, + "ReferralDoctor": referralDoctor, + "ReferringDoctor": referringDoctor, + "ReferralClinic": referralClinic, + "ReferringClinic": referringClinic, + "ReferralStatus": referralStatus, + "ReferralDate": referralDate, + "ReferringDoctorRemarks": referringDoctorRemarks, + "ReferredDoctorRemarks": referredDoctorRemarks, + "ReferralResponseOn": referralResponseOn, + "Priority": priority, + "Frequency": frequency, + "MAXResponseTime": maxResponseTime, + "DischargeDate": dischargeDate, + "Age": age, + "FrequencyDescription": frequencyDescription, + "GenderDescription": genderDescription, + "IsDoctorLate": isDoctorLate, + "IsDoctorResponse": isDoctorResponse, + "NursingStationName": nursingStationName, + "PriorityDescription": priorityDescription, + "ReferralClinicDescription": referralClinicDescription, + "ReferralDoctorName": referralDoctorName, + }; +} diff --git a/lib/models/request_add_referred_doctor_remarks.dart b/lib/models/request_add_referred_doctor_remarks.dart index 0799c7ba..b396c47f 100644 --- a/lib/models/request_add_referred_doctor_remarks.dart +++ b/lib/models/request_add_referred_doctor_remarks.dart @@ -17,6 +17,7 @@ class RequestAddReferredDoctorRemarks { String sessionID; bool isLoginForDoctorApp; bool patientOutSA; + RequestAddReferredDoctorRemarks( {this.projectID, diff --git a/lib/models/verify_referral_doctor_remarks.dart b/lib/models/verify_referral_doctor_remarks.dart new file mode 100644 index 00000000..b9bfce0a --- /dev/null +++ b/lib/models/verify_referral_doctor_remarks.dart @@ -0,0 +1,103 @@ +import 'package:doctor_app_flutter/config/config.dart'; + +class VerifyReferralDoctorRemarks { + int projectID; + String admissionNo; + int lineItemNo; + String referredDoctorRemarks; + int editedBy; + int patientID; + int referringDoctor; + int languageID; + String stamp; + String iPAdress; + double versionID; + int channel; + String tokenID; + String sessionID; + bool isLoginForDoctorApp; + bool patientOutSA; + String firstName; + + String middleName; + String lastName; + String patientMobileNumber; + String patientIdentificationID; + + VerifyReferralDoctorRemarks( + {this.projectID, + this.admissionNo, + this.lineItemNo, + this.referredDoctorRemarks, + this.editedBy, + this.patientID, + this.referringDoctor, + this.languageID = LANGUAGE_ID, + this.stamp = STAMP, + this.iPAdress = IP_ADDRESS, + this.versionID = VERSION_ID, + this.channel= CHANNEL, + this.tokenID, + this.sessionID = SESSION_ID, + this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP, + this.patientOutSA = PATIENT_OUT_SA, + this.firstName, + this.middleName, + this.lastName, + this.patientMobileNumber, + this.patientIdentificationID, + }); + + VerifyReferralDoctorRemarks.fromJson(Map json) { + projectID = json['ProjectID']; + admissionNo = json['AdmissionNo']; + lineItemNo = json['LineItemNo']; + referredDoctorRemarks = json['ReferredDoctorRemarks']; + editedBy = json['EditedBy']; + patientID = json['PatientID']; + referringDoctor = json['ReferringDoctor']; + languageID = json['LanguageID']; + stamp = json['stamp']; + iPAdress = json['IPAdress']; + versionID = json['VersionID']; + channel = json['Channel']; + tokenID = json['TokenID']; + sessionID = json['SessionID']; + isLoginForDoctorApp = json['IsLoginForDoctorApp']; + patientOutSA = json['PatientOutSA']; + firstName= json["FirstName"]; + middleName= json["MiddleName"]; + lastName= json["LastName"]; + patientMobileNumber= json["PatientMobileNumber"]; + patientIdentificationID = json["PatientIdentificationID"]; + + + + } + + Map toJson() { + final Map data = new Map(); + data['ProjectID'] = this.projectID; + data['AdmissionNo'] = this.admissionNo; + data['LineItemNo'] = this.lineItemNo; + data['ReferredDoctorRemarks'] = this.referredDoctorRemarks; + data['EditedBy'] = this.editedBy; + data['PatientID'] = this.patientID; + data['ReferringDoctor'] = this.referringDoctor; + data['LanguageID'] = this.languageID; + data['stamp'] = this.stamp; + data['IPAdress'] = this.iPAdress; + data['VersionID'] = this.versionID; + data['Channel'] = this.channel; + data['TokenID'] = this.tokenID; + data['SessionID'] = this.sessionID; + data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp; + data['PatientOutSA'] = this.patientOutSA; + data['FirstName'] = this.firstName; + data['MiddleName'] = this.middleName; + data['LastName'] = this.lastName; + data['PatientMobileNumber'] = this.patientMobileNumber; + data['PatientIdentificationID'] = this.patientIdentificationID; + return data; + } +} diff --git a/lib/providers/referred_patient_provider.dart b/lib/providers/referred_patient_provider.dart index 19904f2b..0f3e6741 100644 --- a/lib/providers/referred_patient_provider.dart +++ b/lib/providers/referred_patient_provider.dart @@ -1,22 +1,23 @@ 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_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_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'; class MyReferredPatientProvider with ChangeNotifier { - List listMyReferralPatientModel = []; + List listMyReferredPatientModel = []; bool isLoading = true; bool isError = false; String error = ''; RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel(); - RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); - + // RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); + VerifyReferralDoctorRemarks _verifyreferraldoctorremarks = VerifyReferralDoctorRemarks(); MyReferredPatientProvider() { getMyReferralPatient(); } @@ -24,11 +25,11 @@ class MyReferredPatientProvider with ChangeNotifier { getMyReferralPatient() async { try { await BaseAppClient.post( - 'DoctorApplication.svc/REST/GtMyReferralPatient', + 'DoctorApplication.svc/REST/GtMyReferredPatient', body: _requestMyReferralPatient.toJson(), onSuccess: (dynamic response, int statusCode) { - response['List_MyReferralPatient'].forEach((v) { - listMyReferralPatientModel.add(MyReferredPatientModel.fromJson(v)); + response['List_MyReferredPatient'].forEach((v) { + listMyReferredPatientModel.add(MyReferredPatientModel.fromJson(v)); }); isError = false; isLoading = false; @@ -48,22 +49,40 @@ class MyReferredPatientProvider with ChangeNotifier { } } - Future replay( - String referredDoctorRemarks, MyReferredPatientModel model) async { + // Future replay( + // String referredDoctorRemarks, MyReferredPatientModel model) async { + Future replay( + MyReferredPatientModel model) async { try { - _requestAddReferredDoctorRemarks.admissionNo = model.admissionNo; - _requestAddReferredDoctorRemarks.patientID = model.patientID; - _requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks; - _requestAddReferredDoctorRemarks.lineItemNo = model.lineItemNo; - _requestAddReferredDoctorRemarks.referringDoctor = model.referringDoctor; + + _verifyreferraldoctorremarks.patientID=model.projectId; + _verifyreferraldoctorremarks.admissionNo =model.admissionNo; + _verifyreferraldoctorremarks.lineItemNo = model.lineItemNo; + + _verifyreferraldoctorremarks.referredDoctorRemarks=model.referredDoctorRemarks; + _verifyreferraldoctorremarks.referringDoctor=model.referringDoctor; + _verifyreferraldoctorremarks.firstName=model.firstName; + _verifyreferraldoctorremarks.middleName=model.middleName; + _verifyreferraldoctorremarks.lastName=model.lastName; + _verifyreferraldoctorremarks.patientMobileNumber=model.mobileNumber; + _verifyreferraldoctorremarks.patientIdentificationID=model.patientIdentificationNo; + + + + + + + + + await BaseAppClient.post( 'DoctorApplication.svc/REST/GtMyReferredPatient', - body: _requestAddReferredDoctorRemarks.toJson(), + body: _verifyreferraldoctorremarks.toJson(),//_requestAddReferredDoctorRemarks.toJson(), onSuccess: (dynamic body, int statusCode) { - model.referredDoctorRemarks = referredDoctorRemarks; - listMyReferralPatientModel[ - listMyReferralPatientModel.indexOf(model)] = model; + + listMyReferredPatientModel[ + listMyReferredPatientModel.indexOf(model)] = model; notifyListeners(); }, onFailure: (String error, int statusCode) { diff --git a/lib/widgets/doctor/my_referred_patient_widget.dart b/lib/widgets/doctor/my_referred_patient_widget.dart index 0ab91954..0998788a 100644 --- a/lib/widgets/doctor/my_referred_patient_widget.dart +++ b/lib/widgets/doctor/my_referred_patient_widget.dart @@ -99,7 +99,7 @@ class _MyReferredPatientWidgetState extends State { fontWeight: FontWeight.bold, ), AppText( - '${widget.myReferredPatientModel.referringDoctor}', + '${widget.myReferredPatientModel.patientId}', fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.w300, @@ -119,18 +119,18 @@ class _MyReferredPatientWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - 'Referring Doctor', + 'Referral Doctor', fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.bold, ), - AppText( + Texts( widget.myReferredPatientModel - .referringClinicDescription, - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) + .referralDoctorName, + maxLength: 80, + readMore: true, + ), + ], ), ), @@ -152,7 +152,7 @@ class _MyReferredPatientWidgetState extends State { fontWeight: FontWeight.bold, ), AppText( - '${widget.myReferredPatientModel.referringClinicDescription}', + '${widget.myReferredPatientModel.referralClinicDescription}', fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.w300, @@ -232,7 +232,7 @@ class _MyReferredPatientWidgetState extends State { AppText( Helpers.getDateFormatted(widget .myReferredPatientModel - .mAXResponseTime), + .maxResponseTime), fontSize: 1.7 * SizeConfig.textMultiplier, fontWeight: FontWeight.w300, @@ -249,15 +249,17 @@ class _MyReferredPatientWidgetState extends State { fontWeight: FontWeight.bold, textAlign: TextAlign.start, ), + SizedBox( height: 5, ), - AppText( - '${widget.myReferredPatientModel.referringDoctorRemarks}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ), + + Texts( + '${widget.myReferredPatientModel.referringDoctorRemarks}', + style: "bodyText1", + readMore: true, + textAlign: TextAlign.start, + maxLength: 100), SizedBox( height: 5, ), @@ -270,28 +272,17 @@ class _MyReferredPatientWidgetState extends State { SizedBox( height: 5, ), - AppText( - '${widget.myReferredPatientModel.referredDoctorRemarks}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ), - // Form( - // key: _formKey, - // child: TextFields( - // maxLines: 2, - // minLines: 2, - // hintText: 'Answer the patient', - // initialValue: widget.myReferredPatientModel.referredDoctorRemarks ?? '', - // readOnly: _isLoading, - // validator: (value) { - // if (value.isEmpty) - // return "please enter answer"; - // else - // return null; - // }, - // ), - // ), + + Texts( + '${widget.myReferredPatientModel.referredDoctorRemarks}', + style: "bodyText1", + readMore: true, + textAlign: TextAlign.start, + maxLength: 100), + SizedBox( + height: 5, + ), + SizedBox(height: 10.0), if (error != null && error.isNotEmpty) Column( @@ -325,13 +316,10 @@ class _MyReferredPatientWidgetState extends State { 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.myReferredPatientModel); - // await Provider.of(context, listen: false).replay(answerController.text.toString(), widget.myReferredPatientModel);//myReferredPatientModel + await Provider.of(context, listen: false).replay(widget.myReferredPatientModel); + setState(() { _isLoading = false; }); @@ -341,7 +329,7 @@ class _MyReferredPatientWidgetState extends State { _isLoading = false; }); } - } + }, title: 'Verify', loading: _isLoading,