bug fixes

lib/config/localized_values.dart

@@ -1211,7 +1211,7 @@ const Map<String, Map<String, String>> 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<String, Map<String, String>> localizedValues = {
     "en": "Intended Length Of Stay",
     "ar": "المدة المتوقعة للإقامة"
   },
+  "noPreviousDiagnosis":{
+    "en":"No Previous Diagnosis",
+    "ar":"لا يوجد تشخيص سابق"
+  }
 
 };

lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart

@@ -110,17 +110,18 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen> with TickerProviderSt
                             ]),
                       ),
                     ),
+                    _isLoading
+                        ? Container(
+                      height: 0,
+                    )
+                        : UcafButtons(model),
                   ],
                 ),
               ),
             ),
           ],
         ),
-        bottomSheet: _isLoading
+        // bottomSheet:
-            ? Container(
-                height: 0,
-              )
-            : UcafButtons(model),
       ),
     );
   }

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.nameAr??""
-                    : diagnosisType.nameEn!
+                    : 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,
               ),

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(
+                Expanded(
-                  label: "${TranslationBase.of(context).codeNo}: ",
+                  child: CustomRow(
-                  value: "${procedure.achiCode}",
+                    label: "${TranslationBase.of(context).codeNo}: ",
-                  isExpanded: false,
+                    value: "${procedure.achiCode}",
-                  valueSize: SizeConfig.textMultiplier! * 1.8,
+                    isExpanded: false,
-                  labelSize: SizeConfig.textMultiplier! * 1.6,
+                    valueSize: SizeConfig.textMultiplier! * 1.8,
+                    labelSize: SizeConfig.textMultiplier! * 1.6,
+                  ),
                 ),
                 SizedBox(width: 10,),
-                CustomRow(
+                Expanded(
-                  label: "${TranslationBase.of(context).quantity}: ",
+                  child: CustomRow(
-                  value: "1",//done as prescribed https://cloudsolutions-sa.atlassian.net/browse/V4-40476?focusedCommentId=471705
+                    label: "${TranslationBase.of(context).quantity}: ",
-                  isExpanded: false,
+                    value: "1",//done as prescribed https://cloudsolutions-sa.atlassian.net/browse/V4-40476?focusedCommentId=471705
-                  valueSize: SizeConfig.textMultiplier! * 1.8,
+                    isExpanded: false,
-                  labelSize: SizeConfig.textMultiplier! * 1.6,
+                    valueSize: SizeConfig.textMultiplier! * 1.8,
+                    labelSize: SizeConfig.textMultiplier! * 1.6,
+                  ),
                 ),
               ],
             ),
@@ -54,22 +60,26 @@ class ProceduresWidget extends StatelessWidget {
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                CustomRow(
+                Expanded(
-                  label: "${TranslationBase.of(context).covered}: ",
+                  child: CustomRow(
-                  value: "${procedure.isCovered}",
+                    label: "${TranslationBase.of(context).covered}: ",
-                  isExpanded: false,
+                    value: "${procedure.isCovered}",
-                  valueSize: SizeConfig.textMultiplier! * 1.8,
+                    isExpanded: false,
-                  labelSize: SizeConfig.textMultiplier! * 1.6,
+                    valueSize: SizeConfig.textMultiplier! * 1.8,
-                  valueColor: procedure.isCovered!
+                    labelSize: SizeConfig.textMultiplier! * 1.6,
-                      ? AppGlobal.appGreenColor
+                    valueColor: procedure.isCovered!
-                      : AppGlobal.appRedColor,
+                        ? AppGlobal.appGreenColor
+                        : AppGlobal.appRedColor,
+                  ),
                 ),
-                CustomRow(
+                Expanded(
-                  label: "${TranslationBase.of(context).approvalRequired}: ",
+                  child: CustomRow(
-                  value: "${procedure.isApprovalRequired}",
+                    label: "${TranslationBase.of(context).approvalRequired}: ",
-                  isExpanded: false,
+                    value: "${procedure.isApprovalRequired}",
-                  valueSize: SizeConfig.textMultiplier! * 1.8,
+                    isExpanded: false,
-                  labelSize: SizeConfig.textMultiplier! * 1.6,
+                    valueSize: SizeConfig.textMultiplier! * 1.8,
+                    labelSize: SizeConfig.textMultiplier! * 1.6,
+                  ),
                 ),
 
 
@@ -93,6 +103,7 @@ class ProceduresWidget extends StatelessWidget {
               height: 16,
             )
           ],
-        ));
+        )
+    );
   }
 }

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,

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,

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<SOAPViewModel>(

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]!;