Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues

 Conflicts:

	lib/config/localized_values.dart

lib/config/config.dart

@@ -72,7 +72,7 @@ const CREATE_REFERRAL_PATIENT =
     'Services/DoctorApplication.svc/REST/CreateReferral';
 
 const RESPONSE_PENDING_REFERRAL_PATIENT =
-    'Services/DoctorApplication.svc/REST/CreateReferral';
+    'Services/DoctorApplication.svc/REST/RespondReferral';
 
 const GET_PATIENT_REFERRAL = 'Services/DoctorApplication.svc/REST/GetRefferal';
 

lib/config/localized_values.dart

@@ -698,5 +698,8 @@ const Map<String, Map<String, String>> localizedValues = {
   'referralResponse': {'en': "Referral Response : ", 'ar': " : استجابة الإحالة"},
   'estimatedCost': {'en': "Estimated Cost", 'ar': "التكلفة المتوقعة"},
   'diagnosisDetail': {'en': "Diagnosis Detail : ", 'ar': "تفاصيل التشخيص"},
+  'referralSuccessMsgAccept': {'en': "Referral Accepted Successfully", 'ar': "تم قبول الإحالة بنجاح"},
+  'referralSuccessMsgReject': {'en': "Referral Rejected Successfully", 'ar': "تم رفض الإحالة بنجاح"},
+  // 'icd': {'en': "ICD", 'ar': " "},
   'orderNo': {'en': "Order No : ", 'ar': "رقم الطلب"},
 };

lib/core/service/patient-doctor-referral-service.dart

@@ -209,6 +209,7 @@ class PatientReferralService extends LookupService {
     await baseAppClient.post(
       RESPONSE_PENDING_REFERRAL_PATIENT,
       onSuccess: (dynamic response, int statusCode) {
+        print(response);
       },
       onFailure: (String error, int statusCode) {
         hasError = true;

lib/screens/patients/profile/referral/my-referral-detail-screen.dart

@@ -154,6 +154,9 @@ class MyReferralDetailScreen extends StatelessWidget {
                                   pendingReferral, true);
                               if (model.state == ViewState.ErrorLocal) {
                                 DrAppToastMsg.showErrorToast(model.error);
+                              } else {
+                                DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgAccept);
+                                Navigator.pop(context);
                               }
                             },
                           ),
@@ -174,6 +177,9 @@ class MyReferralDetailScreen extends StatelessWidget {
                                   pendingReferral, true);
                               if (model.state == ViewState.ErrorLocal) {
                                 DrAppToastMsg.showErrorToast(model.error);
+                              } else {
+                                DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgReject);
+                                Navigator.pop(context);
                               }
                             },
                           ),

lib/util/translations_delegate_base.dart

@@ -1088,6 +1088,8 @@ class TranslationBase {
   String get referralResponse => localizedValues['referralResponse'][locale.languageCode];
   String get estimatedCost => localizedValues['estimatedCost'][locale.languageCode];
   String get diagnosisDetail => localizedValues['diagnosisDetail'][locale.languageCode];
+  String get referralSuccessMsgAccept => localizedValues['referralSuccessMsgAccept'][locale.languageCode];
+  String get referralSuccessMsgReject => localizedValues['referralSuccessMsgReject'][locale.languageCode];
 
   String get patientName =>
       localizedValues['patient-name'][locale.languageCode];

lib/widgets/patients/patient-referral-item-widget.dart

@@ -175,6 +175,7 @@ class PatientReferralItemWidget extends StatelessWidget {
                       height: 8,
                     ),
                     Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         AppText(
                           TranslationBase.of(context).referralRemark,
@@ -182,11 +183,13 @@ class PatientReferralItemWidget extends StatelessWidget {
                           fontWeight: FontWeight.bold,
                           fontSize: 12,
                         ),
-                        AppText(
-                          remark,
-                          color: Colors.black,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 12,
+                        Expanded(
+                          child: AppText(
+                            remark,
+                            color: Colors.black,
+                            fontWeight: FontWeight.bold,
+                            fontSize: 12,
+                          ),
                         ),
                       ],
                     ),