diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 7cd33c40..4521ebac 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -82,7 +82,7 @@ class AllRequestsProvider extends ChangeNotifier { } } - Future getCalenderRequests({@required DateTime from, DateTime to}) async { + Future getCalendarRequests({@required DateTime from, DateTime to}) async { if (isCalendarLoading == true) return -2; isCalendarLoading = true; notifyListeners(); diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index 81bb11bb..fee6f5e8 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -309,7 +309,7 @@ "updateWorkOrder" : "تعديل طلب العمل", "createPreventiveMaintenanceRequest" : "إنشاء طلب صيانة وقائية", "createNewRequest" : "إنشاء طلب جديد", - "calender" : "التقويم", + "calendar" : "التقويم", "helpCenter" : "مركز المساعدة", "rateUs": "قيمنا", "settings" : " الاعدادات", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index fed81f30..93773057 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -314,7 +314,7 @@ "updateWorkOrder" : "Update Work Order", "createPreventiveMaintenanceRequest" : "Create Preventive Maintenance Request", "createNewRequest" : "Create New Request", - "calender" : "Calender", + "calendar" : "Calendar", "helpCenter" : "Help Center", "rateUs": "Rate Us", "settings" : "Settings", diff --git a/lib/new_views/common_widgets/app_bottom_nav_bar.dart b/lib/new_views/common_widgets/app_bottom_nav_bar.dart index c747d4e0..6336b1ac 100644 --- a/lib/new_views/common_widgets/app_bottom_nav_bar.dart +++ b/lib/new_views/common_widgets/app_bottom_nav_bar.dart @@ -30,7 +30,7 @@ class AppBottomNavigationBar extends StatelessWidget { navBarItem(context, index: 0, iconName: "overview", label: context.translation.overview), navBarItem(context, index: 1, iconName: "requests", label: context.translation.myRequests), navBarItem(context, index: 2, iconName: "assets", label: context.translation.myAssets), - if (isEngineer) navBarItem(context, index: 3, iconName: "calender_bottom", label: context.translation.calender), + if (isEngineer) navBarItem(context, index: 3, iconName: "calender_bottom", label: context.translation.calendar), navBarItem(context, index: isEngineer ? 4 : 3, iconName: "message", label: context.translation.contactUs), ], currentIndex: selectedIndex, diff --git a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart index bde8cb27..c6c53064 100644 --- a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart @@ -26,7 +26,7 @@ class _DailyFragmentState extends State { @override void initState() { super.initState(); - Provider.of(context, listen: false).getCalenderRequests(from: DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day)); + Provider.of(context, listen: false).getCalendarRequests(from: DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day)); } @override 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 ca1a6efb..512e1d22 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 @@ -30,7 +30,7 @@ class _MonthlyFragmentState extends State { _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); Provider.of(context, listen: false) - .getCalenderRequests(from: DateTime(DateTime.now().year, DateTime.now().month, 1), to: DateTime(DateTime.now().year, DateTime.now().month + 1, 0)); + .getCalendarRequests(from: DateTime(DateTime.now().year, DateTime.now().month, 1), to: DateTime(DateTime.now().year, DateTime.now().month + 1, 0)); } @override @@ -64,7 +64,7 @@ class _MonthlyFragmentState extends State { lastDate: _lastDate, ); if (result != null) { - await snapshot.getCalenderRequests(from: DateTime(result.year, result.month, 1), to: DateTime(result.year, result.month + 1, 0)); + await snapshot.getCalendarRequests(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 76fad171..02ab916b 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 @@ -34,7 +34,7 @@ class _WeeklyFragmentState extends State { _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); 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))); + .getCalendarRequests(from: DateTime.now().subtract(Duration(days: DateTime.now().weekday)), to: DateTime.now().add(Duration(days: DateTime.daysPerWeek - DateTime.now().weekday - 1))); } @override @@ -57,7 +57,7 @@ class _WeeklyFragmentState extends State { _initialDate = date; Provider.of(context, listen: false) - .getCalenderRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday - 1))); + .getCalendarRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday - 1))); } }, calendarBuilders: CalendarBuilders(