From 9a0555b715b7b1069a99e15aa7e3eaddb3e2a65a Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 14 Apr 2021 13:01:57 +0300 Subject: [PATCH] design fixes --- lib/config/localized_values.dart | 4 +- .../patient/my_referral/PendingReferral.dart | 79 ++++++++++++------- .../objective/examination-item-card.dart | 7 +- .../objective/update_objective_page.dart | 7 +- 4 files changed, 59 insertions(+), 38 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 20cb9ef7..74f3da60 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -599,8 +599,8 @@ const Map> localizedValues = { 'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"}, 'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"}, 'physicalSystemExamination': { - 'en': "Physical/System Examination", - 'ar': " الفحص البدني / النظام" + 'en': "Physical System / Examination", + 'ar': "الفحص البدني / النظام" }, 'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"}, 'addExamination': {'en': "Add Examination", 'ar': "اضافه"}, diff --git a/lib/models/patient/my_referral/PendingReferral.dart b/lib/models/patient/my_referral/PendingReferral.dart index 9da17985..6d3f0b83 100644 --- a/lib/models/patient/my_referral/PendingReferral.dart +++ b/lib/models/patient/my_referral/PendingReferral.dart @@ -1,8 +1,14 @@ +import '../patiant_info_model.dart'; + class PendingReferral { + PatiantInformtion patientDetails; + String doctorImageUrl; + String nationalityFlagUrl; String responded; String answerFromTarget; String createdOn; int data; + int isSameBranch; String editedOn; int interBranchReferral; int patientID; @@ -27,41 +33,51 @@ class PendingReferral { String targetSetupID; bool isReferralDoctorSameBranch; - PendingReferral( - {this.responded, - this.answerFromTarget, - this.createdOn, - this.data, - this.editedOn, - this.interBranchReferral, - this.patientID, - this.patientName, - this.patientType, - this.referralNo, - this.referralStatus, - this.referredByDoctorInfo, - this.referredFromBranchName, - this.referredOn, - this.referredType, - this.remarksFromSource, - this.respondedOn, - this.sourceAppointmentNo, - this.sourceProjectId, - this.sourceSetupID, - this.startDate, - this.targetAppointmentNo, - this.targetClinicID, - this.targetDoctorID, - this.targetProjectId, - this.targetSetupID, - this.isReferralDoctorSameBranch, - }); + PendingReferral({ + this.patientDetails, + this.doctorImageUrl, + this.nationalityFlagUrl, + this.responded, + this.answerFromTarget, + this.createdOn, + this.data, + this.isSameBranch, + this.editedOn, + this.interBranchReferral, + this.patientID, + this.patientName, + this.patientType, + this.referralNo, + this.referralStatus, + this.referredByDoctorInfo, + this.referredFromBranchName, + this.referredOn, + this.referredType, + this.remarksFromSource, + this.respondedOn, + this.sourceAppointmentNo, + this.sourceProjectId, + this.sourceSetupID, + this.startDate, + this.targetAppointmentNo, + this.targetClinicID, + this.targetDoctorID, + this.targetProjectId, + this.targetSetupID, + this.isReferralDoctorSameBranch, + }); PendingReferral.fromJson(Map json) { + patientDetails = json['patientDetails'] != null + ? PatiantInformtion.fromJson(json['patientDetails']) + : null; + doctorImageUrl = json['DoctorImageURL']; + nationalityFlagUrl = json['NationalityFlagURL']; responded = json['Responded']; answerFromTarget = json['answerFromTarget']; createdOn = json['createdOn']; data = json['data']; + isSameBranch = json['isSameBranch']; editedOn = json['editedOn']; interBranchReferral = json['interBranchReferral']; patientID = json['patientID']; @@ -88,10 +104,13 @@ class PendingReferral { Map toJson() { final Map data = new Map(); + data['DoctorImageURL'] = this.doctorImageUrl; + data['NationalityFlagURL'] = this.nationalityFlagUrl; data['Responded'] = this.responded; data['answerFromTarget'] = this.answerFromTarget; data['createdOn'] = this.createdOn; data['data'] = this.data; + data['isSameBranch'] = this.isSameBranch; data['editedOn'] = this.editedOn; data['interBranchReferral'] = this.interBranchReferral; data['patientID'] = this.patientID; @@ -116,4 +135,4 @@ class PendingReferral { data['targetSetupID'] = this.targetSetupID; return data; } -} \ No newline at end of file +} diff --git a/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart b/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart index 903dc69c..09610a75 100644 --- a/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart +++ b/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart @@ -34,8 +34,9 @@ class ExaminationIitemCard extends StatelessWidget { ? examination.selectedExamination.nameAr : examination.selectedExamination.nameEn : examination.selectedExamination.nameEn, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w600, fontFamily: 'Poppins', + color: Color(0x2B353E), fontSize: SizeConfig.textMultiplier * 1.8, ), )), @@ -43,7 +44,7 @@ class ExaminationIitemCard extends StatelessWidget { children: [ AppText( TranslationBase.of(context).remove, - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w600, fontFamily: 'Poppins', color: Colors.red.shade800, fontSize: SizeConfig.textMultiplier * 1.8, @@ -82,7 +83,7 @@ class ExaminationIitemCard extends StatelessWidget { examination.remark, fontWeight: FontWeight.normal, fontFamily: 'Poppins', - color: Colors.grey.shade500, + color: Color(0xFF575757), fontSize: SizeConfig.textMultiplier * 1.8, ), ], diff --git a/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart b/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart index ce0f6064..43525272 100644 --- a/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart @@ -145,14 +145,15 @@ class _UpdateObjectivePageState extends State { "${TranslationBase.of(context).physicalSystemExamination}", fontFamily: 'Poppins', fontSize: - SizeConfig.textMultiplier * 2.0, + SizeConfig.textMultiplier * 2.1, fontWeight: isSysExaminationExpand ? FontWeight.w700 : FontWeight.normal, + color: Color(0xFF2E303A), ), Icon( FontAwesomeIcons.asterisk, - color: AppGlobal.appPrimaryColor, + color: Colors.black/*AppGlobal.appPrimaryColor*/, size: 12, ) ], @@ -205,7 +206,7 @@ class _UpdateObjectivePageState extends State { fontSize: SizeConfig .textMultiplier * 1.8, - color: Colors.black, + color: Color(0xFF2E303A), fontWeight: FontWeight.bold, ), AppText(