Merge branch 'fix_issues' into 'development'

remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280

lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart

@@ -120,13 +120,25 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                     ),
                     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,
-                        ),
+                      child: Row(
+                        children: [
+                          AppText(
+                            selectedAllergy.remark != null ||
+                                selectedAllergy.remark == ''
+                                ? TranslationBase.of(context).remarks + " : "
+                                : '',
+                            fontWeight: FontWeight.bold,
+                            fontSize: 13,
+                          ),
+                          Container(
+                            width: MediaQuery.of(context).size.width * 0.55,
+                            child: AppText(
+                              selectedAllergy.remark ?? '',
+                              fontSize: 10,
+                              color: Colors.grey,
+                            ),
+                          ),
+                        ],
                       ),
                     ),
                     DividerWithSpacesAround()

lib/widgets/patients/profile/soap_update/update_assessment_page.dart

@@ -342,11 +342,13 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
                                                       height: 6,
                                                     ),
                                                     AppText(
-                                                      TranslationBase.of(context).remarks + " : ",
-                                                      fontWeight: FontWeight
-                                                          .bold,
-                                                      fontSize: 13,
-                                                    ),
+                                                        assessment.remark != null ||
+                                                            assessment.remark == ''
+                                                            ? TranslationBase.of(context).remarks + " : "
+                                                            : '',
+                                                  fontWeight: FontWeight.bold,
+                                                  fontSize: 13,
+                                                ),
                                                     Container(
                                                       width: MediaQuery
                                                           .of(context)