diff --git a/assets/images/DrAppEmblemAnimation_v2.gif b/assets/images/DrAppEmblemAnimation_v2.gif new file mode 100644 index 00000000..fd2248b5 Binary files /dev/null and b/assets/images/DrAppEmblemAnimation_v2.gif differ diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index ed9cfe0c..afddce7f 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -88,6 +88,8 @@ class BaseAppClient { print("URL : $url"); print("Body : ${json.encode(body)}"); + var asd =json.encode(body); + var asd2; if (await Helpers.checkConnection()) { final response = await http.post(url, diff --git a/lib/config/config.dart b/lib/config/config.dart index 35446d66..d350f66f 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -68,6 +68,8 @@ const GET_PRESCRIPTION_REPORT_FOR_IN_PATIENT = const GET_MY_REFERRAL_PATIENT = 'Services/DoctorApplication.svc/REST/GtMyReferralPatient'; +const REFER_TO_DOCTOR = 'Services/DoctorApplication.svc/REST/ReferToDoctor'; + const ADD_REFERRED_DOCTOR_REMARKS = 'Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks'; diff --git a/lib/core/service/ReferralService.dart b/lib/core/service/ReferralService.dart new file mode 100644 index 00000000..532041dd --- /dev/null +++ b/lib/core/service/ReferralService.dart @@ -0,0 +1,48 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/service/base/base_service.dart'; + +class ReferralService extends BaseService { + +//TODO Jammal + Future referralPatient( + {String admissionNo, + String roomID, + String referralClinic, + String referralDoctor, + String patientID, + String patientTypeID, + String referringClinic, + String referringDoctorRemarks, + String priority,String frequency,String extension}) async { + await getDoctorProfile(); + hasError = false; + Map body = Map(); + body['ProjectID'] = doctorProfile.projectID; + body['AdmissionNo'] = admissionNo; + body['RoomID'] = roomID; + body['ReferralClinic'] = referralClinic; + body['ReferralDoctor'] = referralDoctor; + body['CreatedBy'] = doctorProfile.doctorID; + body['EditedBy'] = doctorProfile.doctorID; + body['PatientID'] = patientID; + body['PatientTypeID'] = patientTypeID; + body['ReferringClinic'] = referringClinic; + body['ReferringDoctor'] = doctorProfile.doctorID; + body['ReferringDoctorRemarks'] = referringDoctorRemarks; + body['Priority'] = priority; + body['Frequency'] = frequency; + body['Extension'] = extension; + + await baseAppClient.post( + REFER_TO_DOCTOR, + onSuccess: (dynamic response, int statusCode) { + + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, + body: body, + ); + } +} diff --git a/lib/screens/medical-file/medical_file_page.dart b/lib/screens/medical-file/medical_file_page.dart index 1ebb0249..721a0bb8 100644 --- a/lib/screens/medical-file/medical_file_page.dart +++ b/lib/screens/medical-file/medical_file_page.dart @@ -52,7 +52,7 @@ class _MedicalFilePageState extends State { Row( children: [ AppText( - 'Medical', + 'Health', fontSize: 15.0, fontWeight: FontWeight.w600, fontFamily: 'Poppins', @@ -62,7 +62,7 @@ class _MedicalFilePageState extends State { Row( children: [ AppText( - 'Report', + 'Summary', fontSize: 30.0, fontWeight: FontWeight.w700, ), diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 5c72e574..9c06ee1b 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -536,11 +536,8 @@ class _PatientsScreenState extends State { padding: EdgeInsets.only( left: 10, top: 10), child: AppText( - TranslationBase.of( - context) - .searchPatientName, - fontWeight: - FontWeight.bold, + TranslationBase.of(context).searchPatientName, + fontSize: 13, )), AppTextFormField( // focusNode: focusProject, diff --git a/lib/screens/patients/profile/lab_result/LabResultWidget.dart b/lib/screens/patients/profile/lab_result/LabResultWidget.dart index c63f5bdf..c7e3b078 100644 --- a/lib/screens/patients/profile/lab_result/LabResultWidget.dart +++ b/lib/screens/patients/profile/lab_result/LabResultWidget.dart @@ -135,7 +135,7 @@ class LabResultWidget extends StatelessWidget { color: Colors.white, child: Center( child: AppText( - patientLabResultList[index].resultValue + + patientLabResultList[index].resultValue ??""+ " " + "${patientLabResultList[index].uOM ?? ""}", textAlign: TextAlign.center, diff --git a/lib/util/date-utils.dart b/lib/util/date-utils.dart index c4f187c5..35748638 100644 --- a/lib/util/date-utils.dart +++ b/lib/util/date-utils.dart @@ -32,7 +32,7 @@ class DateUtils { const start = "/Date("; const end = "+0300)"; - + if(str.contains("/Date")){ final startIndex = str.indexOf(start); final endIndex = str.indexOf(end, startIndex + start.length); @@ -40,7 +40,11 @@ class DateUtils { date = new DateTime.fromMillisecondsSinceEpoch( int.parse(str.substring(startIndex + start.length, endIndex))); } else { - date = DateTime.now(); + date = DateTime.now(); + } + + } else { + date = DateTime.parse(str); } return date; diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index f7046a4a..770cb15b 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -62,8 +62,8 @@ class ProfileMedicalInfoWidget extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: MEDICAL_FILE, - nameLine1: "Medical" ,//TranslationBase.of(context).medicalReport, - nameLine2: "Report",//TranslationBase.of(context).summaryReport, + nameLine1: "Health" ,//TranslationBase.of(context).medicalReport, + nameLine2: "Summary",//TranslationBase.of(context).summaryReport, icon: 'patient/health_summary.png'), PatientProfileButton( key: key, diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart index c38f21a9..e23abb7f 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart @@ -114,9 +114,9 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: MEDICAL_FILE, - nameLine1: "Medical", + nameLine1: "Health", //TranslationBase.of(context).medicalReport, - nameLine2: "Report", + nameLine2: "Summary", //TranslationBase.of(context).summaryReport, icon: 'patient/health_summary.png'), PatientProfileButton( @@ -124,10 +124,11 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { patient: patient, patientType: patientType, arrivalType: arrivalType, + isDisable: true, route: MEDICAL_FILE, - nameLine1: "Health", + nameLine1: "Medical",//Health //TranslationBase.of(context).medicalReport, - nameLine2: "Summery", + nameLine2: "Report",//Report //TranslationBase.of(context).summaryReport, icon: 'patient/health_summary.png'), PatientProfileButton( diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index 38cc598f..b6d3414c 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -51,8 +51,8 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { patientType: patientType, arrivalType: arrivalType, route: MEDICAL_FILE, - nameLine1: "Medical" ,//TranslationBase.of(context).medicalReport, - nameLine2: "Report",//TranslationBase.of(context).summaryReport, + nameLine1: "Health" ,//TranslationBase.of(context).medicalReport, + nameLine2: "Summary",//TranslationBase.of(context).summaryReport, icon: 'patient/health_summary.png'), PatientProfileButton( key: key, diff --git a/lib/widgets/shared/doctor_card.dart b/lib/widgets/shared/doctor_card.dart index 2e2f650e..25b3dee1 100644 --- a/lib/widgets/shared/doctor_card.dart +++ b/lib/widgets/shared/doctor_card.dart @@ -59,6 +59,7 @@ class DoctorCard extends StatelessWidget { Expanded( child: AppText( doctorName ?? "", + fontSize: 15, bold: true, )), Expanded(