From 04c9a1168b607dd7bbbde0ad9007291f467d65ab Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Thu, 20 May 2021 14:34:30 +0300 Subject: [PATCH 1/2] add VC_ID --- lib/models/patient/patiant_info_model.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index 0c189b86..fc77af66 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/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 json) => PatiantInformtion( @@ -199,5 +201,6 @@ class PatiantInformtion { startTimes: json['StartTime'] ?? json['StartTime'], dischargeDate: json['DischargeDate'] , status: json['Status'] , + vcId: json['VC_ID'] , ); } From 1367f2bebb7fb8b706b884784e6afda244c9d994 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Thu, 20 May 2021 15:47:13 +0300 Subject: [PATCH 2/2] add translation --- lib/config/localized_values.dart | 1 + .../profile/profile_screen/patient_profile_screen.dart | 4 +++- lib/util/translations_delegate_base.dart | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index dcc4aa1f..e8309d70 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -996,4 +996,5 @@ const Map> localizedValues = { "impressionRecommendation": {"en": "Impression and Recommendation", "ar": "الانطباع والتوصية"}, "onHold": {"en": "'On Hold'", "ar": "قيد الانتظار"}, "verified": {"en": "'Verified'", "ar": "Verified"}, + "endCall": {"en": "'End'", "ar": "انهاء"}, }; diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 344c5394..0ec0cf0e 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -273,7 +273,9 @@ class _PatientProfileScreenState extends State 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 { diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index ac805956..9cf6e024 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -1337,6 +1337,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];