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

insurance approvals deatils fix

Browse Source
merge-requests/441/head
hussam al-habibeh 4 years ago
parent 11f2c30c64
commit 1fba6c839c
6 changed files with 584 additions and 262 deletions
Show Stats Download Patch File Download Diff File

373
lib/core/model/insurance_approval.dart
Unescape Escape View File

@ -1,27 +1,41 @@
class InsuranceApprovalDetails {
class ApporvalDetails {
int approvalNo;
String procedureName;
//String procedureNameN;
String status;
String isInvoicedDesc;
InsuranceApprovalDetails({
this.procedureName,
this.status,
this.isInvoicedDesc,
});
ApporvalDetails(
{this.approvalNo, this.procedureName, this.status, this.isInvoicedDesc});
InsuranceApprovalDetails.fromJson(Map<String, dynamic> json) {
try {
isInvoicedDesc = json['IsInvoicedDesc'];
status = json['Status'];
procedureName = json['ProcedureName'];
} catch (e) {
print(e);
}
ApporvalDetails.fromJson(Map<String, dynamic> json) {
approvalNo = json['ApprovalNo'];
procedureName = json['ProcedureName'];
status = json['Status'];
isInvoicedDesc = json['IsInvoicedDesc'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['ApprovalNo'] = this.approvalNo;
data['ProcedureName'] = this.procedureName;
data['Status'] = this.status;
data['IsInvoicedDesc'] = this.isInvoicedDesc;
return data;
}
}
class InsuranceApprovalModel {
InsuranceApprovalDetails approvalDetails;
List<ApporvalDetails> apporvalDetails;
double versionID;
int channel;
int languageID;
@ -75,11 +89,11 @@ class InsuranceApprovalModel {
//this.companyName,
this.expiryDate,
this.rceiptOn,
this.approvalDetails,
this.apporvalDetails,
this.appointmentNo,
this.doctorImage});
InsuranceApprovalDetails x = InsuranceApprovalDetails();
//InsuranceApprovalDetails x = InsuranceApprovalDetails();
InsuranceApprovalModel.fromJson(Map<String, dynamic> json) {
try {
@ -108,8 +122,12 @@ class InsuranceApprovalModel {
doctorName = json['DoctorName'];
doctorImage = json['DoctorImageURL'];
clinicName = json['ClinicName'];
approvalDetails =
InsuranceApprovalDetails.fromJson(json['ApporvalDetails'][0]);
if (json['ApporvalDetails'] != null) {
apporvalDetails = new List<ApporvalDetails>();
json['ApporvalDetails'].forEach((v) {
apporvalDetails.add(new ApporvalDetails.fromJson(v));
});
}
appointmentNo = json['AppointmentNo'];
} catch (e) {
print(e);
@ -143,3 +161,320 @@ class InsuranceApprovalModel {
return data;
}
}
// class InsuranceApprovalModel {
// String setupID;
// int projectID;
// int approvalNo;
// String approvalDate;
// int patientType;
// int patientID;
// int companyID;
// int subCategoryID;
// int doctorID;
// int clinicID;
// int approvalType;
// Null inpatientApprovalSubType;
// String validFrom;
// Null vaildDays;
// String validTo;
// Null isApprovalOnGross;
// Null isPackage;
// int requestedAmount;
// bool isDentalAllowedBackend;
// int patientTypeID;
//
// String companyApprovalNo;
//
// String submitOn;
// String receiptOn;
//
// int status;
// int eXuldAPPNO;
// String feedbackStatusOn;
// int authorizerID;
// String expiryDate;
// int appointmentNo;
// int admissionNo;
//
// int createdBy;
// String createdOn;
// int editedBy;
// String editedOn;
//
// String extendedOn;
//
// int noOrderAuthorizerID;
// bool isVerbalApproval;
//
// List<ApporvalDetails> apporvalDetails;
// String approvalStatusDescption;
// String clinicName;
//
// //Null companyName;
// String doctorImageURL;
// String doctorName;
//
// int doctorRate;
// String doctorTitle;
// int gender;
// String genderDescription;
// bool isActiveDoctorProfile;
// bool isExecludeDoctor;
// bool isInOutPatient;
// String isInOutPatientDescription;
// String isInOutPatientDescriptionN;
// bool isLiveCareAppointment;
// String projectName;
//
// String qR;
// List<String> speciality;
//
// int totaUnUsedCount;
// int unUsedCount;
//
// InsuranceApprovalModel(
// {this.setupID,
// this.projectID,
// this.approvalNo,
// this.approvalDate,
// this.patientType,
// this.patientID,
// this.companyID,
// this.subCategoryID,
// this.doctorID,
// this.clinicID,
// this.approvalType,
// this.inpatientApprovalSubType,
// this.validFrom,
// this.vaildDays,
// this.validTo,
// this.isApprovalOnGross,
// this.isPackage,
// this.requestedAmount,
// this.patientTypeID,
// this.companyApprovalNo,
// this.eXuldAPPNO,
// this.submitOn,
// this.receiptOn,
// this.status,
// this.feedbackStatusOn,
// this.authorizerID,
// this.expiryDate,
// this.appointmentNo,
// this.admissionNo,
// this.createdBy,
// this.createdOn,
// this.editedBy,
// this.editedOn,
// this.extendedOn,
// this.noOrderAuthorizerID,
// this.isVerbalApproval,
// this.apporvalDetails,
// this.approvalStatusDescption,
// this.clinicName,
// this.doctorImageURL,
// this.doctorName,
// this.doctorRate,
// this.doctorTitle,
// this.gender,
// this.genderDescription,
// this.isActiveDoctorProfile,
// this.isExecludeDoctor,
// this.isInOutPatient,
// this.isInOutPatientDescription,
// this.isInOutPatientDescriptionN,
// this.isLiveCareAppointment,
// this.projectName,
// this.qR,
// this.speciality,
// this.totaUnUsedCount,
// this.unUsedCount,
// this.isDentalAllowedBackend});
//
// InsuranceApprovalModel.fromJson(Map<String, dynamic> json) {
// eXuldAPPNO = json['EXuldAPPNO'];
// setupID = json['SetupID'];
// projectID = json['ProjectID'];
// approvalNo = json['ApprovalNo'];
// approvalDate = json['ApprovalDate'];
// patientType = json['PatientType'];
// patientID = json['PatientID'];
// companyID = json['CompanyID'];
// subCategoryID = json['SubCategoryID'];
// doctorID = json['DoctorID'];
// clinicID = json['ClinicID'];
// approvalType = json['ApprovalType'];
// inpatientApprovalSubType = json['InpatientApprovalSubType'];
// validFrom = json['ValidFrom'];
// vaildDays = json['VaildDays'];
// validTo = json['ValidTo'];
// isApprovalOnGross = json['IsApprovalOnGross'];
// isPackage = json['IsPackage'];
// requestedAmount = json['RequestedAmount'];
//
// companyApprovalNo = json['CompanyApprovalNo'];
//
// submitOn = json['SubmitOn'];
// receiptOn = json['ReceiptOn'];
//
// status = json['Status'];
//
// feedbackStatusOn = json['FeedbackStatusOn'];
// authorizerID = json['AuthorizerID'];
// expiryDate = json['ExpiryDate'];
// appointmentNo = json['AppointmentNo'];
// admissionNo = json['AdmissionNo'];
//
// createdBy = json['CreatedBy'];
// createdOn = json['CreatedOn'];
// editedBy = json['EditedBy'];
// editedOn = json['EditedOn'];
//
// extendedOn = json['ExtendedOn'];
//
// noOrderAuthorizerID = json['NoOrderAuthorizerID'];
// isVerbalApproval = json['isVerbalApproval'];
//
// if (json['ApporvalDetails'] != null) {
// apporvalDetails = new List<ApporvalDetails>();
// json['ApporvalDetails'].forEach((v) {
// apporvalDetails.add(new ApporvalDetails.fromJson(v));
// });
// }
// approvalStatusDescption = json['ApprovalStatusDescption'];
// clinicName = json['ClinicName'];
//
// doctorImageURL = json['DoctorImageURL'];
// doctorName = json['DoctorName'];
//
// doctorRate = json['DoctorRate'];
// doctorTitle = json['DoctorTitle'];
// gender = json['Gender'];
// genderDescription = json['GenderDescription'];
// isActiveDoctorProfile = json['IsActiveDoctorProfile'];
// isExecludeDoctor = json['IsExecludeDoctor'];
// isInOutPatient = json['IsInOutPatient'];
// isInOutPatientDescription = json['IsInOutPatientDescription'];
// isInOutPatientDescriptionN = json['IsInOutPatientDescriptionN'];
// isLiveCareAppointment = json['IsLiveCareAppointment'];
// projectName = json['ProjectName'];
//
// qR = json['QR'];
// speciality = json['Speciality'].cast<String>();
//
// totaUnUsedCount = json['TotaUnUsedCount'];
// unUsedCount = json['UnUsedCount'];
// }
//
// Map<String, dynamic> toJson() {
// final Map<String, dynamic> data = new Map<String, dynamic>();
// data['SetupID'] = this.setupID;
// data['ProjectID'] = this.projectID;
// data['ApprovalNo'] = this.approvalNo;
// data['ApprovalDate'] = this.approvalDate;
// data['PatientType'] = this.patientType;
// data['PatientID'] = this.patientID;
// data['CompanyID'] = this.companyID;
// data['SubCategoryID'] = this.subCategoryID;
// data['DoctorID'] = this.doctorID;
// data['ClinicID'] = this.clinicID;
// data['ApprovalType'] = this.approvalType;
// data['InpatientApprovalSubType'] = this.inpatientApprovalSubType;
// data['ValidFrom'] = this.validFrom;
// data['VaildDays'] = this.vaildDays;
// data['ValidTo'] = this.validTo;
// data['IsApprovalOnGross'] = this.isApprovalOnGross;
// data['IsPackage'] = this.isPackage;
// data['RequestedAmount'] = this.requestedAmount;
//
// data['CompanyApprovalNo'] = this.companyApprovalNo;
//
// data['SubmitOn'] = this.submitOn;
// data['ReceiptOn'] = this.receiptOn;
//
// data['Status'] = this.status;
//
// data['FeedbackStatusOn'] = this.feedbackStatusOn;
// data['AuthorizerID'] = this.authorizerID;
// data['ExpiryDate'] = this.expiryDate;
// data['AppointmentNo'] = this.appointmentNo;
// data['AdmissionNo'] = this.admissionNo;
//
// data['CreatedBy'] = this.createdBy;
// data['CreatedOn'] = this.createdOn;
// data['EditedBy'] = this.editedBy;
// data['EditedOn'] = this.editedOn;
// data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
//
// data['ExtendedOn'] = this.extendedOn;
//
// data['NoOrderAuthorizerID'] = this.noOrderAuthorizerID;
// data['isVerbalApproval'] = this.isVerbalApproval;
//
// if (this.apporvalDetails != null) {
// data['ApporvalDetails'] =
// this.apporvalDetails.map((v) => v.toJson()).toList();
// }
// data['ApprovalStatusDescption'] = this.approvalStatusDescption;
// data['ClinicName'] = this.clinicName;
//
// data['DoctorImageURL'] = this.doctorImageURL;
// data['DoctorName'] = this.doctorName;
// data['EXuldAPPNO'] = this.eXuldAPPNO;
// data['DoctorRate'] = this.doctorRate;
// data['DoctorTitle'] = this.doctorTitle;
// data['Gender'] = this.gender;
// data['GenderDescription'] = this.genderDescription;
// data['IsActiveDoctorProfile'] = this.isActiveDoctorProfile;
// data['IsExecludeDoctor'] = this.isExecludeDoctor;
// data['IsInOutPatient'] = this.isInOutPatient;
// data['IsInOutPatientDescription'] = this.isInOutPatientDescription;
// data['IsInOutPatientDescriptionN'] = this.isInOutPatientDescriptionN;
// data['IsLiveCareAppointment'] = this.isLiveCareAppointment;
// data['ProjectName'] = this.projectName;
//
// data['QR'] = this.qR;
// data['Speciality'] = this.speciality;
//
// data['TotaUnUsedCount'] = this.totaUnUsedCount;
// data['UnUsedCount'] = this.unUsedCount;
// return data;
// }
// }
//
// class ApporvalDetails {
// int approvalNo;
//
// String procedureName;
// //String procedureNameN;
// String status;
//
// String isInvoicedDesc;
//
// ApporvalDetails(
// {this.approvalNo, this.procedureName, this.status, this.isInvoicedDesc});
//
// ApporvalDetails.fromJson(Map<String, dynamic> json) {
// approvalNo = json['ApprovalNo'];
//
// procedureName = json['ProcedureName'];
//
// status = json['Status'];
//
// isInvoicedDesc = json['IsInvoicedDesc'];
// }
//
// Map<String, dynamic> toJson() {
// final Map<String, dynamic> data = new Map<String, dynamic>();
//
// data['ApprovalNo'] = this.approvalNo;
//
// data['ProcedureName'] = this.procedureName;
//
// data['Status'] = this.status;
//
// data['IsInvoicedDesc'] = this.isInvoicedDesc;
// return data;
// }
// }

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

@ -42,7 +42,8 @@ class _InsuranceApprovalScreenNewState
return BaseView<InsuranceViewModel>(
onModelReady: patient.appointmentNo != null
? (model) => model.getInsuranceApproval(patient,
appointmentNo: patient.appointmentNo,projectId: patient.projectId)
appointmentNo: patient.appointmentNo,
projectId: patient.projectId)
: (model) => model.getInsuranceApproval(patient),
builder: (BuildContext context, InsuranceViewModel model, Widget child) =>
AppScaffold(
@ -147,7 +148,8 @@ class _InsuranceApprovalScreenNewState
.toString(),
isPrescriptions: true,
approvalStatus: model.insuranceApproval[index]
.approvalDetails?.status??'',
.approvalStatusDescption ??
'',
),
),
),

160
lib/screens/patients/insurance_approvals_details.dart
Unescape Escape View File

@ -37,7 +37,8 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
return BaseView<InsuranceViewModel>(
onModelReady: patient.appointmentNo != null
? (model) => model.getInsuranceApproval(patient,
appointmentNo: patient.appointmentNo,projectId: patient.projectId)
appointmentNo: patient.appointmentNo,
projectId: patient.projectId)
: (model) => model.getInsuranceApproval(patient),
builder: (BuildContext context, InsuranceViewModel model, Widget child) =>
AppScaffold(
@ -93,12 +94,25 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Row(
children: [
Texts(
model.insuranceApproval[indexInsurance].approvalDetails!=null?
model.insuranceApproval[indexInsurance].approvalDetails.status ??"":"",
color:
model.insuranceApproval[indexInsurance].approvalDetails!=null?
"${model.insuranceApproval[indexInsurance].approvalDetails.status}"
== "Approved" ? Color(0xff359846) : Color(0xffD02127): Color(0xffD02127),
model.insuranceApproval[indexInsurance]
.approvalStatusDescption !=
null
? model
.insuranceApproval[
indexInsurance]
.approvalStatusDescption ??
""
: "",
color: model
.insuranceApproval[
indexInsurance]
.approvalStatusDescption !=
null
? "${model.insuranceApproval[indexInsurance].approvalStatusDescption}" ==
"Approved"
? Color(0xff359846)
: Color(0xffD02127)
: Color(0xffD02127),
),
],
),
@ -208,7 +222,6 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Texts('Sample')
],
),
Row(
children: [
Texts(
@ -293,59 +306,84 @@ class _InsuranceApprovalsDetailsState extends State<InsuranceApprovalsDetails> {
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceAround,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Container(
height: MediaQuery.of(context)
.size
.height *
0.15, //130.0,
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.approvalDetails
?.procedureName??""),
),
Container(
height: MediaQuery.of(context)
.size
.height *
0.15,
width: MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.approvalDetails
?.status??""),
),
Container(
height: MediaQuery.of(context)
.size
.height *
0.15,
width: MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.approvalDetails
?.isInvoicedDesc??""),
),
],
),
child: ListView.builder(
shrinkWrap: true,
physics: ScrollPhysics(),
itemCount: model
.insuranceApproval[indexInsurance]
.apporvalDetails
.length,
itemBuilder: (BuildContext context,
int index) {
return Container(
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceAround,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Container(
height:
MediaQuery.of(context)
.size
.height *
0.15, //130.0,
width:
MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
index]
?.procedureName ??
""),
),
Container(
height:
MediaQuery.of(context)
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.33,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
index]
?.status ??
""),
),
Container(
height:
MediaQuery.of(context)
.size
.height *
0.15,
width:
MediaQuery.of(context)
.size
.width *
0.21,
child: Texts(model
.insuranceApproval[
indexInsurance]
?.apporvalDetails[
index]
?.isInvoicedDesc ??
""),
),
],
),
);
}),
),
Divider(
color: Colors.black45,

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

@ -32,7 +32,8 @@ class PrescriptionsPage extends StatelessWidget {
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
isShowAppBar: true,
appBar: PatientProfileHeaderNewDesignAppBar(patient, arrivalType ?? '0', patientType),
appBar: PatientProfileHeaderNewDesignAppBar(
patient, arrivalType ?? '0', patientType),
body: FractionallySizedBox(
widthFactor: 1.0,
child: ListView(
@ -60,7 +61,9 @@ class PrescriptionsPage extends StatelessWidget {
],
),
),
if (patientType != null && patientType == '7' && patient.patientStatusType == 43)
if (patientType != null &&
patientType == '7' &&
patient.patientStatusType == 43)
InkWell(
onTap: () {
addPrescriptionForm(

290
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
Unescape Escape View File

@ -10,13 +10,14 @@ import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:intl/intl.dart';
class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with PreferredSizeWidget{
class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
with PreferredSizeWidget {
final PatiantInformtion patient;
final String patientType;
final String arrivalType;
PatientProfileHeaderNewDesignAppBar(this.patient, this.patientType, this.arrivalType);
PatientProfileHeaderNewDesignAppBar(
this.patient, this.patientType, this.arrivalType);
@override
Widget build(BuildContext context) {
@ -28,14 +29,16 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
}
return Container(
padding: EdgeInsets.only(
left: 0, right: 5, bottom: 5,),
left: 0,
right: 5,
bottom: 5,
),
decoration: BoxDecoration(
color: Colors.white,
),
height: 200,
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),
child: Column(
children: [
@ -49,12 +52,12 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
),
Expanded(
child: AppText(
patient.firstName != null ?
(Helpers.capitalize(patient.firstName) +
" " +
Helpers.capitalize(
patient.lastName)) : Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier *2.2,
patient.firstName != null
? (Helpers.capitalize(patient.firstName) +
" " +
Helpers.capitalize(patient.lastName))
: Helpers.capitalize(patient.patientDetails.fullName),
fontSize: SizeConfig.textMultiplier * 2.2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
@ -62,13 +65,13 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
),
gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
DoctorApp.female_1,
color: Colors.pink,
),
]),
),
Row(children: [
@ -79,129 +82,97 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
height: 60,
child: Image.asset(
gender == 1
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
SERVICES_PATIANT2[
int.parse(patientType)] ==
"patientArrivalList"
? Container(
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList"
? Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
patient.patientStatusType ==
43
patient.patientStatusType == 43
? AppText(
TranslationBase.of(
context)
.arrivedP,
color: Colors.green,
fontWeight:
FontWeight.bold,
fontFamily:
'Poppins',
fontSize: 12,
)
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,
),
TranslationBase.of(context).notArrived,
color: Colors.red[800],
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 12,
),
arrivalType == '1'
? AppText(
patient.startTime !=
null
? patient
.startTime
: '',
fontFamily:
'Poppins',
fontWeight:
FontWeight.w600,
)
patient.startTime != null
? patient.startTime
: '',
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
)
: AppText(
patient.arrivedOn!=null? DateUtils.convertStringToDateFormat(
patient.arrivedOn,
'MM-dd-yyyy HH:mm'):'',
fontFamily:
'Poppins',
fontWeight:
FontWeight.w600,
)
],
))
patient.arrivedOn != null
? DateUtils.convertStringToDateFormat(
patient.arrivedOn,
'MM-dd-yyyy HH:mm')
: '',
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
)
],
))
: SizedBox(),
if (SERVICES_PATIANT2[
int.parse(patientType)] ==
if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient")
Container(
child: Row(
mainAxisAlignment:
MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context)
.appointmentDate +
TranslationBase.of(context).appointmentDate +
" : ",
fontSize: 14,
),
patient.startTime != null
? Container(
height: 15,
width: 60,
decoration:
BoxDecoration(
borderRadius:
BorderRadius
.circular(
25),
color: HexColor(
"#20A169"),
),
child: AppText(
patient.startTime,
color: Colors.white,
fontSize: 1.5 *
SizeConfig
.textMultiplier,
textAlign: TextAlign
.center,
fontWeight:
FontWeight.bold,
),
)
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
patient.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
)
: SizedBox(),
SizedBox(
width: 3.5,
),
Container(
child: AppText(
convertDateFormat2(patient.appointmentDate.toString()?? ''),
fontSize: 1.5 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight.bold,
convertDateFormat2(
patient.appointmentDate.toString() ?? ''),
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
),
SizedBox(
@ -214,34 +185,23 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
),
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RichText(
text: TextSpan(
style: TextStyle(
fontSize: 1.6 *
SizeConfig
.textMultiplier,
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text:
TranslationBase.of(
context)
.fileNumber,
text: TranslationBase.of(context).fileNumber,
style: TextStyle(
fontSize: 12,
fontFamily:
'Poppins')),
fontSize: 12, fontFamily: 'Poppins')),
new TextSpan(
text: patient.patientId
.toString(),
text: patient.patientId.toString(),
style: TextStyle(
fontWeight:
FontWeight.w700,
fontFamily:
'Poppins',
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
fontSize: 14)),
],
),
@ -249,32 +209,23 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
Row(
children: [
AppText(
patient.nationalityName ??
patient.nationality,
patient.nationalityName ?? patient.nationality,
fontWeight: FontWeight.bold,
fontSize: 12,
),
patient.nationality != null
? ClipRRect(
borderRadius:
BorderRadius
.circular(
20.0),
child: Image.network(
patient.nationalityFlagURL,
height: 25,
width: 30,
errorBuilder:
(BuildContext
context,
Object
exception,
StackTrace
stackTrace) {
return Text(
'No Image');
},
))
borderRadius: BorderRadius.circular(20.0),
child: Image.network(
patient.nationalityFlagURL,
height: 25,
width: 30,
errorBuilder: (BuildContext context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
},
))
: SizedBox()
],
)
@ -284,26 +235,19 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 1.6 *
SizeConfig.textMultiplier,
fontSize: 1.6 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(
context)
.age +
" : ",
style: TextStyle(
fontSize: 14)),
text: TranslationBase.of(context).age + " : ",
style: TextStyle(fontSize: 14)),
new TextSpan(
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(
fontWeight:
FontWeight.w700,
fontSize: 14)),
fontWeight: FontWeight.w700, fontSize: 14)),
],
),
),
@ -330,10 +274,10 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
var date = new DateTime.fromMillisecondsSinceEpoch(
int.parse(str.substring(startIndex + start.length, endIndex)));
newDate = date.year.toString() +
"/" +
date.month.toString().padLeft(2, '0') +
"/" +
date.day.toString().padLeft(2, '0');
"/" +
date.month.toString().padLeft(2, '0') +
"/" +
date.day.toString().padLeft(2, '0');
}
return newDate.toString();
@ -357,7 +301,5 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred
}
@override
Size get preferredSize => Size(double.maxFinite,200);
Size get preferredSize => Size(double.maxFinite, 200);
}

10
lib/widgets/shared/doctor_card_insurance.dart
Unescape Escape View File

@ -56,7 +56,9 @@ class DoctorCardInsurance extends StatelessWidget {
topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10),
),
color: approvalStatus == "Approved" ? Color(0xff359846) : Color(0xffD02127),
color: approvalStatus == "Approved"
? Color(0xff359846)
: Color(0xffD02127),
),
),
Expanded(
@ -99,9 +101,9 @@ class DoctorCardInsurance extends StatelessWidget {
children: [
Expanded(
child: Texts(
doctorName,
bold: true,
)),
doctorName,
bold: true,
)),
],
),
Row(

Write Preview
Loading…
Cancel
Save