Merge branch 'fix_issues' into 'diplomatic-quarter-live'

add missing translation

See merge request Cloud_Solution/diplomatic-quarter!157
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 092f415457

@ -1 +1 @@
a30437b5671472a3d6a8672edcfc504b f4a819c27119d0f472892c1088ad1ca3

@ -522,11 +522,11 @@ const Map localizedValues = {
"PaymentOnline": {"en": "Service", "ar": "الالكتروني"}, "PaymentOnline": {"en": "Service", "ar": "الالكتروني"},
"OnlineCheckIn": {"en": "Online Check-In", "ar": "مدفوعات معلقة"}, "OnlineCheckIn": {"en": "Online Check-In", "ar": "مدفوعات معلقة"},
"MyBalances": {"en": "My Balances", "ar": "رصيدي"}, "MyBalances": {"en": "My Balances", "ar": "رصيدي"},
"BalanceAmount": {"en": "Balance Amount", "ar": "رصيدالحساب"}, "BalanceAmount": { "en": "Wallet Amount", "ar": "مبلغ المحفظة"},
"TotalBalance": {"en": "Total Balance", "ar": "الرصيد الكلي"}, "TotalBalance": { "en": "Total Amount", "ar": "المبلغ الإجمالي"},
"CreateAdvancedPayment": { "CreateAdvancedPayment": {
"en": "Create Advanced Payment", "en": "Recharge Wallet",
"ar": "إنشاء دفعة مقدمة" "ar": "إعادة شحن المحفظة"
}, },
"AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"}, "AdvancePayment": {"en": "Advance Payment", "ar": "الدفع مقدما"},
"AdvancePaymentLabel": { "AdvancePaymentLabel": {
@ -1074,5 +1074,95 @@ const Map localizedValues = {
"en": "time left for appointment", "en": "time left for appointment",
"ar": "الوقت المتبقي للموعد" "ar": "الوقت المتبقي للموعد"
}, },
"covid-test-all-services": {
"en": "Covid-19 Drive-Thru Test",
"ar": "فحص كورونا من داخل السيارة"
},
"pharmacy": {
"en": "Pharmacy",
"ar": "الصيدلية"
},
"ereferral": {
"en": "E-Referral",
"ar": "طلب التحويل"
},
"child-vaccine": {
"en": "Child Vaccines",
"ar": "تطعيمات الأطفال"
},
"calculators": {
"en": "Health Calculators",
"ar": "الحاسبات الصحية"
},
"converters": {
"en": "Health Converter",
"ar": "تحويل القياسات"
},
"h2o": {
"en": "Water Tracker",
"ar": "حساب كمية الماء"
},
"v-tour": {
"en": "Virtual Tour",
"ar": "جولة إفتراضية"
},
"hmg-news": {
"en": "HMG News",
"ar": "أخبار المجموعة"
},
"blood-d": {
"en": "Blood Donation",
"ar": "تبرع بالدم"
},
"symptomCheckerTitle": {
"en": "Symptom Checker",
"ar": "مدقق الأعراض"
},
"latest-news": {
"en": "Latest News",
"ar": "أحدث الأخبار"
},
"our-location": {
"en": "Our Locations",
"ar": "موقعنا"
},
"pharmacies": {
"en": "Pharmacies",
"ar": "الصيدليات"
},
"hospitals": {
"en": "Hospitals",
"ar": "المستشفيات"
},
"wallet": {
"en": "Wallet",
"ar": "محفظة نقود"
},
"hmg": {
"en": "Al Habib",
"ar": "الحبيب"
},
"requested": {
"en": "Requested",
"ar": "مطلوب"
},
"ready": {
"en": "Ready",
"ar": "جاهز"
},
"completed": {
"en": "Completed",
"ar": "مكتمل"
},
"cancelled": {
"en": "Cancelled",
"ar": "ملغى"
},
"request-medical-report": {
"en": "Request medical report",
"ar": "طلب تقرير طبي"
},
}; };

@ -48,6 +48,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
LocationUtils locationUtils; LocationUtils locationUtils;
var weather = '--'; var weather = '--';
@override @override
void initState() { void initState() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
@ -201,7 +202,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
), ),
imageLocation: imageLocation:
'assets/images/new-design/family_menu_icon_red.png', 'assets/images/new-design/family_menu_icon_red.png',
title: 'My Family', title: TranslationBase.of(context).family,
), ),
ServicesContainer( ServicesContainer(
onTap: () => Navigator.push( onTap: () => Navigator.push(
@ -230,20 +231,23 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
"https://hmgwebservices.com/vt_mobile/html/index.html"), "https://hmgwebservices.com/vt_mobile/html/index.html"),
imageLocation: imageLocation:
'assets/images/new-design/virtual_tour_icon.png', 'assets/images/new-design/virtual_tour_icon.png',
title: 'Virtual Tour', title: TranslationBase.of(context).vTour,
), ),
ServicesContainer( ServicesContainer(
onTap: () { onTap: () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) => MyWebView( builder: (BuildContext context) => MyWebView(
title: "HMG News", title: TranslationBase.of(context).hmgNews,
selectedUrl: selectedUrl:
"https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live", "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
))); ),
),
);
}, },
imageLocation: imageLocation:
'assets/images/new-design/twitter_dashboard_icon.png', 'assets/images/new-design/twitter_dashboard_icon.png',
title: 'Latest News', title: TranslationBase.of(context).latestNews,
), ),
ServicesContainer( ServicesContainer(
onTap: () => Navigator.push( onTap: () => Navigator.push(
@ -253,7 +257,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
), ),
), ),
imageLocation: 'assets/images/new-design/find_us_icon.png', imageLocation: 'assets/images/new-design/find_us_icon.png',
title: 'Find Us', title: TranslationBase.of(context).findUs,
), ),
], ],
), ),

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/contactus/findus_view_model
import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/hospitrals_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart'; import 'package:diplomaticquarterapp/pages/ContactUs/findus/pharmacies_page.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -39,7 +40,7 @@ class _FindUsPageState extends State<FindUsPage>
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
appBarTitle: 'Locations', appBarTitle: TranslationBase.of(context).ourLocation,
baseViewModel: model, baseViewModel: model,
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
@ -90,13 +91,13 @@ class _FindUsPageState extends State<FindUsPage>
Container( Container(
width: MediaQuery.of(context).size.width * 0.30, width: MediaQuery.of(context).size.width * 0.30,
child: Center( child: Center(
child: Texts(' Hospitals '), child: Texts(TranslationBase.of(context).hospitals),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.30, width: MediaQuery.of(context).size.width * 0.30,
child: Center( child: Center(
child: Texts(' Pharmacies '), child: Texts(TranslationBase.of(context).pharmacies),
), ),
), ),
], ],

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/insurance_card_View_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/insurance_card_View_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/rounded_container.dart'; import 'package:diplomaticquarterapp/widgets/others/rounded_container.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -20,10 +21,19 @@ class InsuranceApproval extends StatefulWidget {
class _InsuranceApprovalState extends State<InsuranceApproval> { class _InsuranceApprovalState extends State<InsuranceApproval> {
List<ImagesInfo> imagesInfo = List(); List<ImagesInfo> imagesInfo = List();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/0.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/0.png')); imagesInfo.add(ImagesInfo(
imagesInfo.add(ImagesInfo(imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/1.png',imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/1.png')); imageEn:
'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/0.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/0.png'));
imagesInfo.add(ImagesInfo(
imageEn:
'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/en/1.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/imges-info/apporvals/ar/1.png'));
return BaseView<InsuranceViewModel>( return BaseView<InsuranceViewModel>(
onModelReady: widget.appointmentNo != null onModelReady: widget.appointmentNo != null
? (model) => ? (model) =>
@ -63,10 +73,10 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
), ),
if (model.insuranceApproval.length > 0) if (model.insuranceApproval.length > 0)
Container( Container(
width: SizeConfig.widthMultiplier * 18.0, width: 60,
height: SizeConfig.heightMultiplier * 2.8, height: 35,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffC5272D), color: Theme.of(context).primaryColor,
borderRadius: BorderRadius.circular(19.0)), borderRadius: BorderRadius.circular(19.0)),
child: Center( child: Center(
child: Text( child: Text(
@ -92,29 +102,21 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
model.insuranceApproval[index] model.insuranceApproval[index].patientDescription == "In Patient"
.patientDescription ==
"In Patient"
? Container( ? Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffB8372C), color: Theme.of(context).primaryColor,
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
16.0)), 16.0)),
width: 95.0, width: 115.0,
padding: padding:
EdgeInsets.only(left: 11.5), EdgeInsets.only(left: 11.5),
child: Text( child: Center(
model.insuranceApproval[index] child: Texts(
.patientDescription == TranslationBase.of(context).inPatient,
null color: Colors.white,
? '' ),
: model
.insuranceApproval[
index]
.patientDescription,
style: TextStyle(
color: Colors.white),
), ),
) )
: Container( : Container(
@ -123,20 +125,14 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
16.0)), 16.0)),
width: 95.0, width: 115.0,
padding: padding:
EdgeInsets.only(left: 11.5), EdgeInsets.only(left: 11.5),
child: Text( child: Center(
model.insuranceApproval[index] child: Texts(
.patientDescription == TranslationBase.of(context).outpatient,
null color: Colors.white,
? '' ),
: model
.insuranceApproval[
index]
.patientDescription,
style: TextStyle(
color: Colors.white),
), ),
), ),
Padding( Padding(

@ -57,7 +57,7 @@ class MyBalancePage extends StatelessWidget {
color: Colors.white, color: Colors.white,
), ),
Texts( Texts(
'${model.totalAdvanceBalanceAmount ?? 0} SAR', '${model.totalAdvanceBalanceAmount ?? 0} '+ TranslationBase.of(context).sar,
color: Colors.white, color: Colors.white,
bold: true, bold: true,
), ),
@ -81,12 +81,13 @@ class MyBalancePage extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(model.patientAdvanceBalanceAmountList[index]
.projectDescription),
Texts( Texts(
'${model.patientAdvanceBalanceAmountList[index].patientAdvanceBalanceAmount} SAR', '${model.patientAdvanceBalanceAmountList[index].patientAdvanceBalanceAmount} '+TranslationBase.of(context).sar,
bold: true, bold: true,
), ),
Texts(model.patientAdvanceBalanceAmountList[index]
.projectDescription),
], ],
), ),
), ),

@ -86,32 +86,32 @@ class _HomeReportPageState extends State<HomeReportPage>
controller: _tabController, controller: _tabController,
indicatorWeight: 5.0, indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
indicatorColor: Colors.red[800], indicatorColor: Theme.of(context).primaryColor,
labelColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor,
unselectedLabelColor: Colors.grey[800], unselectedLabelColor: Colors.grey[800],
tabs: [ tabs: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.22, width: MediaQuery.of(context).size.width * 0.22,
child: Center( child: Center(
child: Texts('Requested'), child: Texts(TranslationBase.of(context).requested),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.22, width: MediaQuery.of(context).size.width * 0.22,
child: Center( child: Center(
child: Texts('Ready'), child: Texts(TranslationBase.of(context).ready),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.22, width: MediaQuery.of(context).size.width * 0.22,
child: Center( child: Center(
child: Texts('Completed'), child: Texts(TranslationBase.of(context).completed),
), ),
), ),
Container( Container(
width: MediaQuery.of(context).size.width * 0.22, width: MediaQuery.of(context).size.width * 0.22,
child: Center( child: Center(
child: Texts('Cancelled'), child: Texts(TranslationBase.of(context).cancelled),
), ),
), ),
], ],
@ -152,7 +152,7 @@ class _HomeReportPageState extends State<HomeReportPage>
height: 90, height: 90,
margin: EdgeInsets.all(8.0), margin: EdgeInsets.all(8.0),
child: Button( child: Button(
label: 'Resend order & deliver', label: TranslationBase.of(context).requestMedicalReport,
backgroundColor: Colors.grey[800], backgroundColor: Colors.grey[800],
onTap: () => Navigator.push( onTap: () => Navigator.push(
context, context,

@ -115,12 +115,12 @@ class PaymentService extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
'My Balances', TranslationBase.of(context).hmg,
color: HexColor('#B61422'), color: HexColor('#B61422'),
bold: true, bold: true,
), ),
Texts( Texts(
TranslationBase.of(context).payment, TranslationBase.of(context).wallet,
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),

@ -920,6 +920,30 @@ String get fileno => localizedValues['fileno'][locale.languageCode];
String get upcomingEmpty => localizedValues['upcoming-empty'][locale.languageCode]; String get upcomingEmpty => localizedValues['upcoming-empty'][locale.languageCode];
String get upcomingTimeLeft => localizedValues['upcoming-timeLeft'][locale.languageCode]; String get upcomingTimeLeft => localizedValues['upcoming-timeLeft'][locale.languageCode];
String get covidTestAllServices => localizedValues['covid-test-all-services'][locale.languageCode];
String get pharmacy => localizedValues['pharmacy'][locale.languageCode];
String get ereferral => localizedValues['ereferral'][locale.languageCode];
String get childVaccine => localizedValues['child-vaccine'][locale.languageCode];
String get calculators => localizedValues['calculators'][locale.languageCode];
String get converters => localizedValues['converters'][locale.languageCode];
String get h2o => localizedValues['h2o'][locale.languageCode];
String get vTour => localizedValues['v-tour'][locale.languageCode];
String get hmgNews => localizedValues['hmg-news'][locale.languageCode];
String get bloodD => localizedValues['blood-d'][locale.languageCode];
String get symptomCheckerTitle => localizedValues['symptomCheckerTitle'][locale.languageCode];
String get latestNews => localizedValues['latest-news'][locale.languageCode];
String get ourLocation => localizedValues['our-location'][locale.languageCode];
String get pharmacies => localizedValues['pharmacies'][locale.languageCode];
String get hospitals => localizedValues['hospitals'][locale.languageCode];
String get wallet => localizedValues['wallet'][locale.languageCode];
String get hmg => localizedValues['hmg'][locale.languageCode];
String get requested => localizedValues['requested'][locale.languageCode];
String get ready => localizedValues['ready'][locale.languageCode];
String get completed => localizedValues['completed'][locale.languageCode];
String get cancelled => localizedValues['cancelled'][locale.languageCode];
String get requestMedicalReport => localizedValues['request-medical-report'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save