insurance approval & medical file design fix

merge-requests/476/head
hussam al-habibeh 5 years ago
parent 6f914b3e93
commit 0578bb5ed3

@ -148,7 +148,7 @@ class ProcedureCard extends StatelessWidget {
color: Colors.grey, color: Colors.grey,
), ),
Texts( Texts(
entityList.clinicDescription??"", entityList.clinicDescription ?? "",
bold: true, bold: true,
fontSize: 12, fontSize: 12,
), ),

@ -15,8 +15,8 @@ import 'package:provider/provider.dart';
import 'large_avatar.dart'; import 'large_avatar.dart';
class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with PreferredSizeWidget { class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
with PreferredSizeWidget {
final PatiantInformtion patient; final PatiantInformtion patient;
final String patientType; final String patientType;
final String arrivalType; final String arrivalType;
@ -59,8 +59,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
} }
return Container( return Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),
left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
), ),
@ -81,12 +80,12 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
), ),
Expanded( Expanded(
child: AppText( child: AppText(
patient.firstName != null ? patient.firstName != null
(Helpers.capitalize(patient.firstName) + ? (Helpers.capitalize(patient.firstName) +
" " + " " +
Helpers.capitalize( Helpers.capitalize(patient.lastName))
patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName), : Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier *2.2, fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backGroundcolor: Colors.white, backGroundcolor: Colors.white,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -122,11 +121,9 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
), ),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: [ children: [
SERVICES_PATIANT2[ SERVICES_PATIANT2[int.parse(patientType)] ==
int.parse(patientType)] ==
"patientArrivalList" "patientArrivalList"
? Container( ? Container(
child: Row( child: Row(
@ -165,17 +162,14 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
], ],
)) ))
: SizedBox(), : SizedBox(),
if (SERVICES_PATIANT2[ if (SERVICES_PATIANT2[int.parse(patientType)] ==
int.parse(patientType)] ==
"List_MyOutPatient") "List_MyOutPatient")
Container( Container(
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).appointmentDate +
.appointmentDate +
" : ", " : ",
fontSize: 14, fontSize: 14,
), ),
@ -183,25 +177,16 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
? Container( ? Container(
height: 15, height: 15,
width: 60, width: 60,
decoration: decoration: BoxDecoration(
BoxDecoration( borderRadius: BorderRadius.circular(25),
borderRadius: color: HexColor("#20A169"),
BorderRadius
.circular(
25),
color: HexColor(
"#20A169"),
), ),
child: AppText( child: AppText(
patient.startTime, patient.startTime,
color: Colors.white, color: Colors.white,
fontSize: 1.5 * fontSize: 1.5 * SizeConfig.textMultiplier,
SizeConfig textAlign: TextAlign.center,
.textMultiplier, fontWeight: FontWeight.bold,
textAlign: TextAlign
.center,
fontWeight:
FontWeight.bold,
), ),
) )
: SizedBox(), : SizedBox(),
@ -210,12 +195,10 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
), ),
Container( Container(
child: AppText( child: AppText(
convertDateFormat2(patient.appointmentDate.toString()?? ''), convertDateFormat2(
fontSize: 1.5 * patient.appointmentDate.toString() ?? ''),
SizeConfig fontSize: 1.5 * SizeConfig.textMultiplier,
.textMultiplier, fontWeight: FontWeight.bold,
fontWeight:
FontWeight.bold,
), ),
), ),
SizedBox( SizedBox(
@ -228,34 +211,23 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
), ),
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceBetween,
MainAxisAlignment.spaceBetween,
children: [ children: [
RichText( RichText(
text: TextSpan( text: TextSpan(
style: TextStyle( style: TextStyle(
fontSize: 1.6 * fontSize: 1.6 * SizeConfig.textMultiplier,
SizeConfig
.textMultiplier,
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: text: TranslationBase.of(context).fileNumber,
TranslationBase.of(
context)
.fileNumber,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12, fontFamily: 'Poppins')),
fontFamily:
'Poppins')),
new TextSpan( new TextSpan(
text: patient.patientId text: patient.patientId.toString(),
.toString(),
style: TextStyle( style: TextStyle(
fontWeight: fontWeight: FontWeight.w700,
FontWeight.w700, fontFamily: 'Poppins',
fontFamily:
'Poppins',
fontSize: 14)), fontSize: 14)),
], ],
), ),
@ -263,30 +235,21 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
Row( Row(
children: [ children: [
AppText( AppText(
patient.nationalityName ?? patient.nationalityName ?? patient.nationality,
patient.nationality,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
patient.nationality != null patient.nationality != null
? ClipRRect( ? ClipRRect(
borderRadius: borderRadius: BorderRadius.circular(20.0),
BorderRadius
.circular(
20.0),
child: Image.network( child: Image.network(
patient.nationalityFlagURL, patient.nationalityFlagURL,
height: 25, height: 25,
width: 30, width: 30,
errorBuilder: errorBuilder: (BuildContext context,
(BuildContext Object exception,
context, StackTrace stackTrace) {
Object return Text('No Image');
exception,
StackTrace
stackTrace) {
return Text(
'No Image');
}, },
)) ))
: SizedBox() : SizedBox()
@ -298,26 +261,19 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 1.6 * fontSize: 1.6 * SizeConfig.textMultiplier,
SizeConfig.textMultiplier,
color: Colors.black, color: Colors.black,
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of( text: TranslationBase.of(context).age + " : ",
context) style: TextStyle(fontSize: 14)),
.age +
" : ",
style: TextStyle(
fontSize: 14)),
new TextSpan( new TextSpan(
text: text:
"${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}", "${DateUtils.getAgeByBirthday(patient.patientDetails != null ? patient.patientDetails.dateofBirth : patient.dateofBirth, context)}",
style: TextStyle( style: TextStyle(
fontWeight: fontWeight: FontWeight.w700, fontSize: 14)),
FontWeight.w700,
fontSize: 14)),
], ],
), ),
), ),
@ -332,14 +288,16 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
Container( Container(
width: 30, width: 30,
height: 30, height: 30,
margin: EdgeInsets.only(left: projectViewModel.isArabic?10:85, right: projectViewModel.isArabic?85:10,top: 5), margin: EdgeInsets.only(
left: projectViewModel.isArabic ? 10 : 85,
right: projectViewModel.isArabic ? 85 : 10,
top: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
border: Border( border: Border(
bottom:BorderSide(color: Colors.grey[400],width: 2.5), bottom: BorderSide(color: Colors.grey[400], width: 2.5),
left: BorderSide(color: Colors.grey[400],width: 2.5), left: BorderSide(color: Colors.grey[400], width: 2.5),
) )),
),
), ),
Expanded( Expanded(
child: Container( child: Container(
@ -372,31 +330,22 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
if (orderNo != null && !isPrescriptions) if (orderNo != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts('Order No: ',
'Order No: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12 fontSize: 12),
), Texts(orderNo ?? '', fontSize: 12)
Texts(
orderNo ?? '',fontSize: 12
)
], ],
), ),
if (invoiceNO != null && !isPrescriptions) if (invoiceNO != null && !isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts('Invoice: ',
'Invoice: ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12 fontSize: 12),
), Texts(invoiceNO, fontSize: 12)
Texts(
invoiceNO,
fontSize: 12
)
], ],
), ),
if ( branch != null) if (branch != null)
Row( Row(
children: [ children: [
Texts('Branch: ', Texts('Branch: ',
@ -406,7 +355,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
], ],
), ),
if (isPrescriptions) if (isPrescriptions)
if(clinic!=null) if (clinic != null)
Row( Row(
children: [ children: [
Texts('Clinic: ', Texts('Clinic: ',
@ -437,20 +386,22 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Texts( child: Texts(
!isPrescriptions? 'Result Date: ': 'Prescriptions Date ', !isPrescriptions
? 'Result Date: '
: 'Prescriptions Date ',
color: Colors.grey[800], color: Colors.grey[800],
fontSize: 12, fontSize: 12,
), ),
), ),
Texts( Texts(
'${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',fontSize: 14, '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
fontSize: 14,
) )
], ],
) )
]), ]),
), ),
), ),
], ],
), ),
), ),
@ -464,7 +415,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
} }
convertDateFormat2(String str) { convertDateFormat2(String str) {
String newDate =""; String newDate = "";
const start = "/Date("; const start = "/Date(";
const end = "+0300)"; const end = "+0300)";
@ -502,5 +453,5 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
} }
@override @override
Size get preferredSize => Size(double.maxFinite,290); Size get preferredSize => Size(double.maxFinite, 290);
} }

Loading…
Cancel
Save