change the name of the file

merge-requests/738/head
Elham Rababah 5 years ago
parent 07857b28cd
commit 6fd9af9b26

@ -15,7 +15,7 @@ import 'package:doctor_app_flutter/util/VideoChannel.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar-copy.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
@ -103,7 +103,7 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>
children: [ children: [
Column( Column(
children: [ children: [
PatientProfileAppBarCopy( PatientProfileAppBar(
patientProfileAppBarModel: PatientProfileAppBarModel( patientProfileAppBarModel: PatientProfileAppBarModel(
patient: patient, patient: patient,
isFromLiveCare: isFromLiveCare, isFromLiveCare: isFromLiveCare,

@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart'; import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/subjective/update_subjective_page.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar-copy.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -83,7 +83,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
PatientProfileAppBarCopy( PatientProfileAppBar(
patientProfileAppBarModel: patientProfileAppBarModel:
PatientProfileAppBarModel(patient: patient), PatientProfileAppBarModel(patient: patient),
), ),

@ -1,583 +0,0 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'large_avatar.dart';
class PatientProfileAppBarCopy extends StatelessWidget
with PreferredSizeWidget {
final PatientProfileAppBarModel patientProfileAppBarModel;
PatientProfileAppBarCopy({this.patientProfileAppBarModel});
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
int gender = 1;
if (patientProfileAppBarModel.patient.patientDetails != null) {
gender = patientProfileAppBarModel.patient.patientDetails.gender;
} else {
gender = patientProfileAppBarModel.patient.gender;
}
return Container(
padding: EdgeInsets.only(
left: 0,
right: 5,
bottom: 5,
),
decoration: BoxDecoration(
color: Colors.white,
),
child: Container(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
margin: EdgeInsets.only(top: 50),
child: Column(
children: [
Container(
padding: EdgeInsets.only(left: 12.0),
child: Row(children: [
IconButton(
icon: Icon(Icons.arrow_back_ios),
color: Color(0xFF2B353E), //Colors.black,
onPressed: () => Navigator.pop(context),
),
Expanded(
child: AppText(
patientProfileAppBarModel.patient.firstName != null
? (Helpers.capitalize(
patientProfileAppBarModel.patient.firstName) +
" " +
Helpers.capitalize(
patientProfileAppBarModel.patient.lastName))
: Helpers.capitalize(
patientProfileAppBarModel.patient.fullName ??
patientProfileAppBarModel
.patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
color: Color(0xFF2B353E),
),
),
gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
Container(
margin: EdgeInsets.symmetric(horizontal: 4),
child: InkWell(
onTap: () {
launch("tel://" +
patientProfileAppBarModel.patient.mobileNumber);
},
child: Icon(
Icons.phone,
color: Colors.black87,
),
),
),
]),
),
Row(children: [
Padding(
padding: EdgeInsets.only(left: 12.0),
child: Container(
width: 60,
height: 60,
child: Image.asset(
gender == 1
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
),
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
patientProfileAppBarModel.patient.patientStatusType != null
? Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
patientProfileAppBarModel
.patient.patientStatusType ==
43
? AppText(
TranslationBase.of(context).arrivedP,
color: Colors.green,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 12,
)
: AppText(
TranslationBase.of(context).notArrived,
color: Colors.red[800],
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 12,
),
patientProfileAppBarModel.patient.startTime !=
null
? AppText(
patientProfileAppBarModel
.patient.startTime !=
null
? patientProfileAppBarModel
.patient.startTime
: '',
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A))
: SizedBox()
],
))
: SizedBox(),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RichText(
text: TextSpan(
style: TextStyle(
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).fileNumber,
style: TextStyle(
fontSize: 10,
fontFamily: 'Poppins',
color: Color(0xFF575757),
fontWeight: FontWeight.w600,
),
),
new TextSpan(
text: patientProfileAppBarModel
.patient.patientId
.toString(),
style: TextStyle(
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
fontSize: 12,
color: Color(0xFF2E303A),
)),
],
),
),
Row(
children: [
AppText(
patientProfileAppBarModel.patient.nationalityName ??
patientProfileAppBarModel
.patient.nationality ??
patientProfileAppBarModel
.patient.nationalityId ??
'',
fontWeight: FontWeight.bold,
fontSize: 12,
),
patientProfileAppBarModel
.patient.nationalityFlagURL !=
null
? ClipRRect(
borderRadius: BorderRadius.circular(20.0),
child: Image.network(
patientProfileAppBarModel
.patient.nationalityFlagURL,
height: 25,
width: 30,
errorBuilder: (BuildContext context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
},
))
: SizedBox()
],
)
],
),
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).age + " : ",
style: TextStyle(
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
)),
new TextSpan(
text:
"${AppDateUtils.getAgeByBirthday(patientProfileAppBarModel.patient.patientDetails != null ? patientProfileAppBarModel.patient.patientDetails.dateofBirth ?? "" : patientProfileAppBarModel.patient.dateofBirth ?? "", context, isServerFormat: !patientProfileAppBarModel.isFromLiveCare)}",
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A),
)),
],
),
),
),
if (patientProfileAppBarModel.patient.appointmentDate !=
null &&
patientProfileAppBarModel
.patient.appointmentDate.isNotEmpty)
Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).appointmentDate + " : ",
fontSize: 10,
color: Color(0xFF575757),
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
SizedBox(
width: 3.5,
),
AppText(
AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils.convertStringToDate(
patientProfileAppBarModel
.patient.appointmentDate)),
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A),
),
SizedBox(
height: 0.5,
)
],
),
if (patientProfileAppBarModel.isFromLabResult)
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: "Result Date: ",
style: TextStyle(
fontSize: 10,
color: Color(0xFF575757),
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
)),
new TextSpan(
text:
'${AppDateUtils.getDayMonthYearDateFormatted(patientProfileAppBarModel.appointmentDate, isArabic: projectViewModel.isArabic)}',
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 12)),
],
),
),
),
// if(isInpatient)
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (patientProfileAppBarModel.patient.admissionDate !=
null &&
patientProfileAppBarModel
.patient.admissionDate.isNotEmpty)
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: patientProfileAppBarModel
.patient.admissionDate ==
null
? ""
: TranslationBase.of(context)
.admissionDate +
" : ",
style: TextStyle(fontSize: 10)),
new TextSpan(
text: patientProfileAppBarModel
.patient.admissionDate ==
null
? ""
: "${AppDateUtils.getDayMonthYearDateFormatted((AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate.toString())))}",
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A),
)),
]))),
if (patientProfileAppBarModel.patient.admissionDate !=
null)
Row(
children: [
AppText(
"${TranslationBase.of(context).numOfDays}: ",
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757)),
if (patientProfileAppBarModel
.isDischargedPatient &&
patientProfileAppBarModel
.patient.dischargeDate !=
null)
AppText(
"${AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.dischargeDate).difference(AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate)).inDays + 1}",
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A),
)
else
AppText(
"${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate)).inDays + 1}",
fontWeight: FontWeight.w700,
fontSize: 12,
color: Color(0xFF2E303A),
),
],
),
],
),
],
),
),
]),
if (patientProfileAppBarModel.isAppointmentHeader)
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 30,
height: 30,
margin: EdgeInsets.only(
left: projectViewModel.isArabic ? 10 : 85,
right: projectViewModel.isArabic ? 85 : 10,
top: 5),
decoration: BoxDecoration(
shape: BoxShape.rectangle,
border: Border(
bottom:
BorderSide(color: Colors.grey[400], width: 2.5),
left: BorderSide(color: Colors.grey[400], width: 2.5),
)),
),
Expanded(
child: Container(
margin: EdgeInsets.only(top: 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
child: LargeAvatar(
name: patientProfileAppBarModel.doctorName ?? "",
url: patientProfileAppBarModel.profileUrl,
),
width: 25,
height: 25,
margin: EdgeInsets.only(top: 10),
),
Expanded(
flex: 5,
child: Container(
margin: EdgeInsets.all(10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
'${TranslationBase.of(context).dr}${patientProfileAppBarModel.doctorName}',
color: Color(0xFF2E303A),
fontWeight: FontWeight.w700,
fontSize: 12,
),
if (patientProfileAppBarModel.orderNo !=
null &&
!patientProfileAppBarModel
.isPrescriptions)
Row(
children: <Widget>[
AppText(
'Order No: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.orderNo ??
'',
fontSize: 12)
],
),
if (patientProfileAppBarModel.invoiceNO !=
null &&
!patientProfileAppBarModel
.isPrescriptions)
Row(
children: <Widget>[
AppText(
'Invoice: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.invoiceNO ??
"",
fontSize: 12)
],
),
if (patientProfileAppBarModel.branch !=
null)
Row(
children: [
AppText(
'Branch: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.branch ??
'',
fontSize: 12)
],
),
if (patientProfileAppBarModel.clinic !=
null)
Row(
children: [
AppText(
'Clinic: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.clinic ??
'',
fontSize: 12)
],
),
if (patientProfileAppBarModel
.isMedicalFile &&
patientProfileAppBarModel.episode !=
null)
Row(
children: [
AppText(
'Episode: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.episode ??
'',
fontSize: 12)
],
),
if (patientProfileAppBarModel
.isMedicalFile &&
patientProfileAppBarModel.visitDate !=
null)
Row(
children: [
AppText(
'Visit Date: ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.visitDate ??
'',
fontSize: 12)
],
),
if (!patientProfileAppBarModel
.isMedicalFile)
Row(
children: <Widget>[
AppText(
!patientProfileAppBarModel
.isPrescriptions
? 'Result Date:'
: 'Prescriptions Date ',
fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
'${AppDateUtils.getDayMonthYearDateFormatted(patientProfileAppBarModel.appointmentDate, isArabic: projectViewModel.isArabic)}',
fontSize: 12,
)
],
)
]),
),
),
],
),
),
),
],
)
],
),
),
);
}
@override
Size get preferredSize => Size(
double.maxFinite,
patientProfileAppBarModel.height == 0
? patientProfileAppBarModel.isInpatient
? 160
: patientProfileAppBarModel.isAppointmentHeader
? 290
: 170
: patientProfileAppBarModel.height);
}

@ -1,7 +1,7 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@ -14,56 +14,19 @@ import 'large_avatar.dart';
class PatientProfileAppBar extends StatelessWidget class PatientProfileAppBar extends StatelessWidget
with PreferredSizeWidget { with PreferredSizeWidget {
final PatiantInformtion patient; final PatientProfileAppBarModel patientProfileAppBarModel;
final double height;
final bool isInpatient;
final bool isDischargedPatient;
final bool isFromLiveCare;
final String doctorName;
final String branch;
final DateTime appointmentDate;
final String profileUrl;
final String invoiceNO;
final String orderNo;
final bool isPrescriptions;
final bool isMedicalFile;
final String episode;
final String visitDate;
final String clinic;
final bool isAppointmentHeader;
final bool isFromLabResult;
PatientProfileAppBar(
this.patient,
{this.height = 0.0,
this.isInpatient = false,
this.isDischargedPatient = false,
this.isFromLiveCare = false,
this.doctorName,
this.branch,
this.appointmentDate,
this.profileUrl,
this.invoiceNO,
this.orderNo,
this.isPrescriptions = false,
this.clinic,
this.isMedicalFile = false,
this.episode,
this.visitDate,
this.isAppointmentHeader = false,
this.isFromLabResult = false});
PatientProfileAppBar({this.patientProfileAppBarModel});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
int gender = 1; int gender = 1;
if (patient.patientDetails != null) { if (patientProfileAppBarModel.patient.patientDetails != null) {
gender = patient.patientDetails.gender; gender = patientProfileAppBarModel.patient.patientDetails.gender;
} else { } else {
gender = patient.gender; gender = patientProfileAppBarModel.patient.gender;
} }
return Container( return Container(
@ -75,13 +38,6 @@ class PatientProfileAppBar extends StatelessWidget
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
), ),
// height: height == 0
// ? isInpatient
// ? 215
// : isAppointmentHeader
// ? 325
// : 200
// : height,
child: Container( child: Container(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10), padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
margin: EdgeInsets.only(top: 50), margin: EdgeInsets.only(top: 50),
@ -97,11 +53,16 @@ class PatientProfileAppBar extends StatelessWidget
), ),
Expanded( Expanded(
child: AppText( child: AppText(
patient.firstName != null patientProfileAppBarModel.patient.firstName != null
? (Helpers.capitalize(patient.firstName) + ? (Helpers.capitalize(
patientProfileAppBarModel.patient.firstName) +
" " + " " +
Helpers.capitalize(patient.lastName)) Helpers.capitalize(
: Helpers.capitalize(patient.fullName??patient.patientDetails.fullName), patientProfileAppBarModel.patient.lastName))
: Helpers.capitalize(
patientProfileAppBarModel.patient.fullName ??
patientProfileAppBarModel
.patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 1.8, fontSize: SizeConfig.textMultiplier * 1.8,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -121,7 +82,8 @@ class PatientProfileAppBar extends StatelessWidget
margin: EdgeInsets.symmetric(horizontal: 4), margin: EdgeInsets.symmetric(horizontal: 4),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
launch("tel://" + patient.mobileNumber); launch("tel://" +
patientProfileAppBarModel.patient.mobileNumber);
}, },
child: Icon( child: Icon(
Icons.phone, Icons.phone,
@ -152,16 +114,16 @@ class PatientProfileAppBar extends StatelessWidget
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
patient.patientStatusType != null patientProfileAppBarModel.patient.patientStatusType != null
? Container( ? Container(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
patient.patientStatusType == 43 patientProfileAppBarModel
.patient.patientStatusType ==
43
? AppText( ? AppText(
TranslationBase TranslationBase.of(context).arrivedP,
.of(context)
.arrivedP,
color: Colors.green, color: Colors.green,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -174,10 +136,14 @@ class PatientProfileAppBar extends StatelessWidget
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, fontSize: 12,
), ),
patient.startTime != null patientProfileAppBarModel.patient.startTime !=
null
? AppText( ? AppText(
patient.startTime != null patientProfileAppBarModel
? patient.startTime .patient.startTime !=
null
? patientProfileAppBarModel
.patient.startTime
: '', : '',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
@ -197,38 +163,47 @@ class PatientProfileAppBar extends StatelessWidget
color: Colors.black), color: Colors.black),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase text: TranslationBase.of(context).fileNumber,
.of(context)
.fileNumber,
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
fontFamily: 'Poppins', fontFamily: 'Poppins',
color: Color(0xFF575757), color: Color(0xFF575757),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
),
),), ),
new TextSpan( new TextSpan(
text: patient.patientId.toString(), text: patientProfileAppBarModel
.patient.patientId
.toString(),
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 12, color: Color(0xFF2E303A),)), fontSize: 12,
color: Color(0xFF2E303A),
)),
], ],
), ),
), ),
Row( Row(
children: [ children: [
AppText( AppText(
patient.nationalityName ?? patient.nationality?? patient.nationalityId ?? '', patientProfileAppBarModel.patient.nationalityName ??
patientProfileAppBarModel
.patient.nationality ??
patientProfileAppBarModel
.patient.nationalityId ??
'',
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 12, fontSize: 12,
), ),
patient.nationalityFlagURL != null patientProfileAppBarModel
.patient.nationalityFlagURL !=
null
? ClipRRect( ? ClipRRect(
borderRadius: BorderRadius.circular(20.0), borderRadius: BorderRadius.circular(20.0),
child: Image.network( child: Image.network(
patient.nationalityFlagURL, patientProfileAppBarModel
.patient.nationalityFlagURL,
height: 25, height: 25,
width: 30, width: 30,
errorBuilder: (BuildContext context, errorBuilder: (BuildContext context,
@ -252,34 +227,34 @@ class PatientProfileAppBar extends StatelessWidget
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase text: TranslationBase.of(context).age + " : ",
.of(context) style: TextStyle(
.age + " : ", fontSize: 10,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),)), fontWeight: FontWeight.w600,
color: Color(0xFF575757),
)),
new TextSpan( new TextSpan(
text: text:
"${AppDateUtils.getAgeByBirthday( "${AppDateUtils.getAgeByBirthday(patientProfileAppBarModel.patient.patientDetails != null ? patientProfileAppBarModel.patient.patientDetails.dateofBirth ?? "" : patientProfileAppBarModel.patient.dateofBirth ?? "", context, isServerFormat: !patientProfileAppBarModel.isFromLiveCare)}",
patient.patientDetails != null
? patient.patientDetails.dateofBirth ??
""
: patient.dateofBirth ?? "", context,
isServerFormat: !isFromLiveCare)}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
color: Color(0xFF2E303A),)), color: Color(0xFF2E303A),
)),
], ],
), ),
), ),
), ),
if ( patient.appointmentDate != null && patient.appointmentDate.isNotEmpty) if (patientProfileAppBarModel.patient.appointmentDate !=
null &&
patientProfileAppBarModel
.patient.appointmentDate.isNotEmpty)
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).appointmentDate + TranslationBase.of(context).appointmentDate + " : ",
" : ",
fontSize: 10, fontSize: 10,
color: Color(0xFF575757), color: Color(0xFF575757),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -289,11 +264,10 @@ class PatientProfileAppBar extends StatelessWidget
width: 3.5, width: 3.5,
), ),
AppText( AppText(
AppDateUtils AppDateUtils.getDayMonthYearDateFormatted(
.getDayMonthYearDateFormatted(
AppDateUtils.convertStringToDate( AppDateUtils.convertStringToDate(
patient.appointmentDate)) patientProfileAppBarModel
, .patient.appointmentDate)),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
@ -303,7 +277,8 @@ class PatientProfileAppBar extends StatelessWidget
) )
], ],
), ),
if(isFromLabResult)Container( if (patientProfileAppBarModel.isFromLabResult)
Container(
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
@ -314,15 +289,18 @@ class PatientProfileAppBar extends StatelessWidget
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: "Result Date: ", text: "Result Date: ",
style: TextStyle( fontSize: 10, style: TextStyle(
fontSize: 10,
color: Color(0xFF575757), color: Color(0xFF575757),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontFamily: 'Poppins',)), fontFamily: 'Poppins',
)),
new TextSpan( new TextSpan(
text: text:
'${AppDateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}', '${AppDateUtils.getDayMonthYearDateFormatted(patientProfileAppBarModel.appointmentDate, isArabic: projectViewModel.isArabic)}',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontSize: 12)), fontWeight: FontWeight.w700,
fontSize: 12)),
], ],
), ),
), ),
@ -331,68 +309,68 @@ class PatientProfileAppBar extends StatelessWidget
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if(patient.admissionDate != null && patient.admissionDate.isNotEmpty) if (patientProfileAppBarModel.patient.admissionDate !=
null &&
patientProfileAppBarModel
.patient.admissionDate.isNotEmpty)
Container( Container(
child: RichText( child: RichText(
text: new TextSpan( text: new TextSpan(
style: new TextStyle( style: new TextStyle(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757), fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
children: <TextSpan>[ children: <TextSpan>[
new TextSpan( new TextSpan(
text: patient.admissionDate == null text: patientProfileAppBarModel
.patient.admissionDate ==
null
? "" ? ""
: TranslationBase.of(context) : TranslationBase.of(context)
.admissionDate + .admissionDate +
" : ", " : ",
style: TextStyle(fontSize: 10)), style: TextStyle(fontSize: 10)),
new TextSpan( new TextSpan(
text: patient.admissionDate == null text: patientProfileAppBarModel
.patient.admissionDate ==
null
? "" ? ""
: "${AppDateUtils : "${AppDateUtils.getDayMonthYearDateFormatted((AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate.toString())))}",
.getDayMonthYearDateFormatted(
(AppDateUtils
.getDateTimeFromServerFormat(
patient.admissionDate
.toString())))}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
color: Color(0xFF2E303A),)), color: Color(0xFF2E303A),
)),
]))), ]))),
if (patient.admissionDate != null) if (patientProfileAppBarModel.patient.admissionDate !=
null)
Row( Row(
children: [ children: [
AppText( AppText(
"${TranslationBase.of(context).numOfDays}: ", "${TranslationBase.of(context).numOfDays}: ",
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757) fontSize: 10,
), fontWeight: FontWeight.w600,
if(isDischargedPatient && color: Color(0xFF575757)),
patient.dischargeDate != null) if (patientProfileAppBarModel
.isDischargedPatient &&
patientProfileAppBarModel
.patient.dischargeDate !=
null)
AppText( AppText(
"${AppDateUtils "${AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.dischargeDate).difference(AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate)).inDays + 1}",
.getDateTimeFromServerFormat(
patient.dischargeDate)
.difference(AppDateUtils
.getDateTimeFromServerFormat(
patient.admissionDate))
.inDays + 1}",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
) )
else else
AppText( AppText(
"${DateTime "${DateTime.now().difference(AppDateUtils.getDateTimeFromServerFormat(patientProfileAppBarModel.patient.admissionDate)).inDays + 1}",
.now()
.difference(AppDateUtils
.getDateTimeFromServerFormat(
patient.admissionDate))
.inDays + 1}",
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
color: Color(0xFF2E303A),), color: Color(0xFF2E303A),
),
], ],
), ),
], ],
@ -401,7 +379,7 @@ class PatientProfileAppBar extends StatelessWidget
), ),
), ),
]), ]),
if(isAppointmentHeader) if (patientProfileAppBarModel.isAppointmentHeader)
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -415,10 +393,9 @@ class PatientProfileAppBar extends StatelessWidget
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
border: Border( border: Border(
bottom: BorderSide( bottom:
color: Colors.grey[400], width: 2.5), BorderSide(color: Colors.grey[400], width: 2.5),
left: BorderSide( left: BorderSide(color: Colors.grey[400], width: 2.5),
color: Colors.grey[400], width: 2.5),
)), )),
), ),
Expanded( Expanded(
@ -429,107 +406,151 @@ class PatientProfileAppBar extends StatelessWidget
children: <Widget>[ children: <Widget>[
Container( Container(
child: LargeAvatar( child: LargeAvatar(
name: doctorName ?? "", name: patientProfileAppBarModel.doctorName ?? "",
url: profileUrl, url: patientProfileAppBarModel.profileUrl,
), ),
width: 25, width: 25,
height: 25, height: 25,
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
), ),
Expanded( Expanded(
flex: 5, flex: 5,
child: Container( child: Container(
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment crossAxisAlignment: CrossAxisAlignment.start,
.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'${TranslationBase '${TranslationBase.of(context).dr}${patientProfileAppBarModel.doctorName}',
.of(context)
.dr}$doctorName',
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 12, fontSize: 12,
), ),
if (orderNo != null && if (patientProfileAppBarModel.orderNo !=
!isPrescriptions) null &&
!patientProfileAppBarModel
.isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
AppText('Order No: ', AppText(
'Order No: ',
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), fontSize: 10,
AppText(orderNo ?? '', fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.orderNo ??
'',
fontSize: 12) fontSize: 12)
], ],
), ),
if (invoiceNO != null && if (patientProfileAppBarModel.invoiceNO !=
!isPrescriptions) null &&
!patientProfileAppBarModel
.isPrescriptions)
Row( Row(
children: <Widget>[ children: <Widget>[
AppText('Invoice: ', AppText(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), 'Invoice: ',
AppText(invoiceNO ?? "", fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.invoiceNO ??
"",
fontSize: 12) fontSize: 12)
], ],
), ),
if (branch != null) if (patientProfileAppBarModel.branch !=
null)
Row( Row(
children: [ children: [
AppText('Branch: ', AppText(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), 'Branch: ',
AppText(branch ?? '', fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.branch ??
'',
fontSize: 12) fontSize: 12)
], ],
), ),
if (patientProfileAppBarModel.clinic !=
if (clinic != null) null)
Row( Row(
children: [ children: [
AppText('Clinic: ', AppText(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), 'Clinic: ',
AppText(clinic ?? '', fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.clinic ??
'',
fontSize: 12) fontSize: 12)
], ],
), ),
if (isMedicalFile && if (patientProfileAppBarModel
episode != null) .isMedicalFile &&
patientProfileAppBarModel.episode !=
null)
Row( Row(
children: [ children: [
AppText('Episode: ', AppText(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), 'Episode: ',
AppText(episode ?? '', fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.episode ??
'',
fontSize: 12) fontSize: 12)
], ],
), ),
if (isMedicalFile && if (patientProfileAppBarModel
visitDate != null) .isMedicalFile &&
patientProfileAppBarModel.visitDate !=
null)
Row( Row(
children: [ children: [
AppText('Visit Date: ', AppText(
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757),), 'Visit Date: ',
AppText(visitDate ?? '', fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
),
AppText(
patientProfileAppBarModel
.visitDate ??
'',
fontSize: 12) fontSize: 12)
], ],
), ),
if (!isMedicalFile) if (!patientProfileAppBarModel
.isMedicalFile)
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
!isPrescriptions !patientProfileAppBarModel
.isPrescriptions
? 'Result Date:' ? 'Result Date:'
: 'Prescriptions Date ', : 'Prescriptions Date ',
fontSize: 10, fontWeight: FontWeight.w600,color: Color(0xFF575757), fontSize: 10,
fontWeight: FontWeight.w600,
color: Color(0xFF575757),
), ),
AppText( AppText(
'${AppDateUtils '${AppDateUtils.getDayMonthYearDateFormatted(patientProfileAppBarModel.appointmentDate, isArabic: projectViewModel.isArabic)}',
.getDayMonthYearDateFormatted(
appointmentDate,
isArabic: projectViewModel
.isArabic)}',
fontSize: 12, fontSize: 12,
) )
], ],
@ -548,9 +569,15 @@ class PatientProfileAppBar extends StatelessWidget
), ),
); );
} }
@override @override
Size get preferredSize => Size get preferredSize => Size(
Size(double.maxFinite, height == 0 double.maxFinite,
? isInpatient ? 160 : isAppointmentHeader ? 290 : 170 patientProfileAppBarModel.height == 0
: height); ? patientProfileAppBarModel.isInpatient
? 160
: patientProfileAppBarModel.isAppointmentHeader
? 290
: 170
: patientProfileAppBarModel.height);
} }

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart'; import 'package:doctor_app_flutter/models/patient/profile/patient_profile_app_bar_model.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar-copy.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -49,7 +49,7 @@ class AppScaffold extends StatelessWidget {
child: Scaffold( child: Scaffold(
backgroundColor: backgroundColor ?? Colors.white, backgroundColor: backgroundColor ?? Colors.white,
appBar: isShowAppBar appBar: isShowAppBar
? patientProfileAppBarModel != null ? PatientProfileAppBarCopy( ? patientProfileAppBarModel != null ? PatientProfileAppBar(
patientProfileAppBarModel: patientProfileAppBarModel,) : appBar ?? patientProfileAppBarModel: patientProfileAppBarModel,) : appBar ??
AppBar( AppBar(
elevation: 0, elevation: 0,

Loading…
Cancel
Save