Merge branch 'development' into medical-profile-services

lib/config/localized_values.dart

@@ -997,4 +997,5 @@ const Map<String, Map<String, String>> localizedValues = {
   "impressionRecommendation": {"en": "Impression and Recommendation", "ar": "الانطباع والتوصية"},
   "onHold": {"en": "'On Hold'", "ar": "قيد الانتظار"},
   "verified": {"en": "'Verified'", "ar": "Verified"},
+  "endCall": {"en": "'End'", "ar": "انهاء"},
 };

lib/models/patient/patiant_info_model.dart

@@ -62,6 +62,8 @@ class PatiantInformtion {
   String startTimes;
   String dischargeDate;
   int status;
+  int vcId;
+
   PatiantInformtion(
       {this.patientDetails,
       this.projectId,
@@ -121,7 +123,7 @@ class PatiantInformtion {
       this.nationalityFlagURL,
       this.patientStatusType,
       this.visitTypeId,
-      this.startTimes,this.dischargeDate,this.status});
+      this.startTimes,this.dischargeDate,this.status, this.vcId});
 
   factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
       PatiantInformtion(
@@ -199,5 +201,6 @@ class PatiantInformtion {
         startTimes: json['StartTime'] ?? json['StartTime'],
         dischargeDate: json['DischargeDate'] ,
         status: json['Status'] ,
+        vcId: json['VC_ID'] ,
       );
 }

lib/screens/patients/profile/profile_screen/patient_profile_screen.dart

@@ -273,7 +273,9 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
                       child: AppButton(
                         fontWeight: FontWeight.w700,
                         color: model.isFinished?Colors.red[600]:Colors.green[600],
-                        title: model.isFinished?"End":TranslationBase
+                        title: model.isFinished?TranslationBase
+                            .of(context)
+                            .endCall:TranslationBase
                             .of(context)
                             .initiateCall,
                         onPressed: () async {

lib/util/translations_delegate_base.dart

@@ -1339,6 +1339,8 @@ class TranslationBase {
   String get medicalReportVerify => localizedValues['medicalReportVerify'][locale.languageCode];
   String get comments => localizedValues['comments'][locale.languageCode];
   String get initiateCall  => localizedValues['initiateCall '][locale.languageCode];
+  String get endCall  => localizedValues['endCall '][locale.languageCode];
+
   String get transferTo  => localizedValues['transferTo'][locale.languageCode];
   String get admin  => localizedValues['admin'][locale.languageCode];
   String get instructions  => localizedValues['instructions'][locale.languageCode];