From de5621a629f115f7f4bc4c906e54ff9d6c027dad Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Thu, 9 Sep 2021 15:18:07 +0300 Subject: [PATCH] fix issue after merge the dev --- .../In_patient/in_patient_list_page.dart | 13 +++++----- .../In_patient/list_of_all_in_patient.dart | 24 +++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/screens/patients/In_patient/in_patient_list_page.dart b/lib/screens/patients/In_patient/in_patient_list_page.dart index 876c31ba..251054e1 100644 --- a/lib/screens/patients/In_patient/in_patient_list_page.dart +++ b/lib/screens/patients/In_patient/in_patient_list_page.dart @@ -152,8 +152,9 @@ class _InPatientListPageState extends State { setState(() { hasQuery = true; }); - widget.patientSearchViewModel - .filterSearchResults(value, isAllClinic: isAllClinic, isMyInPatient:widget.isMyInPatient); + widget.patientSearchViewModel.filterSearchResults(value, + isAllClinic: isAllClinic, + isMyInPatient: widget.isMyInPatient); }), Positioned( right: 35, @@ -170,7 +171,9 @@ class _InPatientListPageState extends State { onPressed: () { GifLoaderDialogUtils.showMyDialog(context); widget.patientSearchViewModel.sortInPatient( - isDes: isSortDes, isAllClinic: isAllClinic, isMyInPatient:widget.isMyInPatient); + isDes: isSortDes, + isAllClinic: isAllClinic, + isMyInPatient: widget.isMyInPatient); isSortDes = !isSortDes; GifLoaderDialogUtils.hideDialog(context); }, @@ -197,6 +200,7 @@ class _InPatientListPageState extends State { : ListOfAllInPatient( isAllClinic: isAllClinic, hasQuery: hasQuery, + scrollController: _scrollController, patientSearchViewModel: widget.patientSearchViewModel) : NoData() @@ -261,6 +265,3 @@ class _InPatientListPageState extends State { ); } } - - - diff --git a/lib/screens/patients/In_patient/list_of_all_in_patient.dart b/lib/screens/patients/In_patient/list_of_all_in_patient.dart index 4908a848..9c648e66 100644 --- a/lib/screens/patients/In_patient/list_of_all_in_patient.dart +++ b/lib/screens/patients/In_patient/list_of_all_in_patient.dart @@ -11,22 +11,26 @@ class ListOfAllInPatient extends StatelessWidget { @required this.isAllClinic, @required this.hasQuery, this.patientSearchViewModel, + this.scrollController, }) : super(key: key); final bool isAllClinic; final bool hasQuery; + final ScrollController scrollController; + final PatientSearchViewModel patientSearchViewModel; @override Widget build(BuildContext context) { return Expanded( - child: Container( - margin: EdgeInsets.symmetric(horizontal: 16.0), - child: patientSearchViewModel.filteredInPatientItems.length == 0 - ? NoData() - :NotificationListener( + child: Container( + margin: EdgeInsets.symmetric(horizontal: 16.0), + child: patientSearchViewModel.filteredInPatientItems.length == 0 + ? NoData() + : NotificationListener( child: ListView.builder( + controller: scrollController, itemCount: patientSearchViewModel.filteredInPatientItems.length, scrollDirection: Axis.vertical, @@ -104,21 +108,21 @@ class ListOfAllInPatient extends StatelessWidget { // else // return SizedBox(); }), - onNotification: (t) { - if (isAllClinic && !hasQuery) if (t + onNotification: (notification) { + if (isAllClinic && !hasQuery) if (notification is ScrollUpdateNotification) { - if (t.metrics.pixels >= t.metrics.maxScrollExtent - 50) { + if (notification.metrics.pixels >= notification.metrics.maxScrollExtent - 50) { patientSearchViewModel.addOnFilteredList(); } - if (t.metrics.pixels <= t.metrics.minScrollExtent - 50) { + if (notification.metrics.pixels <= notification.metrics.minScrollExtent - 50) { patientSearchViewModel.removeOnFilteredList(); } } return; }, ), - ), + ), ); } }