diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 62e86469..108205bf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -190,4 +190,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69 -COCOAPODS: 1.10.0 +COCOAPODS: 1.10.0.rc.1 diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index ef5aaaa5..7dda2cdb 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -509,4 +509,6 @@ const Map> localizedValues = { 'vitalSignEmptyMsg': {'en': "There is no vital signs for this patient", 'ar':"لا توجد علامات حيوية لهذا المريض" }, 'referralEmptyMsg': {'en': "There is no referral data", 'ar':"لا توجد بيانات إحالة" }, 'referralSuccessMsg': {'en': "You make referral successfully", 'ar':"You make referral successfully" }, + 'addAssessment': {'en': "Add ASSESSMENT", 'ar':"أضف التقييم" }, + 'assessment': {'en': "ASSESSMENT", 'ar':" التقييم" }, }; diff --git a/lib/config/test.dart b/lib/config/test.dart deleted file mode 100644 index e69de29b..00000000 diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 5dee728a..e850c469 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -535,6 +535,8 @@ class TranslationBase { String get vitalSignEmptyMsg => localizedValues['vitalSignEmptyMsg'][locale.languageCode]; String get referralEmptyMsg => localizedValues['referralEmptyMsg'][locale.languageCode]; String get referralSuccessMsg => localizedValues['referralSuccessMsg'][locale.languageCode]; + String get addAssessment => localizedValues['addAssessment'][locale.languageCode]; + String get assessment => localizedValues['assessment'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart b/lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart index 1d143310..a9839a2c 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart @@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; +import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; @@ -71,41 +72,42 @@ class _UpdateAllergiesWidgetState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - - child: Expanded( - child: Texts( + Container( + child: Expanded( + child: Texts( + projectViewModel.isArabic + ? selectedAllergy.selectedAllergy.nameAr + : selectedAllergy.selectedAllergy.nameEn + .toUpperCase(), + variant: "bodyText", + textDecoration: selectedAllergy.isChecked + ? null + : TextDecoration.lineThrough, + bold: true, + color: Colors.black), + ), + width: MediaQuery.of(context).size.width * 0.5, + ), + Texts( projectViewModel.isArabic - ? selectedAllergy.selectedAllergy.nameAr - : selectedAllergy.selectedAllergy.nameEn + ? selectedAllergy.selectedAllergySeverity.nameAr + : selectedAllergy.selectedAllergySeverity.nameEn .toUpperCase(), variant: "bodyText", textDecoration: selectedAllergy.isChecked ? null : TextDecoration.lineThrough, bold: true, - color: Colors.black), - ), - width: MediaQuery.of(context).size.width * 0.5, - ), - Texts( - projectViewModel.isArabic ? selectedAllergy - .selectedAllergySeverity.nameAr : selectedAllergy - .selectedAllergySeverity.nameEn - .toUpperCase(), - variant: "bodyText", - textDecoration: selectedAllergy.isChecked - ? null - : TextDecoration.lineThrough, - bold: true, - color: AppGlobal.appPrimaryColor), - if(selectedAllergy.isChecked) + color: AppGlobal.appPrimaryColor), + if (selectedAllergy.isChecked) InkWell( child: Icon( FontAwesomeIcons.trash, @@ -115,6 +117,20 @@ class _UpdateAllergiesWidgetState extends State { onTap: () => removeAllergy(selectedAllergy), ) ], + ), + Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Container( + width: MediaQuery.of(context).size.width * 0.6, + child: AppText( + selectedAllergy.remark ?? '', + fontSize: 10, + color: Colors.grey, + ), + ), + ), + DividerWithSpacesAround() + ], ), SizedBox( height: 10, @@ -383,7 +399,7 @@ class _AddAllergiesState extends State { height: 10, ), AppButton( - title: "Add".toUpperCase(), + title: TranslationBase.of(context).add.toUpperCase(), onPressed: () { MySelectedAllergy mySelectedAllergy = new MySelectedAllergy( remark: remarkController.text, diff --git a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart index 3eec290c..79d8878c 100644 --- a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart +++ b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart @@ -101,7 +101,7 @@ class _UpdateAssessmentPageState extends State { children: [ Row( children: [ - Texts('ASSESSMENT', + Texts(TranslationBase.of(context).assessment.toUpperCase(), variant: isAssessmentExpand ? "bodyText" : '', bold: isAssessmentExpand ? true : false, @@ -135,7 +135,7 @@ class _UpdateAssessmentPageState extends State { margin: EdgeInsets.only(left: 5, right: 5, top: 15), child: TextFields( - hintText: "Add ASSESSMENT", + hintText: TranslationBase.of(context).addAssessment, fontSize: 13.5, onTapTextFields: () { openAssessmentDialog(context);