From f5b069c31858a6092dc57c87ca277747f54094c9 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 15 Nov 2023 11:36:20 +0300 Subject: [PATCH] replace visit date to return to service --- lib/l10n/app_en.arb | 1 + lib/new_views/common_widgets/app_drawer.dart | 16 ++++++++-------- .../sub_workorder/create_sub_workorder_page.dart | 2 +- .../work_order/create_service_report.dart | 2 +- .../requests/work_order/edit_service_report.dart | 2 +- .../work_order/work_orders_list_page.dart | 12 +++++------- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 1713c757..0e2d06f4 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -128,6 +128,7 @@ "unite": "Unit", "uniteRequired": "Unit Required", "visitDate": "Visit Date", + "returnToService": "Return to service", "whatsApp": "WhatsApp", "workPerformed": "Work Performed", "actualDate": "Actual Date", diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index 43c10efc..57ee0c21 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -75,15 +75,15 @@ class AppDrawer extends StatelessWidget { children: [ drawerItem("drawer_notification", context.translation.notifications, context).onPress(() => Navigator.of(context).pushNamed(NotificationsPage.id)), 18.height, - drawerItem("help_center", context.translation.helpCenter, context) /*.onPress(() => Navigator.of(context).pushNamed(HelpCenterPage.id))*/, - 18.height, - drawerItem("rate_us", context.translation.rateUs, context), - 18.height, + // drawerItem("help_center", context.translation.helpCenter, context) /*.onPress(() => Navigator.of(context).pushNamed(HelpCenterPage.id))*/, + // 18.height, + // drawerItem("rate_us", context.translation.rateUs, context), + // 18.height, drawerItem("setting", context.translation.settings, context).onPress(() => Navigator.of(context).pushNamed(SettingsPage.id)), - 18.height, - drawerItem("report", context.translation.reportBg, context) /*.onPress(() => Navigator.of(context).pushNamed(ReportBugPage.id))*/, - 18.height, - drawerItem("whats_new", context.translation.whatsNew, context), + // 18.height, + // drawerItem("report", context.translation.reportBg, context) /*.onPress(() => Navigator.of(context).pushNamed(ReportBugPage.id))*/, + // 18.height, + // drawerItem("whats_new", context.translation.whatsNew, context), ], ).expanded, drawerItem("logout", context.translation.logout, context, color: AppColor.red50).onPress(() async { diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 796e1b9b..45cd5069 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -140,7 +140,7 @@ class _CreateSubWorkOrderPageState extends State { // WorkOrderDetails(item: widget.workOrder, assetType: _subWorkOrders?.assetType), 8.height, ADatePicker( - label: context.translation.visitDate, + label: context.translation.returnToService, date: DateTime.tryParse(_subWorkOrders.visitDate ?? ""), onDatePicker: (date) { _subWorkOrders.visitDate = date?.toIso8601String(); diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index 94698ec6..f1f5a641 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -135,7 +135,7 @@ class _CreateServiceReportState extends State with TickerPr ), 8.height, ADatePicker( - label: context.translation.visitDate, + label: context.translation.returnToService, date: DateTime.tryParse(_serviceReport.visitDate ?? ""), onDatePicker: (date) { _serviceReport.visitDate = date?.toIso8601String(); diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart index 8e03b3a1..0eb138c5 100644 --- a/lib/views/pages/user/requests/work_order/edit_service_report.dart +++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart @@ -124,7 +124,7 @@ class _EditServiceReportState extends State with TickerProvid ), 8.height, ADatePicker( - label: context.translation.visitDate, + label: context.translation.returnToService, date: DateTime.tryParse(_serviceReport.visitDate ?? ""), onDatePicker: (date) { _serviceReport.visitDate = date?.toIso8601String(); 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 0425d7ad..2a5f598b 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 @@ -116,15 +116,13 @@ class WorkOrderListPage extends StatelessWidget { 4.width, const Icon(Icons.arrow_forward, color: Color(0xFF4A8DB7), size: 14) ], - ).onPress(() { - Navigator.push( - context, - MaterialPageRoute(builder: (context) => WorkOrderDetailsPage(workOrder: workOrders[index], serviceRequest: serviceRequest)), - ); - }), + ), ], ).onPress(() { - // onPressed(request); + Navigator.push( + context, + MaterialPageRoute(builder: (context) => WorkOrderDetailsPage(workOrder: workOrders[index], serviceRequest: serviceRequest)), + ); }), ], ).toShadowContainer(context);