bug fixes for DA-284-DA-285

merge-requests/297/head
mosazaid 5 years ago
parent f87f851100
commit a618292d20

@ -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';

@ -697,5 +697,7 @@ 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': " "},
};

@ -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;

@ -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);
}
},
),

@ -1086,6 +1086,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];

@ -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,
),
),
],
),

Loading…
Cancel
Save