Fix referred-patient-screen design

merge-requests/961/head
RoaaGhali98 4 years ago
parent 06b2e7f194
commit db83bec292

@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import '../../../../util/helpers.dart';
import '../../../../widgets/shared/errors/error_message.dart'; import '../../../../widgets/shared/errors/error_message.dart';
class ReferredPatientScreen extends StatefulWidget { class ReferredPatientScreen extends StatefulWidget {
@ -87,22 +88,27 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralStatus, .referralStatus,
patientName: patientName:
"${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}", Helpers.convertToTitleCase(
"${model.getReferredPatientItem(index).firstName} ${model.getReferredPatientItem(index).middleName} ${model.getReferredPatientItem(index).lastName}",
),
patientGender: model patientGender: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.gender, .gender,
referredDate: AppDateUtils referredDate: AppDateUtils.getDayMonthYearDateFormatted(
.convertDateFromServerFormat( AppDateUtils.convertStringToDate(
model model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralDate, .referralDate,
"dd/MM/yyyy"), ),
referredTime: AppDateUtils isMonthShort: true
),
referredTime:
AppDateUtils
.convertDateFromServerFormat( .convertDateFromServerFormat(
model model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralDate, .referralDate,
"hh:mm a"), " hh:mm a"),
patientID: patientID:
"${model.getReferredPatientItem(index).patientID}", "${model.getReferredPatientItem(index).patientID}",
isSameBranch: model isSameBranch: model
@ -122,7 +128,9 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
.getReferredPatientItem(index) .getReferredPatientItem(index)
.doctorImageURL, .doctorImageURL,
referralDoctorName: referralDoctorName:
"${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}", Helpers.convertToTitleCase(
"${TranslationBase.of(context).dr} ${model.getReferredPatientItem(index).referralDoctorName}",
),
clinicDescription: model clinicDescription: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.referralClinicDescription, .referralClinicDescription,

@ -9,6 +9,9 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../config/size_config.dart';
import '../../util/helpers.dart';
class PatientReferralItemWidget extends StatelessWidget { class PatientReferralItemWidget extends StatelessWidget {
final String referralStatus; final String referralStatus;
final int referralStatusCode; final int referralStatusCode;
@ -58,6 +61,7 @@ class PatientReferralItemWidget extends StatelessWidget {
child: Column( child: Column(
children: [ children: [
Container( Container(
height: MediaQuery.of(context).size.height * 0.33,
child: CardWithBgWidget( child: CardWithBgWidget(
bgColor: referralStatusCode == 1 bgColor: referralStatusCode == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
@ -81,8 +85,8 @@ class PatientReferralItemWidget extends StatelessWidget {
AppText( AppText(
referralStatus != null ? referralStatus : "", referralStatus != null ? referralStatus : "",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 10.0, fontSize: 12.0,
letterSpacing: -0.4, letterSpacing: -0.48,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: referralStatusCode == 1 color: referralStatusCode == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
@ -104,6 +108,9 @@ class PatientReferralItemWidget extends StatelessWidget {
) )
], ],
), ),
SizedBox(
height: 7,
),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -126,7 +133,7 @@ class PatientReferralItemWidget extends StatelessWidget {
: Icon(DoctorApp.female_1, : Icon(DoctorApp.female_1,
color: Color(0xffF0448D)), color: Color(0xffF0448D)),
SizedBox( SizedBox(
width: 4, width: 18,
), ),
AppText( AppText(
referredTime ?? "", referredTime ?? "",
@ -134,7 +141,7 @@ class PatientReferralItemWidget extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 12.0, fontSize: 12.0,
color: Color(0XFF575757), color: Color(0XFF575757),
letterSpacing: 0.48, letterSpacing: -0.48,
) )
], ],
), ),
@ -163,30 +170,34 @@ class PatientReferralItemWidget extends StatelessWidget {
], ],
), ),
), ),
Row( Padding(
children: [ padding: const EdgeInsets.only(right: 0.1),
AppText( child: Row(
nationality != null ? nationality : "", children: [
fontWeight: FontWeight.w600, AppText(
color: Color(0xFF2E303A), nationality != null ? nationality : "",
fontSize: 10.0, fontWeight: FontWeight.w600,
letterSpacing: -0.4, color: Color(0xFF2E303A),
), fontSize: 10.0,
nationalityFlag != null letterSpacing: -0.4,
? ClipRRect( ),
borderRadius: BorderRadius.circular(20.0), nationalityFlag != null
child: Image.network( ? ClipRRect(
nationalityFlag, borderRadius: BorderRadius.circular(20.0),
height: 25, child: Image.network(
width: 30, nationalityFlag,
errorBuilder: (BuildContext context, height: 25,
Object exception, width: 30,
StackTrace stackTrace) { errorBuilder: (BuildContext context,
return Text(''); Object exception,
}, StackTrace stackTrace) {
)) return Text('');
: SizedBox() },
], )
)
: SizedBox()
],
),
) )
], ],
), ),
@ -198,7 +209,7 @@ class PatientReferralItemWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 10, right: 0), margin: EdgeInsets.only(left: 3, right: 0, top: 0.1),
child: Image.asset( child: Image.asset(
isReferral isReferral
? 'assets/images/patient/ic_ref_arrow_up.png' ? 'assets/images/patient/ic_ref_arrow_up.png'
@ -209,8 +220,8 @@ class PatientReferralItemWidget extends StatelessWidget {
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 0, top: 25, right: 0, bottom: 0), left: 0, top: 18, right: 0, bottom: 0),
padding: EdgeInsets.only(left: 4.0, right: 4.0), padding: EdgeInsets.only(left: 4.0, right: 1.0),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,
@ -219,8 +230,8 @@ class PatientReferralItemWidget extends StatelessWidget {
borderRadius: BorderRadius.circular(20.0), borderRadius: BorderRadius.circular(20.0),
child: Image.network( child: Image.network(
doctorAvatar, doctorAvatar,
height: 25, height: 28,
width: 30, width: 28,
errorBuilder: (BuildContext context, errorBuilder: (BuildContext context,
Object exception, Object exception,
StackTrace stackTrace) { StackTrace stackTrace) {
@ -241,7 +252,7 @@ class PatientReferralItemWidget extends StatelessWidget {
flex: 4, flex: 4,
child: Container( child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 10, top: 25, right: 10, bottom: 0), left: 10, top: 17, bottom: 0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

Loading…
Cancel
Save