Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 21 Wiki Activity

dashboard multiple filter cont

Browse Source
export_module_ui_ux_enhancement
Sikander Saleem 2 weeks ago
parent 75221bf61f
commit 164daa7d58
4 changed files with 210 additions and 150 deletions
Show Stats Download Patch File Download Diff File

26
lib/dashboard_latest/dashboard_provider.dart
Unescape Escape View File

@ -3,8 +3,10 @@ import 'dart:developer';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/api_manager.dart';
import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/enum_extensions.dart'; import 'package:test_sa/extensions/enum_extensions.dart';
import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/enums/user_types.dart';
@ -45,12 +47,22 @@ class DashBoardProvider extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
int _currentListIndex = 0; List<int> listIndex = [];
int get currentListIndex => _currentListIndex; int? _currentListIndex;
set currentListIndex(int value) { int? get currentListIndex => _currentListIndex;
set currentListIndex(int? value) {
_currentListIndex = value; _currentListIndex = value;
if (value == null) {
listIndex.clear();
}
else if (listIndex.contains(value)) {
listIndex.remove(value);
} else {
listIndex.add(value);
}
notifyListeners(); notifyListeners();
} }
@ -114,7 +126,13 @@ class DashBoardProvider extends ChangeNotifier {
setTabs(userType: userType, context: context); setTabs(userType: userType, context: context);
getDashBoardCount(usersType: userType); getDashBoardCount(usersType: userType);
resetRequestDataList(); resetRequestDataList();
getRequestDetail(usersType: userType, status: tabs[currentListIndex].tag, tabId: tabs[currentListIndex].id); if (listIndex.isEmpty) {
Provider.of<AllRequestsProvider>(context, listen: false)
..reset()
..getAllRequests(context);
} else {
getRequestDetail(usersType: userType, status: tabs[currentListIndex!].tag, tabId: tabs[currentListIndex!].id);
}
// notifyListeners(); // notifyListeners();
} }

29
lib/dashboard_latest/dashboard_view.dart
Unescape Escape View File

@ -6,6 +6,7 @@ import 'package:nfc_manager/nfc_manager.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/notification/firebase_notification_manger.dart'; import 'package:test_sa/controllers/notification/firebase_notification_manger.dart';
import 'package:test_sa/controllers/notification/notification_manger.dart'; import 'package:test_sa/controllers/notification/notification_manger.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/notifications_provider.dart'; import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@ -57,13 +58,17 @@ class _DashboardViewState extends State<DashboardView> {
_dashBoardProvider.setTabs(userType: userProvider.user!.type!, context: context); _dashBoardProvider.setTabs(userType: userProvider.user!.type!, context: context);
_dashBoardProvider.getDashBoardCount(usersType: userProvider.user!.type!); _dashBoardProvider.getDashBoardCount(usersType: userProvider.user!.type!);
_dashBoardProvider.resetRequestDataList(); _dashBoardProvider.resetRequestDataList();
_dashBoardProvider.currentListIndex = 0; _dashBoardProvider.currentListIndex = null;
_dashBoardProvider.getRequestDetail( Provider.of<AllRequestsProvider>(context, listen: false)
usersType: userProvider.user!.type!, ..reset()
status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag, ..getAllRequests(context);
tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id,
isHighPriority: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isHighPriority, // _dashBoardProvider.getRequestDetail(
isOverdue: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isOverDue); // usersType: userProvider.user!.type!,
// status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag,
// tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id,
// isHighPriority: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isHighPriority,
// isOverdue: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].isOverDue);
} }
void getInitialData() { void getInitialData() {
@ -94,8 +99,14 @@ class _DashboardViewState extends State<DashboardView> {
_scrollController.addListener(() async { _scrollController.addListener(() async {
if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent && !_dashBoardProvider.isDetailLoading) { if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent && !_dashBoardProvider.isDetailLoading) {
_dashBoardProvider.pageNum = _dashBoardProvider.pageNum + 1; _dashBoardProvider.pageNum = _dashBoardProvider.pageNum + 1;
_dashBoardProvider.getRequestDetail( if (_dashBoardProvider.currentListIndex == null) {
usersType: user.type!, showLoader: false, status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag, tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].id); } else {
_dashBoardProvider.getRequestDetail(
usersType: user.type!,
showLoader: false,
status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex!].tag,
tabId: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex!].id);
}
} }
}); });
} }

155
lib/dashboard_latest/widgets/app_bar_widget.dart
Unescape Escape View File

@ -157,84 +157,87 @@ class _AppBarWidgetState extends State<AppBarWidget> with TickerProviderStateMix
child: FadeTransition( child: FadeTransition(
opacity: _rightFadeAnimation, opacity: _rightFadeAnimation,
child: Consumer<SettingProvider>(builder: (context, settingProvider, child) { child: Consumer<SettingProvider>(builder: (context, settingProvider, child) {
return MenuAnchor( return MenuAnchor(
style: MenuStyle( style: MenuStyle(
backgroundColor: WidgetStateProperty.all(AppColor.background(context)), backgroundColor: WidgetStateProperty.all(AppColor.background(context)),
shape: WidgetStateProperty.all( shape: WidgetStateProperty.all(
RoundedRectangleBorder( RoundedRectangleBorder(
borderRadius: const BorderRadius.all(Radius.circular(20.0)), borderRadius: const BorderRadius.all(Radius.circular(20.0)),
side: BorderSide(color: AppColor.borderColor(context), width: 1), side: BorderSide(color: AppColor.borderColor(context), width: 1),
), ),
), ),
padding: WidgetStateProperty.all( padding: WidgetStateProperty.all(
EdgeInsets.symmetric( EdgeInsets.symmetric(
horizontal: 0.toScreenWidth, horizontal: 0.toScreenWidth,
vertical: 8.toScreenHeight, vertical: 8.toScreenHeight,
),
),
elevation: WidgetStateProperty.all(0),
), ),
), menuChildren: Provider.of<UserProvider>(context, listen: false).user?.assetGroups?.map<MenuItemButton>((value) {
elevation: WidgetStateProperty.all(0), return MenuItemButton(
), onPressed: () async {
menuChildren: Provider.of<UserProvider>(context, listen: false).user?.assetGroups?.map<MenuItemButton>((value) { if (settingProvider.assetGroup != value) {
return MenuItemButton( AssetGroup? tempGroup = ApiManager.instance.assetGroup;
onPressed: () async { ApiManager.instance.assetGroup = value;
if (settingProvider.assetGroup != value) {
AssetGroup? tempGroup = ApiManager.instance.assetGroup;
ApiManager.instance.assetGroup = value;
Utils.showLoading(context); Utils.showLoading(context);
bool isSuccess = await context.userProvider.userChangeAssetGroup(); bool isSuccess = await context.userProvider.userChangeAssetGroup();
Utils.hideLoading(context); Utils.hideLoading(context);
if (isSuccess) { if (isSuccess) {
await context.userProvider.getMobilePermissionByUser(); await context.userProvider.getMobilePermissionByUser();
settingProvider.setAssetGroup(value); settingProvider.setAssetGroup(value);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
context.settingProvider.setUser(ApiManager.instance.user!); context.settingProvider.setUser(ApiManager.instance.user!);
context.userProvider.setUser(ApiManager.instance.user!); context.userProvider.setUser(ApiManager.instance.user!);
DashBoardProvider dashBoardProvider = Provider.of<DashBoardProvider>(context, listen: false); DashBoardProvider dashBoardProvider = Provider.of<DashBoardProvider>(context, listen: false);
dashBoardProvider.setTabs(userType: settingProvider.user!.type!, context: context); dashBoardProvider.setTabs(userType: settingProvider.user!.type!, context: context);
dashBoardProvider.getDashBoardCount(usersType: settingProvider.user!.type!); dashBoardProvider.getDashBoardCount(usersType: settingProvider.user!.type!);
dashBoardProvider.resetRequestDataList(); dashBoardProvider.resetRequestDataList();
dashBoardProvider.getRequestDetail(usersType: settingProvider.user!.type!, status: dashBoardProvider.tabs[dashBoardProvider.currentListIndex].tag); if (dashBoardProvider.currentListIndex == null) {
}); } else {
} else { dashBoardProvider.getRequestDetail(usersType: settingProvider.user!.type!, status: dashBoardProvider.tabs[dashBoardProvider.currentListIndex!].tag);
ApiManager.instance.assetGroup = tempGroup; }
context.showConfirmDialog("Failed, Please Try again"); });
} } else {
} ApiManager.instance.assetGroup = tempGroup;
}, context.showConfirmDialog("Failed, Please Try again");
child: Text(value.name ?? "", style: AppTextStyles.bodyText2.copyWith(color: AppColor.headingTextColor(context))), }
); }
}).toList() ?? },
[], child: Text(value.name ?? "", style: AppTextStyles.bodyText2.copyWith(color: AppColor.headingTextColor(context))),
builder: (_, MenuController controller, Widget? child) { );
return Container( }).toList() ??
padding: const EdgeInsets.all(10), [],
decoration: BoxDecoration( builder: (_, MenuController controller, Widget? child) {
borderRadius: BorderRadius.circular(8), return Container(
color: AppColor.assetGroupBackground(context), padding: const EdgeInsets.all(10),
border: Border.all(color: AppColor.white936.withValues(alpha: .03), width: 1), decoration: BoxDecoration(
boxShadow: [ borderRadius: BorderRadius.circular(8),
BoxShadow(color: Colors.black.withValues(alpha: 0.03), blurRadius: 4, offset: const Offset(0, 0), spreadRadius: 0), color: AppColor.assetGroupBackground(context),
], border: Border.all(color: AppColor.white936.withValues(alpha: .03), width: 1),
), boxShadow: [
child: Row( BoxShadow(color: Colors.black.withValues(alpha: 0.03), blurRadius: 4, offset: const Offset(0, 0), spreadRadius: 0),
mainAxisSize: MainAxisSize.min, ],
spacing: 16, ),
children: [ child: Row(
Text(settingProvider.assetGroup?.name ?? "", style: AppTextStyles.bodyText2.copyWith(color: AppColor.headingTextColor(context))), mainAxisSize: MainAxisSize.min,
Icon(Icons.keyboard_arrow_down, color: AppColor.headingTextColor(context)), spacing: 16,
], children: [
), Text(settingProvider.assetGroup?.name ?? "", style: AppTextStyles.bodyText2.copyWith(color: AppColor.headingTextColor(context))),
).onPress(() { Icon(Icons.keyboard_arrow_down, color: AppColor.headingTextColor(context)),
if (controller.isOpen) { ],
controller.close(); ),
} else { ).onPress(() {
controller.open(); if (controller.isOpen) {
} controller.close();
}); } else {
}, controller.open();
); }
}), });
},
);
}),
), ),
), ),
16.width, 16.width,

150
lib/dashboard_latest/widgets/request_category_fragment.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/dashboard_latest/dashboard_provider.dart'; import 'package:test_sa/dashboard_latest/dashboard_provider.dart';
import 'package:test_sa/dashboard_latest/widgets/request_category_list.dart'; import 'package:test_sa/dashboard_latest/widgets/request_category_list.dart';
@ -15,6 +16,8 @@ import 'package:test_sa/new_views/common_widgets/tab_button.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import '../../new_views/pages/land_page/widgets/request_item_view_list.dart';
class RequestCategoryFragment extends StatefulWidget { class RequestCategoryFragment extends StatefulWidget {
const RequestCategoryFragment({Key? key}) : super(key: key); const RequestCategoryFragment({Key? key}) : super(key: key);
@ -75,13 +78,16 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
// Reload data with new sort order // Reload data with new sort order
dashboardProvider.resetRequestDataList(); dashboardProvider.resetRequestDataList();
dashboardProvider.getRequestDetail( if (dashboardProvider.currentListIndex == null) {
usersType: userType ?? UsersTypes.normal_user, } else {
showLoader: true, dashboardProvider.getRequestDetail(
status: tabs[dashboardProvider.currentListIndex].tag, usersType: userType ?? UsersTypes.normal_user,
tabId: tabs[dashboardProvider.currentListIndex].id, showLoader: true,
isAscending: isAscending, status: tabs[dashboardProvider.currentListIndex!].tag,
); tabId: tabs[dashboardProvider.currentListIndex!].id,
isAscending: isAscending,
);
}
} }
@override @override
@ -104,47 +110,62 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
opacity: _headerFadeAnimation, opacity: _headerFadeAnimation,
child: SlideTransition( child: SlideTransition(
position: _headerSlideAnimation, position: _headerSlideAnimation,
child: !isNurse && dashboardProvider.tabs.isNotEmpty && dashboardProvider.tabs[dashboardProvider.currentListIndex].tag == 0 child:
? Column( // !isNurse && dashboardProvider.tabs.isNotEmpty
crossAxisAlignment: CrossAxisAlignment.start, // //&& dashboardProvider.tabs[dashboardProvider.currentListIndex].tag == 0
children: [ // ? Column(
Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))), // crossAxisAlignment: CrossAxisAlignment.start,
// Row( // children: [
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))),
// children: [ // // Row(
// context.translation.allWorkOrder.heading4(context), // // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// GestureDetector( // // children: [
// onTap: () { // // context.translation.allWorkOrder.heading4(context),
// dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar; // // GestureDetector(
// }, // // onTap: () {
// child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset()) // // dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar;
// ], // // },
// ), // // child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset())
dashboardProvider.isShowDashBoardCalendar // // ],
? Padding( // // ),
padding: EdgeInsets.only(top: 12.toScreenHeight), // dashboardProvider.isShowDashBoardCalendar
child: const WeeklyCalendarFragment(), // ? Padding(
) // padding: EdgeInsets.only(top: 12.toScreenHeight),
: const SizedBox(), // child: const WeeklyCalendarFragment(),
], // )
).paddingOnly(start: 14, end: 12) // : const SizedBox(),
: Row( // ],
spacing: 16, // ).paddingOnly(start: 14, end: 12)
children: [ // :
Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))).expanded, Row(
// todo commenting this code, for FM spacing: 16,
// if (!isFMSEngineer) children: [
// 'search'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() { Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))).expanded,
// Navigator.of(context).pushNamed('/cleaner_search'); // todo commenting this code, for FM
// }), // if (!isFMSEngineer)
Transform.flip( // 'search'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
flipY: isAscending, // Navigator.of(context).pushNamed('/cleaner_search');
child: 'dashboard/sort_descending'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() { // }),
_toggleSort(dashboardProvider, user?.type);
}), if (dashboardProvider.listIndex.isNotEmpty)
) Text(
], 'Clear Filters',
).paddingOnly(start: 16, end: 16), style: AppTextStyles.bodyText2.copyWith(color: AppColor.red30),
).onPress(() {
dashboardProvider.resetRequestDataList();
dashboardProvider.currentListIndex = null;
Provider.of<AllRequestsProvider>(context, listen: false)
..reset()
..getAllRequests(context);
}),
Transform.flip(
flipY: isAscending,
child: 'dashboard/sort_descending'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
_toggleSort(dashboardProvider, user?.type);
}),
)
],
).paddingOnly(start: 16, end: 16),
), ),
), ),
@ -159,19 +180,26 @@ class _RequestCategoryFragmentState extends State<RequestCategoryFragment> with
// ], // ],
// ).paddingOnly(start: 16, end: 16) // ).paddingOnly(start: 16, end: 16)
// : context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16), // : context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16),
(dashboardProvider.currentListIndex == null)
dashboardProvider.isDetailLoading ? Consumer<AllRequestsProvider>(builder: (context, snapshot, _) {
? Column( return RequestItemViewList(
mainAxisSize: MainAxisSize.max, snapshot.allRequestsAndCount?.requestsDetails ?? [],
children: List.generate(3, (index) { snapshot.isAllLoading,
return Padding( key: ValueKey('request_list_'), // Key changes on every tab click
padding: EdgeInsets.symmetric(vertical: 10.toScreenHeight, horizontal: 0), );
child: const SizedBox().toRequestShimmer(context, dashboardProvider.isDetailLoading), })
); : dashboardProvider.isDetailLoading
})).paddingOnly(start: 16, end: 16, top: 16) ? Column(
: (dashboardProvider.requestDetailList == null || dashboardProvider.requestDetailList?.data?.isEmpty == true) mainAxisSize: MainAxisSize.max,
? const NoDataFound().paddingOnly(top: 80).center children: List.generate(3, (index) {
: RequestCategoryList(dashboardProvider.requestDetailList?.data ?? <Data>[], dashboardProvider.isDetailLoading, dashboardProvider.requestDetailList?.totalRows ?? 0), return Padding(
padding: EdgeInsets.symmetric(vertical: 10.toScreenHeight, horizontal: 0),
child: const SizedBox().toRequestShimmer(context, dashboardProvider.isDetailLoading),
);
})).paddingOnly(start: 16, end: 16, top: 16)
: (dashboardProvider.requestDetailList == null || dashboardProvider.requestDetailList?.data?.isEmpty == true)
? const NoDataFound().paddingOnly(top: 80).center
: RequestCategoryList(dashboardProvider.requestDetailList?.data ?? <Data>[], dashboardProvider.isDetailLoading, dashboardProvider.requestDetailList?.totalRows ?? 0),
]); ]);
}); });
} }

Write Preview
Loading…
Cancel
Save