Merge branch 'dev_v2.8_roaa' into 'dev_v2.8_withouth_null_ckecking'

fixed some issues in localized_values and progress_note_screen

See merge request Cloud_Solution/doctor_app_flutter!941

lib/config/localized_values.dart

@@ -708,7 +708,7 @@ const Map<String, Map<String, String>> localizedValues = {
   "icd": {"en": "ICD", "ar": "التصنيف الدولي للأمراض"},
   "days": {"en": "Days", "ar": "أيام"},
   "months": {"en": "Months", "ar": "أشهر"},
-  "years": {"en": "Years", "ar": "سنوات"},
+  "years": {"en": "Years", "ar": "سنة"},
   "hr": {"en": "Hr", "ar": "س"},
   "min": {"en": "Min", "ar": "د"},
   "appointmentNumber": {"en": "Appointment Number", "ar": "رقم الموعد"},

lib/screens/patients/profile/notes/note/progress_note_screen.dart

@@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
+import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -92,8 +93,9 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
         ),
         body: model.patientProgressNoteList == null ||
                 model.patientProgressNoteList.length == 0
-            ? DrAppEmbeddedError(
-                error: TranslationBase.of(context).errorNoProgressNote)
+            ? widget.visitType == 3
+            ? ErrorMessage(error: TranslationBase.of(context).errorNoOrders,)
+            : ErrorMessage(error: TranslationBase.of(context).errorNoProgressNote,)
             : Container(
                 color: Colors.grey[200],
                 child: Column(