replace the TabBar in refer-patient-screen-in-patient with our dropDownList

merge-requests/979/head
RoaaGhali98 4 years ago
parent 4c7db58489
commit dc37e2e559

@ -41,6 +41,8 @@ class PatientReferralViewModel extends BaseViewModel {
List<dynamic> doctorsList = []; List<dynamic> doctorsList = [];
List<dynamic> priority = ['One', 'Two', 'Free', 'Four'];
List<ClinicDoctor> get clinicDoctorsList => List<ClinicDoctor> get clinicDoctorsList =>
_referralPatientService.doctorsList; _referralPatientService.doctorsList;

@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart';
import 'package:doctor_app_flutter/utils/date-utils.dart';
import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/utils/tab_utils.dart'; import 'package:doctor_app_flutter/utils/tab_utils.dart';
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
@ -44,6 +45,7 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
dynamic _selectedClinic; dynamic _selectedClinic;
dynamic _selectedDoctor; dynamic _selectedDoctor;
dynamic _selectedFrequency; dynamic _selectedFrequency;
dynamic _selectedPriority;
final _remarksController = TextEditingController(); final _remarksController = TextEditingController();
final _extController = TextEditingController(); final _extController = TextEditingController();
int _activePriority = 1; int _activePriority = 1;
@ -143,6 +145,29 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
dynamic priority1 = {
"ParameterCode": 1,
"Description": TranslationBase.of(context).veryUrgent.toUpperCase(),
};
dynamic priority2 = {
"ParameterCode": 1,
'Description': TranslationBase.of(context).urgent.toUpperCase(),
};
dynamic priority3 = {
"ParameterCode": 1,
'Description': TranslationBase.of(context).routine.toUpperCase(),
};
List<Object> _priorityList = List();
_priorityList.add(
priority1,);
_priorityList.add(
priority2,);
_priorityList.add(
priority3,);
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
bool isInpatient = routeArgs['isInpatient']; bool isInpatient = routeArgs['isInpatient'];
@ -408,22 +433,39 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Padding( AppTextFieldCustom(
padding: const EdgeInsets.all(4.0), height: screenSize.height * 0.075,
child: AppText( hintText:
"${TranslationBase.of(context).priority}", TranslationBase.of(context).priority,
fontFamily: 'Poppins', dropDownText: _selectedPriority != null
fontSize: SizeConfig.textMultiplier * 2.0, ? _selectedPriority['Description']
fontWeight: FontWeight.w600, : null,
), enabled: false,
), isTextFieldHasSuffix: true,
SizedBox( validationError: frequencyError,
height: 4, onClick: () {
), ListSelectDialog dialog = ListSelectDialog(
Padding( list: _priorityList,
padding: const EdgeInsets.all(3.0), attributeName: 'Description',
child: priorityBar(context, screenSize), attributeValueId: 'Description',
usingSearch: false,
okText: TranslationBase.of(context).ok,
okFunction: (selectedValue) {
setState(() {
_selectedPriority = selectedValue;
});
},
);
showDialog(
barrierDismissible: false,
context: context,
builder: (BuildContext context) {
return dialog;
},
);
},
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -668,52 +710,6 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
), ),
), ),
); );
// List<String> _priorities = [
// TranslationBase.of(context).veryUrgent.toUpperCase(),
// TranslationBase.of(context).urgent.toUpperCase(),
// TranslationBase.of(context).routine.toUpperCase(),
// ];
// return Container(
// height: screenSize.height * 0.070,
// width: screenSize.width * 0.95,
// decoration:
// containerBorderDecoration(Color(0Xffffffff), Color(0xFFCCCCCC)),
// child: Row(
// mainAxisSize: MainAxisSize.max,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: _priorities.map((item) {
// bool _isActive = _priorities[_activePriority] == item ? true : false;
// return Expanded(
// child: InkWell(
// child: Center(
// child: Container(
// height: screenSize.height * 0.070,
// decoration: containerBorderDecoration(
// _isActive ? Color(0XFFB8382B) : Colors.white,
// _isActive ? Color(0XFFB8382B) : Colors.white),
// child: Center(
// child: Text(
// item,
// style: TextStyle(
// fontSize: 12,
// color: _isActive ? Colors.white : Colors.black,
// //Colors.black,
// fontWeight: FontWeight.bold,
// ),
// ),
// )),
// ),
// onTap: () {
// print(_priorities.indexOf(item));
// setState(() {
// _activePriority = _priorities.indexOf(item);
// });
// },
// ),
// );
// }).toList(),
// ),
// );
} }
String getPriority() { String getPriority() {
@ -729,11 +725,11 @@ class _PatientMakeInPatientReferralScreenState extends State<PatientMakeInPatien
date = date.add(new Duration(days: 1)); date = date.add(new Duration(days: 1));
break; break;
} }
var format = DateFormat('yyyy/mm/dd HH:mm a'); var format = DateFormat('yyyy/MM/dd HH:mm a');
var time = format.format(date); var localAppointmentDate = format.format(date);
print(time); appointmentDate = localAppointmentDate;
String time = AppDateUtils.getDayMonthYearDateFormatted(date) + ' ' + AppDateUtils.getHour(date);
appointmentDate = time;
return time; return time;
} }

Loading…
Cancel
Save