change the lab result design

merge-requests/388/head
Mohammad Aljammal 5 years ago
parent f0c65bb70b
commit 747a0b7da4

@ -5,6 +5,8 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_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/lab_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.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-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/shared/doctor_card.dart';
@ -20,60 +22,35 @@ class LabsHomePage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
PatiantInformtion patient = routeArgs['patient']; PatiantInformtion patient = routeArgs['patient'];
ProjectViewModel projectViewModel = Provider.of(context); String patientType = routeArgs['patient-type'];
String arrivalType = routeArgs['arrival-type'];
return BaseView<LabsViewModel>( return BaseView<LabsViewModel>(
onModelReady: (model) => model.getLabs(patient), onModelReady: (model) => model.getLabs(patient),
builder: (context, LabsViewModel model, widget) => AppScaffold( builder: (context, LabsViewModel model, widget) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: false,
appBarTitle: TranslationBase.of(context).labOrders,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 1.0, widthFactor: 1.0,
child: Center(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( PatientProfileHeaderNewDesign(patient,arrivalType??'0',patientType),
children: <Widget>[ SizedBox(height: 12,),
Expanded( Padding(
flex: 1, padding: const EdgeInsets.all(8.0),
child: InkWell( child: Column(
onTap: () => model.setFilterType(FilterType.Clinic), crossAxisAlignment: CrossAxisAlignment.start,
child: ListTile( children: [
title: Text(TranslationBase.of(context).clinic), Texts('Lab',style: "caption2",color: Colors.black,fontSize: 13,),
leading: Radio( Texts('Result',bold: true,fontSize: 22,),
value: FilterType.Clinic,
groupValue: model.filterType,
onChanged: (FilterType value) {
model.setFilterType(value);
},
),
),
),
),
Expanded(
flex: 1,
child: InkWell(
onTap: () => model.setFilterType(FilterType.Hospital),
child: ListTile(
title: Text(TranslationBase.of(context).hospital),
leading: Radio(
value: FilterType.Hospital,
groupValue: model.filterType,
onChanged: (FilterType value) =>
model.setFilterType(value),
),
),
),
)
], ],
), ),
),
...List.generate( ...List.generate(
model.patientLabOrdersList.length, model.patientLabOrdersList.length,
(index) => AppExpandableNotifier( (index) => Column(
title: model.patientLabOrdersList[index].filterName,
bodyWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: model children: model
@ -89,29 +66,21 @@ class LabsHomePage extends StatelessWidget {
), ),
), ),
), ),
isInOutPatient: labOrder.isInOutPatient, doctorName: labOrder.doctorName,
name: labOrder.doctorName, invoiceNO: ' ${labOrder.invoiceNo}',
billNo: ' ${labOrder.invoiceNo}',
profileUrl: labOrder.doctorImageURL, profileUrl: labOrder.doctorImageURL,
subName: labOrder.projectName, branch: labOrder.projectName,
isLiveCareAppointment: appointmentDate: labOrder.orderDate,
labOrder.isLiveCareAppointment, orderNo: labOrder.orderNo,
date: projectViewModel.isArabic
? DateUtils.getMonthDayYearDateFormattedAr(
labOrder.orderDate)
: DateUtils.getMonthDayYearDateFormatted(
labOrder.orderDate),
); );
}).toList(), }).toList(),
), ),
),
) )
], ],
), ),
), ),
), ),
), ),
),
); );
} }
} }

@ -88,18 +88,12 @@ class RadiologyHomePage extends StatelessWidget {
), ),
), ),
child: DoctorCard( child: DoctorCard(
isInOutPatient: radiology.isInOutPatient, doctorName: radiology.doctorName,
isLiveCareAppointment:
radiology.isLiveCareAppointment,
name: radiology.doctorName,
profileUrl: radiology.doctorImageURL, profileUrl: radiology.doctorImageURL,
billNo: '${radiology.invoiceNo}', invoiceNO: '${radiology.invoiceNo}',
subName: '${radiology.projectName}', branch: '${radiology.projectName}',
date: projectViewModel.isArabic appointmentDate: radiology.orderDate,
? DateUtils.getMonthDayYearDateFormattedAr( orderNo: radiology.orderNo.toString(),
radiology.orderDate)
: DateUtils.getMonthDayYearDateFormatted(
radiology.orderDate),
), ),
); );
}).toList(), }).toList(),

@ -93,24 +93,15 @@ class PrescriptionsPage extends StatelessWidget {
), ),
), ),
child: DoctorCard( child: DoctorCard(
name: prescriptions.doctorName, doctorName: prescriptions.doctorName,
profileUrl: prescriptions.doctorImageURL, profileUrl: prescriptions.doctorImageURL,
rat: branch: prescriptions.name,
prescriptions.actualDoctorRate.toDouble(), appointmentDate: DateUtils.getDateTimeFromServerFormat(prescriptions.appointmentDate,),
subName: prescriptions.name, orderNo: prescriptions.appointmentNo.toString(),
isInOutPatient: prescriptions.isInOutPatient, invoiceNO:prescriptions.appointmentNo.toString(),
isLiveCareAppointment:
prescriptions.isLiveCareAppointment, )
date: projectViewModel.isArabic
? DateUtils
.getMonthDayYearDateFormattedAr(
DateUtils.convertStringToDate(
prescriptions
.appointmentDate))
: DateUtils.getMonthDayYearDateFormatted(
DateUtils.convertStringToDate(
prescriptions.appointmentDate)),
),
); );
}).toList(), }).toList(),
)), )),

@ -271,10 +271,9 @@ class DateUtils {
/// [dateTime] convert DateTime to data formatted /// [dateTime] convert DateTime to data formatted
static String getDayMonthYearDateFormatted(DateTime dateTime,{bool isArabic = false}) { static String getDayMonthYearDateFormatted(DateTime dateTime,{bool isArabic = false}) {
if (dateTime != null) if (dateTime != null)
return isArabic? getMonthArabic(dateTime.month): getMonth(dateTime.month) + return dateTime.day.toString()+" "+ "${isArabic? getMonthArabic(dateTime.month): getMonth(dateTime.month) }"+
" " +
dateTime.day.toString() +
" " + " " +
dateTime.year.toString(); dateTime.year.toString();
else else
return ""; return "";

@ -47,6 +47,7 @@ class _AppExpandableNotifier extends State<AppExpandableNotifier> {
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 10, right: 10, top: 4), padding: const EdgeInsets.only(left: 10, right: 10, top: 4),
child: Card( child: Card(
color: Colors.grey[200],
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[

@ -1,7 +1,8 @@
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/util/date-utils.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/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.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';
@ -11,28 +12,22 @@ import 'StarRating.dart';
import 'Text.dart'; import 'Text.dart';
class DoctorCard extends StatelessWidget { class DoctorCard extends StatelessWidget {
final String name; final String doctorName;
final String subName; final String branch;
final double rat; final DateTime appointmentDate;
final String date;
final String profileUrl; final String profileUrl;
final String billNo; final String invoiceNO;
final String orderNo;
final Function onTap; final Function onTap;
final Function onEmailTap;
final bool isInOutPatient;
final bool isLiveCareAppointment;
DoctorCard( DoctorCard(
{this.name, {this.doctorName,
this.subName, this.branch,
this.rat,
this.date,
this.profileUrl, this.profileUrl,
this.billNo, this.invoiceNO,
this.onTap, this.onTap,
this.onEmailTap, this.appointmentDate,
this.isInOutPatient, this.orderNo});
this.isLiveCareAppointment = false});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -42,81 +37,57 @@ class DoctorCard extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
width: 0.5, width: 0.5,
color: Theme.of(context).primaryColor, color: Colors.white,
), ),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(8.0), Radius.circular(15.0),
), ),
color: Colors.white), color: Colors.white),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: InkWell( child: InkWell(
onTap: onTap, onTap: onTap,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: [
Container( Expanded(
width: projectViewModel.isArabic ? 27 : 20, child: Texts(
height: date == null doctorName,
? projectViewModel.isArabic bold: true,
? 185
: 100
: 180,
decoration: BoxDecoration(
//Colors.red[900] Color(0xff404545)
color: isLiveCareAppointment
? Color(0xff404545)
: !isInOutPatient
? Colors.red[900]
: Theme.of(context).primaryColor,
borderRadius: BorderRadius.only(
topLeft: projectViewModel.isArabic
? Radius.circular(0)
: Radius.circular(8),
bottomLeft: projectViewModel.isArabic
? Radius.circular(0)
: Radius.circular(8),
topRight: projectViewModel.isArabic
? Radius.circular(8)
: Radius.circular(0),
bottomRight: projectViewModel.isArabic
? Radius.circular(8)
: Radius.circular(0),
),
),
child: RotatedBox(
quarterTurns: 3,
child: Center(
child: Text(
isLiveCareAppointment
? TranslationBase.of(context)
.liveCare
.toUpperCase()
: !isInOutPatient
? TranslationBase.of(context)
.inPatient
.toUpperCase()
: TranslationBase.of(context)
.outpatient
.toUpperCase(),
style: TextStyle(color: Colors.white),
),
)), )),
),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[ children: [
Padding( Texts(
padding: const EdgeInsets.all(10.0), '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
child: Row( color: Colors.black,
fontWeight: FontWeight.w600,
fontSize: 14,
),
Texts(
'${DateUtils.getHour(appointmentDate)}',
fontWeight: FontWeight.w600,
color: Colors.grey[700],
fontSize: 14,
),
],
),
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Expanded( Container(
flex: 1,
child: LargeAvatar( child: LargeAvatar(
name: name, name: doctorName,
url: profileUrl, url: profileUrl,
), ),
width: 55,
height: 55,
), ),
Expanded( Expanded(
flex: 4, flex: 4,
@ -124,75 +95,54 @@ class DoctorCard extends StatelessWidget {
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
if (orderNo != null)
Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
TranslationBase.of(context).dr + 'order No:',
" " + color: Colors.grey[500],
name,
bold: true,
), ),
Texts( Texts(
subName, orderNo ?? '',
)
],
), ),
if (billNo != null) if (invoiceNO != null)
Row( Row(
children: <Widget>[ children: <Widget>[
Texts( Texts(
'${TranslationBase.of(context).billNo}: ', 'Invoice:',
color: Colors.grey[500],
), ),
Texts( Texts(
billNo, invoiceNO,
) )
], ],
), ),
if (rat != null)
StarRating(
totalAverage: rat, forceStars: true),
],
),
),
),
if (onEmailTap != null)
InkWell(
onTap: onEmailTap,
child: Icon(
Icons.email,
color: Theme.of(context).primaryColor,
),
),
],
),
),
if (date != null)
Divider(
height: 8,
color: Colors.grey[400],
),
if (date != null)
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Icon( Texts(
Icons.calendar_today_outlined, 'Branch:',
size: 30, color: Colors.grey[500],
color: Colors.red,
),
Expanded(
child: Texts(
date,
variant: 'bodyText',
), ),
Texts(
branch,
) )
], ],
) )
], ]),
), ),
),
Icon(
EvaIcons.eye,
) )
], ],
), ),
], ],
), ),
), ),
),
); );
} }
} }

Loading…
Cancel
Save