Fixed DA:266

merge-requests/275/head
Elham Rababah 5 years ago
parent d7c3024baf
commit c065dbbdb3

@ -666,4 +666,8 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "You have to add chief complaint fields correctly .", 'en': "You have to add chief complaint fields correctly .",
'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح" 'ar': "يجب عليك إضافة حقول شكوى الرئيس بشكل صحيح"
}, },
'ICDName': {
'en': "ICDName",
'ar': "اسم ال ICD"
},
}; };

@ -1036,6 +1036,8 @@ class TranslationBase {
String get chiefComplaintErrorMsg => String get chiefComplaintErrorMsg =>
localizedValues['chiefComplaintErrorMsg'][locale.languageCode]; localizedValues['chiefComplaintErrorMsg'][locale.languageCode];
String get ICDName =>
localizedValues['ICDName'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -210,7 +210,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
assessment.createdOn !=null?DateTime.parse(assessment.createdOn).day.toString():DateTime.now().day.toString(), assessment.createdOn !=null?DateTime.parse(assessment.createdOn).day.toString():DateTime.now().day.toString(),
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
AppText( AppText(
Helpers.getMonth(assessment.createdOn !=null?DateTime.parse(assessment.createdOn).month:DateTime.now().month).toUpperCase(), Helpers.getMonth(assessment.createdOn !=null?DateTime.parse(assessment.createdOn).month:DateTime.now().month).toUpperCase(),
@ -225,6 +225,32 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment: CrossAxisAlignment
.start, .start,
children: [ children: [
Row(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).ICDName +" : ",
fontWeight: FontWeight
.bold,
fontSize: 13,
),
Container(
width: MediaQuery
.of(context)
.size
.width * 0.29,
child: AppText(
assessment
.selectedICD.description
.toString(),
fontSize: 10,
color: Colors.grey,
),
),
],
),
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
@ -233,7 +259,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
TranslationBase.of(context).appointmentNo, TranslationBase.of(context).appointmentNo,
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
AppText( AppText(
assessment assessment
@ -248,15 +274,21 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText(
TranslationBase.of(context).condition + " : ",
fontWeight: FontWeight
.bold,
fontSize: 13,
),
AppText( AppText(
projectViewModel.isArabic?assessment projectViewModel.isArabic?assessment
.selectedDiagnosisCondition .selectedDiagnosisCondition
.nameAr : assessment .nameAr : assessment
.selectedDiagnosisCondition .selectedDiagnosisCondition
.nameEn, .nameEn,
fontWeight: FontWeight fontSize: 10,
.bold, color: Colors.grey,
fontSize: 16,
), ),
], ],
), ),
@ -268,7 +300,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
TranslationBase.of(context).dType+' : ', TranslationBase.of(context).dType+' : ',
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
AppText( AppText(
projectViewModel.isArabic?assessment projectViewModel.isArabic?assessment
@ -290,7 +322,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
TranslationBase.of(context).doc, TranslationBase.of(context).doc,
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
AppText( AppText(
assessment.doctorName??'', assessment.doctorName??'',
@ -310,16 +342,16 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
height: 6, height: 6,
), ),
AppText( AppText(
TranslationBase.of(context).remarks, TranslationBase.of(context).remarks + " : ",
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
Container( Container(
width: MediaQuery width: MediaQuery
.of(context) .of(context)
.size .size
.width * 0.5, .width * 0.38,
child: AppText( child: AppText(
assessment.remark ?? "", assessment.remark ?? "",
fontSize: 10, fontSize: 10,
@ -341,7 +373,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
"ICD : ".toUpperCase(), "ICD : ".toUpperCase(),
fontWeight: FontWeight fontWeight: FontWeight
.bold, .bold,
fontSize: 16, fontSize: 13,
), ),
Container( Container(
child: AppText( child: AppText(
@ -526,7 +558,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
AppText( AppText(
TranslationBase.of(context).addAssessmentDetails.toUpperCase(), TranslationBase.of(context).addAssessmentDetails.toUpperCase(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16, fontSize: 13,
), ),
SizedBox( SizedBox(
height: 16, height: 16,

Loading…
Cancel
Save