diff --git a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart index 0f550191..24cf352a 100644 --- a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart +++ b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart @@ -4,10 +4,11 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/special_lab_result_details_page.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/patients/profile/patient-profile-app-bar.dart'; +import 'package:doctor_app_flutter/widgets/patients/patient_service_title.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/doctor_card.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; @@ -67,26 +68,11 @@ class _AllLabSpecialResultState extends State { SizedBox( height: 12, ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).special + - " " + - TranslationBase.of(context).lab, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).result, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title: TranslationBase.of(context).special + + " " + + TranslationBase.of(context).lab, + subTitle: TranslationBase.of(context).result, ), if(model.allSpecialLabList.length == 0) ErrorMessage(error: TranslationBase.of(context).noItem), @@ -170,15 +156,15 @@ class _AllLabSpecialResultState extends State { ), ), doctorName: - model.allSpecialLabList[index].doctorName, + Helpers.convertToTitleCase(model.allSpecialLabList[index].doctorName), invoiceNO: ' ${model.allSpecialLabList[index].invoiceNo}', profileUrl: model .allSpecialLabList[index].doctorImageURL, branch: model.allSpecialLabList[index].projectName, - clinic: model - .allSpecialLabList[index].clinicDescription, + clinic: + Helpers.convertToTitleCase(model.allSpecialLabList[index].clinicDescription), appointmentDate: AppDateUtils.getDateTimeFromServerFormat( model.allSpecialLabList[index].createdOn, @@ -191,12 +177,6 @@ class _AllLabSpecialResultState extends State { ), ); }), - if (model.allSpecialLabList.isEmpty && - patient.patientStatusType != 43) - Center( - child: ErrorMessage( - error: TranslationBase.of(context).noDataAvailable, - )) ], ), ), diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 8352db28..22453c13 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; import 'package:doctor_app_flutter/screens/procedures/ProcedureType.dart'; import 'package:doctor_app_flutter/screens/procedures/base_add_procedure_tab_page.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/patients/patient_service_title.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; @@ -77,24 +78,9 @@ class _LabsHomePageState extends State { ), if (patient.patientStatusType != null && patient.patientStatusType == 43) - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).lab, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).result, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title:TranslationBase.of(context).lab, + subTitle: TranslationBase.of(context).result, ), if ((patient.patientStatusType != null && patient.patientStatusType == 43) || @@ -200,15 +186,15 @@ class _LabsHomePageState extends State { ), ), doctorName: - model.patientLabOrdersList[index].doctorName, + Helpers.convertToTitleCase(model.patientLabOrdersList[index].doctorName), invoiceNO: ' ${model.patientLabOrdersList[index].invoiceNo}', profileUrl: model .patientLabOrdersList[index].doctorImageURL, branch: model.patientLabOrdersList[index].projectName, - clinic: model - .patientLabOrdersList[index].clinicDescription, + clinic: + Helpers.convertToTitleCase(model.patientLabOrdersList[index].clinicDescription), appointmentDate: model.patientLabOrdersList[index].orderDate, orderNo: model.patientLabOrdersList[index].orderNo, diff --git a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart index da21ca3d..1883a8f2 100644 --- a/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart +++ b/lib/screens/patients/profile/lab_result/special_lab_result_details_page.dart @@ -1,10 +1,10 @@ -import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientMedicalReportViewModel.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-app-bar.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/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; @@ -31,25 +31,11 @@ class SpecialLabResultDetailsPage extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - margin: EdgeInsets.all(16.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "Special Lab ", - fontSize: SizeConfig.textMultiplier * 1.6, - fontWeight: FontWeight.w700, - color: Color(0xFF2E303A), - ), - AppText( - "Result", - fontSize: SizeConfig.textMultiplier * 3, - fontWeight: FontWeight.bold, - color: Color(0xFF2E303A), - ) - ], - ), + ServiceTitle( + title: TranslationBase.of(context).special + + " " + + TranslationBase.of(context).lab, + subTitle: TranslationBase.of(context).result, ), resultData != null ? Container( diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index cc7ada28..6c3d93f7 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -5,7 +5,9 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_details_page.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/util/helpers.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/patient-profile-app-bar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -68,45 +70,15 @@ class _RadiologyHomePageState extends State { ), if (model.radiologyList.isNotEmpty && patient.patientStatusType != 43) - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).radiology, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).result, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title: TranslationBase.of(context).radiology, + subTitle: TranslationBase.of(context).result, ), if (patient.patientStatusType != null && patient.patientStatusType == 43) - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).radiology, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).result, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title: TranslationBase.of(context).radiology, + subTitle: TranslationBase.of(context).result, ), if ((patient.patientStatusType != null && patient.patientStatusType == 43) || @@ -191,15 +163,15 @@ class _RadiologyHomePageState extends State { child: DoctorCard( isNoMargin: true, doctorName: - model.radiologyList[index].doctorName, + Helpers.convertToTitleCase(model.radiologyList[index].doctorName), profileUrl: model.radiologyList[index].doctorImageURL, invoiceNO: '${model.radiologyList[index].invoiceNo}', branch: '${model.radiologyList[index].projectName}', - clinic: model - .radiologyList[index].clinicDescription, + clinic: + Helpers.convertToTitleCase(model.radiologyList[index].clinicDescription), appointmentDate: model.radiologyList[index].orderDate ?? model.radiologyList[index].reportDate, diff --git a/lib/screens/procedures/ProcedureCard.dart b/lib/screens/procedures/ProcedureCard.dart index d531cf35..26216c94 100644 --- a/lib/screens/procedures/ProcedureCard.dart +++ b/lib/screens/procedures/ProcedureCard.dart @@ -1,12 +1,15 @@ //import 'package:doctor_app_flutter/client/base_app_client.dart'; +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/model/procedure/get_ordered_procedure_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/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/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -82,14 +85,15 @@ class ProcedureCard extends StatelessWidget { : 'Urgent', color: entityList.orderType == 0 ? Colors.black - : Colors.red[800], + : AppGlobal.appRedColor, fontWeight: FontWeight.w600, ), SizedBox( height: 5, ), AppText( - entityList.procedureName, + Helpers.convertToTitleCase( + entityList.procedureName), bold: true, fontSize: 14, ), @@ -104,13 +108,18 @@ class ProcedureCard extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.end, children: [ AppText( - '${AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertISOStringToDateTime(entityList.orderDate), isArabic: projectViewModel.isArabic)}', + '${AppDateUtils.getDayMonthYearDateFormatted( + AppDateUtils.convertISOStringToDateTime( + entityList.createdOn), + isMonthShort: true, + isArabic: projectViewModel.isArabic, + )}', color: Colors.black, fontWeight: FontWeight.w600, fontSize: 14, ), AppText( - '${AppDateUtils.getHour(AppDateUtils.convertISOStringToDateTime(entityList.orderDate))}', + '${AppDateUtils.getHour(AppDateUtils.convertISOStringToDateTime(entityList.createdOn))}', fontWeight: FontWeight.w600, color: Colors.grey[700], fontSize: 14, @@ -119,20 +128,10 @@ class ProcedureCard extends StatelessWidget { ), ], ), - Row( - children: [ - AppText( - TranslationBase.of(context).orderNo, - //color: Colors.grey, - fontSize: 12, - color: Colors.grey, - ), - AppText( - entityList.orderNo.toString(), - fontSize: 12, - bold: true, - ), - ], + CustomRow( + label: TranslationBase.of(context).orderNo + ": ", + value: entityList.orderNo.toString() ?? "".toString(), + isCopyable: false, ), Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -154,8 +153,8 @@ class ProcedureCard extends StatelessWidget { height: 40, child: ClipRRect( borderRadius: BorderRadius.circular(20.0), - child: Image.network( - 'assets/images/male_avatar.png', + child: Image.asset( + 'assets/images/dr_avatar.png', height: 25, width: 30, errorBuilder: (BuildContext context, @@ -174,7 +173,8 @@ class ProcedureCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ AppText( - entityList.doctorName, + Helpers.convertToTitleCase( + entityList.doctorName), fontFamily: 'Poppins', fontWeight: FontWeight.w800, fontSize: 1.7 * SizeConfig.textMultiplier, @@ -182,7 +182,8 @@ class ProcedureCard extends StatelessWidget { ), if (entityList.clinicDescription != null) AppText( - entityList.clinicDescription, + Helpers.convertToTitleCase( + entityList.clinicDescription), fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: 1.4 * SizeConfig.textMultiplier, @@ -201,7 +202,9 @@ class ProcedureCard extends StatelessWidget { children: [ Expanded( child: AppText( - entityList.remarks.toString() ?? '', + entityList.remarks!= null?Helpers.convertToTitleCase( + entityList.remarks.toString()) : + '', fontSize: 12, ), ), diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index 16937262..289170d2 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/procedures/update-procedure.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/patients/patient_service_title.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_texts_widget.dart'; @@ -60,45 +61,15 @@ class ProcedureScreen extends StatelessWidget { ), if (model.procedureList.length == 0 && patient.patientStatusType != 43) - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).orderTestOr, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).procedure, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title: TranslationBase.of(context).orderTestOr, + subTitle: TranslationBase.of(context).procedure, ), if (patient.patientStatusType != null && patient.patientStatusType == 43) - Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).orderTestOr, - style: "caption2", - color: Colors.black, - fontSize: 13, - ), - AppText( - TranslationBase.of(context).procedure, - bold: true, - fontSize: 22, - ), - ], - ), + ServiceTitle( + title: TranslationBase.of(context).orderTestOr, + subTitle: TranslationBase.of(context).procedure, ), if ((patient.patientStatusType != null && patient.patientStatusType == 43) || @@ -161,8 +132,7 @@ class ProcedureScreen extends StatelessWidget { ...List.generate( model.procedureList[0].rowcount, (index) => ProcedureCard( - categoryID: - model.procedureList[0].entityList[index].categoryID, + categoryID: model.procedureList[0].entityList[index].categoryID, entityList: model.procedureList[0].entityList[index], onTap: () { if (model.procedureList[0].entityList[index].categoryID == diff --git a/lib/widgets/shared/doctor_card.dart b/lib/widgets/shared/doctor_card.dart index cc54330c..23feacc5 100644 --- a/lib/widgets/shared/doctor_card.dart +++ b/lib/widgets/shared/doctor_card.dart @@ -3,11 +3,14 @@ import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/user-guid/CusomRow.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import '../../config/size_config.dart'; + class DoctorCard extends StatelessWidget { final String doctorName; final String branch; @@ -109,74 +112,33 @@ class DoctorCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ if (orderNo != null && !isPrescriptions) - Row( - children: [ - AppText( - TranslationBase.of(context).orderNo + - " ", - color: Colors.grey[500], - fontSize: 14, - ), - AppText( - orderNo ?? '', - fontSize: 14, - ) - ], + CustomRow( + label: TranslationBase.of(context).orderNo , + value: orderNo, + valueSize: 13, + labelSize: 13, ), if (invoiceNO != null && !isPrescriptions) - Row( - children: [ - AppText( - TranslationBase.of(context) - .invoiceNo + - " ", - fontSize: 14, - color: Colors.grey[500], - ), - AppText( - invoiceNO, - fontSize: 14, - ) - ], + CustomRow( + label: TranslationBase.of(context).invoiceNo , + value: invoiceNO, + valueSize: 13, + labelSize: 13, ), if (clinic != null) - Row( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).clinic + - ": ", - color: Colors.grey[500], - fontSize: 14, - ), - Expanded( - child: AppText( - clinic, - fontSize: 14, - ), - ) - ], + CustomRow( + label: TranslationBase.of(context).clinic + " : ", + value: clinic, + valueSize: 13, + labelSize: 13, ), if (branch != null) - Row( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).branch + - ": ", - fontSize: 14, - color: Colors.grey[500], - ), - Expanded( - child: AppText( - branch, - fontSize: 14, - ), - ) - ], - ) + CustomRow( + label: TranslationBase.of(context).branch + " : ", + value: branch, + valueSize: 13, + labelSize: 13, + ), ]), ), ),