From 9afffd4ace04b79253214f2ab00a1bf6ac4972dc Mon Sep 17 00:00:00 2001 From: "taha.alam@cloudsolutions.com.sa" Date: Wed, 8 Jul 2026 11:10:15 +0300 Subject: [PATCH] bug fixes --- lib/config/localized_values.dart | 6 +- .../profile/UCAF/ucaf_pager_screen.dart | 11 +-- .../UCAF/widgets/diagnosis_widget.dart | 8 +-- .../UCAF/widgets/pocedures_widget.dart | 71 +++++++++++-------- .../shared_soap_widgets/SOAP_step_header.dart | 2 +- .../assessment/widget/empty_diagnosis.dart | 6 +- .../assessment/widget/previous_diagnosis.dart | 4 +- .../translations_delegate_base_utils.dart | 1 + 8 files changed, 66 insertions(+), 43 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 4188c144..54952544 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1211,7 +1211,7 @@ const Map> localizedValues = { "physicalExamination": {"en": "Physical Examination", "ar":"الفحص البدني"}, "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":"لم يتم إضافة تشخيص ، يرجى إضافته من الزر أعلاه"}, + "noProgressNote": {"en": "No Progress note added, please add it from the button above", "ar":"لم تتم إضافة أي ملاحظة تقدم، يرجى إضافتها من الزر أعلاه."}, "mild": {"en": "Mild", "ar":"خفيف"}, "moderate": {"en": "Moderate", "ar":"معتدل"}, "remarksCanNotBeEmpty": {"en": "Remarks Can Not Be Empty", "ar":"لا يمكن أن تكون الملاحظات فارغة"}, @@ -1286,5 +1286,9 @@ const Map> localizedValues = { "en": "Intended Length Of Stay", "ar": "المدة المتوقعة للإقامة" }, + "noPreviousDiagnosis":{ + "en":"No Previous Diagnosis", + "ar":"لا يوجد تشخيص سابق" + } }; diff --git a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart index 8903ed28..af806477 100644 --- a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart +++ b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart @@ -110,17 +110,18 @@ class _UCAFPagerScreenState extends State with TickerProviderSt ]), ), ), + _isLoading + ? Container( + height: 0, + ) + : UcafButtons(model), ], ), ), ), ], ), - bottomSheet: _isLoading - ? Container( - height: 0, - ) - : UcafButtons(model), + // bottomSheet: ), ); } diff --git a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart index 8616d38a..9a69f6a2 100644 --- a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart +++ b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart @@ -34,8 +34,8 @@ class DiagnosisWidget extends StatelessWidget { label: "${TranslationBase.of(context).diagnoseType}: ", value: diagnosisType != null ? model.selectedLanguage == 'ar' - ? diagnosisType.nameAr! - : diagnosisType.nameEn! + ? diagnosisType.nameAr??"" + : diagnosisType.nameEn??"" : "-", valueSize: SizeConfig.textMultiplier! * 1.8, labelSize: SizeConfig.textMultiplier! * 1.6, @@ -45,7 +45,7 @@ class DiagnosisWidget extends StatelessWidget { ), CustomRow( label: "", - value: diagnosis.asciiDesc!, + value: diagnosis.asciiDesc??"", valueSize: SizeConfig.textMultiplier! * 1.8, labelSize: SizeConfig.textMultiplier! * 1.6, isExpanded: true, @@ -56,7 +56,7 @@ class DiagnosisWidget extends StatelessWidget { CustomRow( label: "${TranslationBase.of(context).condition}: ", - value: "${diagnosisCondition != null ? model.selectedLanguage == 'ar' ? diagnosisCondition.nameAr : diagnosisCondition.nameEn : "-"}", + value: "${diagnosisCondition != null ? model.selectedLanguage == 'ar' ? diagnosisCondition.nameAr ??"": diagnosisCondition.nameEn??"" : "-"}", valueSize: SizeConfig.textMultiplier! * 1.8, labelSize: SizeConfig.textMultiplier! * 1.6, ), diff --git a/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart b/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart index 83d57923..f38d24db 100644 --- a/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart +++ b/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart @@ -15,27 +15,33 @@ class ProceduresWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return CardWithBgWidget( + return + CardWithBgWidget( bgColor: Colors.transparent, - widget: Column( + widget: + Column( children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - CustomRow( - label: "${TranslationBase.of(context).codeNo}: ", - value: "${procedure.achiCode}", - isExpanded: false, - valueSize: SizeConfig.textMultiplier! * 1.8, - labelSize: SizeConfig.textMultiplier! * 1.6, + Expanded( + child: CustomRow( + label: "${TranslationBase.of(context).codeNo}: ", + value: "${procedure.achiCode}", + isExpanded: false, + valueSize: SizeConfig.textMultiplier! * 1.8, + labelSize: SizeConfig.textMultiplier! * 1.6, + ), ), SizedBox(width: 10,), - CustomRow( - label: "${TranslationBase.of(context).quantity}: ", - value: "1",//done as prescribed https://cloudsolutions-sa.atlassian.net/browse/V4-40476?focusedCommentId=471705 - isExpanded: false, - valueSize: SizeConfig.textMultiplier! * 1.8, - labelSize: SizeConfig.textMultiplier! * 1.6, + Expanded( + child: CustomRow( + label: "${TranslationBase.of(context).quantity}: ", + value: "1",//done as prescribed https://cloudsolutions-sa.atlassian.net/browse/V4-40476?focusedCommentId=471705 + isExpanded: false, + valueSize: SizeConfig.textMultiplier! * 1.8, + labelSize: SizeConfig.textMultiplier! * 1.6, + ), ), ], ), @@ -54,22 +60,26 @@ class ProceduresWidget extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - CustomRow( - label: "${TranslationBase.of(context).covered}: ", - value: "${procedure.isCovered}", - isExpanded: false, - valueSize: SizeConfig.textMultiplier! * 1.8, - labelSize: SizeConfig.textMultiplier! * 1.6, - valueColor: procedure.isCovered! - ? AppGlobal.appGreenColor - : AppGlobal.appRedColor, + Expanded( + child: CustomRow( + label: "${TranslationBase.of(context).covered}: ", + value: "${procedure.isCovered}", + isExpanded: false, + valueSize: SizeConfig.textMultiplier! * 1.8, + labelSize: SizeConfig.textMultiplier! * 1.6, + valueColor: procedure.isCovered! + ? AppGlobal.appGreenColor + : AppGlobal.appRedColor, + ), ), - CustomRow( - label: "${TranslationBase.of(context).approvalRequired}: ", - value: "${procedure.isApprovalRequired}", - isExpanded: false, - valueSize: SizeConfig.textMultiplier! * 1.8, - labelSize: SizeConfig.textMultiplier! * 1.6, + Expanded( + child: CustomRow( + label: "${TranslationBase.of(context).approvalRequired}: ", + value: "${procedure.isApprovalRequired}", + isExpanded: false, + valueSize: SizeConfig.textMultiplier! * 1.8, + labelSize: SizeConfig.textMultiplier! * 1.6, + ), ), @@ -93,6 +103,7 @@ class ProceduresWidget extends StatelessWidget { height: 16, ) ], - )); + ) + ); } } diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart index cecd05a3..f9400f94 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart @@ -31,7 +31,7 @@ class SOAPStepHeader extends StatelessWidget { : 15, ), AppText( - TranslationBase.of(context).createNew, + (patientInfo?.episodeNo==0)?TranslationBase.of(context).createNew:TranslationBase.of(context).update, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge ? 3 : 4), fontWeight: FontWeight.w700, letterSpacing: -0.72, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart index 704b41c2..327e60ce 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/empty_diagnosis.dart @@ -4,6 +4,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; class EmptyDiagnosis extends StatelessWidget{ + final String? message; + + const EmptyDiagnosis({super.key, this.message}); + @override Widget build(BuildContext context) { return Column( @@ -12,7 +16,7 @@ class EmptyDiagnosis extends StatelessWidget{ SvgPicture.asset('assets/images/svgs/unavailable.svg'), SizedBox(height: 10,), AppText( - TranslationBase.of(context).noDiagnosisFound, + message ?? TranslationBase.of(context).noDiagnosisFound, fontSize: 12, fontWeight: FontWeight.w400, textAlign: TextAlign.center, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart index 1df5714c..4a2c6bd4 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/previous_diagnosis.dart @@ -24,7 +24,9 @@ class PreviousDiagnosis extends StatelessWidget { Widget build(BuildContext context) { if (diagnosisItems.isEmpty) return Center( - child: EmptyDiagnosis(), + child: EmptyDiagnosis( + message: TranslationBase.of(context).noPreviousDiagnosis, + ), ); return BaseView( diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 6f228007..733e1d63 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -1927,6 +1927,7 @@ class TranslationBase { String get currentDiagnosis => localizedValues['currentDiagnosis']![locale.languageCode]!; String get addNewDiagnosis => localizedValues['addNewDiagnosis']![locale.languageCode]!; String get noDiagnosisFound => localizedValues['noDiagnosisFound']![locale.languageCode]!; + String get noPreviousDiagnosis => localizedValues['noPreviousDiagnosis']![locale.languageCode]!; String get makeCurrentDiagnosis => localizedValues['makeCurrentDiagnosis']![locale.languageCode]!; String get mappedDiagnosis => localizedValues['mappedDiagnosis']![locale.languageCode]!; String get previousDiagnosis => localizedValues['previousDiagnosis']![locale.languageCode]!;