From 6c8f1c6185dce2caf18392c7330a83c624cbeedd Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 17 Aug 2021 15:57:41 +0300 Subject: [PATCH] merge improvement. --- .../AmbulanceRequestIndexPages/Summary.dart | 2 +- .../medical/patient_sick_leave_page.dart | 2 +- lib/uitl/translations_delegate_base.dart | 25 +++---------------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart index d6d4372e..4ddfaaa3 100644 --- a/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart @@ -31,7 +31,7 @@ class _SummaryState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts(TranslationBase.of(context).rrtSummary), + Texts(TranslationBase.of(context).RRTSummary), SizedBox(height: 5,), Container( width: double.infinity, diff --git a/lib/pages/medical/patient_sick_leave_page.dart b/lib/pages/medical/patient_sick_leave_page.dart index a3e1dcd3..b14fb33a 100644 --- a/lib/pages/medical/patient_sick_leave_page.dart +++ b/lib/pages/medical/patient_sick_leave_page.dart @@ -46,7 +46,7 @@ class _PatientSickLeavePageState extends State { itemBuilder: (context, index) => DoctorCard( isLiveCareAppointment: model.sickLeaveList[index].isLiveCareAppointment, name: model.sickLeaveList[index].doctorName, - date:projectViewModel.isArabic? DateUtil.getMonthDayYearDateFormattedAr(model.sickLeaveList[index].appointmentDate):DateUtil.getMonthDayYearDateFormatted(model.sickLeaveList[index].appointmentDate), + date: model.sickLeaveList[index].appointmentDate, profileUrl: model.sickLeaveList[index].doctorImageURL, rat: model.sickLeaveList[index].actualDoctorRate.toDouble(), subName: model.sickLeaveList[index].projectName, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 1d1515bf..8e1234d8 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -513,8 +513,6 @@ class TranslationBase { String get medicalProfile => localizedValues['medicalProfile'][locale.languageCode]; String get parking => localizedValues['parking'][locale.languageCode]; - String get parkingDescription => localizedValues['parkingDescription'][locale.languageCode]; - String get checkinOptions => localizedValues['checkinOption'][locale.languageCode]; String get alhabiServices => localizedValues['alhabiServices'][locale.languageCode]; String get parkingTitle => localizedValues['parkingTitle'][locale.languageCode]; String get readBarcode => localizedValues['readBarcode'][locale.languageCode]; @@ -1181,16 +1179,8 @@ class TranslationBase { String get wantToConnectWithHmgNetwork => localizedValues['wantConnectHmgNetwork'][locale.languageCode]; - String get bloodInstruction => localizedValues['blood-instruction'][locale.languageCode]; - String get bloodTermsNcondition => localizedValues['view-terms'][locale.languageCode]; - String get wantToConnectWithHmgNetwork => localizedValues['wantConnectHmgNetwork'][locale.languageCode]; String get failedToAccessHmgServices => localizedValues['failedToAccessHmgServices'][locale.languageCode]; String get enablingWifi => localizedValues['enablingWifi'][locale.languageCode]; - String get offerAndPackages => localizedValues['offerAndPackages'][locale.languageCode]; - String get failedToAccessHmgServices => localizedValues['failedToAccessHmgServices'][locale.languageCode]; - - String get enablingWifi => localizedValues['enablingWifi'][locale.languageCode]; - String get offerAndPackages => localizedValues['offerAndPackages'][locale.languageCode]; String get invoiceNo => localizedValues['InvoiceNo'][locale.languageCode]; @@ -1278,7 +1268,7 @@ class TranslationBase { String get infoAmbulance => localizedValues['info-ambulance'][locale.languageCode]; String get transportHeading => localizedValues['RRT-transport-heading'][locale.languageCode]; String get directionHeading => localizedValues['RRT-direction-heading'][locale.languageCode]; - String get wayHeading => localizedValues['RRT-way-heading'][locale.languageCode]; + String get toHospital => localizedValues['to-hospital'][locale.languageCode]; String get fromHospital => localizedValues['from-hospital'][locale.languageCode]; @@ -1325,10 +1315,8 @@ class TranslationBase { String get amountBeforeTax => localizedValues['AmountBeforeTax'][locale.languageCode]; String get taxAmount => localizedValues['TaxAmount'][locale.languageCode]; String get totalAmountPayable => localizedValues['TotalAmountPayable'][locale.languageCode]; - String get iAcceptTermsConditions => localizedValues['iAcceptTermsConditions'][locale.languageCode]; String get somethingWentWrongTryLater => localizedValues['somethingWentWrongTryLater'][locale.languageCode]; String get youCanPayByTheFollowingOptions => localizedValues['YouCanPayByTheFollowingOptions'][locale.languageCode]; - String get rrtService => localizedValues['rrtService'][locale.languageCode]; String get rrtUserAgreementTitle => localizedValues['rrtUserAgreementTitle'][locale.languageCode]; String get rrtUserAgreementP1 => localizedValues['rrtUserAgreementP1'][locale.languageCode]; String get rrtUserAgreementP2 => localizedValues['rrtUserAgreementP2'][locale.languageCode]; @@ -1904,14 +1892,9 @@ class TranslationBase { String get insuranceID => localizedValues["insurance-id"][locale.languageCode]; String get enterFile => localizedValues["enter-file"][locale.languageCode]; - String get feedbackType => localizedValues["feedback-type"][locale.languageCode]; String get selectRelationship => localizedValues["selectRelationship"][locale.languageCode]; - String get allow => localizedValues["allow"][locale.languageCode]; - String get reject => localizedValues["reject"][locale.languageCode]; - String get enterReferralRequesterName => localizedValues["enterReferralRequesterName"][locale.languageCode]; - String get selectRelationship => localizedValues["selectRelationship"][locale.languageCode]; String get requesterRelationship => localizedValues["requesterRelationship"][locale.languageCode]; String get newReferral => localizedValues["newReferral"][locale.languageCode]; String get searchForReferrals => localizedValues["searchForReferrals"][locale.languageCode]; @@ -1933,11 +1916,9 @@ class TranslationBase { String get invoicesList => localizedValues["invoice-list"][locale.languageCode]; - String get clinicAcceptLivecare => - localizedValues["clinic-accept-livecare"][locale.languageCode]; + String get clinicAcceptLivecare => localizedValues["clinic-accept-livecare"][locale.languageCode]; - String get livecareModalTop => - localizedValues["livecareModal-top"][locale.languageCode]; + String get livecareModalTop => localizedValues["livecareModal-top"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate {