From 57bf34a93a6c94fc59d5ae85e9c8370a6917e1ce Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Tue, 26 Jul 2022 10:43:28 +0300 Subject: [PATCH] fix translation. --- assets/langs/ar-SA.json | 28 ++++++ assets/langs/en-US.json | 27 ++++++ lib/api/payslip/payslip_api_client.dart | 94 ------------------- lib/generated/codegen_loader.g.dart | 54 +++++++++++ lib/generated/locale_keys.g.dart | 28 ++++++ lib/ui/landing/dashboard_screen.dart | 8 +- lib/ui/landing/widget/app_drawer.dart | 6 +- .../my_attendance/my_attendance_screen.dart | 4 +- lib/ui/profile/add_update_family_member.dart | 2 +- lib/ui/profile/delete_family_member.dart | 2 +- lib/ui/profile/family_members.dart | 4 +- .../announcements/announcement_details.dart | 4 +- .../screens/announcements/announcements.dart | 6 +- lib/ui/screens/eit/add_eit.dart | 6 +- .../screens/mowadhafhi/mowadhafhi_home.dart | 2 +- .../mowadhafhi/mowadhafhi_hr_request.dart | 24 ++--- .../screens/mowadhafhi/request_details.dart | 14 +-- .../pending_transactions.dart | 8 +- .../pending_transactions_details.dart | 6 +- lib/ui/work_list/worklist_detail_screen.dart | 4 +- 20 files changed, 194 insertions(+), 137 deletions(-) delete mode 100644 lib/api/payslip/payslip_api_client.dart diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json index 219f367..2a0ba20 100644 --- a/assets/langs/ar-SA.json +++ b/assets/langs/ar-SA.json @@ -277,6 +277,34 @@ "add" : "اضافه", "myProfile": "معلوماتي", "mowadhafhi": "موظفي", + "searchAnnouncements": "بحث الاعلانات", + "announcements": "اعلانات", + "swipeRequest": "طلب تسجيل حضور", + "serviceType":"نوع الخدمه", + "departmentName":"اسم القسم", + "selectDepartment": "اختر القسم", + "relatedSection":"قسم ذو صله", + "selectSection": "اختيار القسم", + "relatedTopic": "عنوان ذو صله", + "selectTopic": "اختر العنوان", + "supportingDocument":"ارفاق مستند", + "mowadhafhiRequest": "طلب موظفي", + "ticketReference":"مرجع التذكره", + "section": "القسم", + "topic": "العنوان", + "actionBy":"الرد بواسطة", + "pending" : "معلق", + "pendingTransactions": "المعاملات المعلقه", + "selectRequestType":"الرجاء اختيار نوع الطلب", + "dateFrom":"من تاريخ", + "dateTo":"الى تاريخ", + "requestName":"اسم الطلب", + "createdFor":"انشاء لأجل", + "requestCreatedSuccessfully": "تم انشاء الطلب بنجاح", + "search": "Search", + "wantToReject": "هل انت متأكد تريد الرفض", + "Reject": "رفض", + "requestType":"نوع الطلب", "profile": { "reset_password": { "label": "Reset Password", diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json index f66f22c..59f3bf4 100644 --- a/assets/langs/en-US.json +++ b/assets/langs/en-US.json @@ -278,6 +278,33 @@ "edit" : "Edit", "myProfile": "My Profile", "mowadhafhi": "Mowadhafhi", + "searchAnnouncements": "Search Announcements", + "announcements": "Announcements", + "swipeRequest": "Swipe Request", + "serviceType":"Service Type", + "departmentName":"Department Name", + "selectDepartment": "Select Department", + "relatedSection":"Related Section", + "selectSection": "Select Section", + "relatedTopic": "Related Topic", + "selectTopic": "Select Topic", + "supportingDocument":"Supporting Document", + "mowadhafhiRequest": "Mowadhafhi Request", + "ticketReference":"Ticket Reference", + "section": "Section", + "topic": "Topic", + "actionBy":"Action By", + "pendingTransactions": "Pending Transactions", + "selectRequestType":"Please select request type", + "dateFrom":"Date From", + "dateTo":"Date To", + "requestName":"Request Name", + "createdFor":"Created For", + "requestType":"Request Type", + "requestCreatedSuccessfully": "Request created successfully", + "search": "Search", + "wantToReject": "Are you sure want to reject?", + "reject": "Reject", "profile": { "reset_password": { "label": "Reset Password", diff --git a/lib/api/payslip/payslip_api_client.dart b/lib/api/payslip/payslip_api_client.dart deleted file mode 100644 index eff8608..0000000 --- a/lib/api/payslip/payslip_api_client.dart +++ /dev/null @@ -1,94 +0,0 @@ - - -import 'dart:async'; - -import 'package:mohem_flutter_app/api/api_client.dart'; -import 'package:mohem_flutter_app/app_state/app_state.dart'; -import 'package:mohem_flutter_app/classes/consts.dart'; -import 'package:mohem_flutter_app/models/generic_response_model.dart'; -import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart'; -import 'package:mohem_flutter_app/models/payslip/get_deductions_list.dart'; -import 'package:mohem_flutter_app/models/payslip/get_earnings_list.dart'; -import 'package:mohem_flutter_app/models/payslip/get_payment_information.dart'; -import 'package:mohem_flutter_app/models/payslip/get_payslip.dart'; -import 'package:mohem_flutter_app/models/payslip/get_summary_of_payment.dart'; - - -class PayslipApiClient { - static final PayslipApiClient _instance = PayslipApiClient._internal(); - - PayslipApiClient._internal(); - - factory PayslipApiClient() => _instance; - - Future> getPayslip() async { - String url = "${ApiConsts.erpRest}GET_PAYSLIP"; - Map postParams = { - "P_MENU_TYPE": "E", - "P_SELECTED_RESP_ID": -999, - }; - postParams.addAll(AppState().postParamsJson); - return await ApiClient().postJsonForObject((json) { - GenericResponseModel? responseData = GenericResponseModel.fromJson(json); - print(responseData); - return responseData.getPayslipList ?? []; - }, url, postParams); - } - - Future> getSummaryOfPayment() async { - String url = "${ApiConsts.erpRest}GET_SUMMARY_OF_PAYMENT"; - Map postParams = { - "P_ACTION_CONTEXT_ID": 188844253, - }; - postParams.addAll(AppState().postParamsJson); - return await ApiClient().postJsonForObject((json) { - GenericResponseModel? responseData = GenericResponseModel.fromJson(json); - print(responseData); - return responseData.getSummaryOfPaymentList ?? []; - }, url, postParams); - } - - Future> getPaymentInfo() async { - String url = "${ApiConsts.erpRest}GET_PAYMENT_INFORMATION"; - Map postParams = { - "P_ACTION_CONTEXT_ID": 188844253, - }; - postParams.addAll(AppState().postParamsJson); - return await ApiClient().postJsonForObject((json) { - GenericResponseModel? responseData = GenericResponseModel.fromJson(json); - print(responseData); - return responseData.getPaymentInformationList ?? []; - }, url, postParams); - } - - Future> getDeductionsList() async { - String url = "${ApiConsts.erpRest}GET_DEDUCTIONS"; - Map postParams = { - "P_ACTION_CONTEXT_ID": 188844253, - "P_PAGE_LIMIT": 100, - "P_PAGE_NUM": 1 - }; - postParams.addAll(AppState().postParamsJson); - return await ApiClient().postJsonForObject((json) { - GenericResponseModel? responseData = GenericResponseModel.fromJson(json); - print(responseData); - return responseData.getDeductionsList ?? []; - }, url, postParams); - } - - - Future> getEarningsList() async { - String url = "${ApiConsts.erpRest}GET_EARNINGS"; - Map postParams = { - "P_ACTION_CONTEXT_ID": 188844253, - "P_PAGE_LIMIT": 100, - "P_PAGE_NUM": 1 - }; - postParams.addAll(AppState().postParamsJson); - return await ApiClient().postJsonForObject((json) { - GenericResponseModel? responseData = GenericResponseModel.fromJson(json); - print(responseData); - return responseData.getEarningsList ?? []; - }, url, postParams); - } -} \ No newline at end of file diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 13b2b3e..2d198cb 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -293,6 +293,34 @@ class CodegenLoader extends AssetLoader{ "add": "اضافه", "myProfile": "معلوماتي", "mowadhafhi": "موظفي", + "searchAnnouncements": "بحث الاعلانات", + "announcements": "اعلانات", + "swipeRequest": "طلب تسجيل حضور", + "serviceType": "نوع الخدمه", + "departmentName": "اسم القسم", + "selectDepartment": "اختر القسم", + "relatedSection": "قسم ذو صله", + "selectSection": "اختيار القسم", + "relatedTopic": "عنوان ذو صله", + "selectTopic": "اختر العنوان", + "supportingDocument": "ارفاق مستند", + "mowadhafhiRequest": "طلب موظفي", + "ticketReference": "مرجع التذكره", + "section": "القسم", + "topic": "العنوان", + "actionBy": "الرد بواسطة", + "pending": "معلق", + "pendingTransactions": "المعاملات المعلقه", + "selectRequestType": "الرجاء اختيار نوع الطلب", + "dateFrom": "من تاريخ", + "dateTo": "الى تاريخ", + "requestName": "اسم الطلب", + "createdFor": "انشاء لأجل", + "requestCreatedSuccessfully": "تم انشاء الطلب بنجاح", + "search": "Search", + "wantToReject": "هل انت متأكد تريد الرفض", + "Reject": "رفض", + "requestType": "نوع الطلب", "profile": { "reset_password": { "label": "Reset Password", @@ -604,6 +632,32 @@ static const Map en_US = { "edit": "Edit", "myProfile": "My Profile", "mowadhafhi": "Mowadhafhi", + "searchAnnouncements": "Search Announcements", + "announcements": "Announcements", + "swipeRequest": "Swipe Request", + "serviceType": "Service Type", + "departmentName": "Department Name", + "selectDepartment": "Select Department", + "relatedSection": "Related Section", + "selectSection": "Select Section", + "relatedTopic": "Related Topic", + "selectTopic": "Select Topic", + "supportingDocument": "Supporting Document", + "mowadhafhiRequest": "Mowadhafhi Request", + "ticketReference": "Ticket Reference", + "section": "Section", + "topic": "Topic", + "actionBy": "Action By", + "pendingTransactions": "Pending Transactions", + "selectRequestType": "Please select request type", + "dateFrom": "Date From", + "dateTo": "Date To", + "requestName": "Request Name", + "createdFor": "Created For", + "requestType": "Request Type", + "requestCreatedSuccessfully": "Request created successfully", + "search": "Search", + "wantToReject": "Are you sure want to reject?", "profile": { "reset_password": { "label": "Reset Password", diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 07c5cde..8b9f42a 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -278,6 +278,34 @@ abstract class LocaleKeys { static const add = 'add'; static const myProfile = 'myProfile'; static const mowadhafhi = 'mowadhafhi'; + static const searchAnnouncements = 'searchAnnouncements'; + static const announcements = 'announcements'; + static const swipeRequest = 'swipeRequest'; + static const serviceType = 'serviceType'; + static const departmentName = 'departmentName'; + static const selectDepartment = 'selectDepartment'; + static const relatedSection = 'relatedSection'; + static const selectSection = 'selectSection'; + static const relatedTopic = 'relatedTopic'; + static const selectTopic = 'selectTopic'; + static const supportingDocument = 'supportingDocument'; + static const mowadhafhiRequest = 'mowadhafhiRequest'; + static const ticketReference = 'ticketReference'; + static const section = 'section'; + static const topic = 'topic'; + static const actionBy = 'actionBy'; + static const pending = 'pending'; + static const pendingTransactions = 'pendingTransactions'; + static const selectRequestType = 'selectRequestType'; + static const dateFrom = 'dateFrom'; + static const dateTo = 'dateTo'; + static const requestName = 'requestName'; + static const createdFor = 'createdFor'; + static const requestCreatedSuccessfully = 'requestCreatedSuccessfully'; + static const search = 'search'; + static const wantToReject = 'wantToReject'; + static const Reject = 'Reject'; + static const requestType = 'requestType'; static const profile_reset_password_label = 'profile.reset_password.label'; static const profile_reset_password_username = 'profile.reset_password.username'; static const profile_reset_password_password = 'profile.reset_password.password'; diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index c125c2d..74688da 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -334,7 +334,7 @@ class _DashboardScreenState extends State { height: 20, ), ), - label: 'Home', + label: LocaleKeys.home.tr(), ), BottomNavigationBarItem( icon: Padding( @@ -345,7 +345,7 @@ class _DashboardScreenState extends State { height: 20, ), ), - label: 'Create Request', + label: LocaleKeys.createRequest.tr(), ), BottomNavigationBarItem( icon: Padding( @@ -356,7 +356,7 @@ class _DashboardScreenState extends State { height: 20, ), ), - label: 'Work List', + label: LocaleKeys.workList.tr(), ), BottomNavigationBarItem( icon: Padding( @@ -367,7 +367,7 @@ class _DashboardScreenState extends State { height: 20, ), ), - label: 'Items for Sale', + label: LocaleKeys.itemsForSale.tr(), ), ], currentIndex: 0, diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index 9b63ded..fb7421b 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/lib/ui/landing/widget/app_drawer.dart @@ -1,6 +1,8 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:mohem_flutter_app/config/routes.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/ui/landing/widget/drawer_item.dart'; class AppDrawer extends StatefulWidget { @@ -26,7 +28,7 @@ class _AppDrawerState extends State { children: [ const Divider(), InkWell( - child: const DrawerItem( + child: new DrawerItem( //'My Profile', LocaleKeys.myProfile.tr(), icon: Icons.person, @@ -37,7 +39,7 @@ class _AppDrawerState extends State { }), const Divider(), InkWell( - child: const DrawerItem( + child: new DrawerItem( // 'Mowadhafhi', LocaleKeys.mowadhafhi.tr(), icon: Icons.person, diff --git a/lib/ui/my_attendance/my_attendance_screen.dart b/lib/ui/my_attendance/my_attendance_screen.dart index e037d6f..cfa8eee 100644 --- a/lib/ui/my_attendance/my_attendance_screen.dart +++ b/lib/ui/my_attendance/my_attendance_screen.dart @@ -38,8 +38,8 @@ class MyAttendanceScreen extends StatelessWidget { "assets/images/pdf.svg", LocaleKeys.myAttendance.tr(), ).onPress(() { - Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(LocaleKeys.missingSwipes.tr(), "HMG_OTL_MISSING_SWIPE_EIT_SS")); - }), + Navigator.pushNamed(context, AppRoutes.monthlyAttendance, arguments: DynamicListViewParams(LocaleKeys.missingSwipes.tr(), "HMG_OTL_MISSING_SWIPE_EIT_SS")); + }).paddingOnly(left: 21, right: 21), 12.height, ListView.separated( padding: const EdgeInsets.all(21), diff --git a/lib/ui/profile/add_update_family_member.dart b/lib/ui/profile/add_update_family_member.dart index cd84051..777f00d 100644 --- a/lib/ui/profile/add_update_family_member.dart +++ b/lib/ui/profile/add_update_family_member.dart @@ -361,7 +361,7 @@ else if(args['actionType']== "UPDATE") { return time; } - footer() { + Widget footer() { return Container( color: MyColors.white, child: Row( diff --git a/lib/ui/profile/delete_family_member.dart b/lib/ui/profile/delete_family_member.dart index e9c252c..a699fc9 100644 --- a/lib/ui/profile/delete_family_member.dart +++ b/lib/ui/profile/delete_family_member.dart @@ -88,7 +88,7 @@ class _DeleteFamilyMemberState extends State { )); } - footer() { + Widget footer() { return Container( color: MyColors.white, child: Row( diff --git a/lib/ui/profile/family_members.dart b/lib/ui/profile/family_members.dart index 3578aff..ffb52c2 100644 --- a/lib/ui/profile/family_members.dart +++ b/lib/ui/profile/family_members.dart @@ -200,7 +200,7 @@ class _FamilyMembersState extends State { )); } - footer() { + Widget footer() { return Container( decoration: BoxDecoration( // borderRadius: BorderRadius.circular(10), @@ -252,7 +252,7 @@ class _FamilyMembersState extends State { ); } - showRemoveAlertDialog(BuildContext context, int relationId) { + void showRemoveAlertDialog(BuildContext context, int relationId) { Widget cancelButton = TextButton( child: Text( LocaleKeys.cancel.tr(), diff --git a/lib/ui/screens/announcements/announcement_details.dart b/lib/ui/screens/announcements/announcement_details.dart index 6909be5..a788b5d 100644 --- a/lib/ui/screens/announcements/announcement_details.dart +++ b/lib/ui/screens/announcements/announcement_details.dart @@ -1,9 +1,11 @@ import 'dart:convert'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/get_announcement_details.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; @@ -33,7 +35,7 @@ class _AnnouncementDetailsState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Announcements", + title: LocaleKeys.announcements.tr(), ), body: SingleChildScrollView( child: Container( diff --git a/lib/ui/screens/announcements/announcements.dart b/lib/ui/screens/announcements/announcements.dart index cad3a9a..f367157 100644 --- a/lib/ui/screens/announcements/announcements.dart +++ b/lib/ui/screens/announcements/announcements.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart'; @@ -8,6 +9,7 @@ import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/get_announcements.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart'; @@ -40,7 +42,7 @@ class _AnnouncementsState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Announcements", + title: LocaleKeys.announcements.tr(), ), body: getAnnouncementsObject.isNotEmpty ? Container( @@ -54,7 +56,7 @@ class _AnnouncementsState extends State { margin: const EdgeInsets.fromLTRB(12.0, 0.0, 12.0, 0.0), child: DynamicTextFieldWidget( "Search", - "Search Announcements", + LocaleKeys.searchAnnouncements.tr(), isEnable: true, suffixIconData: Icons.search, isPopup: false, diff --git a/lib/ui/screens/eit/add_eit.dart b/lib/ui/screens/eit/add_eit.dart index 0dbcd1c..629fbd0 100644 --- a/lib/ui/screens/eit/add_eit.dart +++ b/lib/ui/screens/eit/add_eit.dart @@ -1,5 +1,7 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/dashboard/menu_entries.dart'; import 'package:mohem_flutter_app/models/dashboard/menus.dart'; import 'package:mohem_flutter_app/provider/eit_provider_model.dart'; @@ -45,10 +47,10 @@ class AddEITScreen extends StatelessWidget { labelColor: Colors.white, tabs: [ Tab( - text: "Missing Swipe", + text: LocaleKeys.missingSwipes.tr(), ), Tab( - text: "Swipe Request", + text: LocaleKeys.swipeRequest.tr(), ), ], ), diff --git a/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart b/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart index f3ae4f8..edf6b03 100644 --- a/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart +++ b/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart @@ -34,7 +34,7 @@ class _MowadhafhiHomeState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Mowadhafhi Request", + title: LocaleKeys.mowadhafhiRequest.tr(), ), body: Container( margin: const EdgeInsets.only(top: 10.0), diff --git a/lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart b/lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart index 4ee819d..b557ab9 100644 --- a/lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart +++ b/lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:easy_localization/easy_localization.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/api/mowadhafhi/mowadhafhi_api_client.dart'; @@ -9,6 +10,7 @@ import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_department_sections.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_project_departments.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_projects.dart'; @@ -56,7 +58,7 @@ class _MowadhafhiHRRequestState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Mowadhafhi Request", + title: LocaleKeys.mowadhafhiRequest.tr(), ), body: SingleChildScrollView( child: getTicketTypesList.isNotEmpty @@ -78,7 +80,7 @@ class _MowadhafhiHRRequestState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - "Service Type: ".toText16(), + LocaleKeys.serviceType.tr().toText16(), 12.height, Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -108,11 +110,11 @@ class _MowadhafhiHRRequestState extends State { ], ), 12.height, - "Department Name: ".toText16(), + LocaleKeys.departmentName.tr().toText16(), 12.height, PopupMenuButton( child: DynamicTextFieldWidget( - "Select Department", + LocaleKeys.selectDepartment.tr(), selectedDepartment?.departmentName ?? "", isEnable: false, isPopup: true, @@ -128,11 +130,11 @@ class _MowadhafhiHRRequestState extends State { setState(() {}); }), 12.height, - "Related Section: ".toText16(), + LocaleKeys.relatedSection.tr().toText16(), 12.height, PopupMenuButton( child: DynamicTextFieldWidget( - "Select Section", + LocaleKeys.selectSection.tr(), selectedSection?.sectionName ?? "", isEnable: false, isPopup: true, @@ -148,11 +150,11 @@ class _MowadhafhiHRRequestState extends State { setState(() {}); }), 12.height, - "Related Topic: ".toText16(), + LocaleKeys.relatedTopic.tr().toText16(), 12.height, PopupMenuButton( child: DynamicTextFieldWidget( - "Select Topic", + LocaleKeys.selectTopic.tr(), selectedTopic?.topicName ?? "", isEnable: false, isPopup: true, @@ -168,11 +170,11 @@ class _MowadhafhiHRRequestState extends State { setState(() {}); }), 12.height, - "Supporting Document: ".toText16(), + LocaleKeys.supportingDocument.tr().toText16(), 12.height, attachmentView("Attachments"), 12.height, - "Description: ".toText16(), + LocaleKeys.description.tr().toText16(), 12.height, DynamicTextFieldWidget( "", @@ -203,7 +205,7 @@ class _MowadhafhiHRRequestState extends State { 12.width, Expanded( child: DefaultButton( - "Submit", + LocaleKeys.submit.tr(), !checkValidation() ? null : () { diff --git a/lib/ui/screens/mowadhafhi/request_details.dart b/lib/ui/screens/mowadhafhi/request_details.dart index 9426929..aa22bdd 100644 --- a/lib/ui/screens/mowadhafhi/request_details.dart +++ b/lib/ui/screens/mowadhafhi/request_details.dart @@ -1,9 +1,11 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/api/mowadhafhi/mowadhafhi_api_client.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_ticket_details.dart'; import 'package:mohem_flutter_app/models/mowadhafhi/get_ticket_transactions.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; @@ -41,7 +43,7 @@ class _RequestDetailsState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Mowadhafhi Request", + title: LocaleKeys.mowadhafhiRequest.tr(), ), body: SingleChildScrollView( child: getTicketsByEmployeeList.length != 0 @@ -74,16 +76,16 @@ class _RequestDetailsState extends State { ], ), 8.height, - "Ticket Reference: ".toText12(color: MyColors.grey98Color), + LocaleKeys.ticketReference.tr().toText12(color: MyColors.grey98Color), getTicketsByEmployeeList![0].ticketReferenceNo!.toText14(color: MyColors.grey57Color), 8.height, - "Section: ".toText12(color: MyColors.grey98Color), + LocaleKeys.section.tr().toText12(color: MyColors.grey98Color), getTicketsByEmployeeList![0].sectionName!.toText14(color: MyColors.grey57Color), 8.height, - "Topic: ".toText12(color: MyColors.grey98Color), + LocaleKeys.topic.tr().toText12(color: MyColors.grey98Color), getTicketsByEmployeeList![0].topicName!.toText14(color: MyColors.grey57Color), 8.height, - "Description: ".toText12(color: MyColors.grey98Color), + LocaleKeys.description.tr().toText12(color: MyColors.grey98Color), getTicketsByEmployeeList![0].description!.toText14(color: MyColors.grey57Color), ], ), @@ -125,7 +127,7 @@ class _RequestDetailsState extends State { children: [ Row( children: [ - "Action By: ".toText14(color: MyColors.grey57Color), + LocaleKeys.actionBy.tr().toText14(color: MyColors.grey57Color), getTicketTransactionsList![index].actionBy!.toText14(color: MyColors.grey57Color), ], ), diff --git a/lib/ui/screens/pending_transactions/pending_transactions.dart b/lib/ui/screens/pending_transactions/pending_transactions.dart index 98d7fe3..997ec0d 100644 --- a/lib/ui/screens/pending_transactions/pending_transactions.dart +++ b/lib/ui/screens/pending_transactions/pending_transactions.dart @@ -42,7 +42,7 @@ class _PendingTransactionsState extends State { backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Pending Transactions", + title: LocaleKeys.pendingTransactions.tr(), ), body: SingleChildScrollView( child: Container( @@ -65,7 +65,7 @@ class _PendingTransactionsState extends State { 12.height, PopupMenuButton( child: DynamicTextFieldWidget( - "Please select request type", + LocaleKeys.selectRequestType.tr(), selectedFunction?.fUNCTIONPROMPT ?? "", isEnable: false, isPopup: true, @@ -81,7 +81,7 @@ class _PendingTransactionsState extends State { }), 12.height, DynamicTextFieldWidget( - "Date From: ", + LocaleKeys.dateFrom.tr(), selectedDateFrom.toString().split(" ")[0], suffixIconData: Icons.calendar_today, isEnable: false, @@ -92,7 +92,7 @@ class _PendingTransactionsState extends State { ).paddingOnly(bottom: 12), 12.height, DynamicTextFieldWidget( - "Date To: ", + LocaleKeys.dateTo.tr(), selectedDateTo.toString().split(" ")[0], suffixIconData: Icons.calendar_today, isEnable: false, diff --git a/lib/ui/screens/pending_transactions/pending_transactions_details.dart b/lib/ui/screens/pending_transactions/pending_transactions_details.dart index 1877c5b..2c8895a 100644 --- a/lib/ui/screens/pending_transactions/pending_transactions_details.dart +++ b/lib/ui/screens/pending_transactions/pending_transactions_details.dart @@ -1,9 +1,11 @@ +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart'; import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart'; +import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/models/pending_transactions/get_pending_transactions_details.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; @@ -43,7 +45,7 @@ class _PendingTransactionsDetailsState extends State backgroundColor: Colors.white, appBar: AppBarWidget( context, - title: "Pending Transactions", + title: LocaleKeys.pendingTransactions.tr(), ), body: getPendingTransactionsDetails.isNotEmpty ? Container( @@ -105,7 +107,7 @@ class _PendingTransactionsDetailsState extends State padding: const EdgeInsets.only(top: 0.0), child: Row( children: [ - "Request Type: ".toText14(color: MyColors.grey57Color), + LocaleKeys.requestType.tr().toText14(color: MyColors.grey57Color), getPendingTransactionsDetails[index].rEQUESTTYPE!.toText14(color: MyColors.redColor), ], ), diff --git a/lib/ui/work_list/worklist_detail_screen.dart b/lib/ui/work_list/worklist_detail_screen.dart index 6ad0a79..d2a0e0b 100644 --- a/lib/ui/work_list/worklist_detail_screen.dart +++ b/lib/ui/work_list/worklist_detail_screen.dart @@ -395,8 +395,8 @@ class _WorkListDetailScreenState extends State { showDialog( context: context, builder: (cxt) => ConfirmDialog( - message: "Are you sure want to reject?", - okTitle: "Reject", + message: LocaleKeys.wantToReject.tr(), + okTitle: LocaleKeys.reject.tr(), onTap: () async { Navigator.pop(cxt); Utils.showLoading(context);