Fix ER service

merge-requests/244/head
Mohammad Aljammal 5 years ago
parent cf59057836
commit 200334d8f8

@ -1 +1 @@
269226e53e3ba1b1460fd3df51f89f77 59a6c452ee075b50114918f17f1ad8f5

@ -452,4 +452,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7 PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7
COCOAPODS: 1.10.0.rc.1 COCOAPODS: 1.10.0

@ -225,8 +225,8 @@ const GET_LIVECARE_HISTORY = 'Services/ER_VirtualCall.svc/REST/GetPatientErVirtu
const CANCEL_LIVECARE_REQUEST = 'Services/ER_VirtualCall.svc/REST/DeleteErRequest'; const CANCEL_LIVECARE_REQUEST = 'Services/ER_VirtualCall.svc/REST/DeleteErRequest';
const SEND_LIVECARE_INVOICE_EMAIL = 'Services/Notifications.svc/REST/SendInvoiceForLiveCare'; const SEND_LIVECARE_INVOICE_EMAIL = 'Services/Notifications.svc/REST/SendInvoiceForLiveCare';
const GET_USER_TERMS = '/Services/Patients.svc/REST/GetUserTermsAndConditions'; const GET_USER_TERMS = 'Services/Patients.svc/REST/GetUserTermsAndConditions';
const UPDATE_HEALTH_TERMS = '/services/Patients.svc/REST/UpdatePateintHealthSummaryReport'; const UPDATE_HEALTH_TERMS = 'services/Patients.svc/REST/UpdatePateintHealthSummaryReport';
//URL to get medicine and pharmacies list //URL to get medicine and pharmacies list
const CHANNEL = 3; const CHANNEL = 3;

@ -288,7 +288,7 @@ const Map localizedValues = {
}, },
"ksa": {"en": "KSA", "ar": "السعودية"}, "ksa": {"en": "KSA", "ar": "السعودية"},
"dubai": {"en": "Dubai", "ar": "دبي"}, "dubai": {"en": "Dubai", "ar": "دبي"},
"enter-email": {"en": "Enter Email", "ar": "ادخل البريد الالكتروني"}, "enter-email": {"en": "Please Enter Email", "ar": "ادخل البريد الالكتروني"},
"family": {"en": "My Family", "ar": "عائلتي"}, "family": {"en": "My Family", "ar": "عائلتي"},
"family-title": {"en": "My Family Files", "ar": "ملفات العائلة"}, "family-title": {"en": "My Family Files", "ar": "ملفات العائلة"},
"myFamily": {"en": "My Family", "ar": "ملفات العائلة"}, "myFamily": {"en": "My Family", "ar": "ملفات العائلة"},
@ -1065,7 +1065,7 @@ const Map localizedValues = {
"pickup-location": {"en": "Pickup Location", "ar": "نقطة الانطلاق"}, "pickup-location": {"en": "Pickup Location", "ar": "نقطة الانطلاق"},
"pickup-spot": {"en": "Pickup Spot", "ar": "نقطة اللقاء"}, "pickup-spot": {"en": "Pickup Spot", "ar": "نقطة اللقاء"},
"inside-home": {"en": "Inside Home", "ar": "داخل المنزل"}, "inside-home": {"en": "Inside Home", "ar": "داخل المنزل"},
"have-appo": {"en": "Do you have an appointment?", "ar": "هل لديك موعد؟"}, "have-appo": {"en": "Do you have an appointment ?", "ar": "هل لديك موعد ؟"},
"dropoff-location": {"en": "Dropoff Location", "ar": "نقطة الوصول"}, "dropoff-location": {"en": "Dropoff Location", "ar": "نقطة الوصول"},
"select-all": { "select-all": {
"en": "Please select all fields", "en": "Please select all fields",
@ -1469,4 +1469,13 @@ const Map localizedValues = {
"en": "Through this service, you can request a set of tests that help you and your doctor to understand the current health condition and then identify potential risks.", "en": "Through this service, you can request a set of tests that help you and your doctor to understand the current health condition and then identify potential risks.",
"ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة" "ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
}, },
"instructionAgree": {
"en": "This monthly Health Summary Report reflects the health indicators and analysis results of the latest visits. Please note that this will be sent automatically from the system and it's not considered as an official report so no medical decisions should be taken based on it.",
"ar": "هذا ملخص التقرير الصحي الشهري و الذي يسرد المؤشرات الصحية و نتائج التحاليل لأخر الزيارات. يرجى ملاحظة أن هذا التقرير هو تقرير يتم ارساله بشكل آلي من النظام و لا يعتبر رسمي و لا تؤخذ عليه أي قرارات طبية"
},
"reqId": {
"en": "Request ID:",
"ar": " رقم الطلب"
},
}; };

@ -18,8 +18,8 @@ class PickUpRequestPresOrder {
int pickupSpot; int pickupSpot;
dynamic dropoffLocationId; dynamic dropoffLocationId;
int transportationMethodId; int transportationMethodId;
double cost; dynamic cost;
double vAT; dynamic vAT;
double totalPrice; double totalPrice;
int amountCollected; int amountCollected;
int selectedAmbulate; int selectedAmbulate;

@ -11,24 +11,24 @@ class Reports {
String setupId; String setupId;
int patientID; int patientID;
int doctorID; int doctorID;
Null clinicID; dynamic clinicID;
DateTime requestDate; DateTime requestDate;
bool isRead; bool isRead;
DateTime isReadOn; DateTime isReadOn;
int actualDoctorRate; int actualDoctorRate;
String clinicDescription; String clinicDescription;
Null clinicDescriptionN; dynamic clinicDescriptionN;
String docName; String docName;
Null docNameN; Null docNameN;
String doctorImageURL; String doctorImageURL;
Null doctorName; dynamic doctorName;
Null doctorNameN; dynamic doctorNameN;
int doctorRate; int doctorRate;
bool isDoctorAllowVedioCall; bool isDoctorAllowVedioCall;
bool isExecludeDoctor; bool isExecludeDoctor;
int noOfPatientsRate; int noOfPatientsRate;
String projectName; String projectName;
Null projectNameN; dynamic projectNameN;
Reports( Reports(
{this.status, {this.status,
@ -61,37 +61,41 @@ class Reports {
this.projectNameN}); this.projectNameN});
Reports.fromJson(Map<String, dynamic> json) { Reports.fromJson(Map<String, dynamic> json) {
status = json['Status']; try {
encounterDate = DateUtil.convertStringToDate( status = json['Status'];
json['EncounterDate']); //json['EncounterDate']; encounterDate = DateUtil.convertStringToDate(
projectID = json['ProjectID']; json['EncounterDate']); //json['EncounterDate'];
invoiceNo = json['InvoiceNo']; projectID = json['ProjectID'];
encounterNo = json['EncounterNo']; invoiceNo = json['InvoiceNo'];
procedureId = json['ProcedureId']; encounterNo = json['EncounterNo'];
requestType = json['RequestType']; procedureId = json['ProcedureId'];
setupId = json['SetupId']; requestType = json['RequestType'];
patientID = json['PatientID']; setupId = json['SetupId'];
doctorID = json['DoctorID']; patientID = json['PatientID'];
clinicID = json['ClinicID']; doctorID = json['DoctorID'];
requestDate = DateUtil.convertStringToDate( clinicID = json['ClinicID'];
json['RequestDate']); //json['RequestDate']; requestDate = DateUtil.convertStringToDate(
isRead = json['IsRead']; json['RequestDate']); //json['RequestDate'];
isReadOn = isRead = json['IsRead'];
DateUtil.convertStringToDate(json['IsReadOn']); //json['IsReadOn']; isReadOn =
actualDoctorRate = json['ActualDoctorRate']; DateUtil.convertStringToDate(json['IsReadOn']); //json['IsReadOn'];
clinicDescription = json['ClinicDescription']; actualDoctorRate = json['ActualDoctorRate'];
clinicDescriptionN = json['ClinicDescriptionN']; clinicDescription = json['ClinicDescription'];
docName = json['DocName']; clinicDescriptionN = json['ClinicDescriptionN'];
docNameN = json['DocNameN']; docName = json['DocName'];
doctorImageURL = json['DoctorImageURL']; docNameN = json['DocNameN'];
doctorName = json['DoctorName']; doctorImageURL = json['DoctorImageURL'];
doctorNameN = json['DoctorNameN']; doctorName = json['DoctorName'];
doctorRate = json['DoctorRate']; doctorNameN = json['DoctorNameN'];
isDoctorAllowVedioCall = json['IsDoctorAllowVedioCall']; doctorRate = json['DoctorRate'];
isExecludeDoctor = json['IsExecludeDoctor']; isDoctorAllowVedioCall = json['IsDoctorAllowVedioCall'];
noOfPatientsRate = json['NoOfPatientsRate']; isExecludeDoctor = json['IsExecludeDoctor'];
projectName = json['ProjectName']; noOfPatientsRate = json['NoOfPatientsRate'];
projectNameN = json['ProjectNameN']; projectName = json['ProjectName'];
projectNameN = json['ProjectNameN'];
}catch(e){
print(e);
}
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {

@ -68,6 +68,19 @@ class ReportsService extends BaseService {
}, body: body); }, body: body);
} }
Future updateEmail({String email}) async {
Map<String, dynamic> body = Map<String, dynamic>();
body['EmailAddress'] = email;
body['isDentalAllowedBackend'] = false;
hasError = false;
await baseAppClient.post(UPDATE_PATENT_EMAIL,
onSuccess: (dynamic response, int statusCode) {},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: body);
}
Future insertRequestForMedicalReport( Future insertRequestForMedicalReport(
AppointmentHistory appointmentHistory) async { AppointmentHistory appointmentHistory) async {
Map<String, dynamic> body = new Map<String, dynamic>(); Map<String, dynamic> body = new Map<String, dynamic>();

@ -13,11 +13,9 @@ class ReportsMonthlyViewModel extends BaseViewModel {
ReportsService _reportsService = locator<ReportsService>(); ReportsService _reportsService = locator<ReportsService>();
String get userAgreementContent => _reportsService.userAgreementContent; String get userAgreementContent => _reportsService.userAgreementContent;
getUserTermsAndConditions() async{ getUserTermsAndConditions() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _reportsService.getUserTermsAndConditions(); await _reportsService.getUserTermsAndConditions();
if (_reportsService.hasError) { if (_reportsService.hasError) {
@ -28,19 +26,33 @@ class ReportsMonthlyViewModel extends BaseViewModel {
} }
} }
updatePatientHealthSummaryReport({String message, bool isSummary})async{ updatePatientHealthSummaryReport(
{String message,
bool isSummary,
bool isUpdateEmail = false,
String email}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _reportsService.updatePatientHealthSummaryReport(isSummary: isSummary); await _reportsService.updatePatientHealthSummaryReport(
isSummary: isSummary);
if (_reportsService.hasError) { if (_reportsService.hasError) {
error = _reportsService.error; error = _reportsService.error;
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
AppToast.showSuccessToast(message: message); if (isUpdateEmail) {
setState(ViewState.Idle); await _reportsService.updateEmail(email: email);
if (_reportsService.hasError) {
error = _reportsService.error;
AppToast.showErrorToast(message: error);
setState(ViewState.ErrorLocal);
} else {
AppToast.showSuccessToast(message: message);
setState(ViewState.Idle);
}
} else {
AppToast.showSuccessToast(message: message);
setState(ViewState.Idle);
}
} }
} }
} }

@ -79,7 +79,7 @@ class _AmbulanceReqState extends State<AmbulanceReq>
child: Container( child: Container(
height: 60.0, height: 60.0,
margin: EdgeInsets.only(top: 10.0), margin: EdgeInsets.only(top: 10.0),
width: MediaQuery.of(context).size.width * 0.93, width: MediaQuery.of(context).size.width * 0.90,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
@ -92,8 +92,7 @@ class _AmbulanceReqState extends State<AmbulanceReq>
isScrollable: true, isScrollable: true,
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.label,
indicatorColor: Colors.red[800],
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
labelPadding: labelPadding:
EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0),

@ -46,7 +46,7 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
body: widget.amRequestViewModel.pickUpRequestPresOrder != null body: false
? Column( ? Column(
children: [ children: [
SizedBox( SizedBox(
@ -62,18 +62,18 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
OrderLogItem( OrderLogItem(
title: 'Request ID', title: TranslationBase.of(context).reqId,
value: widget.amRequestViewModel.pickUpRequestPresOrder value: widget.amRequestViewModel.pickUpRequestPresOrder
.presOrderID .presOrderID
.toString(), .toString(),
), ),
OrderLogItem( OrderLogItem(
title: 'Status', title: TranslationBase.of(context).status,
value: widget.amRequestViewModel.pickUpRequestPresOrder value: widget.amRequestViewModel.pickUpRequestPresOrder
.ambulateDescription, .ambulateDescription,
), ),
OrderLogItem( OrderLogItem(
title: 'Last edit time', title: TranslationBase.of(context).pickupDate,
value: DateUtil.getDayMonthYearDateFormatted( value: DateUtil.getDayMonthYearDateFormatted(
DateUtil.convertStringToDate(widget DateUtil.convertStringToDate(widget
.amRequestViewModel .amRequestViewModel
@ -81,17 +81,17 @@ class _AmbulanceRequestIndexPageState extends State<AmbulanceRequestIndexPage> {
.lastEditDate)), .lastEditDate)),
), ),
OrderLogItem( OrderLogItem(
title: 'Pickup Location', title: TranslationBase.of(context).pickupLocation,
value: widget.amRequestViewModel.pickUpRequestPresOrder value: widget.amRequestViewModel.pickUpRequestPresOrder
.pickupLocationName, .pickupLocationName,
), ),
OrderLogItem( OrderLogItem(
title: 'Drop off Location', title: TranslationBase.of(context).dropoffLocation,
value: widget.amRequestViewModel.pickUpRequestPresOrder value: widget.amRequestViewModel.pickUpRequestPresOrder
.dropoffLocationName, .dropoffLocationName,
), ),
OrderLogItem( OrderLogItem(
title: 'Trasfaer way', title: TranslationBase.of(context).transportMethod,
value: widget value: widget
.amRequestViewModel.pickUpRequestPresOrder.title, .amRequestViewModel.pickUpRequestPresOrder.title,
), ),

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/Ambulate.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart'; import 'package:diplomaticquarterapp/pages/Blood/new_text_Field.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -51,7 +52,7 @@ class _BillAmountState extends State<BillAmount> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('Bill Amount '), Texts(TranslationBase.of(context).billAmount),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -73,7 +74,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'Amount before tax: ', TranslationBase.of(context).patientShareB,
textAlign: TextAlign.start, textAlign: TextAlign.start,
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
@ -91,7 +92,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'SR ${widget.patientER.patientERTransportationMethod.price}', TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.price}',
color: Colors.black, color: Colors.black,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 15, fontSize: 15,
@ -108,7 +109,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'Tax amount :', TranslationBase.of(context).patientShareTax,
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -121,7 +122,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'SR ${widget.patientER.patientERTransportationMethod.vAT}', TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.vAT}',
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -143,7 +144,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'Total amount payable', TranslationBase.of(context).patientShareTotal,
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -162,7 +163,7 @@ class _BillAmountState extends State<BillAmount> {
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Texts( child: Texts(
'SR ${widget.patientER.patientERTransportationMethod.totalPrice}', TranslationBase.of(context).sar+' ${widget.patientER.patientERTransportationMethod.totalPrice}',
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -176,7 +177,7 @@ class _BillAmountState extends State<BillAmount> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Texts('Select Ambulate',bold: true,), Texts(TranslationBase.of(context).selectAmbulate,bold: true,),
SizedBox(height: 5,), SizedBox(height: 5,),
Row( Row(
children: [ children: [
@ -196,7 +197,7 @@ class _BillAmountState extends State<BillAmount> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Wheelchair'), title: Text(TranslationBase.of(context).wheelchair),
leading: Radio( leading: Radio(
value: Ambulate.Wheelchair, value: Ambulate.Wheelchair,
groupValue: _ambulate, groupValue: _ambulate,
@ -227,7 +228,7 @@ class _BillAmountState extends State<BillAmount> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Walker'), title: Text(TranslationBase.of(context).walker),
leading: Radio( leading: Radio(
value: Ambulate.Walker, value: Ambulate.Walker,
groupValue: _ambulate, groupValue: _ambulate,
@ -263,7 +264,7 @@ class _BillAmountState extends State<BillAmount> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Stretcher'), title: Text(TranslationBase.of(context).stretcher),
leading: Radio( leading: Radio(
value: Ambulate.Stretcher, value: Ambulate.Stretcher,
groupValue: _ambulate, groupValue: _ambulate,
@ -294,7 +295,7 @@ class _BillAmountState extends State<BillAmount> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('None'), title: Text(TranslationBase.of(context).none),
leading: Radio( leading: Radio(
value: Ambulate.None, value: Ambulate.None,
groupValue: _ambulate, groupValue: _ambulate,
@ -313,7 +314,7 @@ class _BillAmountState extends State<BillAmount> {
), ),
SizedBox(height: 12,), SizedBox(height: 12,),
NewTextFields( NewTextFields(
hintText: 'Note', hintText: TranslationBase.of(context).notes,
initialValue: note, initialValue: note,
onChanged: (value){ onChanged: (value){
setState(() { setState(() {
@ -340,7 +341,7 @@ class _BillAmountState extends State<BillAmount> {
widget.changeCurrentTab(3); widget.changeCurrentTab(3);
}); });
}, },
label: 'Next', label: TranslationBase.of(context).next,
), ),
) )
], ],

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/landing/home_page.dart';
import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart'; import 'package:diplomaticquarterapp/uitl/ProgressDialog.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMap.dart'; import 'package:diplomaticquarterapp/widgets/pickupLocation/PickupLocationFromMap.dart';
@ -78,7 +79,7 @@ class _PickupLocationState extends State<PickupLocation> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('Pickup Location'), Texts(TranslationBase.of(context).pickupLocation),
SizedBox( SizedBox(
height: 15, height: 15,
), ),
@ -110,7 +111,7 @@ class _PickupLocationState extends State<PickupLocation> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getSelectFromMapName()), Texts(getSelectFromMapName(context)),
Icon( Icon(
FontAwesomeIcons.mapMarkerAlt, FontAwesomeIcons.mapMarkerAlt,
size: 24, size: 24,
@ -123,7 +124,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Pickup Spot'), Texts(TranslationBase.of(context).pickupSpot),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -141,7 +142,7 @@ class _PickupLocationState extends State<PickupLocation> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Texts('Inside Home'), title: Texts(TranslationBase.of(context).insideHome),
leading: Checkbox( leading: Checkbox(
activeColor: Colors.red[800], activeColor: Colors.red[800],
value: _isInsideHome, value: _isInsideHome,
@ -157,7 +158,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Do you have an appointment ?'), Texts(TranslationBase.of(context).haveAppo),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -182,7 +183,7 @@ class _PickupLocationState extends State<PickupLocation> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Yes'), title: Texts(TranslationBase.of(context).yes),
leading: Radio( leading: Radio(
value: HaveAppointment.YES, value: HaveAppointment.YES,
groupValue: _haveAppointment, groupValue: _haveAppointment,
@ -217,7 +218,7 @@ class _PickupLocationState extends State<PickupLocation> {
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('No'), title: Texts(TranslationBase.of(context).no),
leading: Radio( leading: Radio(
value: HaveAppointment.NO, value: HaveAppointment.NO,
groupValue: _haveAppointment, groupValue: _haveAppointment,
@ -250,7 +251,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Drop off Location'), Texts(TranslationBase.of(context).dropoffLocation),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
@ -270,7 +271,7 @@ class _PickupLocationState extends State<PickupLocation> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getHospitalName('Pickup Location')), Texts(getHospitalName(TranslationBase.of(context).pickupLocation)),
Icon( Icon(
Icons.arrow_drop_down, Icons.arrow_drop_down,
size: 24, size: 24,
@ -286,7 +287,7 @@ class _PickupLocationState extends State<PickupLocation> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('Pickup Location'), Texts(TranslationBase.of(context).pickupLocation),
SizedBox( SizedBox(
height: 15, height: 15,
), ),
@ -306,7 +307,7 @@ class _PickupLocationState extends State<PickupLocation> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getHospitalName('Pickup Location')), Texts(getHospitalName(TranslationBase.of(context).pickupLocation)),
Icon( Icon(
Icons.arrow_drop_down, Icons.arrow_drop_down,
size: 24, size: 24,
@ -319,7 +320,7 @@ class _PickupLocationState extends State<PickupLocation> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Drop off Location'), Texts(TranslationBase.of(context).dropoffLocation),
SizedBox( SizedBox(
height: 8, height: 8,
), ),
@ -351,7 +352,7 @@ class _PickupLocationState extends State<PickupLocation> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(getSelectFromMapName()), Texts(getSelectFromMapName(context)),
Icon( Icon(
FontAwesomeIcons.mapMarkerAlt, FontAwesomeIcons.mapMarkerAlt,
size: 24, size: 24,
@ -377,7 +378,7 @@ class _PickupLocationState extends State<PickupLocation> {
onTap: () { onTap: () {
if (_result == null || _selectedHospital == null) if (_result == null || _selectedHospital == null)
AppToast.showErrorToast( AppToast.showErrorToast(
message: 'please select all fields'); message: TranslationBase.of(context).selectAll);
else else
setState(() { setState(() {
widget.patientER.pickupSpot = _isInsideHome ? 1 : 0; widget.patientER.pickupSpot = _isInsideHome ? 1 : 0;
@ -427,7 +428,7 @@ class _PickupLocationState extends State<PickupLocation> {
widget.changeCurrentTab(2); widget.changeCurrentTab(2);
}); });
}, },
label: 'Next', label: TranslationBase.of(context).next,
), ),
) )
], ],
@ -455,8 +456,8 @@ class _PickupLocationState extends State<PickupLocation> {
return _selectedHospital == null ? title : _selectedHospital.name; return _selectedHospital == null ? title : _selectedHospital.name;
} }
String getSelectFromMapName() { String getSelectFromMapName(context) {
return _result != null ? _result.formattedAddress : 'Select From Map'; return _result != null ? _result.formattedAddress : TranslationBase.of(context).selectMap;
} }
getAppointment() { getAppointment() {
@ -494,7 +495,7 @@ class _PickupLocationState extends State<PickupLocation> {
setState(() { setState(() {
_haveAppointment = HaveAppointment.NO; _haveAppointment = HaveAppointment.NO;
}); });
AppToast.showErrorToast(message: 'You don\'t have any appointment'); AppToast.showErrorToast(message: TranslationBase.of(context).noAppointment);
} }
}).catchError((e) { }).catchError((e) {
ProgressDialogUtil.hideProgressDialog(context); ProgressDialogUtil.hideProgressDialog(context);

@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/core/enum/OrderService.dart';
import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart';
import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -67,7 +68,7 @@ class _SelectTransportationMethodState
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Select Transportation Method'), Texts(TranslationBase.of(context).transportHeading),
...List.generate( ...List.generate(
widget.amRequestViewModel.amRequestModeList.length, widget.amRequestViewModel.amRequestModeList.length,
(index) => InkWell( (index) => InkWell(
@ -108,7 +109,7 @@ class _SelectTransportationMethodState
Expanded( Expanded(
flex: 1, flex: 1,
child: Texts( child: Texts(
'SR ${widget.amRequestViewModel.amRequestModeList[index].price}'), TranslationBase.of(context).sar+' ${widget.amRequestViewModel.amRequestModeList[index].price}'),
) )
], ],
), ),
@ -118,7 +119,7 @@ class _SelectTransportationMethodState
SizedBox( SizedBox(
height: 12, height: 12,
), ),
Texts('Select Direction'), Texts(TranslationBase.of(context).directionHeading),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -144,7 +145,7 @@ class _SelectTransportationMethodState
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('To Hospital'), title: Text(TranslationBase.of(context).toHospital),
leading: Radio( leading: Radio(
value: Direction.ToHospital, value: Direction.ToHospital,
groupValue: _direction, groupValue: _direction,
@ -175,7 +176,7 @@ class _SelectTransportationMethodState
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Form Hospital'), title: Text(TranslationBase.of(context).fromHospital),
leading: Radio( leading: Radio(
value: Direction.FromHospital, value: Direction.FromHospital,
groupValue: _direction, groupValue: _direction,
@ -200,7 +201,7 @@ class _SelectTransportationMethodState
SizedBox( SizedBox(
height: 8, height: 8,
), ),
Texts('Select Direction'), Texts(TranslationBase.of(context).directionHeading),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -222,7 +223,7 @@ class _SelectTransportationMethodState
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('One Way'), title: Text(TranslationBase.of(context).oneDirec),
leading: Radio( leading: Radio(
value: Way.OneWay, value: Way.OneWay,
groupValue: _way, groupValue: _way,
@ -253,7 +254,7 @@ class _SelectTransportationMethodState
color: Colors.white, color: Colors.white,
), ),
child: ListTile( child: ListTile(
title: Text('Two Ways'), title: Text(TranslationBase.of(context).twoDirec),
leading: Radio( leading: Radio(
value: Way.TwoWays, value: Way.TwoWays,
groupValue: _way, groupValue: _way,
@ -298,7 +299,7 @@ class _SelectTransportationMethodState
widget.changeCurrentTab(1); widget.changeCurrentTab(1);
}); });
}, },
label: 'Next', label: TranslationBase.of(context).next,
), ),
) )
], ],

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/model/er/PatientER.dart'; import 'package:diplomaticquarterapp/core/model/er/PatientER.dart';
import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/am_request_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -27,7 +28,7 @@ class _SummaryState extends State<Summary> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('Summary'), Texts(TranslationBase.of(context).RRTSummary),
SizedBox(height: 5,), SizedBox(height: 5,),
Container( Container(
width: double.infinity, width: double.infinity,
@ -39,11 +40,11 @@ class _SummaryState extends State<Summary> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts('Transportation Method',color: Colors.grey,), Texts(TranslationBase.of(context).transportMethod,color: Colors.grey,),
Texts('${widget.patientER.patientERTransportationMethod.title}',bold: true,), Texts('${widget.patientER.patientERTransportationMethod.title}',bold: true,),
SizedBox(height: 8,), SizedBox(height: 8,),
Texts('Direction',color: Colors.grey,), Texts(TranslationBase.of(context).directions,color: Colors.grey,),
Texts('From Hospital',bold: true,), Texts('From Hospital',bold: true,),
SizedBox(height: 8,), SizedBox(height: 8,),
@ -92,7 +93,7 @@ class _SummaryState extends State<Summary> {
child:SecondaryButton( child:SecondaryButton(
color: Colors.grey[800], color: Colors.grey[800],
textColor: Colors.white, textColor: Colors.white,
label: 'Send', label: TranslationBase.of(context).send,
onTap: () async { onTap: () async {
await widget.amRequestViewModel.insertERPressOrder(patientER: widget.patientER); await widget.amRequestViewModel.insertERPressOrder(patientER: widget.patientER);

@ -74,7 +74,6 @@ class _FeedbackHomePageState extends State<FeedbackHomePage>
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
indicatorColor: Colors.red[800],
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
labelPadding: labelPadding:
EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0),

@ -2,10 +2,12 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/reports_monthly_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/reports_monthly_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/reports/user_agreement_page.dart'; import 'package:diplomaticquarterapp/pages/medical/reports/user_agreement_page.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/input/custom_switch.dart'; import 'package:diplomaticquarterapp/widgets/input/custom_switch.dart';
import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -19,6 +21,8 @@ class MonthlyReportsPage extends StatefulWidget {
class _MonthlyReportsPageState extends State<MonthlyReportsPage> { class _MonthlyReportsPageState extends State<MonthlyReportsPage> {
bool isAgree = false; bool isAgree = false;
bool isSummary = false; bool isSummary = false;
String email = "";
final formKey = GlobalKey<FormState>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -29,135 +33,161 @@ class _MonthlyReportsPageState extends State<MonthlyReportsPage> {
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),
child: Column( child: Form(
crossAxisAlignment: CrossAxisAlignment.start, key: formKey,
children: [ child: Column(
Container( crossAxisAlignment: CrossAxisAlignment.start,
padding: EdgeInsets.all(9), children: [
height: 55, Container(
decoration: BoxDecoration( padding: EdgeInsets.all(9),
color: Colors.white, height: 55,
borderRadius: BorderRadius.all(Radius.circular(8)), decoration: BoxDecoration(
shape: BoxShape.rectangle, color: Colors.white,
border: Border.all(color: Colors.grey)), borderRadius: BorderRadius.all(Radius.circular(8)),
child: Row( shape: BoxShape.rectangle,
mainAxisAlignment: MainAxisAlignment.spaceBetween, border: Border.all(color: Colors.grey)),
children: [ child: Row(
Texts( mainAxisAlignment: MainAxisAlignment.spaceBetween,
TranslationBase.of(context).patientHealthSummaryReport, children: [
bold: true,
), Texts(
CustomSwitch( TranslationBase.of(context).patientHealthSummaryReport,
value: isSummary, bold: true,
activeColor: Colors.red, ),
inactiveColor: Colors.grey, CustomSwitch(
onChanged: () async { value: isSummary,
setState(() { activeColor: Colors.red,
isSummary = !isSummary; inactiveColor: Colors.grey,
}); onChanged: () async {
}, setState(() {
) isSummary = !isSummary;
], });
if(!isSummary) {
GifLoaderDialogUtils.showMyDialog(context);
await model.updatePatientHealthSummaryReport(
message: TranslationBase
.of(context)
.updateSuccessfully, isSummary: isSummary);
GifLoaderDialogUtils.hideDialog(context);
}
},
)
],
),
), ),
), SizedBox(
SizedBox( height: 15,
height: 15,
),
Container(
margin: EdgeInsets.all(8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Texts(
model.user.emailAddress,
bold: true,
),
],
), ),
), Container(
Divider( margin: EdgeInsets.all(8),
height: 10.4, child: TextFields(
thickness: 1.0, fillColor: Colors.red,
), hintText: 'email@email.com',
SizedBox( fontSize: 20,
height: 15, initialValue: model.user.emailAddress,
), fontWeight: FontWeight.w600,
Container( onChanged: (text) {
margin: EdgeInsets.all(8), email = text;
child: Row( },
mainAxisAlignment: MainAxisAlignment.spaceBetween, validator: (value) {
if (value.isEmpty)
return TranslationBase.of(context).enterEmail;
else
return null;
},
),
),
Divider(
height: 10.4,
thickness: 1.0,
),
SizedBox(
height: 15,
),
Container(
margin: EdgeInsets.all(8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Texts(TranslationBase.of(context)
.toViewTheTermsAndConditions),
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: UserAgreementContent(),
),
);
},
child: Texts(
TranslationBase.of(context).clickHere,
color: Colors.blue,
),
)
],
),
),
SizedBox(
height: 5,
),
Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Expanded( Checkbox(
child: Texts(TranslationBase.of(context) value: isAgree,
.toViewTheTermsAndConditions), onChanged: (value) {
), setState(() {
InkWell( isAgree = !isAgree;
onTap: () { });
Navigator.push(
context,
FadePage(
page: UserAgreementContent(),
),
);
}, },
child: Texts( activeColor: Colors.red,
TranslationBase.of(context).clickHere, ),
color: Colors.blue, Texts(TranslationBase.of(context).iAgreeToTheTermsAndConditions),
),
)
], ],
), ),
), Container(
SizedBox( margin: EdgeInsets.all(8),
height: 5, width: double.infinity,
), child: SecondaryButton(
Row( textColor: Colors.white,
crossAxisAlignment: CrossAxisAlignment.center, label: TranslationBase.of(context).save,
mainAxisAlignment: MainAxisAlignment.start, disabled: (!isAgree || !isSummary ),
children: [ onTap: () async {
Checkbox( final form = formKey.currentState;
value: isAgree, if (form.validate()) {
onChanged: (value) { GifLoaderDialogUtils.showMyDialog(context);
setState(() { await model.updatePatientHealthSummaryReport(
isAgree = !isAgree; message: TranslationBase
}); .of(context)
.updateSuccessfully,
isSummary: isSummary,
isUpdateEmail: true,
email: email.isNotEmpty ? email : model.user
.emailAddress);
GifLoaderDialogUtils.hideDialog(context);
}
}, },
activeColor: Colors.red,
), ),
Texts(TranslationBase.of(context)
.iAgreeToTheTermsAndConditions),
],
),
Container(
margin: EdgeInsets.all(8),
width: double.infinity,
child: SecondaryButton(
textColor: Colors.white,
label: TranslationBase.of(context).save,
disabled: !isAgree,
loading: model.state == ViewState.BusyLocal,
onTap: () {
model.updatePatientHealthSummaryReport(
message: TranslationBase.of(context)
.updateSuccessfully,
isSummary: isSummary);
},
), ),
), Padding(
Padding( padding: const EdgeInsets.all(5.0),
padding: const EdgeInsets.all(5.0), child: Texts(
child: Texts( TranslationBase.of(context)
TranslationBase.of(context) .instructionAgree,
.iAgreeToTheTermsAndConditionsSubtitle, fontWeight: FontWeight.normal,
fontWeight: FontWeight.normal, ),
),
SizedBox(
height: 12,
), ),
), Center(child: Image.asset('assets/images/report.jpg'))
SizedBox( ],
height: 12, ),
),
Center(child: Image.asset('assets/images/report.jpg'))
],
), ),
), ),
), ),

@ -1042,7 +1042,7 @@ class TranslationBase {
String get selectAmbulate => String get selectAmbulate =>
localizedValues['select-ambulate'][locale.languageCode]; localizedValues['select-ambulate'][locale.languageCode];
String get wheelchair => localizedValues['wheelchair'][locale.languageCode]; String get wheelchair => localizedValues['wheelchair'][locale.languageCode];
String get walker => localizedValues['walker"'][locale.languageCode]; String get walker => localizedValues['walker'][locale.languageCode];
String get stretcher => localizedValues['stretcher'][locale.languageCode]; String get stretcher => localizedValues['stretcher'][locale.languageCode];
String get none => localizedValues['none'][locale.languageCode]; String get none => localizedValues['none'][locale.languageCode];
String get RRTSummary => localizedValues['RRT-Summary'][locale.languageCode]; String get RRTSummary => localizedValues['RRT-Summary'][locale.languageCode];
@ -1248,6 +1248,8 @@ class TranslationBase {
String get NearestErDesc => localizedValues['NearestErDesc'][locale.languageCode]; String get NearestErDesc => localizedValues['NearestErDesc'][locale.languageCode];
String get NearestEr => localizedValues['NearestEr'][locale.languageCode]; String get NearestEr => localizedValues['NearestEr'][locale.languageCode];
String get infoCMC => localizedValues['infoCMC'][locale.languageCode]; String get infoCMC => localizedValues['infoCMC'][locale.languageCode];
String get instructionAgree => localizedValues['instructionAgree'][locale.languageCode];
String get reqId => localizedValues['reqId'][locale.languageCode];
} }

@ -46,8 +46,7 @@ class TextFields extends StatefulWidget {
this.suffixIcon, this.suffixIcon,
this.autoFocus, this.autoFocus,
this.onChanged, this.onChanged,
this.initialValue,
// this.initialValue,
this.minLines, this.minLines,
this.maxLines, this.maxLines,
this.inputFormatters, this.inputFormatters,
@ -78,8 +77,7 @@ class TextFields extends StatefulWidget {
: super(key: key); : super(key: key);
final String hintText; final String hintText;
final String initialValue;
// final String initialValue;
final String type; final String type;
final bool autoFocus; final bool autoFocus;
final IconData suffixIcon; final IconData suffixIcon;
@ -230,7 +228,7 @@ class _TextFieldsState extends State<TextFields> {
minLines: widget.minLines ?? 1, minLines: widget.minLines ?? 1,
maxLines: widget.maxLines ?? 1, maxLines: widget.maxLines ?? 1,
maxLengthEnforced: widget.maxLengthEnforced, maxLengthEnforced: widget.maxLengthEnforced,
// initialValue: widget.initialValue, initialValue: widget.initialValue,
onChanged: widget.onChanged, onChanged: widget.onChanged,
focusNode: _focusNode, focusNode: _focusNode,
maxLength: widget.maxLength ?? null, maxLength: widget.maxLength ?? null,

Loading…
Cancel
Save