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

Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list

Browse Source 
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
merge-requests/362/head
Elham Rababah 4 years ago
parent 96d07e7a59 770767ebb6
commit 103a1bc6fc
24 changed files with 641 additions and 996 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/fonts/Poppins/Poppins-Bold.ttf
View File

Binary file not shown.

BIN
assets/fonts/Poppins/Poppins-Medium.ttf
View File

Binary file not shown.

BIN
assets/fonts/Poppins/Poppins-Regular.ttf
View File

Binary file not shown.

BIN
assets/images/female_avatar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/images/male_avatar.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

7
lib/config/localized_values.dart
Unescape Escape View File

@ -750,4 +750,11 @@ const Map<String, Map<String, String>> localizedValues = {
'arrived_p': {'en': "Arrived", 'ar': "وصل"},
"open-rad": {"en": "Open Image", "ar": "فتح صور الاشعة"},
'fileNumber': {'en': "File Number: ", 'ar': " :رقم الملف"},
'searchPatient-name': {
'en': 'Search Name, Medical File, Phone Number',
'ar': "اسم البحث ، الملف الطبي ، رقم الهاتف"
},
'reschedule': {'en': 'Reschedule', 'ar': 'إعادة الجدولة'},
'leaves': {'en': 'Leaves', 'ar': 'يغادر'},
};

5
lib/core/model/prescription_req_model.dart
Unescape Escape View File

@ -1,18 +1,21 @@
class PrescriptionReqModel {
String vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
PrescriptionReqModel({this.vidaAuthTokenID, this.patientMRN});
PrescriptionReqModel({this.vidaAuthTokenID, this.patientMRN, this.appNo});
PrescriptionReqModel.fromJson(Map<String, dynamic> json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
patientMRN = json['PatientMRN'];
appNo = json['AppointmentNo'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
data['PatientMRN'] = this.patientMRN;
data['AppointmentNo'] = this.appNo;
return data;
}
}

4
lib/core/service/prescription_service.dart
Unescape Escape View File

@ -82,7 +82,9 @@ class PrescriptionService extends LookupService {
}
Future getPrescription({int mrn}) async {
_prescriptionReqModel = PrescriptionReqModel(patientMRN: mrn);
_prescriptionReqModel = PrescriptionReqModel(
patientMRN: mrn,
);
hasError = false;
_prescriptionList.clear();
await baseAppClient.post(GET_PRESCRIPTION_LIST,

231
lib/models/patient/patiant_info_model.dart
Unescape Escape View File

@ -1,5 +1,3 @@
// TODO : it have to be changed.
class PatiantInformtion {
@ -55,114 +53,129 @@ class PatiantInformtion {
String nursingStationName;
String startTime;
String visitType;
PatiantInformtion({
this.list,
this.projectId,
this.clinicId,
this.doctorId,
this.patientId,
this.doctorName,
this.doctorNameN,
this.firstName,
this.middleName,
this.lastName,
this.firstNameN,
this.middleNameN,
this.lastNameN,
this.gender,
this.dateofBirth,
this.nationalityId,
this.mobileNumber,
this.emailAddress,
this.patientIdentificationNo,
this.patientType,
this.admissionNo,
this.admissionDate,
this.createdOn,
this.roomId,
this.bedId,
this.nursingStationId,
this.description,
this.clinicDescription,
this.clinicDescriptionN,
this.nationalityName,
this.nationalityNameN,
this.age,
this.genderDescription,
this.nursingStationName,
this.appointmentDate,
this.startTime,
this.appointmentNo,
this.appointmentType,
this.arrivedOn,
this.clinicGroupId,
this.companyName,
this.dischargeStatus,
this.doctorDetails,
this.endTime,
this.episodeNo,
this.fallRiskScore,
this.genderInt,
this.isSigned,
this.medicationOrders,
this.nationality,
this.patientMRN,
this.visitType,
});
String nationalityFlagURL;
int patientStatusType;
PatiantInformtion(
{this.list,
this.projectId,
this.clinicId,
this.doctorId,
this.patientId,
this.doctorName,
this.doctorNameN,
this.firstName,
this.middleName,
this.lastName,
this.firstNameN,
this.middleNameN,
this.lastNameN,
this.gender,
this.dateofBirth,
this.nationalityId,
this.mobileNumber,
this.emailAddress,
this.patientIdentificationNo,
this.patientType,
this.admissionNo,
this.admissionDate,
this.createdOn,
this.roomId,
this.bedId,
this.nursingStationId,
this.description,
this.clinicDescription,
this.clinicDescriptionN,
this.nationalityName,
this.nationalityNameN,
this.age,
this.genderDescription,
this.nursingStationName,
this.appointmentDate,
this.startTime,
this.appointmentNo,
this.appointmentType,
this.arrivedOn,
this.clinicGroupId,
this.companyName,
this.dischargeStatus,
this.doctorDetails,
this.endTime,
this.episodeNo,
this.fallRiskScore,
this.genderInt,
this.isSigned,
this.medicationOrders,
this.nationality,
this.patientMRN,
this.visitType,
this.nationalityFlagURL,
this.patientStatusType});
factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
PatiantInformtion(
projectId: json["ProjectID"] ?? json["projectID"],
clinicId: json["ClinicID"]?? json["clinicID"],
doctorId: json["DoctorID"]?? json["doctorID"],
patientId: json["PatientID"]?? json["patientID"]??json['patientMRN'] ?? json['PatientMRN'],
doctorName: json["DoctorName"]?? json["doctorName"],
doctorNameN: json["DoctorNameN"]?? json["doctorNameN"],
firstName: json["FirstName"]?? json["firstName"],
middleName: json["MiddleName"]?? json["middleName"],
lastName: json["LastName"]?? json["lastName"],
firstNameN: json["FirstNameN"]?? json["firstNameN"],
middleNameN: json["MiddleNameN"]?? json["middleNameN"],
lastNameN: json["LastNameN"]?? json["lastNameN"],
gender: json["Gender"]?? json["gender"],
dateofBirth: json["DateofBirth"]?? json["dob"],
nationalityId: json["NationalityID"]?? json["nationalityID"],
mobileNumber: json["MobileNumber"]?? json["mobileNumber"],
emailAddress: json["EmailAddress"]?? json["emailAddress"],
patientIdentificationNo: json["PatientIdentificationNo"]?? json["patientIdentificationNo"],
patientType: json["PatientType"]?? json["patientType"],
admissionNo: json["AdmissionNo"]?? json["admissionNo"],
admissionDate: json["AdmissionDate"]?? json["admissionDate"],
createdOn: json["CreatedOn"]?? json["CreatedOn"],
roomId: json["RoomID"]?? json["roomID"],
bedId: json["BedID"]?? json["bedID"],
nursingStationId: json["NursingStationID"]?? json["nursingStationID"],
description: json["Description"]?? json["description"],
clinicDescription: json["ClinicDescription"]?? json["clinicDescription"],
clinicDescriptionN: json["ClinicDescriptionN"]?? json["clinicDescriptionN"],
nationalityName: json["NationalityName"]?? json["nationalityName"]??json['NationalityName'],
nationalityNameN: json["NationalityNameN"]?? json["nationalityNameN"]??json['NationalityNameN'],
age: json["Age"]?? json["age"],
genderDescription: json["GenderDescription"],
nursingStationName: json["NursingStationName"],
appointmentDate: json["AppointmentDate"]?? '',
startTime: json["StartTime"],
appointmentNo :json['appointmentNo'] ?? json['AppointmentNo'],
appointmentType :json['appointmentType'],
arrivedOn :json['arrivedOn'],
clinicGroupId :json['clinicGroupId'],
companyName :json['companyName'],
dischargeStatus :json['dischargeStatus'],
doctorDetails :json['doctorDetails'],
endTime :json['endTime'],
episodeNo :json['episodeNo'] ?? json['EpisodeID'],
fallRiskScore :json['fallRiskScore'],
isSigned :json['isSigned'],
medicationOrders :json['medicationOrders'],
nationality :json['nationality']??json['NationalityNameN'],
patientMRN :json['patientMRN'] ?? json['PatientMRN'],
visitType :json['visitType'] ?? json['visitType'],
);
projectId: json["ProjectID"] ?? json["projectID"],
clinicId: json["ClinicID"] ?? json["clinicID"],
doctorId: json["DoctorID"] ?? json["doctorID"],
patientId: json["PatientID"] ??
json["patientID"] ??
json['patientMRN'] ??
json['PatientMRN'],
doctorName: json["DoctorName"] ?? json["doctorName"],
doctorNameN: json["DoctorNameN"] ?? json["doctorNameN"],
firstName: json["FirstName"] ?? json["firstName"],
middleName: json["MiddleName"] ?? json["middleName"],
lastName: json["LastName"] ?? json["lastName"],
firstNameN: json["FirstNameN"] ?? json["firstNameN"],
middleNameN: json["MiddleNameN"] ?? json["middleNameN"],
lastNameN: json["LastNameN"] ?? json["lastNameN"],
gender: json["Gender"] ?? json["gender"],
dateofBirth: json["DateofBirth"] ?? json["dob"],
nationalityId: json["NationalityID"] ?? json["nationalityID"],
mobileNumber: json["MobileNumber"] ?? json["mobileNumber"],
emailAddress: json["EmailAddress"] ?? json["emailAddress"],
patientIdentificationNo: json["PatientIdentificationNo"] ??
json["patientIdentificationNo"],
patientType: json["PatientType"] ?? json["patientType"],
admissionNo: json["AdmissionNo"] ?? json["admissionNo"],
admissionDate: json["AdmissionDate"] ?? json["admissionDate"],
createdOn: json["CreatedOn"] ?? json["CreatedOn"],
roomId: json["RoomID"] ?? json["roomID"],
bedId: json["BedID"] ?? json["bedID"],
nursingStationId:
json["NursingStationID"] ?? json["nursingStationID"],
description: json["Description"] ?? json["description"],
clinicDescription:
json["ClinicDescription"] ?? json["clinicDescription"],
clinicDescriptionN:
json["ClinicDescriptionN"] ?? json["clinicDescriptionN"],
nationalityName: json["NationalityName"] ??
json["nationalityName"] ??
json['NationalityName'],
nationalityNameN: json["NationalityNameN"] ??
json["nationalityNameN"] ??
json['NationalityNameN'],
age: json["Age"] ?? json["age"],
genderDescription: json["GenderDescription"],
nursingStationName: json["NursingStationName"],
appointmentDate: json["AppointmentDate"] ?? '',
startTime: json["startTime"],
appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'],
appointmentType: json['appointmentType'],
arrivedOn: json['arrivedOn'],
clinicGroupId: json['clinicGroupId'],
companyName: json['companyName'],
dischargeStatus: json['dischargeStatus'],
doctorDetails: json['doctorDetails'],
endTime: json['endTime'],
episodeNo: json['episodeNo'] ?? json['EpisodeID'],
fallRiskScore: json['fallRiskScore'],
isSigned: json['isSigned'],
medicationOrders: json['medicationOrders'],
nationality: json['nationality'] ?? json['NationalityNameN'],
patientMRN: json['patientMRN'] ?? json['PatientMRN'],
visitType: json['visitType'] ?? json['visitType'],
nationalityFlagURL:
json['NationalityFlagURL'] ?? json['NationalityFlagURL'],
patientStatusType:
json['patientStatusType'] ?? json['patientStatusType']);
}

511
lib/screens/dashboard_screen.dart
Unescape Escape View File

@ -753,7 +753,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
SizedBox(
height: 15,
),
sliderActiveIndex == 0
sliderActiveIndex == 1
? Column(
children: [
Row(
@ -793,7 +793,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
})))
],
)
: sliderActiveIndex == 1
: sliderActiveIndex == 0
? Column(
children: [
Row(
@ -988,7 +988,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
Navigator.of(context)
.pushNamed(PATIENTS, arguments: {
"patientSearchForm": _patientSearchFormValues,
"selectedType": "7"
"selectedType": "7",
"arrivalType": "1"
});
},
),
@ -1024,12 +1025,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
builder: (context) =>
SearchMedicinePatientScreen(),
));
// Navigator.of(context)
// .pushNamed(PATIENTS, arguments: {
// "patientSearchForm": _patientSearchFormValues,
// "selectedType": "7"
// });
},
)
],
@ -1037,132 +1032,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
SizedBox(
height: 10,
),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// DashboardItem(
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Center(
// child: Icon(
// DoctorApp.search_patient_1,
// size: 50,
// color: Colors.black,
// ),
// ),
// Column(
// children: [
// AppText(
// TranslationBase.of(context).searchAbout,
// color: Colors.black,
// textAlign: TextAlign.center,
// ),
// AppText(
// TranslationBase.of(context).patient,
// color: Colors.black,
// textAlign: TextAlign.center,
// )
// ],
// )
// ],
// ),
// hasBorder: true,
// onTap: () {
// Navigator.of(context).pushNamed(PATIENT_SEARCH);
// },
// ),
// DashboardItem(
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Icon(
// DoctorApp.medicine_search,
// size: 50,
// color: Colors.black,
// ),
// AppText(
// TranslationBase.of(context).searchMedicine,
// color: Colors.black,
// textAlign: TextAlign.center,
// )
// ],
// ),
// hasBorder: true,
// onTap: () {
// // Navigator.push(
// // context,
// // MaterialPageRoute(
// // builder: (context) => MedicineSearchScreen(),
// // ),
// // );
// },
// ),
// DashboardItem(
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Icon(
// DoctorApp.leaves,
// size: 50,
// ),
// AppText(
// TranslationBase.of(context).rescheduleLeaves,
// color: Colors.black,
// textAlign: TextAlign.center,
// )
// ],
// ),
// hasBorder: true,
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) =>
// AddRescheduleLeavScreen(),
// // MyReferredPatient(),
// ),
// );
// },
// ),
// DashboardItem(
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Icon(
// DoctorApp.qr_code,
// size: 50,
// color: Colors.black,
// ),
// Column(
// children: [
// AppText(
// projectsProvider.isArabic
// ? TranslationBase.of(context).reader
// : TranslationBase.of(context).qr,
// color: Colors.black,
// textAlign: TextAlign.center,
// ),
// AppText(
// projectsProvider.isArabic
// ? TranslationBase.of(context).qr
// : TranslationBase.of(context).reader,
// color: Colors.black,
// textAlign: TextAlign.center,
// ),
// ],
// )
// ],
// ),
// // imageName: '1.png',
// hasBorder: true,
// onTap: () {
// Navigator.of(context).pushNamed(QR_READER);
// },
// ),
//],
//),
SizedBox(
height: 20,
),
@ -1173,41 +1042,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
SizedBox(
width: 8,
),
// DashboardItem(
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Icon(
// DoctorApp.mail,
// size: 50,
// color: Colors.black,
// ),
// Column(
// children: [
// AppText(
// TranslationBase.of(context).theDoctor,
// textAlign: TextAlign.center,
// color: Colors.black,
// ),
// AppText(
// TranslationBase.of(context).reply,
// textAlign: TextAlign.center,
// color: Colors.black,
// ),
// ],
// )
// ],
// ),
// hasBorder: true,
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => DoctorReplyScreen(),
// ),
// );
// },
// )
],
),
SizedBox(
@ -1224,41 +1058,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
);
}
// static List<charts.Series<GaugeSegment, String>> _createInpatientData(model) {
// final data = [
// new GaugeSegment(
// model.dashboardItemsList[0].summaryoptions[0].kPIParameter,
// getValue(model.dashboardItemsList[0].summaryoptions[0].value),
// charts.MaterialPalette.blue.shadeDefault),
// new GaugeSegment(
// model.dashboardItemsList[0].summaryoptions[1].kPIParameter,
// getValue(model.dashboardItemsList[0].summaryoptions[1].value),
// charts.MaterialPalette.cyan.shadeDefault),
// new GaugeSegment(
// model.dashboardItemsList[0].summaryoptions[2].kPIParameter,
// getValue(model.dashboardItemsList[0].summaryoptions[2].value),
// charts.MaterialPalette.red.shadeDefault),
// new GaugeSegment(
// model.dashboardItemsList[0].summaryoptions[3].kPIParameter,
// getValue(model.dashboardItemsList[0].summaryoptions[3].value),
// charts.MaterialPalette.deepOrange.shadeDefault.lighter),
// new GaugeSegment(
// model.dashboardItemsList[0].summaryoptions[4].kPIParameter,
// getValue(model.dashboardItemsList[0].summaryoptions[4].value),
// charts.MaterialPalette.green.shadeDefault),
// ];
// return [
// new charts.Series<GaugeSegment, String>(
// id: 'Segments',
// domainFn: (GaugeSegment segment, _) => segment.segment,
// measureFn: (GaugeSegment segment, _) => segment.size,
// data: data,
// colorFn: (GaugeSegment segment, _) => segment.color,
// )
// ];
// }
static List<charts.Series<GaugeSegment, String>> _createReferralData(model) {
final data = [
new GaugeSegment(
@ -1290,71 +1089,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
return value == 0 ? 1 : value;
}
// showCupertinoPicker(
// {context, List<ClinicModel> actionList, decKey, onSelectFun}) {
// showModalBottomSheet(
// isDismissible: false,
// isScrollControlled: true,
// context: context,
// builder: (BuildContext builder) {
// return Container(
// // height: 500,
// height: SizeConfig.realScreenHeight * 0.4,
// color: Color(0xfff7f7f7),
// child: Column(
// mainAxisAlignment: MainAxisAlignment.end,
// children: <Widget>[
// Container(
// color: Color(0xfff7f7f7),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: <Widget>[
// CupertinoButton(
// child: AppText(TranslationBase.of(context).cancel
// // style: TextStyle(context)
// ),
// onPressed: () {
// Navigator.pop(context);
// },
// ),
// CupertinoButton(
// child: AppText(TranslationBase.of(context).done
// // style: textStyle(context),
// ),
// onPressed: () {
// Navigator.pop(context);
// // onSelectFun(cupertinoPickerIndex);
// },
// )
// ],
// ),
// ),
// Container(
// height: SizeConfig.realScreenHeight * 0.3,
// color: Color(0xfff7f7f7),
// child: Column(
// children: actionList
// .map((e) => Flexible(
// child: Container(
// height: 50,
// child: InkWell(
// onTap: () => changeClinic(
// e.clinicID, context, model),
// child: AppText(
// e.clinicName,
// fontSize:
// SizeConfig.textMultiplier * 1.9,
// )),
// ),
// ))
// .toList(),
// ))
// ],
// ),
// );
// });
// }
changeClinic(clinicId, BuildContext context, model) async {
// Navigator.pop(context);
changeIsLoading(true);
@ -1528,80 +1262,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
margin: 5,
child: Padding(
padding: const EdgeInsets.all(5.0),
child: getOutPatientStack(model.dashboardItemsList[0]))),
child: getOutPatientStack(model.dashboardItemsList[1]))),
RoundedContainer(
height: MediaQuery.of(context).size.height * 0.32,
margin: 5,
child: Padding(
padding: const EdgeInsets.all(5.0),
child: getOutPatientStack(model.dashboardItemsList[1]))),
// Column(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// rowCount(
// model.dashboardItemsList[0]
// .summaryoptions[0].kPIParameter,
// model.dashboardItemsList[0]
// .summaryoptions[0].value,
// Colors.blue),
// rowCount(
// model.dashboardItemsList[0]
// .summaryoptions[1].kPIParameter,
// model.dashboardItemsList[0]
// .summaryoptions[1].value,
// Colors.cyan),
// rowCount(
// model.dashboardItemsList[0]
// .summaryoptions[2].kPIParameter,
// model.dashboardItemsList[0]
// .summaryoptions[2].value,
// Colors.red),
// rowCount(
// model.dashboardItemsList[0]
// .summaryoptions[3].kPIParameter,
// model.dashboardItemsList[0]
// .summaryoptions[3].value,
// Colors.orange),
// rowCount(
// model.dashboardItemsList[0]
// .summaryoptions[4].kPIParameter,
// model.dashboardItemsList[0]
// .summaryoptions[4].value,
// Colors.green),
// ],
// ))),
// Expanded(
// flex: 3,
// child: Stack(children: [
// Container(
// child: GaugeChart(_createInpatientData(model))),
// Positioned(
// child: Center(
// child: Column(
// children: [
// AppText(
// TranslationBase.of(context).inPatient,
// fontSize: 11,
// fontWeight: FontWeight.bold,
// ),
// AppText(
// getPatientCount(model.dashboardItemsList[0])
// .toString(),
// fontSize: 18,
// fontWeight: FontWeight.bold,
// )
// ],
// )),
// top: MediaQuery.of(context).size.height * 0.12,
// left: MediaQuery.of(context).size.width * 0.11)
// ])),
// ],
// )
// ),
//])
//),
child: getOutPatientStack(model.dashboardItemsList[0]))),
RoundedContainer(
height: MediaQuery.of(context).size.height * 0.24,
margin: 5,
@ -1653,18 +1320,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
model.dashboardItemsList[2]
.summaryoptions[2].value,
Colors.red),
// rowCount(
// model.dashboardItemsList[2]
// .summaryoptions[3].kPIParameter,
// model.dashboardItemsList[2]
// .summaryoptions[3].value,
// Colors.orange),
// rowCount(
// model.dashboardItemsList[2]
// .summaryoptions[4].kPIParameter,
// model.dashboardItemsList[2]
// .summaryoptions[4].value,
// Colors.green),
],
),
)
@ -1679,12 +1334,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// AppText(
// TranslationBase.of(context).,
// fontSize: 11,
// fontWeight: FontWeight.bold,
// textOverflow: TextOverflow.ellipsis,
// ),
AppText(
getPatientCount(model.dashboardItemsList[2])
.toString(),
@ -1701,154 +1350,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
],
)),
])),
// RoundedContainer(
// height: MediaQuery.of(context).size.height * 0.24,
// margin: 5,
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Padding(
// padding: EdgeInsets.all(10),
// child: AppText(TranslationBase.of(context).otherStatistic)),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: <Widget>[
// DashboardItem(
// width: MediaQuery.of(context).size.width * 0.25,
// height: MediaQuery.of(context).orientation ==
// Orientation.portrait
// ? MediaQuery.of(context).size.height * 0.18
// : MediaQuery.of(context).size.height * 0.36,
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Container(
// margin: EdgeInsets.only(top: 5),
// child: Icon(
// DoctorApp.lab_results,
// size: 40,
// color: Colors.black,
// ),
// ),
// Container(
// // margin: EdgeInsets.only(bottom: 10),
// child: Column(
// children: <Widget>[
// AppText(
// model.dashboardItemsList.length > 0
// ? getPatientCount(
// model.dashboardItemsList[5])
// : "",
// fontSize: SizeConfig.textMultiplier * 6,
// color: Colors.black,
// ),
// AppText(
// TranslationBase.of(context).targetPatient,
// textAlign: TextAlign.center,
// color: Colors.black,
// )
// ],
// ),
// ),
// ],
// ),
// //imageName: '1.png',
// opacity: 0,
// ),
// Container(
// color: Colors.black12,
// height: MediaQuery.of(context).size.height * 0.18,
// width: 1,
// ),
// DashboardItem(
// width: MediaQuery.of(context).size.width * 0.25,
// height: MediaQuery.of(context).orientation ==
// Orientation.portrait
// ? MediaQuery.of(context).size.height * 0.18
// : MediaQuery.of(context).size.height * 0.36,
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Container(
// margin: EdgeInsets.only(top: 5),
// child: Icon(
// DoctorApp.radiology,
// size: 40,
// color: Colors.black,
// ),
// ),
// Container(
// margin: EdgeInsets.only(bottom: 5),
// child: Column(
// children: <Widget>[
// AppText(
// clinicName.length.toString(),
// fontSize: SizeConfig.textMultiplier * 6,
// color: Colors.black,
// ),
// AppText(
// TranslationBase.of(context).clinic,
// color: Colors.black,
// )
// ],
// ),
// ),
// ],
// ),
// //imageName: '2.png',
// opacity: 0,
// ),
// Container(
// color: Colors.black12,
// height: MediaQuery.of(context).size.height * 0.18,
// width: 1,
// ),
// DashboardItem(
// width: MediaQuery.of(context).size.width * 0.25,
// height: MediaQuery.of(context).orientation ==
// Orientation.portrait
// ? MediaQuery.of(context).size.height * 0.18
// : MediaQuery.of(context).size.height * 0.36,
// child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// children: <Widget>[
// Container(
// margin: EdgeInsets.only(top: 5),
// child: Icon(
// DoctorApp.referral,
// size: 40,
// color: Colors.black,
// ),
// ),
// Container(
// margin: EdgeInsets.only(bottom: 5),
// child: Column(
// children: <Widget>[
// AppText(
// model.dashboardItemsList.length > 0
// ? getPatientCount(
// model.dashboardItemsList[2])
// : "",
// fontSize: SizeConfig.textMultiplier * 6,
// color: Colors.black,
// ),
// AppText(
// TranslationBase.of(context).referral,
// color: Colors.black,
// )
// ],
// ),
// ),
// ],
// ),
// //imageName: '3.png',
// opacity: 0,
// ),
// ],
// )
// ],
// ))
];
}
}

222
lib/screens/medical-file/medical_file_page.dart
Unescape Escape View File

@ -31,128 +31,122 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
body: NetworkBaseView(
baseViewModel: model,
child: SingleChildScrollView(
child: Center(
child: Container(
color: Colors.white,
child: Column(
// mainAxisAlignment: model.medicalFileList.length != 0 &&
// model.medicalFileList != null
// ? MainAxisAlignment.start
// : MainAxisAlignment.center,
children: [
PatientPageHeaderWidget(patient),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey,
),
(model.medicalFileList.length != 0 &&
model.medicalFileList != null)
? ListView.builder(
//physics: ,
physics: NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: model.medicalFileList[0].entityList[0]
.timelines.length,
itemBuilder: (BuildContext ctxt, int index) {
return Padding(
padding: EdgeInsets.symmetric(
horizontal: 12.0, vertical: 8.0),
child: InkWell(
child: Container(
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context)
.branch +
": ",
fontWeight: FontWeight.w700,
),
AppText(model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.projectName),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.doctorName
.toUpperCase() +
": ",
fontWeight: FontWeight.w700,
),
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.doctorName,
fontWeight: FontWeight.w700,
),
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
": ",
fontWeight: FontWeight.w700,
),
AppText(
child: Container(
color: Colors.white,
child: Column(
// mainAxisAlignment: model.medicalFileList.length != 0 &&
// model.medicalFileList != null
// ? MainAxisAlignment.start
// : MainAxisAlignment.center,
children: [
PatientPageHeaderWidget(patient),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey,
),
(model.medicalFileList != null &&
model.medicalFileList.length != 0)
? ListView.builder(
//physics: ,
physics: NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
shrinkWrap: true,
itemCount: model.medicalFileList[0].entityList[0]
.timelines.length,
itemBuilder: (BuildContext ctxt, int index) {
return Padding(
padding: EdgeInsets.symmetric(
horizontal: 12.0, vertical: 8.0),
child: InkWell(
child: Container(
child: Column(
children: [
Row(
children: [
AppText(
TranslationBase.of(context).branch +
": ",
fontWeight: FontWeight.w700,
),
AppText(model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.projectName),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.doctorName
.toUpperCase() +
": ",
fontWeight: FontWeight.w700,
),
Expanded(
child: AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
.doctorName,
fontWeight: FontWeight.w700,
),
],
),
SizedBox(height: 10.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
)
],
),
),
],
),
Row(
children: [
AppText(
TranslationBase.of(context)
.clinicName +
": ",
fontWeight: FontWeight.w700,
),
AppText(
model
.medicalFileList[0]
.entityList[0]
.timelines[index]
.clinicName,
),
],
),
SizedBox(height: 10.0),
Divider(
height: 1.0,
thickness: 1.0,
color: Colors.grey.shade400,
)
],
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
MedicalFileDetails(
age: patient.age,
firstName: patient.firstName,
lastName: patient.lastName,
gender:
patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
)),
);
},
),
);
})
: Center(
child: Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
MedicalFileDetails(
age: patient.age,
firstName: patient.firstName,
lastName: patient.lastName,
gender: patient.genderDescription,
encounterNumber: index,
pp: patient.patientId,
)),
);
},
),
),
)
],
),
);
})
: Container(
child: AppText(
'THERES NO MEDICAL FILE FOR THIS Patient',
),
)
],
),
),
),

1
lib/screens/medicine/search_medicine_patient_screen.dart
Unescape Escape View File

@ -52,6 +52,7 @@ class _SearchMedicinePatientScreen extends State<SearchMedicinePatientScreen>
height: 60.0,
color: Colors.white,
margin: EdgeInsets.only(top: 10.0),
width: MediaQuery.of(context).size.width, // 0.9,
// decoration: BoxDecoration(
// border: Border(

2
lib/screens/patients/patient_search_screen.dart
Unescape Escape View File

@ -510,7 +510,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
),
])
: SizedBox(
height: SizeConfig.screenHeight * .4,
height: SizeConfig.screenHeight * .45,
),
],
),

58
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -33,8 +33,12 @@ class PatientsScreen extends StatefulWidget {
final patientSearchForm;
final selectedType;
final isAppbar;
final arrivalType;
PatientsScreen(
{this.patientSearchForm, this.selectedType, this.isAppbar = true});
{this.patientSearchForm,
this.selectedType,
this.isAppbar = true,
this.arrivalType});
@override
_PatientsScreenState createState() => _PatientsScreenState();
}
@ -70,6 +74,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
var selectedFilter = 1;
bool _isError = false;
String error = "";
String arrivalType;
ProjectViewModel projectsProvider;
final _controller = TextEditingController();
@ -85,8 +90,13 @@ class _PatientsScreenState extends State<PatientsScreen> {
for (var i = 0; i < responseModelList2.length; i++) {
String firstName = responseModelList[i].firstName.toUpperCase();
String lastName = responseModelList[i].lastName.toUpperCase();
String mobile = responseModelList[i].mobileNumber.toUpperCase();
String patientID = responseModelList[i].patientId.toString();
if (firstName.contains(str.toUpperCase()) ||
lastName.contains(str.toUpperCase())) {
lastName.contains(str.toUpperCase()) ||
mobile.contains(str) ||
patientID.contains(str)) {
filterData.add(responseModelList[i]);
}
}
@ -220,7 +230,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
patientType = widget.selectedType != null
? widget.selectedType
: routeArgs['selectedType'];
arrivalType = widget.arrivalType != null
? widget.arrivalType
: routeArgs['arrivalType'];
if (routeArgs != null && routeArgs.containsKey("isSearch")) {
isSearch = routeArgs['isSearch'];
}
@ -355,7 +367,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Container(
width: SizeConfig.screenWidth * 0.9,
height:
SizeConfig.screenHeight * 0.07,
SizeConfig.screenHeight * 0.08,
child: TextField(
controller: _controller,
onChanged: (String str) {
@ -364,21 +376,30 @@ class _PatientsScreenState extends State<PatientsScreen> {
decoration: buildInputDecoration(
context,
TranslationBase.of(context)
.searchPatient),
.searchPatientName),
),
),
SizedBox(
height: 10.0,
),
if (int.parse(patientType) == 7)
ClinicList(
clinicId: clinicId,
onClinicChange: (newValue) {
clinicId = newValue;
changeClinic(
newValue, context, model);
},
),
Container(
padding: EdgeInsets.all(5),
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(
color: Colors.grey),
borderRadius:
BorderRadius.circular(
10)),
child: ClinicList(
clinicId: clinicId,
onClinicChange: (newValue) {
clinicId = newValue;
changeClinic(
newValue, context, model);
},
)),
Padding(
padding: EdgeInsets.only(
top: MediaQuery.of(context)
@ -482,6 +503,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
return PatientCard(
patientInfo: item,
patientType: patientType,
arrivalType: arrivalType,
onTap: () {
Navigator.of(context)
.pushNamed(
@ -494,7 +516,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
.getFrom,
"to":
patient.getTo,
"isSearch":isSearch
});
},
);
@ -574,6 +595,11 @@ class _PatientsScreenState extends State<PatientsScreen> {
}
parsed = lItems;
responseModelList = new ModelResponse.fromJson(parsed).list;
responseModelList.sort((a, b) {
var adate = a.arrivedOn;
var bdate = b.arrivedOn; //before -> var bdate = b.expiry;
return adate.compareTo(bdate);
});
responseModelList2 = responseModelList;
_isError = false;
} else {
@ -599,10 +625,10 @@ class _PatientsScreenState extends State<PatientsScreen> {
InputDecoration buildInputDecoration(BuildContext context, hint) {
return InputDecoration(
suffixIcon: IconButton(
icon: new Image.asset("assets/images/filter-512.png"),
icon: Icon(DoctorApp.search_patient),
color: Colors.grey,
onPressed: () {},
iconSize: 20,
iconSize: 30,
),
filled: true,
fillColor: Colors.white,

2
lib/screens/prescription/prescription_screen.dart
Unescape Escape View File

@ -35,7 +35,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient'];
return BaseView<PrescriptionViewModel>(
onModelReady: (model) => model.getPrescription(mrn: 0),
onModelReady: (model) => model.getPrescription(mrn: patient.patientId),
builder:
(BuildContext context, PrescriptionViewModel model, Widget child) =>
AppScaffold(

4
lib/util/helpers.dart
Unescape Escape View File

@ -421,4 +421,8 @@ class Helpers {
static hideKeyboard(BuildContext context) {
FocusScope.of(context).unfocus();
}
static String capitalize(str) {
return "${str[0].toUpperCase()}${str.substring(1).toLowerCase()}";
}
}

5
lib/util/translations_delegate_base.dart
Unescape Escape View File

@ -70,6 +70,8 @@ class TranslationBase {
String get searchPatient =>
localizedValues['searchPatient'][locale.languageCode];
String get searchPatientName =>
localizedValues['searchPatient-name'][locale.languageCode];
String get searchAbout => localizedValues['searchAbout'][locale.languageCode];
@ -1136,6 +1138,9 @@ class TranslationBase {
String get appointmentDate =>
localizedValues['appointmentDate'][locale.languageCode];
String get arrivedP => localizedValues['arrived_p'][locale.languageCode];
String get fileNumber => localizedValues['fileNumber'][locale.languageCode];
String get reschedule => localizedValues['reschedule'][locale.languageCode];
String get leaves => localizedValues['leaves'][locale.languageCode];
String get openRad => localizedValues['open-rad'][locale.languageCode];
}

2
lib/widgets/auth/verification_methods.dart
Unescape Escape View File

@ -695,7 +695,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
this.checkActivationCode(authProv, value: value);
},
() => {
//Navigator.pop(context),
Navigator.pop(context),
print('Faild..'),
},
).displayDialog(context);

102
lib/widgets/doctor/lab_result_widget.dart
Unescape Escape View File

@ -59,9 +59,58 @@ class _LabResultWidgetState extends State<LabResultWidget> {
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
),
child: Column(
children: widget.labResult.map((result) {
child: Column(children: [
Container(
child: Row(
children: <Widget>[
Expanded(
child: Container(
decoration: BoxDecoration(
color: HexColor('#515B5D'),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.0),
),
),
child: Center(
child: Texts(
TranslationBase.of(context).description,
color: Colors.white,
),
),
height: 60,
),
),
Expanded(
child: Container(
color: HexColor('#515B5D'),
child: Center(
child: Texts(
TranslationBase.of(context).value,
color: Colors.white),
),
height: 60),
),
Expanded(
child: Container(
decoration: BoxDecoration(
color: HexColor('#515B5D'),
borderRadius: BorderRadius.only(
topRight: Radius.circular(10.0),
),
),
child: Center(
child: Texts(
TranslationBase.of(context).range,
color: Colors.white),
),
height: 60),
),
],
),
),
...widget.labResult.map((result) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 4),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)),
border: Border(
@ -76,53 +125,6 @@ class _LabResultWidgetState extends State<LabResultWidget> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
Expanded(
child: Container(
decoration: BoxDecoration(
color: HexColor('#515B5D'),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.0),
),
),
child: Center(
child: Texts(
TranslationBase.of(context)
.description,
color: Colors.white,
),
),
height: 60,
),
),
Expanded(
child: Container(
color: HexColor('#515B5D'),
child: Center(
child: Texts(
TranslationBase.of(context).value,
color: Colors.white),
),
height: 60),
),
Expanded(
child: Container(
decoration: BoxDecoration(
color: HexColor('#515B5D'),
borderRadius: BorderRadius.only(
topRight: Radius.circular(10.0),
),
),
child: Center(
child: Texts(
TranslationBase.of(context).range,
color: Colors.white),
),
height: 60),
),
],
),
Row(
children: <Widget>[
Expanded(
@ -164,7 +166,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
),
);
}).toList(),
),
]),
),
)
],

432
lib/widgets/patients/PatientCard.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/config/size_config.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/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/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -15,200 +16,275 @@ class PatientCard extends StatelessWidget {
final PatiantInformtion patientInfo;
final Function onTap;
final String patientType;
const PatientCard({Key key, this.patientInfo, this.onTap, this.patientType})
final String arrivalType;
const PatientCard(
{Key key,
this.patientInfo,
this.onTap,
this.patientType,
this.arrivalType})
: super(key: key);
@override
Widget build(BuildContext context) {
return Container(
width: SizeConfig.screenWidth * 0.95,
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
width: SizeConfig.screenWidth * 0.9,
margin: EdgeInsets.all(6),
padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10), color: Colors.white),
margin: EdgeInsets.all(5),
child: InkWell(
child: Column(
children: [
SERVICES_PATIANT2[int.parse(patientType)] == "patientArrivalList"
? Container(height: 5, color: Colors.green[800])
: Container(),
SizedBox(
height: 10,
),
SERVICES_PATIANT2[int.parse(patientType)] == "patientArrivalList"
? Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
AppText(
TranslationBase.of(context).arrivedP,
color: Colors.green[800],
fontWeight: FontWeight.bold,
),
isToday(patientInfo.arrivedOn) == false
? AppText(DateUtils.convertStringToDateFormat(
patientInfo.arrivedOn, 'mm-dd-yyyy hh:mm'))
: AppText(DateUtils.convertStringToDateFormat(
patientInfo.arrivedOn, 'hh:mm'))
],
)
: SizedBox(),
Padding(
padding: EdgeInsets.only(left: 12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [
AppText(
patientInfo.firstName + " " + patientInfo.lastName,
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
),
patientInfo.gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
]),
AppText(
patientInfo.nationalityName ?? patientInfo.nationality,
fontWeight: FontWeight.bold,
)
],
)),
Row(children: <Widget>[
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
borderRadius: BorderRadius.circular(15),
color: Colors.white,
),
child: Stack(children: [
Container(
height: MediaQuery.of(context).size.height * .17,
width: 5,
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10),
bottomLeft: Radius.circular(10)),
color: patientInfo.patientStatusType == 43
? Colors.green[500]
: Colors.red[800],
)),
Container(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
child: InkWell(
child: Column(
children: [
SizedBox(
height: 10,
),
SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList"
? Padding(
padding: EdgeInsets.only(left: 12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
patientInfo.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,
),
this.arrivalType == '1'
? AppText(
patientInfo.startTime != null
? patientInfo.startTime
: '',
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
)
: AppText(
DateUtils.convertStringToDateFormat(
patientInfo.arrivedOn,
'MM-dd-yyyy HH:mm'),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
)
],
))
: SizedBox(),
Padding(
padding: EdgeInsets.only(left: 12.0),
child: Container(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Color.fromRGBO(0, 0, 0, 0.08),
offset: Offset(0.0, 5.0),
blurRadius: 16.0)
padding: EdgeInsets.only(left: 12.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [
AppText(
(Helpers.capitalize(patientInfo.firstName) +
" " +
Helpers.capitalize(patientInfo.lastName)),
fontSize: SizeConfig.textMultiplier * 2,
fontWeight: FontWeight.bold,
backGroundcolor: Colors.white,
fontFamily: 'Poppins',
),
patientInfo.gender == 1
? Icon(
DoctorApp.male_2,
color: Colors.blue,
)
: Icon(
DoctorApp.female_1,
color: Colors.pink,
),
]),
Row(
children: [
AppText(
patientInfo.nationalityName ??
patientInfo.nationality,
fontWeight: FontWeight.bold,
fontSize: 14,
),
patientInfo.nationality != null
? ClipRRect(
borderRadius:
BorderRadius.circular(20.0),
child: Image.network(
patientInfo.nationalityFlagURL,
height: 25,
width: 30,
errorBuilder: (BuildContext context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
},
))
: SizedBox()
],
)
],
borderRadius: BorderRadius.all(Radius.circular(35.0)),
color: Color(0xffCCCCCC),
),
width: 70,
height: 70,
child: Icon(
patientInfo.gender == 1
? DoctorApp.male
: DoctorApp.female_icon,
size: 70,
color: Colors.white,
),
),
),
],
),
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).fileNo,
style: TextStyle(
fontSize:
2.2 * SizeConfig.textMultiplier)),
new TextSpan(
text: patientInfo.patientId.toString(),
style: TextStyle(
fontWeight: FontWeight.w700,
)),
],
),
),
),
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).age + " : ",
)),
Row(children: <Widget>[
Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(left: 12.0),
child: Container(
// decoration: BoxDecoration(
// boxShadow: [
// // BoxShadow(
// // color: Color.fromRGBO(0, 0, 0, 0.08),
// // offset: Offset(0.0, 5.0),
// // blurRadius: 16.0)
// // ],
// // borderRadius: BorderRadius.all(Radius.circular(35.0)),
// // color: Color(0xffCCCCCC),
// ),
width: 60,
height: 60,
child: Image.asset(
patientInfo.gender == 1
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}",
style: TextStyle(
fontWeight: FontWeight.w700,
)),
],
),
),
),
],
),
if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient")
Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).appointmentDate +
" : ",
fontSize: 14,
),
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
patientInfo.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
SizedBox(
width: 10,
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context)
.fileNumber,
style: TextStyle(
fontSize: 14,
fontFamily: 'Poppins')),
new TextSpan(
text: patientInfo.patientId.toString(),
style: TextStyle(
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
fontSize: 15)),
],
),
),
SizedBox(
width: 3.5,
),
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context).age +
" : ",
style: TextStyle(fontSize: 14)),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}",
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 15)),
],
),
),
),
if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient")
Container(
child: AppText(
convertDateFormat2(
patientInfo.appointmentDate.toString()),
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context)
.appointmentDate +
" : ",
fontSize: 14,
),
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
patientInfo.startTime,
color: Colors.white,
fontSize:
1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
SizedBox(
width: 3.5,
),
Container(
child: AppText(
convertDateFormat2(patientInfo
.appointmentDate
.toString()),
fontSize:
1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
),
SizedBox(
height: 0.5,
)
],
),
margin: EdgeInsets.only(
top: 8,
),
),
SizedBox(
height: 0.5,
)
],
),
margin: EdgeInsets.only(
top: 8,
),
)
]))
]),
],
),
onTap: onTap,
));
]))
]),
],
),
onTap: onTap,
))
]));
// ]),
// TableRow(children: [

32
lib/widgets/patients/profile/profile_medical_info_widget_search.dart
Unescape Escape View File

@ -26,7 +26,6 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
crossAxisCount: 2,
childAspectRatio: 1.5,
children: [
PatientProfileButton(
key: key,
patient: patient,
@ -66,22 +65,21 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
// nameLine1: TranslationBase.of(context).admission,
// nameLine2: TranslationBase.of(context).request,
// icon: 'heartbeat.png'),
// (int.parse(patientType) == 7 || int.parse(patientType) == 6)
// ? PatientProfileButton(
// key: key,
// patient: patient,
// route: ORDER_PRESCRIPTION,
// nameLine1: TranslationBase.of(context).orders,
// nameLine2: TranslationBase.of(context).prescription,
// icon: 'lab.png')
// :
PatientProfileButton(
key: key,
patient: patient,
route: ORDER_PRESCRIPTION_HISTORY,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png'),
(int.parse(patientType) == 7 || int.parse(patientType) == 6)
? PatientProfileButton(
key: key,
patient: patient,
route: ORDER_PRESCRIPTION,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png')
: PatientProfileButton(
key: key,
patient: patient,
route: ORDER_PRESCRIPTION_HISTORY,
nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).prescription,
icon: 'lab.png'),
PatientProfileButton(
key: key,
patient: patient,

7
lib/widgets/shared/app_drawer_widget.dart
Unescape Escape View File

@ -142,8 +142,11 @@ class _AppDrawerState extends State<AppDrawer> {
},
),
InkWell(
child: DrawerItem(TranslationBase.of(context).rescheduleLeaves,
DoctorApp.leaves),
child: DrawerItem(
TranslationBase.of(context).reschedule,
DoctorApp.leaves,
subTitle: TranslationBase.of(context).leaves,
),
onTap: () {
Navigator.pop(context);

1
lib/widgets/shared/drawer_item_widget.dart
Unescape Escape View File

@ -42,6 +42,7 @@ class _DrawerItemState extends State<DrawerItem> {
AppText(
widget.title,
color: widget.color ?? Colors.black,
textOverflow: TextOverflow.ellipsis,
// fontWeight: FontWeight.bold,
// margin: 5,
marginLeft: 5,

9
pubspec.yaml
Unescape Escape View File

@ -122,6 +122,15 @@ flutter:
- asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf
- asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf
weight: 700
- family: Poppins
fonts:
- asset: assets/fonts/Poppins/Poppins-Regular.ttf
- asset: assets/fonts/Poppins/Poppins-Medium.ttf
- asset: assets/fonts/Poppins/Poppins-Bold.ttf
weight: 700
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf

Write Preview
Loading…
Cancel
Save