diff --git a/lib/config/config.dart b/lib/config/config.dart index d350f66f..8b4bf1f9 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -254,8 +254,10 @@ const SEND_PRESCRIPTION_EMAIL = const GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh'; const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList"; -const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; -const CREATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; +const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = + "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; +const CREATE_PROGRESS_NOTE_FOR_INPATIENT = + "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; const GET_PRESCRIPTION_IN_PATIENT = 'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient'; @@ -287,8 +289,8 @@ var SERVICES_PATIANT2 = [ "patientArrivalList" ]; var SERVICES_PATIANT_HEADER = [ - "Search Out-Patient", - "Search In-Patient", + "My OutPatient", + "My InPatient", "Discharge", "Referred", "Referral Discharge", diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index e64913b6..b2c201e1 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -439,10 +439,7 @@ const Map> localizedValues = { 'en': "Expected Admission Date", 'ar': 'تاريخ القبول المتوقع' }, - 'admissionDate': { - 'en': "Admission Date", - 'ar': 'تاريخ القبول' - }, + 'admissionDate': {'en': "Admission Date", 'ar': 'تاريخ القبول'}, // 'emergencyAdmission': {'en': "EMERGENCY ADMISSION", 'ar': 'دخول الطوارئ'}, 'isSickLeaveRequired': { 'en': "Is Sick Leave Required", diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 17f04980..a18aed2f 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -397,37 +397,46 @@ class _PatientsScreenState extends State { ? Column( children: [ Column(children: [ - SizedBox(height: 18.5), - - Container( - decoration: BoxDecoration( - borderRadius: - BorderRadius.all(Radius.circular(6.0)), - border: Border.all( - width: 1.0, - color: HexColor("#CCCCCC"), - ), - color: Colors.white), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only( - left: 10, top: 10), - child: AppText( - TranslationBase.of(context) - .selectYourProject, - fontWeight: FontWeight.w600, - )), - AppTextFormField( - // focusNode: focusProject, - controller: _controller, - borderColor: Colors.white, - suffixIcon: Icons.arrow_drop_down, - onTap: () {}, - ) - ])), + // Container( + // width: SizeConfig.screenWidth * 0.9, + // height: 75, + // decoration: BoxDecoration( + // borderRadius: + // BorderRadius.all(Radius.circular(6.0)), + // border: Border.all( + // width: 1.0, + // color: HexColor("#CCCCCC"), + // ), + // color: Colors.white), + // child: Column( + // crossAxisAlignment: + // CrossAxisAlignment.start, + // children: [ + // Padding( + // padding: EdgeInsets.only( + // left: 10, top: 10), + // child: AppText( + // TranslationBase.of(context) + // .searchPatientName, + // fontSize: 13, + // )), + // AppTextFormField( + // // focusNode: focusProject, + // controller: _controller, + // borderColor: Colors.white, + // prefix: IconButton( + // icon: Icon( + // DoctorApp.filter_1, + // color: Colors.black, + // ), + // iconSize: 20, + // padding: + // EdgeInsets.only(bottom: 30), + // ), + // onChanged: (String str) { + // this.searchData(str); + // }), + // ])), // Container( // width: SizeConfig.screenWidth * 0.9, @@ -467,7 +476,7 @@ class _PatientsScreenState extends State { // child: _locationBar(context) child: SERVICES_PATIANT2[int.parse(patientType)] == - "patientArrivalList" + "List_MyOutPatient" ? _locationBar(context, model) : Container(), ) @@ -539,7 +548,9 @@ class _PatientsScreenState extends State { padding: EdgeInsets.only( left: 10, top: 10), child: AppText( - TranslationBase.of(context).searchPatientName, + TranslationBase.of( + context) + .searchPatientName, fontSize: 13, )), AppTextFormField( diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart b/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart index 74292c56..ca6910ae 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart @@ -145,7 +145,7 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget { ), AppText( DateUtils.convertDateFromServerFormat( - patient.createdOn, "dd MMM,yyyy"), + patient.admissionDate, "dd MMM,yyyy"), fontSize: 1.4 * SizeConfig.textMultiplier, fontWeight: FontWeight.w700), ], @@ -184,7 +184,8 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget { "${TranslationBase.of(context).numOfDays}: ", fontSize: 1.2 * SizeConfig.textMultiplier, ), - AppText("${ DateTime.now().difference(DateUtils.getDateTimeFromServerFormat(patient.createdOn)).inDays + 1}", + AppText( + "${DateTime.now().difference(DateUtils.getDateTimeFromServerFormat(patient.createdOn)).inDays + 1}", fontSize: 1.4 * SizeConfig.textMultiplier, fontWeight: FontWeight.w700), ],