Merge branch 'fixes_nov' into 'development'

Fixes nov

See merge request Cloud_Solution/doctor_app_flutter!905
merge-requests/907/head
Elham Ali 4 years ago
commit 8e795535b8

@ -741,4 +741,15 @@ const Map<String, Map<String, String>> localizedValues = {
"postOperationDiagnosis": {"en": "Post Operation Diagnosis", "ar": "تشخيص ما بعد العملية"}, "postOperationDiagnosis": {"en": "Post Operation Diagnosis", "ar": "تشخيص ما بعد العملية"},
"surgeon": {"en": "surgeon", "ar": "دكتور جراح"}, "surgeon": {"en": "surgeon", "ar": "دكتور جراح"},
"assistant": {"en": "assistant", "ar": "مساعد"}, "assistant": {"en": "assistant", "ar": "مساعد"},
"askForIdentification": {"en": "Please enter a mobile number or Identification number", "ar": "الرجاء إدخال رقم الهاتف المحمول أو رقم التعريف"},
"iDNumber": {"en": "ID Number", "ar": "رقم معرف"},
"calender": {"en": "Calender", "ar": "التقويم"},
"gregorian": {"en": "Gregorian", "ar": "ميلادي"},
"hijri": {"en": "Hijri", "ar": "هجري"},
"birthdate": {"en": "Birthdate", "ar": "تاريخ الولادة"},
"activation": {"en": "Activation", "ar": "تفعيل"},
"confirmation": {"en": "Confirmation", "ar": "تفعيل"},
"firstNameInAr": {"en": "First Name In Arabic", "ar": "الاسم الاول بالعربية"},
"middleNameInAr": {"en": "Middle Name In Arabic", "ar": "الاسم الأوسط بالعربية"},
"lastNameInAr": {"en": "Last Name In Arabic", "ar": "الاسم الأخير بالعربية"},
}; };

@ -98,7 +98,7 @@ class _DoctorReplyScreenState extends State<DischargeSummaryPage>
tabWidget( tabWidget(
screenSize, screenSize,
_activeTab == 0, _activeTab == 0,
"Pending", TranslationBase.of(context).pending,
), ),
tabWidget( tabWidget(
screenSize, screenSize,

@ -134,7 +134,7 @@ class _RegisterConfirmationPatientPageState
CustomEditableText( CustomEditableText(
controller: firstNameAr, controller: firstNameAr,
isSubmitted: isSubmitted, isSubmitted: isSubmitted,
hint: "First Name Arabic"), hint: TranslationBase.of(context).firstNameInAr),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
@ -142,14 +142,14 @@ class _RegisterConfirmationPatientPageState
controller: middleNameAr, controller: middleNameAr,
isEditable: middleNameN.text.isEmpty, isEditable: middleNameN.text.isEmpty,
isSubmitted: isSubmitted, isSubmitted: isSubmitted,
hint: "Middle Name Arabic"), hint: TranslationBase.of(context).middleNameInAr),
SizedBox( SizedBox(
height: 4, height: 4,
), ),
CustomEditableText( CustomEditableText(
controller: lastNameAr, controller: lastNameAr,
isSubmitted: isSubmitted, isSubmitted: isSubmitted,
hint: "Last Name Arabic"), hint: TranslationBase.of(context).lastNameInAr),
SizedBox( SizedBox(
height: 20, height: 20,
), ),

@ -80,9 +80,9 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
currentStepIndex: _currentIndex + 1, currentStepIndex: _currentIndex + 1,
screenSize: screenSize, screenSize: screenSize,
stepsTitles: [ stepsTitles: [
"Search", TranslationBase.of(context).search,
"Activation", TranslationBase.of(context).activation,
"Confirmation", TranslationBase.of(context).confirmation,
], ],
), ),
SizedBox( SizedBox(

@ -131,7 +131,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Please enter mobile number or Identification number", TranslationBase.of(context).askForIdentification,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
@ -164,7 +164,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
width: MediaQuery.of(context).size.width * 0.28, width: MediaQuery.of(context).size.width * 0.28,
child: AppTextFieldCustom( child: AppTextFieldCustom(
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: "Code", hintText: TranslationBase.of(context).codeNo,
inputType: TextInputType.phone, inputType: TextInputType.phone,
controller: _phoneCode, controller: _phoneCode,
validationError: phoneError, validationError: phoneError,
@ -185,7 +185,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
// width: MediaQuery.of(context).size.width*0.7, // width: MediaQuery.of(context).size.width*0.7,
child: AppTextFieldCustom( child: AppTextFieldCustom(
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: "Phone Number", hintText: TranslationBase.of(context).phoneNumber,
inputType: TextInputType.phone, inputType: TextInputType.phone,
controller: _phoneController, controller: _phoneController,
validationError: validationError:
@ -202,7 +202,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: "ID Number", hintText: TranslationBase.of(context).iDNumber,
inputType: TextInputType.phone, inputType: TextInputType.phone,
controller: _idController, controller: _idController,
validationError: _idController.text.isEmpty && isSubmitted validationError: _idController.text.isEmpty && isSubmitted
@ -213,7 +213,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
height: 12, height: 12,
), ),
AppText( AppText(
"Calender", TranslationBase.of(context).calender,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
), ),
@ -224,7 +224,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
children: [ children: [
Expanded( Expanded(
child: RadioListTile<CalenderType>( child: RadioListTile<CalenderType>(
title: AppText("Gregorian"), title: AppText(TranslationBase.of(context).gregorian),
value: CalenderType.Gregorian, value: CalenderType.Gregorian,
groupValue: calenderType, groupValue: calenderType,
onChanged: (CalenderType value) { onChanged: (CalenderType value) {
@ -236,7 +236,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
), ),
Expanded( Expanded(
child: RadioListTile<CalenderType>( child: RadioListTile<CalenderType>(
title: AppText("Hijri"), title: AppText(TranslationBase.of(context).hijri),
value: CalenderType.Hijri, value: CalenderType.Hijri,
groupValue: calenderType, groupValue: calenderType,
onChanged: (CalenderType value) { onChanged: (CalenderType value) {
@ -253,7 +253,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
), ),
AppTextFieldCustom( AppTextFieldCustom(
height: screenSize.height * 0.075, height: screenSize.height * 0.075,
hintText: "Birthdate", hintText:TranslationBase.of(context).birthdate,
dropDownText: getBirthdate(), dropDownText: getBirthdate(),
enabled: false, enabled: false,
isTextFieldHasSuffix: true, isTextFieldHasSuffix: true,

@ -462,7 +462,7 @@ class _ActivationPageState extends State<ActivationPage> {
if (widget.model.state == ViewState.ErrorLocal) { if (widget.model.state == ViewState.ErrorLocal) {
Helpers.showErrorToast(widget.model.error); Helpers.showErrorToast(widget.model.error);
//TODO Elham* remove this //TODO Elham* remove this
//widget.changePageViewIndex(2); widget.changePageViewIndex(2);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
} else { } else {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);

@ -114,10 +114,13 @@ class TranslationBase {
String get referredOn => localizedValues['referredOn'][locale.languageCode]; String get referredOn => localizedValues['referredOn'][locale.languageCode];
String get firstName => localizedValues['firstName'][locale.languageCode]; String get firstName => localizedValues['firstName'][locale.languageCode];
String get firstNameInAr => localizedValues['firstNameInAr'][locale.languageCode];
String get middleName => localizedValues['middleName'][locale.languageCode]; String get middleName => localizedValues['middleName'][locale.languageCode];
String get middleNameInAr => localizedValues['middleNameInAr'][locale.languageCode];
String get lastName => localizedValues['lastName'][locale.languageCode]; String get lastName => localizedValues['lastName'][locale.languageCode];
String get lastNameInAr => localizedValues['lastNameInAr'][locale.languageCode];
String get phoneNumber => localizedValues['phoneNumber'][locale.languageCode]; String get phoneNumber => localizedValues['phoneNumber'][locale.languageCode];
@ -1133,6 +1136,14 @@ class TranslationBase {
String get postOperationDiagnosis => localizedValues['postOperationDiagnosis'][locale.languageCode]; String get postOperationDiagnosis => localizedValues['postOperationDiagnosis'][locale.languageCode];
String get surgeon => localizedValues['surgeon'][locale.languageCode]; String get surgeon => localizedValues['surgeon'][locale.languageCode];
String get assistant => localizedValues['assistant'][locale.languageCode]; String get assistant => localizedValues['assistant'][locale.languageCode];
String get askForIdentification => localizedValues['askForIdentification'][locale.languageCode];
String get iDNumber => localizedValues['iDNumber'][locale.languageCode];
String get calender => localizedValues['calender'][locale.languageCode];
String get gregorian => localizedValues['gregorian'][locale.languageCode];
String get hijri => localizedValues['hijri'][locale.languageCode];
String get birthdate => localizedValues['birthdate'][locale.languageCode];
String get activation => localizedValues['activation'][locale.languageCode];
String get confirmation => localizedValues['confirmation'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save