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

Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

Browse Source
main_design2.0
Sikander Saleem 2 years ago
parent 29e414a703 114a0b9e40
commit a602dbe2eb
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File

8
lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart
Unescape Escape View File

@ -29,8 +29,8 @@ class _MonthlyFragmentState extends State<MonthlyFragment> {
_firstDate = DateTime.utc(2010, 10, 16);
_lastDate = DateTime.utc(2030, 3, 14);
Provider.of<AllRequestsProvider>(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<MonthlyFragment> {
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(() {});
}

7
lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart
Unescape Escape View File

@ -33,7 +33,9 @@ class _WeeklyFragmentState extends State<WeeklyFragment> {
_initialDate = DateTime.now();
_firstDate = DateTime.utc(2010, 10, 16);
_lastDate = DateTime.utc(2030, 3, 14);
Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(from: DateTime.now().subtract(const Duration(days: 7)), to: DateTime.now());
Provider.of<AllRequestsProvider>(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<WeeklyFragment> {
onCalendarCreated: (controller) {},
onPageChanged: (date) {
_initialDate = date;
Provider.of<AllRequestsProvider>(context, listen: false).getCalenderRequests(from: date, to: date.add(const Duration(days: 7)));
Provider.of<AllRequestsProvider>(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(

3
lib/new_views/pages/land_page/dashboard_page.dart
Unescape Escape View File

@ -37,6 +37,7 @@ class _DashboardPageState extends State<DashboardPage> {
@override
Widget build(BuildContext context) {
final user = Provider.of<UserProvider>(context, listen: false).user;
return Scaffold(
appBar: AppBar(
automaticallyImplyLeading: false,
@ -105,7 +106,7 @@ class _DashboardPageState extends State<DashboardPage> {
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,

23
lib/views/pages/user/requests/work_order/work_orders_list_page.dart
Unescape Escape View File

@ -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<SearchWorkOrder>;
@ -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 {
],
);
},
)));
),
),
);
}
}

Write Preview
Loading…
Cancel
Save