WD: nursing station added to the PharmacyIntervention.dart dialog

pharmacy_ntervention
taha.alam 11 months ago
parent e347a35d10
commit 4d31e14d6e

@ -1160,6 +1160,7 @@ const Map<String, Map<String, String>> localizedValues = {
"doctorRota": {"en": "Doctor Rota", "ar":"دوران الطبيب"}, "doctorRota": {"en": "Doctor Rota", "ar":"دوران الطبيب"},
"dateFrom": {"en": "Date From", "ar":"التاريخ من"}, "dateFrom": {"en": "Date From", "ar":"التاريخ من"},
"dateTo": {"en": "Date To", "ar":"التاريخ إلى"}, "dateTo": {"en": "Date To", "ar":"التاريخ إلى"},
"nursingStation": {"en": "Nursing Station", "ar":"محطة التمريض"},
"searchFindSchedule": {"en": "Search and find out the doctors schedule ", "ar":"بحث ومعرفة جدول الطبيب"}, "searchFindSchedule": {"en": "Search and find out the doctors schedule ", "ar":"بحث ومعرفة جدول الطبيب"},
"onePrimaryDiagnosis": {"en": "There has to be at-least 1 principal diagnosis", "ar":"يجب أن يكون هناك تشخيص رئيسي واحد على الأقل"}, "onePrimaryDiagnosis": {"en": "There has to be at-least 1 principal diagnosis", "ar":"يجب أن يكون هناك تشخيص رئيسي واحد على الأقل"},
"principalDiagnosisCannot": {"en": "Principal Diagnosis cannot modify once the order created", "ar":"لا يمكن تعديل التشخيص الرئيسي بمجرد إنشاء الطلب"}, "principalDiagnosisCannot": {"en": "Principal Diagnosis cannot modify once the order created", "ar":"لا يمكن تعديل التشخيص الرئيسي بمجرد إنشاء الطلب"},
@ -1167,6 +1168,7 @@ const Map<String, Map<String, String>> localizedValues = {
"principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"}, "principalCoveredOrNot": {"en": "Principal Diagnosis is not covered for this patient", "ar":"لا يتم تغطية التشخيص الرئيسي لهذا المريض"},
"complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"}, "complexDiagnosis": {"en": "Complex Diagnosis", "ar":"التشخيص المعقد"},
"pharmacyInterventionApproval": {"en": "Pharmacy Intervention Approval", "ar":"الموافقة على التدخل الصيدلي"}, "pharmacyInterventionApproval": {"en": "Pharmacy Intervention Approval", "ar":"الموافقة على التدخل الصيدلي"},
"pharmacyApproval": {"en": "Pharmacy Approval", "ar":"موافقة الصيدلية"},

@ -51,14 +51,14 @@ class _PharmacyIntervention extends State<PharmacyIntervention>
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBar: PatientSearchHeader( appBar: PatientSearchHeader(
title: TranslationBase.of(context).pharmacyInterventionApproval, title: TranslationBase.of(context).pharmacyApproval,
fontSize: 18, fontSize: 18,
showSearchIcon: true, showSearchIcon: true,
onSearchPressed: () { onSearchPressed: () {
SearchDialog(); SearchDialog();
}, },
), ),
appBarTitle: TranslationBase.of(context).pharmacyInterventionApproval, appBarTitle: TranslationBase.of(context).pharmacyApproval,
body: Column( body: Column(
children: [ children: [
SizedBox( SizedBox(
@ -144,6 +144,7 @@ class PharmacyInterventionDialog extends StatefulWidget {
class _PharmacyInterventionDialogState class _PharmacyInterventionDialogState
extends State<PharmacyInterventionDialog> { extends State<PharmacyInterventionDialog> {
final TextEditingController admissionNumber = TextEditingController(); final TextEditingController admissionNumber = TextEditingController();
final TextEditingController nursingStation = TextEditingController();
final TextEditingController patientId = TextEditingController(); final TextEditingController patientId = TextEditingController();
@ -151,7 +152,6 @@ class _PharmacyInterventionDialogState
String dateTo = ''; String dateTo = '';
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -170,27 +170,37 @@ class _PharmacyInterventionDialogState
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
_titleAndTextField( _titleAndTextField(TranslationBase.of(context).nursingStation,
TranslationBase.of(context).admissionNumber, admissionNumber), nursingStation, TextInputType.number),
SizedBox(height: 4,), SizedBox(
height: 4,
_titleAndTextField( ),
TranslationBase.of(context).patientID, patientId), _titleAndTextField(TranslationBase.of(context).admissionNumber,
SizedBox(height: 4,), admissionNumber, TextInputType.number),
SizedBox(
height: 4,
),
_titleAndTextField(TranslationBase.of(context).patientID, patientId,
TextInputType.number),
SizedBox(
height: 4,
),
_dateSelection(TranslationBase.of(context).dateFrom, (date) { _dateSelection(TranslationBase.of(context).dateFrom, (date) {
setState(() { setState(() {
dateFrom = date; dateFrom = date;
}); });
}, dateFrom), }, dateFrom),
SizedBox(height: 4,), SizedBox(
height: 4,
),
_dateSelection(TranslationBase.of(context).dateTo, (date) { _dateSelection(TranslationBase.of(context).dateTo, (date) {
setState(() { setState(() {
dateTo = date; dateTo = date;
}); });
}, dateTo), }, dateTo),
SizedBox(height: 8,), SizedBox(
height: 8,
),
Row(children: [ Row(children: [
Expanded( Expanded(
child: AppButton( child: AppButton(
@ -231,24 +241,6 @@ class _PharmacyInterventionDialogState
} }
Future _selectDate(Function(String) updateDate) async { Future _selectDate(Function(String) updateDate) async {
// if (calenderType == CalenderType.Hijri) {
// JDateModel hijriDate = JDateModel(dateTime: DateTime.now());
// final JPickerValue? pickedH = await showGlobalDatePicker(
// context: context,
// pickerType: PickerType.JHijri,
// startDate: birthDateInHijri ?? hijriDate,
// endDate: JDateModel(
// jhijri: JHijri(fDate: hijriDate.dateTime),
// ),
//
// // firstDate: new HijriCalendar()
// // ..hYear = 1438
// // ..hMonth = 12
// // ..hDay = 25,
// pickerMode: DatePickerMode.day,
// );
// if (pickedH != null && birthDateInHijri != pickedH) updateDate(pickedH);
// } else {
final DateTime? picked = await showDatePicker( final DateTime? picked = await showDatePicker(
context: context, context: context,
initialDate: DateTime.now(), initialDate: DateTime.now(),
@ -266,17 +258,15 @@ class _PharmacyInterventionDialogState
), ),
child: child!, child: child!,
); );
} });
);
if (picked != null) { if (picked != null) {
updateDate(getFormattedDate(picked)); updateDate(getFormattedDate(picked));
} }
// } // }
} }
Widget _titleAndTextField(String title, TextEditingController controller) { Widget _titleAndTextField(String title, TextEditingController controller,
TextInputType? inputType) {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -284,6 +274,7 @@ class _PharmacyInterventionDialogState
Text(title), Text(title),
Expanded( Expanded(
child: TextFormField( child: TextFormField(
keyboardType: inputType,
decoration: InputDecoration( decoration: InputDecoration(
hintText: '', hintText: '',
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,

@ -1467,8 +1467,12 @@ class TranslationBase {
localizedValues['updateAssessmentDetails']![locale.languageCode]!; localizedValues['updateAssessmentDetails']![locale.languageCode]!;
String get pharmacyInterventionApproval => String get pharmacyInterventionApproval =>
localizedValues['pharmacyInterventionApproval']![locale.languageCode]!; localizedValues['pharmacyInterventionApproval']![locale.languageCode]!;
String get pharmacyApproval =>
localizedValues['pharmacyApproval']![locale.languageCode]!;
String get admissionNumber => String get admissionNumber =>
localizedValues['admissionNumber']![locale.languageCode]!; localizedValues['admissionNumber']![locale.languageCode]!;
String get nursingStation =>
localizedValues['nursingStation']![locale.languageCode]!;
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save