Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'doctor-app-design' into 'development'

Browse Source 
referal patient card design fix

See merge request Cloud_Solution/doctor_app_flutter!920
merge-requests/921/merge
Elham Ali 4 years ago
parent d3e90ed984 658a28e558
commit fc81370b0a
6 changed files with 234 additions and 197 deletions
Show Stats Download Patch File Download Diff File

127
lib/screens/patients/insurance_approval_screen_patient.dart
Unescape Escape View File

@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/locator.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/patients/insurance_approvals_details.dart'; import 'package:doctor_app_flutter/screens/patients/insurance_approvals_details.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/patient_service_title.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.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/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -22,10 +23,12 @@ class InsuranceApprovalScreenNew extends StatefulWidget {
InsuranceApprovalScreenNew({this.appointmentNo}); InsuranceApprovalScreenNew({this.appointmentNo});
@override @override
_InsuranceApprovalScreenNewState createState() => _InsuranceApprovalScreenNewState(); _InsuranceApprovalScreenNewState createState() =>
_InsuranceApprovalScreenNewState();
} }
class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew> { class _InsuranceApprovalScreenNewState
extends State<InsuranceApprovalScreenNew> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -39,9 +42,11 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
? (model) => model.getInsuranceInPatient(mrn: patient.patientId) ? (model) => model.getInsuranceInPatient(mrn: patient.patientId)
: patient.appointmentNo != null : patient.appointmentNo != null
? (model) => model.getInsuranceApproval(patient, ? (model) => model.getInsuranceApproval(patient,
appointmentNo: int.parse(patient?.appointmentNo.toString()), projectId: patient.projectId) appointmentNo: int.parse(patient?.appointmentNo.toString()),
projectId: patient.projectId)
: (model) => model.getInsuranceApproval(patient), : (model) => model.getInsuranceApproval(patient),
builder: (BuildContext context, InsuranceViewModel model, Widget child) => AppScaffold( builder: (BuildContext context, InsuranceViewModel model, Widget child) =>
AppScaffold(
appBar: PatientProfileAppBar( appBar: PatientProfileAppBar(
patient, patient,
isInpatient: isInpatient, isInpatient: isInpatient,
@ -59,32 +64,11 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
), ),
child: model.insuranceApprovalInPatient.length != 0 child: model.insuranceApprovalInPatient.length != 0
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( ServiceTitle(
padding: const EdgeInsets.all(8.0), title: TranslationBase.of(context).insurance22,
child: Column( subTitle: TranslationBase.of(context).approvals22,
children: [
Row(
children: [
AppText(
TranslationBase.of(context).insurance22,
fontSize: 15.0,
fontWeight: FontWeight.w600,
fontFamily: 'Poppins',
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context).approvals22,
fontSize: 30.0,
fontWeight: FontWeight.w700,
),
],
),
],
),
), ),
...List.generate( ...List.generate(
model.insuranceApprovalInPatient.length, model.insuranceApprovalInPatient.length,
@ -94,25 +78,40 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => InsuranceApprovalsDetails( builder: (context) =>
InsuranceApprovalsDetails(
patient: patient, patient: patient,
indexInsurance: index, indexInsurance: index,
patientType: patientType, patientType: patientType,
), ),
settings: RouteSettings(name: 'InsuranceApprovalsDetails'), settings: RouteSettings(
name: 'InsuranceApprovalsDetails'),
), ),
); );
}, },
child: DoctorCardInsurance( child: DoctorCardInsurance(
patientOut: "In Patient", patientOut: "In Patient",
profileUrl: model.insuranceApprovalInPatient[index].doctorImage, profileUrl: model
clinic: model.insuranceApprovalInPatient[index].clinicName, .insuranceApprovalInPatient[index]
doctorName: model.insuranceApprovalInPatient[index].doctorName, .doctorImage,
branch: model.insuranceApprovalInPatient[index].approvalNo.toString(), clinic: model
.insuranceApprovalInPatient[index]
.clinicName,
doctorName: model
.insuranceApprovalInPatient[index]
.doctorName,
branch: model
.insuranceApprovalInPatient[index]
.approvalNo
.toString(),
isPrescriptions: true, isPrescriptions: true,
approvalStatus: approvalStatus: model
model.insuranceApprovalInPatient[index].approvalStatusDescption ?? '', .insuranceApprovalInPatient[index]
branch2: model.insuranceApprovalInPatient[index].projectName, .approvalStatusDescption ??
'',
branch2: model
.insuranceApprovalInPatient[index]
.projectName,
), ),
), ),
), ),
@ -129,7 +128,8 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context).noInsuranceApprovalFound), child: AppText(TranslationBase.of(context)
.noInsuranceApprovalFound),
), ),
SizedBox( SizedBox(
height: 150.0, height: 150.0,
@ -156,7 +156,8 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).insurance22, TranslationBase.of(context)
.insurance22,
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -166,7 +167,8 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
Row( Row(
children: [ children: [
AppText( AppText(
TranslationBase.of(context).approvals22, TranslationBase.of(context)
.approvals22,
fontSize: 30.0, fontSize: 30.0,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
@ -180,31 +182,47 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
(index) => Container( (index) => Container(
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
await locator<AnalyticsService>().logEvent( await locator<AnalyticsService>()
eventCategory: "Insurance Approval Screen New", .logEvent(
eventAction: "Insurance Approval Details", eventCategory:
"Insurance Approval Screen New",
eventAction:
"Insurance Approval Details",
); );
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => InsuranceApprovalsDetails( builder: (context) =>
InsuranceApprovalsDetails(
patient: patient, patient: patient,
indexInsurance: index, indexInsurance: index,
patientType: patientType, patientType: patientType,
), ),
settings: RouteSettings(name: 'InsuranceApprovalsDetails'), settings: RouteSettings(
name:
'InsuranceApprovalsDetails'),
), ),
); );
}, },
child: DoctorCardInsurance( child: DoctorCardInsurance(
patientOut: model.insuranceApproval[index].patientDescription, patientOut: model.insuranceApproval[index]
profileUrl: model.insuranceApproval[index].doctorImage, .patientDescription,
clinic: model.insuranceApproval[index].clinicName, profileUrl: model
doctorName: model.insuranceApproval[index].doctorName, .insuranceApproval[index].doctorImage,
branch: model.insuranceApproval[index].approvalNo.toString(), clinic: model
.insuranceApproval[index].clinicName,
doctorName: model
.insuranceApproval[index].doctorName,
branch: model
.insuranceApproval[index].approvalNo
.toString(),
isPrescriptions: true, isPrescriptions: true,
approvalStatus: model.insuranceApproval[index].approvalStatusDescption ?? '', approvalStatus: model
branch2: model.insuranceApproval[index].projectName, .insuranceApproval[index]
.approvalStatusDescption ??
'',
branch2: model
.insuranceApproval[index].projectName,
), ),
), ),
), ),
@ -221,7 +239,8 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
Image.asset('assets/images/no-data.png'), Image.asset('assets/images/no-data.png'),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: AppText(TranslationBase.of(context).noInsuranceApprovalFound), child: AppText(TranslationBase.of(context)
.noInsuranceApprovalFound),
) )
], ],
), ),

95
lib/screens/patients/profile/lab_result/labs_home_page.dart
Unescape Escape View File

@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laborator
import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart';
import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_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/patient_service_title.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.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';
@ -66,27 +67,14 @@ class _LabsHomePageState extends State<LabsHomePage> {
SizedBox( SizedBox(
height: 12, height: 12,
), ),
if (model.patientLabOrdersList.isNotEmpty && patient.patientStatusType != 43) if (model.patientLabOrdersList.isNotEmpty &&
Padding( patient.patientStatusType != 43)
padding: const EdgeInsets.all(8.0), ServiceTitle(
child: Column( title: TranslationBase.of(context).lab,
crossAxisAlignment: CrossAxisAlignment.start, subTitle: TranslationBase.of(context).result,
children: [
AppText(
TranslationBase.of(context).lab,
style: "caption2",
color: Colors.black,
fontSize: 13,
),
AppText(
TranslationBase.of(context).result,
bold: true,
fontSize: 22,
),
],
),
), ),
if (patient.patientStatusType != null && patient.patientStatusType == 43) if (patient.patientStatusType != null &&
patient.patientStatusType == 43)
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
@ -106,7 +94,8 @@ class _LabsHomePageState extends State<LabsHomePage> {
], ],
), ),
), ),
if ((patient.patientStatusType != null && patient.patientStatusType == 43) || if ((patient.patientStatusType != null &&
patient.patientStatusType == 43) ||
(isFromLiveCare && patient.appointmentNo != null)) (isFromLiveCare && patient.appointmentNo != null))
AddNewOrder( AddNewOrder(
onTap: () { onTap: () {
@ -146,26 +135,44 @@ class _LabsHomePageState extends State<LabsHomePage> {
child: Container( child: Container(
width: 20, width: 20,
decoration: BoxDecoration( decoration: BoxDecoration(
color: model.patientLabOrdersList[index].isLiveCareAppointment color: model.patientLabOrdersList[index]
.isLiveCareAppointment
? Colors.red[900] ? Colors.red[900]
: !model.patientLabOrdersList[index].isInOutPatient : !model.patientLabOrdersList[index]
.isInOutPatient
? Colors.black ? Colors.black
: Color(0xffa9a089), : Color(0xffa9a089),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(8), topLeft: projectViewModel.isArabic
bottomLeft: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(8), ? Radius.circular(0)
topRight: projectViewModel.isArabic ? Radius.circular(8) : Radius.circular(0), : Radius.circular(8),
bottomRight: projectViewModel.isArabic ? Radius.circular(8) : Radius.circular(0)), 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( child: RotatedBox(
quarterTurns: 3, quarterTurns: 3,
child: Center( child: Center(
child: Text( child: Text(
model.patientLabOrdersList[index].isLiveCareAppointment model.patientLabOrdersList[index]
? TranslationBase.of(context).liveCare.toUpperCase() .isLiveCareAppointment
: !model.patientLabOrdersList[index].isInOutPatient ? TranslationBase.of(context)
? TranslationBase.of(context).inPatientLabel.toUpperCase() .liveCare
: TranslationBase.of(context).outpatient.toUpperCase(), .toUpperCase()
: !model.patientLabOrdersList[index]
.isInOutPatient
? TranslationBase.of(context)
.inPatientLabel
.toUpperCase()
: TranslationBase.of(context)
.outpatient
.toUpperCase(),
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
), ),
)), )),
@ -181,7 +188,8 @@ class _LabsHomePageState extends State<LabsHomePage> {
context, context,
FadePage( FadePage(
page: LaboratoryResultPage( page: LaboratoryResultPage(
patientLabOrders: model.patientLabOrdersList[index], patientLabOrders:
model.patientLabOrdersList[index],
patient: patient, patient: patient,
isInpatient: isInpatient, isInpatient: isInpatient,
arrivalType: arrivalType, arrivalType: arrivalType,
@ -189,12 +197,18 @@ class _LabsHomePageState extends State<LabsHomePage> {
), ),
), ),
), ),
doctorName: model.patientLabOrdersList[index].doctorName, doctorName:
invoiceNO: ' ${model.patientLabOrdersList[index].invoiceNo}', model.patientLabOrdersList[index].doctorName,
profileUrl: model.patientLabOrdersList[index].doctorImageURL, invoiceNO:
branch: model.patientLabOrdersList[index].projectName, ' ${model.patientLabOrdersList[index].invoiceNo}',
clinic: model.patientLabOrdersList[index].clinicDescription, profileUrl: model
appointmentDate: model.patientLabOrdersList[index].orderDate, .patientLabOrdersList[index].doctorImageURL,
branch:
model.patientLabOrdersList[index].projectName,
clinic: model
.patientLabOrdersList[index].clinicDescription,
appointmentDate:
model.patientLabOrdersList[index].orderDate,
orderNo: model.patientLabOrdersList[index].orderNo, orderNo: model.patientLabOrdersList[index].orderNo,
isShowTime: false, isShowTime: false,
), ),
@ -203,7 +217,8 @@ class _LabsHomePageState extends State<LabsHomePage> {
), ),
), ),
), ),
if (model.patientLabOrdersList.isEmpty && patient.patientStatusType != 43) if (model.patientLabOrdersList.isEmpty &&
patient.patientStatusType != 43)
Center( Center(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,

33
lib/screens/prescription/prescriptions_page.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart';
import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.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/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/patient_service_title.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.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';
@ -57,16 +58,10 @@ class PrescriptionsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( ServiceTitle(
TranslationBase.of(context).orders, title: TranslationBase.of(context).orders,
style: "caption2", subTitle:
color: Colors.black, TranslationBase.of(context).prescriptions,
fontSize: 13,
),
AppText(
TranslationBase.of(context).prescriptions,
bold: true,
fontSize: 22,
), ),
], ],
), ),
@ -78,16 +73,10 @@ class PrescriptionsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( ServiceTitle(
TranslationBase.of(context).orders, title: TranslationBase.of(context).orders,
style: "caption2", subTitle:
color: Colors.black, TranslationBase.of(context).prescriptions,
fontSize: 13,
),
AppText(
TranslationBase.of(context).prescriptions,
bold: true,
fontSize: 22,
), ),
], ],
), ),
@ -169,10 +158,6 @@ class PrescriptionsPage extends StatelessWidget {
child: ListView( child: ListView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
children: <Widget>[ children: <Widget>[
// SizedBox(
// height: 12,
// ),
ListView.builder( ListView.builder(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),

112
lib/widgets/patients/patient-referral-item-widget.dart
Unescape Escape View File

@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.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/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart';
import 'package:flutter/cupertino.dart'; 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';
@ -81,8 +82,9 @@ class PatientReferralItemWidget extends StatelessWidget {
AppText( AppText(
referralStatus != null ? referralStatus : "", referralStatus != null ? referralStatus : "",
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontSize: 1.9 * SizeConfig.textMultiplier, fontSize: 10.0,
fontWeight: FontWeight.w700, letterSpacing: -0.4,
fontWeight: FontWeight.w600,
color: referralStatusCode == 1 color: referralStatusCode == 1
? Color(0xffc4aa54) ? Color(0xffc4aa54)
: referralStatusCode == 2 : referralStatusCode == 2
@ -97,7 +99,8 @@ class PatientReferralItemWidget extends StatelessWidget {
referredDate, referredDate,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 2.0 * SizeConfig.textMultiplier, letterSpacing: -0.48,
fontSize: 12.0,
color: Color(0XFF28353E), color: Color(0XFF28353E),
) )
], ],
@ -108,24 +111,23 @@ class PatientReferralItemWidget extends StatelessWidget {
Expanded( Expanded(
child: AppText( child: AppText(
patientName, patientName,
fontSize: SizeConfig.textMultiplier * 2.2, fontSize: 16.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
color: Colors.black, color: Color(0xff2E303A),
fontFamily: 'Poppins', fontFamily: 'Poppins',
letterSpacing: -0.64,
), ),
), ),
SizedBox( SizedBox(
width: 4, width: 0,
), ),
patientGender == 1 patientGender == 1
? Icon( ? Icon(
DoctorApp.male_2, DoctorApp.male_2,
color: Colors.blue, color: Colors.blue,
) )
: Icon( : Icon(DoctorApp.female_1,
DoctorApp.female_1, color: Color(0xffF0448D)),
color: Colors.pink,
),
SizedBox( SizedBox(
width: 4, width: 4,
), ),
@ -133,8 +135,9 @@ class PatientReferralItemWidget extends StatelessWidget {
referredTime, referredTime,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 1.8 * SizeConfig.textMultiplier, fontSize: 12.0,
color: Color(0XFF575757), color: Color(0XFF575757),
letterSpacing: 0.48,
) )
], ],
), ),
@ -148,19 +151,10 @@ class PatientReferralItemWidget extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
AppText( CustomRow(
TranslationBase.of(context).fileNumber, label:
fontFamily: 'Poppins', TranslationBase.of(context).fileNumber,
fontWeight: FontWeight.w600, value: patientID,
fontSize: 1.7 * SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
AppText(
patientID,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
), ),
], ],
), ),
@ -168,30 +162,18 @@ class PatientReferralItemWidget extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( CustomRow(
isSameBranch label: isSameBranch
? TranslationBase.of(context) ? TranslationBase.of(context)
.referredFrom .referredFrom
: TranslationBase.of(context).refClinic, : TranslationBase.of(context).refClinic,
fontFamily: 'Poppins', value: !isReferralClinic
fontWeight: FontWeight.w600, ? isSameBranch
fontSize: 1.7 * SizeConfig.textMultiplier, ? TranslationBase.of(context)
color: Color(0XFF575757), .sameBranch
), : TranslationBase.of(context)
Expanded( .otherBranch
child: AppText( : " " + referralClinic,
!isReferralClinic
? isSameBranch
? TranslationBase.of(context)
.sameBranch
: TranslationBase.of(context)
.otherBranch
: " " + referralClinic,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
), ),
], ],
), ),
@ -202,9 +184,10 @@ class PatientReferralItemWidget extends StatelessWidget {
children: [ children: [
AppText( AppText(
nationality != null ? nationality : "", nationality != null ? nationality : "",
fontWeight: FontWeight.bold, fontWeight: FontWeight.w600,
color: Color(0xFF2E303A), color: Color(0xFF2E303A),
fontSize: 1.4 * SizeConfig.textMultiplier, fontSize: 10.0,
letterSpacing: -0.4,
), ),
nationalityFlag != null nationalityFlag != null
? ClipRRect( ? ClipRRect(
@ -228,22 +211,9 @@ class PatientReferralItemWidget extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( CustomRow(
TranslationBase.of(context).remarks + " : ", label: TranslationBase.of(context).remarks + " : ",
fontFamily: 'Poppins', value: remark ?? "",
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
Expanded(
child: AppText(
remark ?? "",
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
maxLines: 1,
),
), ),
], ],
), ),
@ -301,17 +271,19 @@ class PatientReferralItemWidget extends StatelessWidget {
AppText( AppText(
referralDoctorName, referralDoctorName,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w800, fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 14.0,
color: Colors.black, color: Color(0xff2E303A),
letterSpacing: -0.56,
), ),
if (clinicDescription != null) if (clinicDescription != null)
AppText( AppText(
clinicDescription, clinicDescription,
fontFamily: 'Poppins', fontFamily: 'Poppins',
fontWeight: FontWeight.w700, fontWeight: FontWeight.w600,
fontSize: 1.4 * SizeConfig.textMultiplier, fontSize: 10.0,
color: Color(0XFF2E303A), color: Color(0xff575757),
letterSpacing: -0.4,
), ),
], ],
), ),

43
lib/widgets/patients/patient_service_title.dart
Unescape Escape View File

@ -0,0 +1,43 @@
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class ServiceTitle extends StatefulWidget {
final String title;
final String subTitle;
const ServiceTitle({Key key, this.title, this.subTitle}) : super(key: key);
@override
_ServiceTitleState createState() => _ServiceTitleState();
}
class _ServiceTitleState extends State<ServiceTitle> {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
widget.title,
color: Color(0xff2E303A),
fontSize: 12.0,
letterSpacing: -0.72,
fontWeight: FontWeight.w600,
fontHeight: 1.0,
),
AppText(
widget.subTitle,
color: Color(0xff2E303A),
fontSize: 24,
fontWeight: FontWeight.w700,
letterSpacing: -1.44,
fontHeight: 1.0,
),
],
),
);
}
}

21
lib/widgets/patients/profile/add-order/addNewOrder.dart
Unescape Escape View File

@ -4,7 +4,8 @@ import 'package:flutter/material.dart';
class AddNewOrder extends StatelessWidget { class AddNewOrder extends StatelessWidget {
const AddNewOrder({ const AddNewOrder({
Key key, Key key,
this.onTap, this.label, this.onTap,
this.label,
}) : super(key: key); }) : super(key: key);
final Function onTap; final Function onTap;
@ -16,22 +17,22 @@ class AddNewOrder extends StatelessWidget {
onTap: onTap, onTap: onTap,
child: Container( child: Container(
width: double.maxFinite, width: double.maxFinite,
height: 140, height: MediaQuery.of(context).size.height * 0.18,
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.grey[300], color: Color(0xffEAEAEA),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Center( child: Center(
child: Container( child: Container(
height: 90, height: MediaQuery.of(context).size.height * 0.11,
child: Column( child: Column(
children: [ children: [
Container( Container(
height: 40, height: MediaQuery.of(context).size.height * 0.05,
width: 40, width: MediaQuery.of(context).size.height * 0.05,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.grey[600], color: Color(0xff7E7E7E),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Center( child: Center(
@ -45,8 +46,10 @@ class AddNewOrder extends StatelessWidget {
height: 10, height: 10,
), ),
AppText( AppText(
label ??'', label ?? '',
color: Colors.grey[600], color: Color(0xff7E7E7E),
letterSpacing: -0.64,
fontSize: 16.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
) )
], ],

Write Preview
Loading…
Cancel
Save