diff --git a/assets/images/svgs/resolve.svg b/assets/images/svgs/resolve.svg new file mode 100644 index 00000000..51d064f3 --- /dev/null +++ b/assets/images/svgs/resolve.svg @@ -0,0 +1,4 @@ + + + + diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 17fac19a..bb4b956f 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1192,5 +1192,6 @@ const Map> localizedValues = { "addPhysicalExamination": {"en": "Add Physical Examination", "ar":"إضافة الفحص البدني"}, "noPhysicalExamination": {"en": "No Physical Examination added, please add it from the button above", "ar":"لم يتم إضافة فحص بدني ، يرجى إضافته من الزر أعلاه"}, "noProgressNote": {"en": "No Diagnosis added, please add it from the button above", "ar":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, - + "mild": {"en": "Mild", "ar":"خفيف"}, + "moderate": {"en": "Moderate", "ar":"معتدل"}, }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart index a8a4ddfe..fc8e53d7 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/update_objective_page_vida_plus.dart @@ -145,7 +145,7 @@ class _UpdateObjectivePageVidaPlusState Center( child: Padding( padding: const EdgeInsets.all(65), - child: EmptyExamination(), + child: EmptyWidget(TranslationBase.of(context).noPhysicalExamination), ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart index c552848f..2d9094f4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/EmptyExamination.dart @@ -4,7 +4,12 @@ import 'package:flutter_svg/flutter_svg.dart'; import '../../../../../../../utils/translations_delegate_base_utils.dart'; -class EmptyExamination extends StatelessWidget{ +class EmptyWidget extends StatelessWidget{ + + String message = ""; + + + EmptyWidget(this.message); @override Widget build(BuildContext context) { return Column( @@ -13,7 +18,8 @@ class EmptyExamination extends StatelessWidget{ SvgPicture.asset('assets/images/svgs/unavailable.svg'), SizedBox(height: 10,), AppText( - TranslationBase.of(context).noPhysicalExamination, + this.message, + //TranslationBase.of(context).noPhysicalExamination, fontSize: 12, fontWeight: FontWeight.w400, textAlign: TextAlign.center, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart index 67f50b15..6eadd40a 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/add_allergies.dart @@ -58,14 +58,15 @@ class _AddAllergiesState extends State { // }, ), bottomSheet: CustomBottomSheetContainer( + widthFactor: .9, buttonColor: Color(0xffEAEAEA), fontColor: Colors.black, label: TranslationBase.of(context).cancel, onTap: () { Navigator.of(context).pop(); }, - ), - )); + )), + ); } // // isServiceSelected(MasterKeyModel masterKey) { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart index da1177aa..fd42e837 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/master_key_checkbox_search_allergies_widget.dart @@ -11,6 +11,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import '../../../../../../widgets/transitions/fade_page.dart'; +import '../../objective/widget/EmptyExamination.dart'; class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { @@ -109,8 +110,7 @@ bool loading =false; }, ) - : loading ? Center(child: CircularProgressIndicator()) :SizedBox() - + : widget.model.state == ViewState.BusyLocal ? Center(child: CircularProgressIndicator()) :Center(child: EmptyWidget(TranslationBase.of(context).noDataAvailable)) ), ), diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index 11e0cbde..48cb4f6c 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -111,7 +111,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "Mild", + value: TranslationBase.of(context).mild, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -125,7 +125,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Mild', + TranslationBase.of(context).mild, fontSize: 10, ), ], @@ -140,7 +140,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "moderate", + value: TranslationBase.of(context).moderate, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -154,7 +154,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Moderate', + TranslationBase.of(context).moderate, fontSize: 10, ), ], @@ -169,7 +169,7 @@ class _ReactionsSelectionAllergiesWidgetState MaterialTapTargetSize.shrinkWrap, // Reduces padding around checkbox visualDensity: VisualDensity.compact, - value: "severe", + value: TranslationBase.of(context).severe, groupValue: widget .mySelectedAllergy .allergyReactionDTOs![index] @@ -183,7 +183,7 @@ class _ReactionsSelectionAllergiesWidgetState }, ), AppText( - 'Severe', + TranslationBase.of(context).severe, fontSize: 10, ), ], diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 6d0b12df..a04cc041 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -99,16 +99,18 @@ class _UpdateAllergiesWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ +Row(children: [ AppText(reaction.allergyReactionName!, fontSize: 10,), + AppText(" - "), + AppText( + Severity.values[reaction.severity! -1].name, - AppText(reaction.allergyReactionName!), - AppText( - Severity.values[reaction.severity! -1].name, - color: Color(0xFFCC9B14), - fontSize: 10, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - ) - ],)).toList()) : AppText("----", color: Color(0xFFCC9B14)), + color: Color(0xFFCC9B14), + fontSize: 10, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + )],) + + ],)).toList()) : AppText("----"), Row( mainAxisAlignment: MainAxisAlignment.end, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart index 9627e06f..75f453ed 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/update_soap_index_vida_plus.dart @@ -144,7 +144,7 @@ class _UpdateSoapIndexVidaPlusState extends State ), Container( child: FractionallySizedBox( - widthFactor: .80, + widthFactor: .9, child: getBottomSheet(model, patient)), ), SizedBox( diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index c9e22c24..1c1acd50 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1918,6 +1918,8 @@ class TranslationBase { String get progressNoteType => localizedValues['progressNoteType']![locale.languageCode]!; String get addYourNote => localizedValues['addYourNote']![locale.languageCode]!; String get saveAsDraft => localizedValues['saveAsDraft']![locale.languageCode]!; + String get mild => localizedValues['mild']![locale.languageCode]!; + String get moderate => localizedValues['moderate']![locale.languageCode]!; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart index 0330f08d..52e2a1d7 100644 --- a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart +++ b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart @@ -10,9 +10,10 @@ class CustomBottomSheetContainer extends StatelessWidget { final String label; final Color? buttonColor; final Color? fontColor; + final double? widthFactor; double headerHeight = SizeConfig.heightMultiplier! * 12; - CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white }) : super(key: key); + CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key); @override Widget build(BuildContext context) { @@ -31,7 +32,7 @@ class CustomBottomSheetContainer extends StatelessWidget { Container( margin: EdgeInsets.only(top: headerHeight * (SizeConfig.isWidthLarge ? 0.3 : 0.2)), child: FractionallySizedBox( - widthFactor: .80, + widthFactor: widthFactor, child: Center( child: AppButton( fontColor: fontColor!,