From 15c98e873e06ae14edfc2f1a787e1368b4904b0c Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Tue, 14 Nov 2023 13:51:24 +0300 Subject: [PATCH 1/2] Enhancement --- .../pages/land_page/dashboard_page.dart | 4 +++- .../work_order/work_orders_list_page.dart | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lib/new_views/pages/land_page/dashboard_page.dart b/lib/new_views/pages/land_page/dashboard_page.dart index 8368265d..c856f5d7 100644 --- a/lib/new_views/pages/land_page/dashboard_page.dart +++ b/lib/new_views/pages/land_page/dashboard_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.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/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; @@ -36,6 +37,7 @@ class _DashboardPageState extends State { @override Widget build(BuildContext context) { + final user = Provider.of(context, listen: false).user; return Scaffold( appBar: AppBar( automaticallyImplyLeading: false, @@ -98,7 +100,7 @@ class _DashboardPageState extends State { style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), Text( - "Eng Mahmoud", + user.username ?? "Eng Mahmoud", style: AppTextStyles.heading2.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, fontWeight: FontWeight.w600), ), 24.height, diff --git a/lib/views/pages/user/requests/work_order/work_orders_list_page.dart b/lib/views/pages/user/requests/work_order/work_orders_list_page.dart index 334f8cc9..0425d7ad 100644 --- a/lib/views/pages/user/requests/work_order/work_orders_list_page.dart +++ b/lib/views/pages/user/requests/work_order/work_orders_list_page.dart @@ -37,10 +37,10 @@ class WorkOrderListPage extends StatelessWidget { } print("serviceRequest.statusValue:${serviceRequest.statusValue}"); return Scaffold( - appBar: DefaultAppBar(title: context.translation.workOrders), - //backgroundColor: const Color(0xfff8f9fb), - body: SafeArea( - child: FutureBuilder( + appBar: DefaultAppBar(title: context.translation.workOrders), + //backgroundColor: const Color(0xfff8f9fb), + body: SafeArea( + child: FutureBuilder( future: serviceRequestsProvider.searchWorkOrders(callId: serviceRequest.requestCode), builder: (context, snap) { workOrders = snap.data as List; @@ -72,7 +72,7 @@ class WorkOrderListPage extends StatelessWidget { children: [ StatusLabel(label: workOrders[index].currentSituation.name, textColor: AppColor.orange60, backgroundColor: AppColor.orange40), 8.height, - Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark?AppColor.neutral30:const Color(0xFF3B3D4A))), + Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : const Color(0xFF3B3D4A))), ], ).expanded, if (_userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) @@ -93,15 +93,16 @@ class WorkOrderListPage extends StatelessWidget { children: [ Text( '${context.translation.assetName}: ${workOrders[index].callRequest.asset.modelDefinition.assetName}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark?AppColor.neutral10:const Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : const Color(0xFF757575)), ), Text( '${context.translation.status}: ${workOrders[index].currentSituation.name}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark?AppColor.neutral10:const Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : const Color(0xFF757575)), ), ], ).expanded, - Text(workOrders[index].visitDate?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral30:const Color(0xFF3B3D4A))), + Text(workOrders[index].visitDate?.toServiceRequestCardFormat ?? "", + textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral30 : const Color(0xFF3B3D4A))), ], ), 16.height, @@ -122,7 +123,7 @@ class WorkOrderListPage extends StatelessWidget { ); }), ], - ).paddingAll(16).onPress(() { + ).onPress(() { // onPressed(request); }), ], @@ -140,6 +141,8 @@ class WorkOrderListPage extends StatelessWidget { ], ); }, - ))); + ), + ), + ); } } From 114a0b9e402f1049e3631d0ea21565e3bb2c5ae3 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Tue, 14 Nov 2023 14:54:08 +0300 Subject: [PATCH 2/2] On calendar weekly swipe data calling issue Also on monthly --- .../land_page/calender_fragments/monthly_fragment.dart | 8 +++++--- .../land_page/calender_fragments/weekly_fragment.dart | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index b7c139bc..7d153145 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -29,8 +29,8 @@ class _MonthlyFragmentState extends State { _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); Provider.of(context, listen: false).getCalenderRequests( - from: DateTime.now().subtract(const Duration(days: 31)), - to: DateTime.now(), + from: DateTime(DateTime.now().year, DateTime.now().month, 1), + to:DateTime(DateTime.now().year, DateTime.now().month +1, 0) ); } @@ -59,7 +59,9 @@ class _MonthlyFragmentState extends State { initialDatePickerMode: DatePickerMode.year, ); if (result != null) { - await snapshot.getCalenderRequests(from: DateTime(result.year, result.month), to: DateTime.now()); + await snapshot.getCalenderRequests( + from: DateTime(result.year, result.month, 1), + to: DateTime(result.year, result.month+1, 0)); _initialDate = result; setState(() {}); } diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index 38ff0a7c..f8e2801e 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -33,7 +33,9 @@ class _WeeklyFragmentState extends State { _initialDate = DateTime.now(); _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); - Provider.of(context, listen: false).getCalenderRequests(from: DateTime.now().subtract(const Duration(days: 7)), to: DateTime.now()); + Provider.of(context, listen: false).getCalenderRequests( + from: DateTime.now().subtract(Duration(days: DateTime.now().weekday)), + to: DateTime.now().add(Duration(days: DateTime.daysPerWeek - DateTime.now().weekday -1))); } @override @@ -58,7 +60,8 @@ class _WeeklyFragmentState extends State { onCalendarCreated: (controller) {}, onPageChanged: (date) { _initialDate = date; - Provider.of(context, listen: false).getCalenderRequests(from: date, to: date.add(const Duration(days: 7))); + + Provider.of(context, listen: false).getCalenderRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday -1))); }, calendarBuilders: CalendarBuilders( headerTitleBuilder: (context, dateTime) => Column(