patient profile aligment fix

merge-requests/812/head
hussam al-habibeh 4 years ago
parent 19487ba435
commit a0bc5b73de

File diff suppressed because it is too large Load Diff

@ -69,7 +69,7 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
"Special " + TranslationBase.of(context).lab, TranslationBase.of(context).special + " " + TranslationBase.of(context).lab,
style: "caption2", style: "caption2",
color: Colors.black, color: Colors.black,
fontSize: 13, fontSize: 13,

@ -41,8 +41,8 @@ class ProfileGridForInPatient extends StatelessWidget {
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel( PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).specialResult,
TranslationBase.of(context).lab, 'Special Result', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).result, PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).result,
RADIOLOGY_PATIENT, 'patient/health_summary.png', RADIOLOGY_PATIENT, 'patient/health_summary.png',

@ -39,8 +39,8 @@ class ProfileGridForOther extends StatelessWidget {
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel( PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).specialResult,
TranslationBase.of(context).lab, 'Special Result', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service,
RADIOLOGY_PATIENT, 'patient/health_summary.png', RADIOLOGY_PATIENT, 'patient/health_summary.png',

@ -29,8 +29,8 @@ class ProfileGridForSearch extends StatelessWidget {
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel( PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).specialResult,
TranslationBase.of(context).lab, 'Special Result', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient), isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service,
RADIOLOGY_PATIENT, 'patient/health_summary.png', RADIOLOGY_PATIENT, 'patient/health_summary.png',

File diff suppressed because it is too large Load Diff

@ -48,7 +48,9 @@ class PatientProfileButton extends StatelessWidget {
this.isDischargedPatient = false, this.isDischargedPatient = false,
this.isSelectInpatient = false, this.isSelectInpatient = false,
this.isDartIcon = false, this.isDartIcon = false,
this.dartIcon, this.isFromLiveCare = false, this.color, this.dartIcon,
this.isFromLiveCare = false,
this.color,
}) : super(key: key); }) : super(key: key);
@override @override
@ -73,38 +75,40 @@ class PatientProfileButton extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
child: isDartIcon ? Icon( child: isDartIcon
dartIcon, size: 30, color: color?? Color(0xFF333C45),) : new Image ? Icon(
.asset( dartIcon,
url + icon, size: 30,
width: 30, color: color ?? Color(0xFF333C45),
height: 30, )
fit: BoxFit.contain, : new Image.asset(
), url + icon,
width: 30,
height: 30,
fit: BoxFit.contain,
),
) )
], ],
)), )),
Container( Container(
alignment: projectsProvider.isArabic alignment: projectsProvider.isArabic ? Alignment.topRight : Alignment.topLeft,
? Alignment.topRight
: Alignment.topLeft,
padding: EdgeInsets.symmetric(horizontal: 8), padding: EdgeInsets.symmetric(horizontal: 8),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
!projectsProvider.isArabic ? this.nameLine1 : nameLine2, !projectsProvider.isArabic ? this.nameLine1 : nameLine2,
color: color??Color(0xFF2B353E), color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.5, fontSize: SizeConfig.textMultiplier * 1.35,
), ),
AppText( AppText(
!projectsProvider.isArabic ? this.nameLine2 : nameLine1, !projectsProvider.isArabic ? this.nameLine2 : nameLine1,
color: color??Color(0xFF2B353E), color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
textAlign: TextAlign.left, textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.5, fontSize: SizeConfig.textMultiplier * 1.35,
), ),
if (isLoading) DrAppCircularProgressIndeicator() if (isLoading) DrAppCircularProgressIndeicator()
], ],
@ -117,7 +121,7 @@ class PatientProfileButton extends StatelessWidget {
color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white, color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border.fromBorderSide(BorderSide( border: Border.fromBorderSide(BorderSide(
color: color??Color(0xffBBBBBB), color: color ?? Color(0xffBBBBBB),
width: 1, width: 1,
)), )),
), ),
@ -145,7 +149,7 @@ class PatientProfileButton extends StatelessWidget {
'isInpatient': isInPatient, 'isInpatient': isInPatient,
'isDischargedPatient': isDischargedPatient, 'isDischargedPatient': isDischargedPatient,
'isSelectInpatient': isSelectInpatient, 'isSelectInpatient': isSelectInpatient,
"isFromLiveCare":isFromLiveCare "isFromLiveCare": isFromLiveCare
}); });
} }
} }

Loading…
Cancel
Save