diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index 716c2006..ee58f8d5 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -52,23 +52,23 @@ class _RegisterInfo extends State { bool isLoading; int page; final List locationList = [ - new Location(name: 'KSA', value: '1'), - new Location(name: 'Dubai', value: '2'), + new Location(name: 'KSA', value: '1', nameAr: "السعودية"), + new Location(name: 'Dubai', value: '2', nameAr: "دبي"), ]; String language = '1'; CheckPatientAuthenticationReq registerd_data; final List languageList = [ - new Language(name: 'English', value: '2'), - new Language(name: 'Arabic', value: '1'), + new Language(name: 'English', value: '2', nameAr: "إنجليزي"), + new Language(name: 'Arabic', value: '1', nameAr: "عربي"), ]; final List genderList = [ - new Language(name: 'Male', value: 'M'), - new Language(name: 'Female', value: 'F'), + new Language(name: 'Male', value: 'M', nameAr: "ذكر"), + new Language(name: 'Female', value: 'F',nameAr: "أنثى"), ]; final List maritalList = [ - new Language(name: 'Married', value: 'M'), - new Language(name: 'Single', value: 'S'), - new Language(name: 'Divorce', value: 'D'), + new Language(name: 'Married', value: 'M', nameAr: "متزوج"), + new Language(name: 'Single', value: 'S',nameAr: "اعزب"), + new Language(name: 'Divorce', value: 'D',nameAr:"الطلاق"), ]; String email = ''; List countriesList = []; @@ -146,6 +146,14 @@ class _RegisterInfo extends State { .mobileNumber, registerd_data.patientMobileNumber.toString()), // SizedBox(height: 20), + projectViewModel.isArabic ? getnameField( + '', + + + inputWidget( "First Name","First Name English",'fNameEn'), + '', + inputWidget( "Last Name", "Last Name English",'lNameEn'), + ) :SizedBox(height: 0,), getnameField( '', @@ -197,7 +205,8 @@ class _RegisterInfo extends State { (Language value) { return DropdownMenuItem( value: value.value, - child: Text(value.name), + child: Text( projectViewModel.isArabic ==1 ? value.nameAr : value.name , + ), ); }).toList()))), ), @@ -229,7 +238,8 @@ class _RegisterInfo extends State { (Language value) { return DropdownMenuItem( value: value.value, - child: Text(value.name), + child: Text( projectViewModel.isArabic ==1 ? value.nameAr : value.name , + ), ); }).toList()))), TranslationBase @@ -258,7 +268,8 @@ class _RegisterInfo extends State { (CountriesLists value) { return DropdownMenuItem( value: value.iD, - child: Text(value.name), + child: Text(value.name , + ), ); }).toList())))), SizedBox(height: 20), @@ -385,7 +396,8 @@ class _RegisterInfo extends State { value: value.value, child: Text( - value.name), + projectViewModel.isArabic ==1 ? value.nameAr : value.name , + ), ); }).toList()))) ])) @@ -444,7 +456,7 @@ class _RegisterInfo extends State { value: value.value, child: Text( - value.name, + projectViewModel.isArabic ==1 ? value.nameAr : value.name , ), ); }).toList()))) @@ -691,6 +703,7 @@ class _RegisterInfo extends State { this.registerd_data = data2; isDubai = data2.patientOutSA == 1 ? true : false; + if(isDubai) location ='2'; }); } } @@ -802,7 +815,7 @@ class _RegisterInfo extends State { bool isValid() { if ((location != null && language != null && - Utils.validEmail(email) == true) || (registerInfo.firstNameEn !=null && registerInfo.secondNameEn !=null && registerInfo.lastNameEn !=null)) { + Utils.validEmail(email) == true) || (registerInfo.firstNameEn !=null && registerInfo.secondNameEn !=null && registerInfo.lastNameEn !=null) || (projectViewModel.isArabic && registerInfo.firstNameEn !=null && registerInfo.firstNameAr !=null && registerInfo.lastNameEn !=null && registerInfo.secondNameAr !=null && registerInfo.lastNameAr !=null)) { return true; } else { return false; @@ -993,13 +1006,43 @@ class _RegisterInfo extends State { setState((){ switch(name) { case 'fName': - registerInfo.firstNameEn = registerInfo.firstNameAr = value; + { + if(projectViewModel.isArabic) { + registerInfo.firstNameAr = value; + + }else{ + registerInfo.firstNameEn =value; + registerInfo.firstNameAr ='...'; + } + } break; case 'sName': - registerInfo.secondNameEn = registerInfo.secondNameAr = value; + { + if(projectViewModel.isArabic) { + registerInfo.secondNameAr = value; + registerInfo.secondNameEn ='...'; + }else{ + registerInfo.secondNameEn =value; + registerInfo.secondNameAr ='...'; + } + } break; case 'lName': - registerInfo.lastNameEn = registerInfo.lastNameAr = value; + { + if(projectViewModel.isArabic) { + registerInfo.lastNameAr = value; + + }else{ + registerInfo.lastNameEn =value; + registerInfo.lastNameAr ='...'; + } + } + break; + case 'fNameEn': + registerInfo.firstNameEn = value; + break; + case 'lNameEn': + registerInfo.lastNameEn = value; break; } }) @@ -1047,13 +1090,14 @@ class _RegisterInfo extends State { class Language { final String name; final String value; - - Language({this.name, this.value}); + final String nameAr; + Language({this.name, this.value, this.nameAr}); } class Location { final String name; final String value; + final String nameAr; - Location({this.name, this.value}); + Location({this.name, this.value, this.nameAr}); }