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

bug fixes

Browse Source
merge-requests/555/head
Sultan Khan 5 years ago
parent c5f12ca307
commit c9150ef088
4 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File

10
lib/config/config.dart
Unescape Escape View File

@ -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",

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

@ -30,7 +30,7 @@ const Map<String, Map<String, String>> localizedValues = {
'ar': 'ملاحضات وتفاصيل العيادة'
},
'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'},
'myOutPatient': {'en': 'My Out Patients', 'ar': 'المريض الخارجي'},
'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'},
'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
@ -47,7 +47,7 @@ const Map<String, Map<String, String>> localizedValues = {
'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
'service': {'en': 'Service', 'ar': 'خدمة'},
'referral': {'en': 'Referral', 'ar': 'الإحالة'},
'inPatient': {'en': 'My In Patients', 'ar': 'المريض الداخلي'},
'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'},
'operations': {'en': 'Operations', 'ar': 'عمليات'},
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},
@ -439,10 +439,7 @@ const Map<String, Map<String, String>> 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",

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

@ -397,37 +397,46 @@ class _PatientsScreenState extends State<PatientsScreen> {
? Column(
children: [
Column(children: <Widget>[
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<PatientsScreen> {
// child: _locationBar(context)
child:
SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList"
"List_MyOutPatient"
? _locationBar(context, model)
: Container(),
)
@ -539,7 +548,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
padding: EdgeInsets.only(
left: 10, top: 10),
child: AppText(
TranslationBase.of(context).searchPatientName,
TranslationBase.of(
context)
.searchPatientName,
fontSize: 13,
)),
AppTextFormField(

5
lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart
Unescape Escape View File

@ -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),
],

Write Preview
Loading…
Cancel
Save