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

Loading…
Cancel
Save