Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!555
merge-requests/556/merge
Mohammad Aljammal 5 years ago
commit cc706c71e5

@ -254,8 +254,10 @@ const SEND_PRESCRIPTION_EMAIL =
const GET_PRESCRIPTION_REPORT_ENH = const GET_PRESCRIPTION_REPORT_ENH =
'Services/Patients.svc/REST/GetPrescriptionReport_enh'; 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList"; const GET_PHARMACY_LIST = "Services/Patients.svc/REST/GetPharmcyList";
const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient"; const UPDATE_PROGRESS_NOTE_FOR_INPATIENT =
const CREATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient"; "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
const CREATE_PROGRESS_NOTE_FOR_INPATIENT =
"Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
const GET_PRESCRIPTION_IN_PATIENT = const GET_PRESCRIPTION_IN_PATIENT =
'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient'; 'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
@ -287,8 +289,8 @@ var SERVICES_PATIANT2 = [
"patientArrivalList" "patientArrivalList"
]; ];
var SERVICES_PATIANT_HEADER = [ var SERVICES_PATIANT_HEADER = [
"Search Out-Patient", "My OutPatient",
"Search In-Patient", "My InPatient",
"Discharge", "Discharge",
"Referred", "Referred",
"Referral Discharge", "Referral Discharge",

@ -439,10 +439,7 @@ const Map<String, Map<String, String>> localizedValues = {
'en': "Expected Admission Date", 'en': "Expected Admission Date",
'ar': 'تاريخ القبول المتوقع' 'ar': 'تاريخ القبول المتوقع'
}, },
'admissionDate': { 'admissionDate': {'en': "Admission Date", 'ar': 'تاريخ القبول'},
'en': "Admission Date",
'ar': 'تاريخ القبول'
},
// 'emergencyAdmission': {'en': "EMERGENCY ADMISSION", 'ar': 'دخول الطوارئ'}, // 'emergencyAdmission': {'en': "EMERGENCY ADMISSION", 'ar': 'دخول الطوارئ'},
'isSickLeaveRequired': { 'isSickLeaveRequired': {
'en': "Is Sick Leave Required", 'en': "Is Sick Leave Required",

@ -397,37 +397,46 @@ class _PatientsScreenState extends State<PatientsScreen> {
? Column( ? Column(
children: [ children: [
Column(children: <Widget>[ Column(children: <Widget>[
SizedBox(height: 18.5), // Container(
// width: SizeConfig.screenWidth * 0.9,
Container( // height: 75,
decoration: BoxDecoration( // decoration: BoxDecoration(
borderRadius: // borderRadius:
BorderRadius.all(Radius.circular(6.0)), // BorderRadius.all(Radius.circular(6.0)),
border: Border.all( // border: Border.all(
width: 1.0, // width: 1.0,
color: HexColor("#CCCCCC"), // color: HexColor("#CCCCCC"),
), // ),
color: Colors.white), // color: Colors.white),
child: Column( // child: Column(
crossAxisAlignment: // crossAxisAlignment:
CrossAxisAlignment.start, // CrossAxisAlignment.start,
children: [ // children: [
Padding( // Padding(
padding: EdgeInsets.only( // padding: EdgeInsets.only(
left: 10, top: 10), // left: 10, top: 10),
child: AppText( // child: AppText(
TranslationBase.of(context) // TranslationBase.of(context)
.selectYourProject, // .searchPatientName,
fontWeight: FontWeight.w600, // fontSize: 13,
)), // )),
AppTextFormField( // AppTextFormField(
// focusNode: focusProject, // // focusNode: focusProject,
controller: _controller, // controller: _controller,
borderColor: Colors.white, // borderColor: Colors.white,
suffixIcon: Icons.arrow_drop_down, // prefix: IconButton(
onTap: () {}, // icon: Icon(
) // DoctorApp.filter_1,
])), // color: Colors.black,
// ),
// iconSize: 20,
// padding:
// EdgeInsets.only(bottom: 30),
// ),
// onChanged: (String str) {
// this.searchData(str);
// }),
// ])),
// Container( // Container(
// width: SizeConfig.screenWidth * 0.9, // width: SizeConfig.screenWidth * 0.9,
@ -467,7 +476,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
// child: _locationBar(context) // child: _locationBar(context)
child: child:
SERVICES_PATIANT2[int.parse(patientType)] == SERVICES_PATIANT2[int.parse(patientType)] ==
"patientArrivalList" "List_MyOutPatient"
? _locationBar(context, model) ? _locationBar(context, model)
: Container(), : Container(),
) )
@ -539,7 +548,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 10, top: 10), left: 10, top: 10),
child: AppText( child: AppText(
TranslationBase.of(context).searchPatientName, TranslationBase.of(
context)
.searchPatientName,
fontSize: 13, fontSize: 13,
)), )),
AppTextFormField( AppTextFormField(

@ -145,7 +145,7 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget {
), ),
AppText( AppText(
DateUtils.convertDateFromServerFormat( DateUtils.convertDateFromServerFormat(
patient.createdOn, "dd MMM,yyyy"), patient.admissionDate, "dd MMM,yyyy"),
fontSize: 1.4 * SizeConfig.textMultiplier, fontSize: 1.4 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
], ],
@ -184,7 +184,8 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget {
"${TranslationBase.of(context).numOfDays}: ", "${TranslationBase.of(context).numOfDays}: ",
fontSize: 1.2 * SizeConfig.textMultiplier, 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, fontSize: 1.4 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700), fontWeight: FontWeight.w700),
], ],

Loading…
Cancel
Save