merge-requests/622/head
Elham Rababah 5 years ago
parent 7337dc4f87
commit 4d87c6fb75

@ -26,13 +26,15 @@ class FilterDatePage extends StatefulWidget {
}
class _FilterDatePageState extends State<FilterDatePage> {
DateTime selectedFromDate;
DateTime selectedToDate;
@override
void initState() {
// TODO: implement initState
super.initState();
}
@override
Widget build(BuildContext context) {
DateTime selectedFromDate = widget.patientSearchViewModel.selectedFromDate;
DateTime selectedToDate= widget.patientSearchViewModel.selectedToDate;
var screenSize;
return AppScaffold(
isShowAppBar: false,
@ -80,10 +82,10 @@ class _FilterDatePageState extends State<FilterDatePage> {
.of(
context)
.fromDate,
selectedFromDate != null
widget.patientSearchViewModel.selectedFromDate != null
? "${DateUtils
.convertStringToDateFormat(
selectedFromDate.toString(),
widget.patientSearchViewModel.selectedFromDate.toString(),
"yyyy-MM-dd")}"
: null,
true,
@ -113,10 +115,10 @@ class _FilterDatePageState extends State<FilterDatePage> {
.of(
context)
.toDate,
selectedToDate != null
widget.patientSearchViewModel.selectedToDate != null
? "${DateUtils
.convertStringToDateFormat(
selectedToDate.toString(),
widget.patientSearchViewModel.selectedToDate.toString(),
"yyyy-MM-dd")}"
: null,
true,
@ -167,16 +169,16 @@ class _FilterDatePageState extends State<FilterDatePage> {
padding: 10,
color: Color(0xFF359846),
onPressed: () async {
if (selectedFromDate == null ||
selectedToDate == null) {
if (widget.patientSearchViewModel.selectedFromDate == null ||
widget.patientSearchViewModel.selectedToDate == null) {
Helpers.showErrorToast(
"Please Select All The date Fields ");
} else {
String dateTo = DateUtils.convertDateToFormat(
selectedToDate,
widget.patientSearchViewModel.selectedToDate,
'yyyy-MM-dd');
String dateFrom = DateUtils.convertDateToFormat(
selectedFromDate,
widget.patientSearchViewModel.selectedFromDate,
'yyyy-MM-dd');
PatientSearchRequestModel currentModel = PatientSearchRequestModel();
@ -211,8 +213,8 @@ class _FilterDatePageState extends State<FilterDatePage> {
{bool isFromDate = true, DateTime firstDate, lastDate}) async {
Helpers.hideKeyboard(context);
DateTime selectedDate = isFromDate
? this.selectedFromDate ?? firstDate
: this.selectedToDate ?? lastDate;
? this.widget.patientSearchViewModel.selectedFromDate ?? firstDate
: this.widget.patientSearchViewModel.selectedToDate ?? lastDate;
final DateTime picked = await showDatePicker(
context: context,
initialDate: selectedDate,
@ -223,11 +225,11 @@ class _FilterDatePageState extends State<FilterDatePage> {
if (picked != null) {
if (isFromDate) {
setState(() {
this.selectedFromDate = picked;
this.widget.patientSearchViewModel.selectedFromDate = picked;
});
} else {
setState(() {
this.selectedToDate = picked;
this.widget.patientSearchViewModel.selectedToDate = picked;
});
}
}

Loading…
Cancel
Save