Merge branch 'all_special_lab_result' into 'development'

All special lab result

See merge request Cloud_Solution/doctor_app_flutter!812
merge-requests/811/merge
Mohammad Aljammal 5 years ago
commit 6b146ed00b

File diff suppressed because it is too large Load Diff

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

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

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

@ -29,8 +29,8 @@ class ProfileGridForSearch extends StatelessWidget {
PatientProfileCardModel(
TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient),
PatientProfileCardModel(
TranslationBase.of(context).lab, 'Special Result', ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).specialResult,
ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png',
isInPatient: isInpatient),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service,
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.isSelectInpatient = false,
this.isDartIcon = false,
this.dartIcon, this.isFromLiveCare = false, this.color,
this.dartIcon,
this.isFromLiveCare = false,
this.color,
}) : super(key: key);
@override
@ -73,9 +75,13 @@ class PatientProfileButton extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Container(
child: isDartIcon ? Icon(
dartIcon, size: 30, color: color?? Color(0xFF333C45),) : new Image
.asset(
child: isDartIcon
? Icon(
dartIcon,
size: 30,
color: color ?? Color(0xFF333C45),
)
: new Image.asset(
url + icon,
width: 30,
height: 30,
@ -85,10 +91,8 @@ class PatientProfileButton extends StatelessWidget {
],
)),
Container(
alignment: projectsProvider.isArabic
? Alignment.topRight
: Alignment.topLeft,
padding: EdgeInsets.symmetric(horizontal: 8),
alignment: projectsProvider.isArabic ? Alignment.topRight : Alignment.topLeft,
padding: EdgeInsets.symmetric(horizontal: 7),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -97,14 +101,14 @@ class PatientProfileButton extends StatelessWidget {
color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.5,
fontSize: SizeConfig.textMultiplier * 1.35,
),
AppText(
!projectsProvider.isArabic ? this.nameLine2 : nameLine1,
color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.5,
fontSize: SizeConfig.textMultiplier * 1.35,
),
if (isLoading) DrAppCircularProgressIndeicator()
],

Loading…
Cancel
Save