design fixes

merge-requests/479/head
mosazaid 5 years ago
parent 0666940d56
commit 9a0555b715

@ -599,8 +599,8 @@ const Map<String, Map<String, String>> localizedValues = {
'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"}, 'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"},
'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"}, 'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"},
'physicalSystemExamination': { 'physicalSystemExamination': {
'en': "Physical/System Examination", 'en': "Physical System / Examination",
'ar': " الفحص البدني / النظام" 'ar': "الفحص البدني / النظام"
}, },
'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"}, 'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"},
'addExamination': {'en': "Add Examination", 'ar': "اضافه"}, 'addExamination': {'en': "Add Examination", 'ar': "اضافه"},

@ -1,8 +1,14 @@
import '../patiant_info_model.dart';
class PendingReferral { class PendingReferral {
PatiantInformtion patientDetails;
String doctorImageUrl;
String nationalityFlagUrl;
String responded; String responded;
String answerFromTarget; String answerFromTarget;
String createdOn; String createdOn;
int data; int data;
int isSameBranch;
String editedOn; String editedOn;
int interBranchReferral; int interBranchReferral;
int patientID; int patientID;
@ -27,41 +33,51 @@ class PendingReferral {
String targetSetupID; String targetSetupID;
bool isReferralDoctorSameBranch; bool isReferralDoctorSameBranch;
PendingReferral( PendingReferral({
{this.responded, this.patientDetails,
this.answerFromTarget, this.doctorImageUrl,
this.createdOn, this.nationalityFlagUrl,
this.data, this.responded,
this.editedOn, this.answerFromTarget,
this.interBranchReferral, this.createdOn,
this.patientID, this.data,
this.patientName, this.isSameBranch,
this.patientType, this.editedOn,
this.referralNo, this.interBranchReferral,
this.referralStatus, this.patientID,
this.referredByDoctorInfo, this.patientName,
this.referredFromBranchName, this.patientType,
this.referredOn, this.referralNo,
this.referredType, this.referralStatus,
this.remarksFromSource, this.referredByDoctorInfo,
this.respondedOn, this.referredFromBranchName,
this.sourceAppointmentNo, this.referredOn,
this.sourceProjectId, this.referredType,
this.sourceSetupID, this.remarksFromSource,
this.startDate, this.respondedOn,
this.targetAppointmentNo, this.sourceAppointmentNo,
this.targetClinicID, this.sourceProjectId,
this.targetDoctorID, this.sourceSetupID,
this.targetProjectId, this.startDate,
this.targetSetupID, this.targetAppointmentNo,
this.isReferralDoctorSameBranch, this.targetClinicID,
}); this.targetDoctorID,
this.targetProjectId,
this.targetSetupID,
this.isReferralDoctorSameBranch,
});
PendingReferral.fromJson(Map<String, dynamic> json) { PendingReferral.fromJson(Map<String, dynamic> json) {
patientDetails = json['patientDetails'] != null
? PatiantInformtion.fromJson(json['patientDetails'])
: null;
doctorImageUrl = json['DoctorImageURL'];
nationalityFlagUrl = json['NationalityFlagURL'];
responded = json['Responded']; responded = json['Responded'];
answerFromTarget = json['answerFromTarget']; answerFromTarget = json['answerFromTarget'];
createdOn = json['createdOn']; createdOn = json['createdOn'];
data = json['data']; data = json['data'];
isSameBranch = json['isSameBranch'];
editedOn = json['editedOn']; editedOn = json['editedOn'];
interBranchReferral = json['interBranchReferral']; interBranchReferral = json['interBranchReferral'];
patientID = json['patientID']; patientID = json['patientID'];
@ -88,10 +104,13 @@ class PendingReferral {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['DoctorImageURL'] = this.doctorImageUrl;
data['NationalityFlagURL'] = this.nationalityFlagUrl;
data['Responded'] = this.responded; data['Responded'] = this.responded;
data['answerFromTarget'] = this.answerFromTarget; data['answerFromTarget'] = this.answerFromTarget;
data['createdOn'] = this.createdOn; data['createdOn'] = this.createdOn;
data['data'] = this.data; data['data'] = this.data;
data['isSameBranch'] = this.isSameBranch;
data['editedOn'] = this.editedOn; data['editedOn'] = this.editedOn;
data['interBranchReferral'] = this.interBranchReferral; data['interBranchReferral'] = this.interBranchReferral;
data['patientID'] = this.patientID; data['patientID'] = this.patientID;
@ -116,4 +135,4 @@ class PendingReferral {
data['targetSetupID'] = this.targetSetupID; data['targetSetupID'] = this.targetSetupID;
return data; return data;
} }
} }

@ -34,8 +34,9 @@ class ExaminationIitemCard extends StatelessWidget {
? examination.selectedExamination.nameAr ? examination.selectedExamination.nameAr
: examination.selectedExamination.nameEn : examination.selectedExamination.nameEn
: examination.selectedExamination.nameEn, : examination.selectedExamination.nameEn,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Color(0x2B353E),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
), ),
)), )),
@ -43,7 +44,7 @@ class ExaminationIitemCard extends StatelessWidget {
children: [ children: [
AppText( AppText(
TranslationBase.of(context).remove, TranslationBase.of(context).remove,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.red.shade800, color: Colors.red.shade800,
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
@ -82,7 +83,7 @@ class ExaminationIitemCard extends StatelessWidget {
examination.remark, examination.remark,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Colors.grey.shade500, color: Color(0xFF575757),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
), ),
], ],

@ -145,14 +145,15 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
"${TranslationBase.of(context).physicalSystemExamination}", "${TranslationBase.of(context).physicalSystemExamination}",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: fontSize:
SizeConfig.textMultiplier * 2.0, SizeConfig.textMultiplier * 2.1,
fontWeight: isSysExaminationExpand fontWeight: isSysExaminationExpand
? FontWeight.w700 ? FontWeight.w700
: FontWeight.normal, : FontWeight.normal,
color: Color(0xFF2E303A),
), ),
Icon( Icon(
FontAwesomeIcons.asterisk, FontAwesomeIcons.asterisk,
color: AppGlobal.appPrimaryColor, color: Colors.black/*AppGlobal.appPrimaryColor*/,
size: 12, size: 12,
) )
], ],
@ -205,7 +206,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.8, 1.8,
color: Colors.black, color: Color(0xFF2E303A),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(

Loading…
Cancel
Save