From d6cc5fcc6cc5d93852b490f76cfc91e9629a8a92 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 25 Aug 2022 12:40:52 +0300 Subject: [PATCH] pending transaction. --- analysis_options.yaml | 2 + lib/classes/date_uitl.dart | 8 +- lib/models/add_att_success_list_model.dart | 4 +- lib/models/add_attachment_list_model.dart | 2 +- lib/models/attachment_model.dart | 2 +- .../basic_member_information_model.dart | 2 +- .../check_mobile_app_version_model.dart | 2 +- lib/models/content_info_model.dart | 4 +- .../get_set_values_request_model.dart | 2 +- .../validate_eit_transaction_model.dart | 2 +- lib/models/eit/get_eit_transaction_model.dart | 4 +- lib/models/generic_response_model.dart | 2 +- ...llection_notification_body_list_model.dart | 4 +- lib/models/get_action_history_list_model.dart | 2 +- lib/models/get_announcement_details.dart | 2 +- lib/models/get_announcements.dart | 2 +- lib/models/get_approves_list_model.dart | 2 +- lib/models/get_attachement_list_model.dart | 2 +- .../get_contact_dff_structure_list.dart | 2 +- ...get_day_hours_type_details_list_model.dart | 2 +- lib/models/get_default_value_list_model.dart | 2 +- .../get_eit_dff_structure_list_model.dart | 10 +- .../get_eit_transaction_list_model.dart | 4 +- lib/models/get_employee_address_model.dart | 2 +- .../get_employee_basic_details.model.dart | 2 +- lib/models/get_employee_contacts.model.dart | 2 +- lib/models/get_employee_phones_model.dart | 2 +- ...get_item_creation_ntf_body_list_model.dart | 6 +- .../get_mo_Item_history_list_model.dart | 2 +- .../get_mo_notification_body_list_model.dart | 2 +- .../get_mobile_login_info_list_model.dart | 2 +- .../get_notification_buttons_list_model.dart | 2 +- .../get_po_Item_history_list_model.dart | 2 +- .../get_po_notification_body_list_model.dart | 6 +- .../get_quotation_analysis_list_model.dart | 2 +- ...et_schedule_shifts_details_list_model.dart | 2 +- ...stamp_ms_notification_body_list_model.dart | 2 +- ...stamp_ns_notification_body_list_model.dart | 2 +- .../get_time_card_summary_list_model.dart | 2 +- .../allowed_actions_model.dart | 2 +- .../itg_forms_models/field_goups_model.dart | 2 +- lib/models/itg_forms_models/fields_model.dart | 2 +- .../itg_forms_models/itg_request_model.dart | 2 +- .../request_detail_model.dart | 2 +- .../itg_forms_models/request_type_model.dart | 2 +- .../itg_forms_models/wf_history_model.dart | 2 +- lib/models/member_information_list_model.dart | 2 +- lib/models/member_login_list_model.dart | 2 +- .../get_deductions_List_model.dart | 2 +- .../get_earnings_list_model.dart | 2 +- .../get_pay_slip_list_model.dart | 2 +- .../get_payment_information_list_model.dart | 2 +- .../get_summary_of_payment_list_model.dart | 2 +- .../mowadhafhi/get_department_sections.dart | 2 +- .../mowadhafhi/get_project_departments.dart | 2 +- lib/models/mowadhafhi/get_projects.dart | 2 +- lib/models/mowadhafhi/get_section_topics.dart | 2 +- lib/models/mowadhafhi/get_ticket_details.dart | 2 +- .../mowadhafhi/get_ticket_transactions.dart | 2 +- lib/models/mowadhafhi/get_ticket_types.dart | 2 +- lib/models/mowadhafhi/get_tickets_list.dart | 2 +- .../mowadhafhi_attachement_request.dart | 2 +- lib/models/notification_action_model.dart | 2 +- ...ion_get_respond_attributes_list_model.dart | 2 +- lib/models/payslip/get_deductions_list.dart | 2 +- lib/models/payslip/get_earnings_list.dart | 2 +- .../payslip/get_payment_information.dart | 2 +- lib/models/payslip/get_payslip.dart | 2 +- .../payslip/get_summary_of_payment.dart | 2 +- .../get_pending_transactions_details.dart | 2 +- .../get_req_functions.dart | 2 +- lib/models/post_params_model.dart | 4 +- lib/models/privilege_list_model.dart | 2 +- .../basic_details_cols_structions.dart | 4 +- .../profile/basic_details_dff_structure.dart | 2 +- .../get_address_dff_structure_list.dart | 2 +- .../get_contact_clos_structure_list.dart | 4 +- .../profile/get_contact_details_list.dart | 2 +- .../profile/get_countries_list_model.dart | 2 +- .../profile/phone_number_types_model.dart | 2 +- .../start_address_approval_process_model.dart | 2 +- .../profile/submit_address_transaction.dart | 2 +- ...ubmit_basic_details_transaction_model.dart | 2 +- ...submit_contact_transaction_list_model.dart | 2 +- .../profile/submit_phone_transactions.dart | 2 +- .../start_eit_approval_process_model.dart | 2 +- .../start_phone_approval_process_model.dart | 2 +- .../submit_eit_transaction_list_model.dart | 2 +- lib/models/subordinates_on_leaves_model.dart | 2 +- lib/models/surah_model.dart | 4 +- .../create_vacation_rule_list_model.dart | 2 +- ...et_item_type_notifications_list_model.dart | 2 +- ...notification_reassign_mode_list_model.dart | 2 +- .../get_vacation_rules_list_model.dart | 2 +- .../respond_attributes_list_model.dart | 2 +- .../vr_item_types_list_model.dart | 2 +- .../vacation_rule/wf_look_up_list_model.dart | 2 +- .../validate_eit_transaction_list_model.dart | 2 +- .../hr/get_basic_det_ntf_body_list_model.dart | 2 +- lib/models/worklist_item_type_model.dart | 2 +- lib/models/worklist_response_model.dart | 2 +- .../attendance/add_vacation_rule_screen.dart | 6 +- .../attendance/monthly_attendance_screen.dart | 4 +- lib/ui/landing/dashboard_screen.dart | 2 +- .../dynamic_screens/dynamic_input_screen.dart | 4 +- lib/ui/profile/add_update_family_member.dart | 2 +- lib/ui/profile/delete_family_member.dart | 2 +- .../dynamic_input_address_screen.dart | 2 +- .../dynamic_input_basic_details_screen.dart | 2 +- lib/ui/profile/profile_screen.dart | 2 +- .../announcements/announcement_details.dart | 2 +- .../pending_transactions.dart | 156 +++++++----------- .../pending_transactions_details.dart | 104 +++--------- lib/widgets/circular_step_progress_bar.dart | 52 +++--- lib/widgets/location/Location.dart | 4 +- lib/widgets/nfc/nfc_reader_sheet.dart | 2 +- 116 files changed, 252 insertions(+), 336 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index a84033c..674be66 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -18,6 +18,7 @@ analyzer: avoid_annotating_with_dynamic: error unnecessary_null_checks: error unnecessary_brace_in_string_interps: error + unnecessary_final: error linter: @@ -49,6 +50,7 @@ linter: unnecessary_null_checks: true unnecessary_brace_in_string_interps: true unnecessary_string_interpolations: true + unnecessary_final: true # avoid_print: false # Uncomment to disable the `avoid_print` rule # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule diff --git a/lib/classes/date_uitl.dart b/lib/classes/date_uitl.dart index 8754fdb..73945f8 100644 --- a/lib/classes/date_uitl.dart +++ b/lib/classes/date_uitl.dart @@ -8,8 +8,8 @@ class DateUtil { if (date != null) { const start = "/Date("; const end = "+0300)"; - final startIndex = date.indexOf(start); - final endIndex = date.indexOf(end, startIndex + start.length); + int startIndex = date.indexOf(start); + int endIndex = date.indexOf(end, startIndex + start.length); return DateTime.fromMillisecondsSinceEpoch( int.parse( date.substring(startIndex + start.length, endIndex), @@ -32,8 +32,8 @@ class DateUtil { if (date != null) { const start = "/Date("; const end = ")"; - final startIndex = date.indexOf(start); - final endIndex = date.indexOf(end, startIndex + start.length); + int startIndex = date.indexOf(start); + int endIndex = date.indexOf(end, startIndex + start.length); return DateTime.fromMillisecondsSinceEpoch( int.parse( date.substring(startIndex + start.length, endIndex), diff --git a/lib/models/add_att_success_list_model.dart b/lib/models/add_att_success_list_model.dart index e33fff2..f432d42 100644 --- a/lib/models/add_att_success_list_model.dart +++ b/lib/models/add_att_success_list_model.dart @@ -10,9 +10,9 @@ class AddAttSuccessList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AddSuccess'] = this.addSuccess; data['AttachmentID'] = this.attachmentID; return data; } -} \ No newline at end of file +} diff --git a/lib/models/add_attachment_list_model.dart b/lib/models/add_attachment_list_model.dart index e34d80c..aa75d8f 100644 --- a/lib/models/add_attachment_list_model.dart +++ b/lib/models/add_attachment_list_model.dart @@ -10,7 +10,7 @@ class AddAttachmentList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/attachment_model.dart b/lib/models/attachment_model.dart index eb51dcf..855a490 100644 --- a/lib/models/attachment_model.dart +++ b/lib/models/attachment_model.dart @@ -16,7 +16,7 @@ class AttachmentModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AttachmentID'] = this.attachmentID; data['P_FILE_CONTENT_TYPE'] = this.pFILECONTENTTYPE; data['P_FILE_DATA'] = this.pFILEDATA; diff --git a/lib/models/basic_member_information_model.dart b/lib/models/basic_member_information_model.dart index 33b55fa..6df7e84 100644 --- a/lib/models/basic_member_information_model.dart +++ b/lib/models/basic_member_information_model.dart @@ -21,7 +21,7 @@ class BasicMemberInformationModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_EMAIL_ADDRESS'] = this.pEMAILADDRESS; data['P_LEGISLATION_CODE'] = this.pLEGISLATIONCODE; data['P_MOBILE_NUMBER'] = this.pMOBILENUMBER; diff --git a/lib/models/check_mobile_app_version_model.dart b/lib/models/check_mobile_app_version_model.dart index cd301d3..a7a72d1 100644 --- a/lib/models/check_mobile_app_version_model.dart +++ b/lib/models/check_mobile_app_version_model.dart @@ -139,7 +139,7 @@ class CheckMobileAppVersionModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Date'] = this.date; data['LanguageID'] = this.languageID; data['ServiceName'] = this.serviceName; diff --git a/lib/models/content_info_model.dart b/lib/models/content_info_model.dart index 4eec746..c7a4a7a 100644 --- a/lib/models/content_info_model.dart +++ b/lib/models/content_info_model.dart @@ -19,7 +19,7 @@ class ContentInfoModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['totalItemsCount'] = this.totalItemsCount; data['statusCode'] = this.statusCode; data['message'] = this.message; @@ -52,7 +52,7 @@ class ContentInfoDataModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['contentInfoId'] = this.contentInfoId; data['contentTypeId'] = this.contentTypeId; data['content'] = this.content; diff --git a/lib/models/dyanmic_forms/get_set_values_request_model.dart b/lib/models/dyanmic_forms/get_set_values_request_model.dart index 82bc05a..07c840a 100644 --- a/lib/models/dyanmic_forms/get_set_values_request_model.dart +++ b/lib/models/dyanmic_forms/get_set_values_request_model.dart @@ -21,7 +21,7 @@ class GetSetValuesRequestModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['SEGMENT_NAME'] = this.sEGMENTNAME; data['VALUE_COLUMN_NAME'] = this.vALUECOLUMNNAME; data['DESCRIPTION'] = this.dESCRIPTION; diff --git a/lib/models/dyanmic_forms/validate_eit_transaction_model.dart b/lib/models/dyanmic_forms/validate_eit_transaction_model.dart index a543e5c..3b485d7 100644 --- a/lib/models/dyanmic_forms/validate_eit_transaction_model.dart +++ b/lib/models/dyanmic_forms/validate_eit_transaction_model.dart @@ -16,7 +16,7 @@ class ValidateEitTransactionModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['TRANSACTION_NUMBER'] = this.tRANSACTIONNUMBER; data['NAME'] = this.nAME; data['VARCHAR2_VALUE'] = this.vARCHAR2VALUE; diff --git a/lib/models/eit/get_eit_transaction_model.dart b/lib/models/eit/get_eit_transaction_model.dart index 309c0a4..dffe320 100644 --- a/lib/models/eit/get_eit_transaction_model.dart +++ b/lib/models/eit/get_eit_transaction_model.dart @@ -13,7 +13,7 @@ class GetEitTransactionsModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.collectionTransaction != null) { data['Collection_Transaction'] = this.collectionTransaction!.map((v) => v.toJson()).toList(); } @@ -80,7 +80,7 @@ class CollectionTransaction { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DATE_VALUE'] = this.dATEVALUE; diff --git a/lib/models/generic_response_model.dart b/lib/models/generic_response_model.dart index e288d38..23026e3 100644 --- a/lib/models/generic_response_model.dart +++ b/lib/models/generic_response_model.dart @@ -1249,7 +1249,7 @@ class GenericResponseModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Date'] = this.date; data['LanguageID'] = this.languageID; data['ServiceName'] = this.serviceName; diff --git a/lib/models/get_absence_collection_notification_body_list_model.dart b/lib/models/get_absence_collection_notification_body_list_model.dart index 057cb64..8ca774a 100644 --- a/lib/models/get_absence_collection_notification_body_list_model.dart +++ b/lib/models/get_absence_collection_notification_body_list_model.dart @@ -13,7 +13,7 @@ class GetAbsenceCollectionNotificationBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.collectionNotification != null) { data['Collection_Notification'] = this.collectionNotification!.map((v) => v.toJson()).toList(); } @@ -74,7 +74,7 @@ class CollectionNotificationAbsence { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION'] = this.aCTION; data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; diff --git a/lib/models/get_action_history_list_model.dart b/lib/models/get_action_history_list_model.dart index c89a974..fd6857a 100644 --- a/lib/models/get_action_history_list_model.dart +++ b/lib/models/get_action_history_list_model.dart @@ -54,7 +54,7 @@ class GetActionHistoryList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION'] = this.aCTION; data['ACTION_CODE'] = this.aCTIONCODE; data['EMAIL_ADDRESS'] = this.eMAILADDRESS; diff --git a/lib/models/get_announcement_details.dart b/lib/models/get_announcement_details.dart index 33628ce..45e4a1c 100644 --- a/lib/models/get_announcement_details.dart +++ b/lib/models/get_announcement_details.dart @@ -51,7 +51,7 @@ class GetAnnouncementDetails { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Title_EN'] = this.titleEN; data['Title_AR'] = this.titleAR; data['EmailBody_EN'] = this.emailBodyEN; diff --git a/lib/models/get_announcements.dart b/lib/models/get_announcements.dart index 05b6988..70e93dc 100644 --- a/lib/models/get_announcements.dart +++ b/lib/models/get_announcements.dart @@ -51,7 +51,7 @@ class GetAnnouncementsObject { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Title_EN'] = this.titleEN; data['Title_AR'] = this.titleAR; data['Banner_Image'] = this.bannerImage; diff --git a/lib/models/get_approves_list_model.dart b/lib/models/get_approves_list_model.dart index f5a4d82..2aec5b8 100644 --- a/lib/models/get_approves_list_model.dart +++ b/lib/models/get_approves_list_model.dart @@ -42,7 +42,7 @@ class GetApprovesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPROVAL_STATUS'] = this.aPPROVALSTATUS; data['APPROVER'] = this.aPPROVER; data['APPROVER_CATEGORY'] = this.aPPROVERCATEGORY; diff --git a/lib/models/get_attachement_list_model.dart b/lib/models/get_attachement_list_model.dart index 79c43bb..7dd6376 100644 --- a/lib/models/get_attachement_list_model.dart +++ b/lib/models/get_attachement_list_model.dart @@ -51,7 +51,7 @@ class GetAttachementList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ATTACHED_DOCUMENT_ID'] = this.aTTACHEDDOCUMENTID; data['CATEGORY_ID'] = this.cATEGORYID; data['DATATYPE_ID'] = this.dATATYPEID; diff --git a/lib/models/get_contact_dff_structure_list.dart b/lib/models/get_contact_dff_structure_list.dart index 44a86be..7c226a9 100644 --- a/lib/models/get_contact_dff_structure_list.dart +++ b/lib/models/get_contact_dff_structure_list.dart @@ -126,7 +126,7 @@ class GetContactDffStructureList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ALPHANUMERIC_ALLOWED_FLAG'] = this.aLPHANUMERICALLOWEDFLAG; data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['CHILD_SEGMENTS_VS'] = this.cHILDSEGMENTSVS; diff --git a/lib/models/get_day_hours_type_details_list_model.dart b/lib/models/get_day_hours_type_details_list_model.dart index daaac74..e4eef25 100644 --- a/lib/models/get_day_hours_type_details_list_model.dart +++ b/lib/models/get_day_hours_type_details_list_model.dart @@ -132,7 +132,7 @@ class GetDayHoursTypeDetailsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ABSENCE_ATTENDANCE_ID'] = this.aBSENCEATTENDANCEID; data['ABSENCE_ATTENDANCE_TYPE_ID'] = this.aBSENCEATTENDANCETYPEID; data['ABSENT_FLAG'] = this.aBSENTFLAG; diff --git a/lib/models/get_default_value_list_model.dart b/lib/models/get_default_value_list_model.dart index 3ee7fc1..6e46d2b 100644 --- a/lib/models/get_default_value_list_model.dart +++ b/lib/models/get_default_value_list_model.dart @@ -18,7 +18,7 @@ class GetDefaultValueList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ID_COLUMN_NAME'] = this.pIDCOLUMNNAME; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/get_eit_dff_structure_list_model.dart b/lib/models/get_eit_dff_structure_list_model.dart index 5856014..832dc86 100644 --- a/lib/models/get_eit_dff_structure_list_model.dart +++ b/lib/models/get_eit_dff_structure_list_model.dart @@ -151,7 +151,7 @@ class GetEITDFFStructureList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ALPHANUMERIC_ALLOWED_FLAG'] = this.aLPHANUMERICALLOWEDFLAG; data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['CHILD_SEGMENTS_DV'] = this.cHILDSEGMENTSDV; @@ -225,7 +225,7 @@ class ESERVICESDV { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ID_COLUMN_NAME'] = this.pIDCOLUMNNAME; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; @@ -256,7 +256,7 @@ class ESERVICESVS { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['DESCRIPTION'] = this.dESCRIPTION; data['FROM_ROW_NUM'] = this.fROMROWNUM; data['ID_COLUMN_NAME'] = this.iDCOLUMNNAME; @@ -280,7 +280,7 @@ class PARENTSEGMENTSDVSplited { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['IsRequired'] = this.isRequired; data['Name'] = this.name; return data; @@ -299,7 +299,7 @@ class PARENTSEGMENTSVSSplitedVS { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['IsRequired'] = this.isRequired; data['Name'] = this.name; return data; diff --git a/lib/models/get_eit_transaction_list_model.dart b/lib/models/get_eit_transaction_list_model.dart index d2ff7c0..d8c39c9 100644 --- a/lib/models/get_eit_transaction_list_model.dart +++ b/lib/models/get_eit_transaction_list_model.dart @@ -13,7 +13,7 @@ class GetEITTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.collectionTransaction != null) { data['Collection_Transaction'] = this.collectionTransaction!.map((v) => v.toJson()).toList(); @@ -81,7 +81,7 @@ class CollectionTransaction { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DATE_VALUE'] = this.dATEVALUE; diff --git a/lib/models/get_employee_address_model.dart b/lib/models/get_employee_address_model.dart index 1033797..8531ced 100644 --- a/lib/models/get_employee_address_model.dart +++ b/lib/models/get_employee_address_model.dart @@ -35,7 +35,7 @@ } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DATE_VALUE'] = this.dATEVALUE; diff --git a/lib/models/get_employee_basic_details.model.dart b/lib/models/get_employee_basic_details.model.dart index 06713c0..0a3acd7 100644 --- a/lib/models/get_employee_basic_details.model.dart +++ b/lib/models/get_employee_basic_details.model.dart @@ -37,7 +37,7 @@ class GetEmployeeBasicDetailsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DATE_VALUE'] = this.dATEVALUE; diff --git a/lib/models/get_employee_contacts.model.dart b/lib/models/get_employee_contacts.model.dart index 4064d10..df0a41f 100644 --- a/lib/models/get_employee_contacts.model.dart +++ b/lib/models/get_employee_contacts.model.dart @@ -31,7 +31,7 @@ class GetEmployeeContactsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CONTACT_NAME'] = this.cONTACTNAME; data['CONTACT_PERSON_ID'] = this.cONTACTPERSONID; data['CONTACT_RELATIONSHIP_ID'] = this.cONTACTRELATIONSHIPID; diff --git a/lib/models/get_employee_phones_model.dart b/lib/models/get_employee_phones_model.dart index b4038ae..f18138e 100644 --- a/lib/models/get_employee_phones_model.dart +++ b/lib/models/get_employee_phones_model.dart @@ -28,7 +28,7 @@ class GetEmployeePhonesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION'] = this.aCTION; data['DATE_FROM'] = this.dATEFROM; data['DATE_TO'] = this.dATETO; diff --git a/lib/models/get_item_creation_ntf_body_list_model.dart b/lib/models/get_item_creation_ntf_body_list_model.dart index 83c81cb..e4c22e7 100644 --- a/lib/models/get_item_creation_ntf_body_list_model.dart +++ b/lib/models/get_item_creation_ntf_body_list_model.dart @@ -24,7 +24,7 @@ class GetItemCreationNtfBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.itemCreationHeader != null) { data['ItemCreationHeader'] = this.itemCreationHeader!.map((v) => v.toJson()).toList(); } @@ -108,7 +108,7 @@ class ItemCreationHeader { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ANALYZED_BY'] = this.aNALYZEDBY; data['ANALYZED_BY_ID'] = this.aNALYZEDBYID; data['ANALYZED_DATE'] = this.aNALYZEDDATE; @@ -250,7 +250,7 @@ class ItemCreationLines { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CHARGE_TO_PATIENT'] = this.cHARGETOPATIENT; data['FROM_ROW_NUM'] = this.fROMROWNUM; data['INVENTORY_ITEM_ID'] = this.iNVENTORYITEMID; diff --git a/lib/models/get_mo_Item_history_list_model.dart b/lib/models/get_mo_Item_history_list_model.dart index 3604322..f008a17 100644 --- a/lib/models/get_mo_Item_history_list_model.dart +++ b/lib/models/get_mo_Item_history_list_model.dart @@ -72,7 +72,7 @@ class GetMoItemHistoryList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['DATE_REQUIRED'] = this.dATEREQUIRED; data['DESCRIPTION'] = this.dESCRIPTION; data['FROM_LOCATOR'] = this.fROMLOCATOR; diff --git a/lib/models/get_mo_notification_body_list_model.dart b/lib/models/get_mo_notification_body_list_model.dart index 613d10f..1fc11ca 100644 --- a/lib/models/get_mo_notification_body_list_model.dart +++ b/lib/models/get_mo_notification_body_list_model.dart @@ -75,7 +75,7 @@ class GetMoNotificationBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['DATE_REQUIRED'] = this.dATEREQUIRED; data['DESCRIPTION'] = this.dESCRIPTION; data['FROM_LOCATOR'] = this.fROMLOCATOR; diff --git a/lib/models/get_mobile_login_info_list_model.dart b/lib/models/get_mobile_login_info_list_model.dart index ff419f2..a2f7799 100644 --- a/lib/models/get_mobile_login_info_list_model.dart +++ b/lib/models/get_mobile_login_info_list_model.dart @@ -45,7 +45,7 @@ class GetMobileLoginInfoListModel { } Map toJson() { - final Map data = Map(); + Map data = Map(); data['ID'] = iD; data['EmployeeID'] = employeeID; data['ChannelID'] = channelID; diff --git a/lib/models/get_notification_buttons_list_model.dart b/lib/models/get_notification_buttons_list_model.dart index a6b29d2..91ac57d 100644 --- a/lib/models/get_notification_buttons_list_model.dart +++ b/lib/models/get_notification_buttons_list_model.dart @@ -15,7 +15,7 @@ class GetNotificationButtonsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['BUTTON_ACTION'] = this.bUTTONACTION; data['BUTTON_ICON'] = this.bUTTONICON; data['BUTTON_LABEL'] = this.bUTTONLABEL; diff --git a/lib/models/get_po_Item_history_list_model.dart b/lib/models/get_po_Item_history_list_model.dart index d51861b..656457d 100644 --- a/lib/models/get_po_Item_history_list_model.dart +++ b/lib/models/get_po_Item_history_list_model.dart @@ -66,7 +66,7 @@ class GetPoItemHistoryList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['BALANCE_QUANTITY'] = this.bALANCEQUANTITY; data['BONUS_QUANTITY'] = this.bONUSQUANTITY; data['BUYER'] = this.bUYER; diff --git a/lib/models/get_po_notification_body_list_model.dart b/lib/models/get_po_notification_body_list_model.dart index 7b5c1cb..5d77b68 100644 --- a/lib/models/get_po_notification_body_list_model.dart +++ b/lib/models/get_po_notification_body_list_model.dart @@ -26,7 +26,7 @@ class GetPoNotificationBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.pOHeader != null) { data['POHeader'] = this.pOHeader!.map((v) => v.toJson()).toList(); } @@ -116,7 +116,7 @@ class POHeader { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['BUYER'] = this.bUYER; data['COMMENTS'] = this.cOMMENTS; data['CREATION_DATE'] = this.cREATIONDATE; @@ -215,7 +215,7 @@ class POLines { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['DELIVER_TO_LOCATION'] = this.dELIVERTOLOCATION; data['FROM_ROW_NUM'] = this.fROMROWNUM; data['ITEM_CODE'] = this.iTEMCODE; diff --git a/lib/models/get_quotation_analysis_list_model.dart b/lib/models/get_quotation_analysis_list_model.dart index c0be32d..4ceaa96 100644 --- a/lib/models/get_quotation_analysis_list_model.dart +++ b/lib/models/get_quotation_analysis_list_model.dart @@ -60,7 +60,7 @@ class GetQuotationAnalysisList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['FROM_ROW_NUM'] = this.fROMROWNUM; data['ITEM_CODE'] = this.iTEMCODE; data['ITEM_DESC'] = this.iTEMDESC; diff --git a/lib/models/get_schedule_shifts_details_list_model.dart b/lib/models/get_schedule_shifts_details_list_model.dart index 8003446..df740a0 100644 --- a/lib/models/get_schedule_shifts_details_list_model.dart +++ b/lib/models/get_schedule_shifts_details_list_model.dart @@ -94,7 +94,7 @@ class GetScheduleShiftsDetailsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTUAL_WOB_HRS'] = this.aCTUALWOBHRS; data['APPROVED_END_DATETIME'] = this.aPPROVEDENDDATETIME; data['APPROVED_END_REASON'] = this.aPPROVEDENDREASON; diff --git a/lib/models/get_stamp_ms_notification_body_list_model.dart b/lib/models/get_stamp_ms_notification_body_list_model.dart index dbead87..884f32b 100644 --- a/lib/models/get_stamp_ms_notification_body_list_model.dart +++ b/lib/models/get_stamp_ms_notification_body_list_model.dart @@ -96,7 +96,7 @@ class GetStampMsNotificationBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTUAL_WOB_HRS'] = this.aCTUALWOBHRS; data['ACTUAL_WOB_SEC'] = this.aCTUALWOBSEC; data['APPROVED_END_REASON_DESC'] = this.aPPROVEDENDREASONDESC; diff --git a/lib/models/get_stamp_ns_notification_body_list_model.dart b/lib/models/get_stamp_ns_notification_body_list_model.dart index 4ce708c..c1c8515 100644 --- a/lib/models/get_stamp_ns_notification_body_list_model.dart +++ b/lib/models/get_stamp_ns_notification_body_list_model.dart @@ -43,7 +43,7 @@ class GetStampNsNotificationBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ASSIGNMENT_ID'] = this.aSSIGNMENTID; data['ASSIGNMENT_NUMBER'] = this.aSSIGNMENTNUMBER; data['BUSINESS_GROUP_ID'] = this.bUSINESSGROUPID; diff --git a/lib/models/get_time_card_summary_list_model.dart b/lib/models/get_time_card_summary_list_model.dart index 727e29f..85a2a8e 100644 --- a/lib/models/get_time_card_summary_list_model.dart +++ b/lib/models/get_time_card_summary_list_model.dart @@ -113,7 +113,7 @@ class GetTimeCardSummaryList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ABSENT_DAYS'] = this.aBSENTDAYS; data['ACTUAL_HRS'] = this.aCTUALHRS; data['APPROVED_TIMEBACK_HRS'] = this.aPPROVEDTIMEBACKHRS; diff --git a/lib/models/itg_forms_models/allowed_actions_model.dart b/lib/models/itg_forms_models/allowed_actions_model.dart index 9c394c3..0ab5efc 100644 --- a/lib/models/itg_forms_models/allowed_actions_model.dart +++ b/lib/models/itg_forms_models/allowed_actions_model.dart @@ -12,7 +12,7 @@ class AllowedActions { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Action'] = this.action; data['Details'] = this.details; data['IsAvailable'] = this.isAvailable; diff --git a/lib/models/itg_forms_models/field_goups_model.dart b/lib/models/itg_forms_models/field_goups_model.dart index 362fda7..a964a4d 100644 --- a/lib/models/itg_forms_models/field_goups_model.dart +++ b/lib/models/itg_forms_models/field_goups_model.dart @@ -17,7 +17,7 @@ class FieldGoups { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.fields != null) { data['Fields'] = this.fields!.map((v) => v.toJson()).toList(); } diff --git a/lib/models/itg_forms_models/fields_model.dart b/lib/models/itg_forms_models/fields_model.dart index 3800f81..528c960 100644 --- a/lib/models/itg_forms_models/fields_model.dart +++ b/lib/models/itg_forms_models/fields_model.dart @@ -16,7 +16,7 @@ class Fields { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['MultipleValue'] = this.multipleValue; data['TableValue'] = this.tableValue; data['Title'] = this.title; diff --git a/lib/models/itg_forms_models/itg_request_model.dart b/lib/models/itg_forms_models/itg_request_model.dart index 5bc4fa4..75f6a69 100644 --- a/lib/models/itg_forms_models/itg_request_model.dart +++ b/lib/models/itg_forms_models/itg_request_model.dart @@ -35,7 +35,7 @@ class ITGRequest { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); if (this.allowedActions != null) { data['AllowedActions'] = this.allowedActions!.map((v) => v.toJson()).toList(); } diff --git a/lib/models/itg_forms_models/request_detail_model.dart b/lib/models/itg_forms_models/request_detail_model.dart index b7b5a9c..1193423 100644 --- a/lib/models/itg_forms_models/request_detail_model.dart +++ b/lib/models/itg_forms_models/request_detail_model.dart @@ -21,7 +21,7 @@ class RequestDetails { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ID'] = this.iD; data['ItemID'] = this.itemID; data['ListID'] = this.listID; diff --git a/lib/models/itg_forms_models/request_type_model.dart b/lib/models/itg_forms_models/request_type_model.dart index 92d2515..0845183 100644 --- a/lib/models/itg_forms_models/request_type_model.dart +++ b/lib/models/itg_forms_models/request_type_model.dart @@ -21,7 +21,7 @@ class RequestType { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ItemCount'] = this.itemCount; if (this.requestDetails != null) { data['RequestDetails'] = this.requestDetails!.map((v) => v.toJson()).toList(); diff --git a/lib/models/itg_forms_models/wf_history_model.dart b/lib/models/itg_forms_models/wf_history_model.dart index 8e3dd6d..c804f67 100644 --- a/lib/models/itg_forms_models/wf_history_model.dart +++ b/lib/models/itg_forms_models/wf_history_model.dart @@ -27,7 +27,7 @@ class WFHistory { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Action'] = this.action; data['ApprovalLevel'] = this.approvalLevel; data['Date'] = this.date; diff --git a/lib/models/member_information_list_model.dart b/lib/models/member_information_list_model.dart index dc64e53..0050fed 100644 --- a/lib/models/member_information_list_model.dart +++ b/lib/models/member_information_list_model.dart @@ -254,7 +254,7 @@ class MemberInformationListModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTUAL_TERMINATION_DATE'] = this.aCTUALTERMINATIONDATE; data['ASSIGNMENT_END_DATE'] = this.aSSIGNMENTENDDATE; data['ASSIGNMENT_ID'] = this.aSSIGNMENTID; diff --git a/lib/models/member_login_list_model.dart b/lib/models/member_login_list_model.dart index ffbc942..c9e1039 100644 --- a/lib/models/member_login_list_model.dart +++ b/lib/models/member_login_list_model.dart @@ -33,7 +33,7 @@ class MemberLoginListModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_EMAIL_ADDRESS'] = this.pEMAILADDRESS; data['P_INVALID_LOGIN_MSG'] = this.pINVALIDLOGINMSG; data['P_LEGISLATION_CODE'] = this.pLEGISLATIONCODE; diff --git a/lib/models/monthly_pay_slip/get_deductions_List_model.dart b/lib/models/monthly_pay_slip/get_deductions_List_model.dart index 7a99447..07bf1ba 100644 --- a/lib/models/monthly_pay_slip/get_deductions_List_model.dart +++ b/lib/models/monthly_pay_slip/get_deductions_List_model.dart @@ -24,7 +24,7 @@ class GetDeductionsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AMOUNT'] = this.aMOUNT; data['ELEMENT_NAME'] = this.eLEMENTNAME; data['FROM_ROW_NUM'] = this.fROMROWNUM; diff --git a/lib/models/monthly_pay_slip/get_earnings_list_model.dart b/lib/models/monthly_pay_slip/get_earnings_list_model.dart index 4c38fa6..f525d16 100644 --- a/lib/models/monthly_pay_slip/get_earnings_list_model.dart +++ b/lib/models/monthly_pay_slip/get_earnings_list_model.dart @@ -24,7 +24,7 @@ class GetEarningsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AMOUNT'] = this.aMOUNT; data['ELEMENT_NAME'] = this.eLEMENTNAME; data['FROM_ROW_NUM'] = this.fROMROWNUM; diff --git a/lib/models/monthly_pay_slip/get_pay_slip_list_model.dart b/lib/models/monthly_pay_slip/get_pay_slip_list_model.dart index 7cf8883..c3e9d7e 100644 --- a/lib/models/monthly_pay_slip/get_pay_slip_list_model.dart +++ b/lib/models/monthly_pay_slip/get_pay_slip_list_model.dart @@ -24,7 +24,7 @@ class GetPayslipList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION_CONTEXT_ID'] = this.aCTIONCONTEXTID; data['PAYMENT_DATE'] = this.pAYMENTDATE; data['PAYSLIP_CHOICE'] = this.pAYSLIPCHOICE; diff --git a/lib/models/monthly_pay_slip/get_payment_information_list_model.dart b/lib/models/monthly_pay_slip/get_payment_information_list_model.dart index 75ed21c..f73be78 100644 --- a/lib/models/monthly_pay_slip/get_payment_information_list_model.dart +++ b/lib/models/monthly_pay_slip/get_payment_information_list_model.dart @@ -21,7 +21,7 @@ class GetPaymentInformationList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACCOUNT_NUMBER'] = this.aCCOUNTNUMBER; data['AMOUNT'] = this.aMOUNT; data['BANK_NAME'] = this.bANKNAME; diff --git a/lib/models/monthly_pay_slip/get_summary_of_payment_list_model.dart b/lib/models/monthly_pay_slip/get_summary_of_payment_list_model.dart index 72ee89b..be65e35 100644 --- a/lib/models/monthly_pay_slip/get_summary_of_payment_list_model.dart +++ b/lib/models/monthly_pay_slip/get_summary_of_payment_list_model.dart @@ -24,7 +24,7 @@ class GetSummaryOfPaymentList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['TOTAL_DEDUCTIONS_AMOUNT'] = this.tOTALDEDUCTIONSAMOUNT; data['TOTAL_DEDUCTIONS_PERCENTAGE'] = this.tOTALDEDUCTIONSPERCENTAGE; data['TOTAL_EARNINGS_AMOUNT'] = this.tOTALEARNINGSAMOUNT; diff --git a/lib/models/mowadhafhi/get_department_sections.dart b/lib/models/mowadhafhi/get_department_sections.dart index 2d534ba..3a98db4 100644 --- a/lib/models/mowadhafhi/get_department_sections.dart +++ b/lib/models/mowadhafhi/get_department_sections.dart @@ -30,7 +30,7 @@ class GetDepartmentSections { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['departmentId'] = this.departmentId; data['departmentName'] = this.departmentName; data['departmentSectionId'] = this.departmentSectionId; diff --git a/lib/models/mowadhafhi/get_project_departments.dart b/lib/models/mowadhafhi/get_project_departments.dart index 436399d..53a2d5d 100644 --- a/lib/models/mowadhafhi/get_project_departments.dart +++ b/lib/models/mowadhafhi/get_project_departments.dart @@ -21,7 +21,7 @@ class GetProjectDepartments { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['departmentId'] = this.departmentId; data['departmentName'] = this.departmentName; data['projectCode'] = this.projectCode; diff --git a/lib/models/mowadhafhi/get_projects.dart b/lib/models/mowadhafhi/get_projects.dart index 62b99c3..3e76e84 100644 --- a/lib/models/mowadhafhi/get_projects.dart +++ b/lib/models/mowadhafhi/get_projects.dart @@ -10,7 +10,7 @@ class GetMowadhafhiProjects { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['projectId'] = this.projectId; data['projectName'] = this.projectName; return data; diff --git a/lib/models/mowadhafhi/get_section_topics.dart b/lib/models/mowadhafhi/get_section_topics.dart index c596527..d7ed3b8 100644 --- a/lib/models/mowadhafhi/get_section_topics.dart +++ b/lib/models/mowadhafhi/get_section_topics.dart @@ -42,7 +42,7 @@ class GetSectionTopics { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['departmentId'] = this.departmentId; data['departmentName'] = this.departmentName; data['projectCode'] = this.projectCode; diff --git a/lib/models/mowadhafhi/get_ticket_details.dart b/lib/models/mowadhafhi/get_ticket_details.dart index 5f896bd..cc1b13c 100644 --- a/lib/models/mowadhafhi/get_ticket_details.dart +++ b/lib/models/mowadhafhi/get_ticket_details.dart @@ -57,7 +57,7 @@ class GetTicketDetailsByEmployee { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['closedBy'] = this.closedBy; data['created'] = this.created; data['departmentId'] = this.departmentId; diff --git a/lib/models/mowadhafhi/get_ticket_transactions.dart b/lib/models/mowadhafhi/get_ticket_transactions.dart index 9091761..be793ca 100644 --- a/lib/models/mowadhafhi/get_ticket_transactions.dart +++ b/lib/models/mowadhafhi/get_ticket_transactions.dart @@ -27,7 +27,7 @@ class GetTicketTransactions { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['actionBy'] = this.actionBy; data['actionDate'] = this.actionDate; data['comments'] = this.comments; diff --git a/lib/models/mowadhafhi/get_ticket_types.dart b/lib/models/mowadhafhi/get_ticket_types.dart index ae68e2d..53a9fc4 100644 --- a/lib/models/mowadhafhi/get_ticket_types.dart +++ b/lib/models/mowadhafhi/get_ticket_types.dart @@ -12,7 +12,7 @@ class GetTicketTypes { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ticketIdPrefix'] = this.ticketIdPrefix; data['ticketTypeId'] = this.ticketTypeId; data['typeName'] = this.typeName; diff --git a/lib/models/mowadhafhi/get_tickets_list.dart b/lib/models/mowadhafhi/get_tickets_list.dart index 34005df..0172b45 100644 --- a/lib/models/mowadhafhi/get_tickets_list.dart +++ b/lib/models/mowadhafhi/get_tickets_list.dart @@ -135,7 +135,7 @@ class GetTicketsByEmployeeList { } Map toJson() { - final Map data = {}; + Map data = {}; data['agentRating'] = agentRating; data['assignedSpecialist'] = assignedSpecialist; data['assignedSpecialistName'] = assignedSpecialistName; diff --git a/lib/models/mowadhafhi/mowadhafhi_attachement_request.dart b/lib/models/mowadhafhi/mowadhafhi_attachement_request.dart index a72bd16..e223834 100644 --- a/lib/models/mowadhafhi/mowadhafhi_attachement_request.dart +++ b/lib/models/mowadhafhi/mowadhafhi_attachement_request.dart @@ -13,7 +13,7 @@ class MowadhafhiRequestAttachment { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['Base64Data'] = this.base64Data; data['FileName'] = this.fileName; data['ContentType'] = this.contentType; diff --git a/lib/models/notification_action_model.dart b/lib/models/notification_action_model.dart index a1214e1..3398ed6 100644 --- a/lib/models/notification_action_model.dart +++ b/lib/models/notification_action_model.dart @@ -10,7 +10,7 @@ class NotificationAction { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/notification_get_respond_attributes_list_model.dart b/lib/models/notification_get_respond_attributes_list_model.dart index 9810e24..e85e2c8 100644 --- a/lib/models/notification_get_respond_attributes_list_model.dart +++ b/lib/models/notification_get_respond_attributes_list_model.dart @@ -14,7 +14,7 @@ class NotificationGetRespondAttributesList { } Map toJson() { - final Map data = {}; + Map data = {}; data['ATTRIBUTE_DISPLAY_NAME'] = attributeDisplayName; data['ATTRIBUTE_FORMAT'] = attributeFormat; data['ATTRIBUTE_NAME'] = attributeName; diff --git a/lib/models/payslip/get_deductions_list.dart b/lib/models/payslip/get_deductions_list.dart index 7a99447..07bf1ba 100644 --- a/lib/models/payslip/get_deductions_list.dart +++ b/lib/models/payslip/get_deductions_list.dart @@ -24,7 +24,7 @@ class GetDeductionsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AMOUNT'] = this.aMOUNT; data['ELEMENT_NAME'] = this.eLEMENTNAME; data['FROM_ROW_NUM'] = this.fROMROWNUM; diff --git a/lib/models/payslip/get_earnings_list.dart b/lib/models/payslip/get_earnings_list.dart index 272dab3..a374733 100644 --- a/lib/models/payslip/get_earnings_list.dart +++ b/lib/models/payslip/get_earnings_list.dart @@ -25,7 +25,7 @@ class GetEarningsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['AMOUNT'] = this.aMOUNT; data['ELEMENT_NAME'] = this.eLEMENTNAME; data['FROM_ROW_NUM'] = this.fROMROWNUM; diff --git a/lib/models/payslip/get_payment_information.dart b/lib/models/payslip/get_payment_information.dart index 277b409..7d92eba 100644 --- a/lib/models/payslip/get_payment_information.dart +++ b/lib/models/payslip/get_payment_information.dart @@ -22,7 +22,7 @@ class GetPaymentInformationList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACCOUNT_NUMBER'] = this.aCCOUNTNUMBER; data['AMOUNT'] = this.aMOUNT; data['BANK_NAME'] = this.bANKNAME; diff --git a/lib/models/payslip/get_payslip.dart b/lib/models/payslip/get_payslip.dart index 2bb8280..bc85d16 100644 --- a/lib/models/payslip/get_payslip.dart +++ b/lib/models/payslip/get_payslip.dart @@ -26,7 +26,7 @@ class GetPayslipList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION_CONTEXT_ID'] = this.aCTIONCONTEXTID; data['PAYMENT_DATE'] = this.pAYMENTDATE; data['PAYSLIP_CHOICE'] = this.pAYSLIPCHOICE; diff --git a/lib/models/payslip/get_summary_of_payment.dart b/lib/models/payslip/get_summary_of_payment.dart index abf3dc4..e977371 100644 --- a/lib/models/payslip/get_summary_of_payment.dart +++ b/lib/models/payslip/get_summary_of_payment.dart @@ -26,7 +26,7 @@ class GetSummaryOfPaymentList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['TOTAL_DEDUCTIONS_AMOUNT'] = this.tOTALDEDUCTIONSAMOUNT; data['TOTAL_DEDUCTIONS_PERCENTAGE'] = this.tOTALDEDUCTIONSPERCENTAGE; data['TOTAL_EARNINGS_AMOUNT'] = this.tOTALEARNINGSAMOUNT; diff --git a/lib/models/pending_transactions/get_pending_transactions_details.dart b/lib/models/pending_transactions/get_pending_transactions_details.dart index 0752269..711d689 100644 --- a/lib/models/pending_transactions/get_pending_transactions_details.dart +++ b/lib/models/pending_transactions/get_pending_transactions_details.dart @@ -39,7 +39,7 @@ class GetPendingTransactionsDetails { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CREATION_DATE'] = this.cREATIONDATE; data['FROM_ROW_NUM'] = this.fROMROWNUM; data['ITEM_KEY'] = this.iTEMKEY; diff --git a/lib/models/pending_transactions/get_req_functions.dart b/lib/models/pending_transactions/get_req_functions.dart index bfb5892..22e4ced 100644 --- a/lib/models/pending_transactions/get_req_functions.dart +++ b/lib/models/pending_transactions/get_req_functions.dart @@ -13,7 +13,7 @@ class GetPendingTransactionsFunctions { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['FUNCTION_ID'] = this.fUNCTIONID; data['FUNCTION_NAME'] = this.fUNCTIONNAME; data['FUNCTION_PROMPT'] = this.fUNCTIONPROMPT; diff --git a/lib/models/post_params_model.dart b/lib/models/post_params_model.dart index 7e62257..b44bec9 100644 --- a/lib/models/post_params_model.dart +++ b/lib/models/post_params_model.dart @@ -43,7 +43,7 @@ class PostParamsModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; @@ -56,7 +56,7 @@ class PostParamsModel { } Map toJsonAfterLogin() { - final Map data = new Map(); + Map data = new Map(); data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; diff --git a/lib/models/privilege_list_model.dart b/lib/models/privilege_list_model.dart index ad83500..3d39118 100644 --- a/lib/models/privilege_list_model.dart +++ b/lib/models/privilege_list_model.dart @@ -17,7 +17,7 @@ class PrivilegeListModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ID'] = this.iD; data['ServiceName'] = this.serviceName; data['Previlege'] = this.previlege; diff --git a/lib/models/profile/basic_details_cols_structions.dart b/lib/models/profile/basic_details_cols_structions.dart index dceacd6..bb3138c 100644 --- a/lib/models/profile/basic_details_cols_structions.dart +++ b/lib/models/profile/basic_details_cols_structions.dart @@ -45,7 +45,7 @@ class GetBasicDetColsStructureList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DISPLAY_FLAG'] = this.dISPLAYFLAG; @@ -76,7 +76,7 @@ class ObjectValuesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CODE'] = this.cODE; data['DESCRIPTION'] = this.dESCRIPTION; data['MEANING'] = this.mEANING; diff --git a/lib/models/profile/basic_details_dff_structure.dart b/lib/models/profile/basic_details_dff_structure.dart index 9d44b85..cb68ac5 100644 --- a/lib/models/profile/basic_details_dff_structure.dart +++ b/lib/models/profile/basic_details_dff_structure.dart @@ -142,7 +142,7 @@ class GetBasicDetDffStructureList { } Map toJson() { - final Map data = Map(); + Map data = Map(); data['ALPHANUMERIC_ALLOWED_FLAG'] = this.aLPHANUMERICALLOWEDFLAG; data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['CHILD_SEGMENTS_VS'] = this.cHILDSEGMENTSVS; diff --git a/lib/models/profile/get_address_dff_structure_list.dart b/lib/models/profile/get_address_dff_structure_list.dart index 50d9b97..786e683 100644 --- a/lib/models/profile/get_address_dff_structure_list.dart +++ b/lib/models/profile/get_address_dff_structure_list.dart @@ -137,7 +137,7 @@ class GetAddressDffStructureList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ALPHANUMERIC_ALLOWED_FLAG'] = this.aLPHANUMERICALLOWEDFLAG; data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['CHILD_SEGMENTS_VS'] = this.cHILDSEGMENTSVS; diff --git a/lib/models/profile/get_contact_clos_structure_list.dart b/lib/models/profile/get_contact_clos_structure_list.dart index 7f3ad90..29b991b 100644 --- a/lib/models/profile/get_contact_clos_structure_list.dart +++ b/lib/models/profile/get_contact_clos_structure_list.dart @@ -51,7 +51,7 @@ class GetContactColsStructureList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DISPLAY_FLAG'] = this.dISPLAYFLAG; @@ -84,7 +84,7 @@ class ObjectValuesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CODE'] = this.cODE; data['DESCRIPTION'] = this.dESCRIPTION; data['MEANING'] = this.mEANING; diff --git a/lib/models/profile/get_contact_details_list.dart b/lib/models/profile/get_contact_details_list.dart index 9097291..4b8dbbc 100644 --- a/lib/models/profile/get_contact_details_list.dart +++ b/lib/models/profile/get_contact_details_list.dart @@ -38,7 +38,7 @@ class GetContactDetailsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['APPLICATION_COLUMN_NAME'] = this.aPPLICATIONCOLUMNNAME; data['DATATYPE'] = this.dATATYPE; data['DATE_VALUE'] = this.dATEVALUE; diff --git a/lib/models/profile/get_countries_list_model.dart b/lib/models/profile/get_countries_list_model.dart index dc9e9c7..b8ae1e4 100644 --- a/lib/models/profile/get_countries_list_model.dart +++ b/lib/models/profile/get_countries_list_model.dart @@ -10,7 +10,7 @@ class GetCountriesListModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['COUNTRY_CODE'] = this.cOUNTRYCODE; data['COUNTRY_NAME'] = this.cOUNTRYNAME; return data; diff --git a/lib/models/profile/phone_number_types_model.dart b/lib/models/profile/phone_number_types_model.dart index 47b8a35..417ba87 100644 --- a/lib/models/profile/phone_number_types_model.dart +++ b/lib/models/profile/phone_number_types_model.dart @@ -12,7 +12,7 @@ class GetPhoneNumberTypesModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['CODE'] = this.cODE; data['DESCRIPTION'] = this.dESCRIPTION; data['MEANING'] = this.mEANING; diff --git a/lib/models/profile/start_address_approval_process_model.dart b/lib/models/profile/start_address_approval_process_model.dart index 717298d..6083057 100644 --- a/lib/models/profile/start_address_approval_process_model.dart +++ b/lib/models/profile/start_address_approval_process_model.dart @@ -10,7 +10,7 @@ class StartAddressApprovalProcess { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/profile/submit_address_transaction.dart b/lib/models/profile/submit_address_transaction.dart index 193cb68..a2cd874 100644 --- a/lib/models/profile/submit_address_transaction.dart +++ b/lib/models/profile/submit_address_transaction.dart @@ -14,7 +14,7 @@ class SubmitAddressTransaction { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ITEM_KEY'] = this.pITEMKEY; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/profile/submit_basic_details_transaction_model.dart b/lib/models/profile/submit_basic_details_transaction_model.dart index db6ea7a..bed00ed 100644 --- a/lib/models/profile/submit_basic_details_transaction_model.dart +++ b/lib/models/profile/submit_basic_details_transaction_model.dart @@ -14,7 +14,7 @@ class SubmitBasicDetailsTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ITEM_KEY'] = this.pITEMKEY; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/profile/submit_contact_transaction_list_model.dart b/lib/models/profile/submit_contact_transaction_list_model.dart index 3510473..531567c 100644 --- a/lib/models/profile/submit_contact_transaction_list_model.dart +++ b/lib/models/profile/submit_contact_transaction_list_model.dart @@ -19,7 +19,7 @@ class SubmitContactTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ITEM_KEY'] = this.pITEMKEY; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/profile/submit_phone_transactions.dart b/lib/models/profile/submit_phone_transactions.dart index 6b7afd1..c9af8b0 100644 --- a/lib/models/profile/submit_phone_transactions.dart +++ b/lib/models/profile/submit_phone_transactions.dart @@ -14,7 +14,7 @@ class SubmitPhonesTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ITEM_KEY'] = this.pITEMKEY; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/start_eit_approval_process_model.dart b/lib/models/start_eit_approval_process_model.dart index f49043b..359b882 100644 --- a/lib/models/start_eit_approval_process_model.dart +++ b/lib/models/start_eit_approval_process_model.dart @@ -10,7 +10,7 @@ class StartEitApprovalProcess { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/start_phone_approval_process_model.dart b/lib/models/start_phone_approval_process_model.dart index 2ce3a15..005b29a 100644 --- a/lib/models/start_phone_approval_process_model.dart +++ b/lib/models/start_phone_approval_process_model.dart @@ -10,7 +10,7 @@ class StartPhoneApprovalProcess { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/submit_eit_transaction_list_model.dart b/lib/models/submit_eit_transaction_list_model.dart index 288ce8e..f493f8b 100644 --- a/lib/models/submit_eit_transaction_list_model.dart +++ b/lib/models/submit_eit_transaction_list_model.dart @@ -18,7 +18,7 @@ class SubmitEITTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_ITEM_KEY'] = this.pITEMKEY; data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; diff --git a/lib/models/subordinates_on_leaves_model.dart b/lib/models/subordinates_on_leaves_model.dart index d6437f3..aac37ff 100644 --- a/lib/models/subordinates_on_leaves_model.dart +++ b/lib/models/subordinates_on_leaves_model.dart @@ -48,7 +48,7 @@ class SubordinatesLeavesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ABSENCE_ATTENDANCE_TYPE_NAME'] = this.aBSENCEATTENDANCETYPENAME; data['CALENDAR_ENTRY_DESC'] = this.cALENDARENTRYDESC; data['DATE_END'] = this.dATEEND; diff --git a/lib/models/surah_model.dart b/lib/models/surah_model.dart index acc171a..bd96e18 100644 --- a/lib/models/surah_model.dart +++ b/lib/models/surah_model.dart @@ -19,7 +19,7 @@ class SurahModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['totalItemsCount'] = totalItemsCount; data['statusCode'] = statusCode; data['message'] = message; @@ -58,7 +58,7 @@ class SurahModelData { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['id'] = this.id; data['surahID'] = this.surahID; data['nameAR'] = this.nameAR; diff --git a/lib/models/vacation_rule/create_vacation_rule_list_model.dart b/lib/models/vacation_rule/create_vacation_rule_list_model.dart index 5fd489a..cff2a49 100644 --- a/lib/models/vacation_rule/create_vacation_rule_list_model.dart +++ b/lib/models/vacation_rule/create_vacation_rule_list_model.dart @@ -10,7 +10,7 @@ class CreateVacationRuleList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/vacation_rule/get_item_type_notifications_list_model.dart b/lib/models/vacation_rule/get_item_type_notifications_list_model.dart index 4d80a0e..ef11453 100644 --- a/lib/models/vacation_rule/get_item_type_notifications_list_model.dart +++ b/lib/models/vacation_rule/get_item_type_notifications_list_model.dart @@ -18,7 +18,7 @@ class GetItemTypeNotificationsList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['FYI_FLAG'] = this.fYIFLAG; data['NOTIFICATION_DISPLAY_NAME'] = this.nOTIFICATIONDISPLAYNAME; data['NOTIFICATION_NAME'] = this.nOTIFICATIONNAME; diff --git a/lib/models/vacation_rule/get_notification_reassign_mode_list_model.dart b/lib/models/vacation_rule/get_notification_reassign_mode_list_model.dart index e3495d0..c111a71 100644 --- a/lib/models/vacation_rule/get_notification_reassign_mode_list_model.dart +++ b/lib/models/vacation_rule/get_notification_reassign_mode_list_model.dart @@ -13,7 +13,7 @@ class GetNotificationReassignModeList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['RADIO_BUTTON_ACTION'] = this.rADIOBUTTONACTION; data['RADIO_BUTTON_LABEL'] = this.rADIOBUTTONLABEL; data['RADIO_BUTTON_SEQ'] = this.rADIOBUTTONSEQ; diff --git a/lib/models/vacation_rule/get_vacation_rules_list_model.dart b/lib/models/vacation_rule/get_vacation_rules_list_model.dart index 5abd32a..f93fdb5 100644 --- a/lib/models/vacation_rule/get_vacation_rules_list_model.dart +++ b/lib/models/vacation_rule/get_vacation_rules_list_model.dart @@ -66,7 +66,7 @@ class GetVacationRulesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ACTION'] = this.aCTION; data['ACTION_DISPLAY'] = this.aCTIONDISPLAY; data['BEGIN_DATE'] = this.bEGINDATE; diff --git a/lib/models/vacation_rule/respond_attributes_list_model.dart b/lib/models/vacation_rule/respond_attributes_list_model.dart index ca7b2db..79de43f 100644 --- a/lib/models/vacation_rule/respond_attributes_list_model.dart +++ b/lib/models/vacation_rule/respond_attributes_list_model.dart @@ -18,7 +18,7 @@ class RespondAttributesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ATTRIBUTE_DISPLAY_NAME'] = this.aTTRIBUTEDISPLAYNAME; data['ATTRIBUTE_FORMAT'] = this.aTTRIBUTEFORMAT; data['ATTRIBUTE_NAME'] = this.aTTRIBUTENAME; diff --git a/lib/models/vacation_rule/vr_item_types_list_model.dart b/lib/models/vacation_rule/vr_item_types_list_model.dart index d31ffa6..69735db 100644 --- a/lib/models/vacation_rule/vr_item_types_list_model.dart +++ b/lib/models/vacation_rule/vr_item_types_list_model.dart @@ -10,7 +10,7 @@ class VrItemTypesList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['ITEM_TYPE'] = this.iTEMTYPE; data['ITEM_TYPE_DISPLAY_NAME'] = this.iTEMTYPEDISPLAYNAME; return data; diff --git a/lib/models/vacation_rule/wf_look_up_list_model.dart b/lib/models/vacation_rule/wf_look_up_list_model.dart index 25fb2ee..3b48e26 100644 --- a/lib/models/vacation_rule/wf_look_up_list_model.dart +++ b/lib/models/vacation_rule/wf_look_up_list_model.dart @@ -12,7 +12,7 @@ class WFLookUpList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['LOOKUP_CODE'] = this.lOOKUPCODE; data['LOOKUP_DESCRIPTION'] = this.lOOKUPDESCRIPTION; data['LOOKUP_MEANING'] = this.lOOKUPMEANING; diff --git a/lib/models/validate_eit_transaction_list_model.dart b/lib/models/validate_eit_transaction_list_model.dart index 02f2af0..ac35c17 100644 --- a/lib/models/validate_eit_transaction_list_model.dart +++ b/lib/models/validate_eit_transaction_list_model.dart @@ -10,7 +10,7 @@ class ValidateEITTransactionList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['P_RETURN_MSG'] = this.pRETURNMSG; data['P_RETURN_STATUS'] = this.pRETURNSTATUS; return data; diff --git a/lib/models/worklist/hr/get_basic_det_ntf_body_list_model.dart b/lib/models/worklist/hr/get_basic_det_ntf_body_list_model.dart index afdcd29..0275ce5 100644 --- a/lib/models/worklist/hr/get_basic_det_ntf_body_list_model.dart +++ b/lib/models/worklist/hr/get_basic_det_ntf_body_list_model.dart @@ -14,7 +14,7 @@ class GetBasicDetNtfBodyList { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['PREV_SEGMENT_VALUE_DSP'] = this.prevSegmentValueDsp; data['SEGMENT_PROMPT'] = this.segmentPrompt; data['SEGMENT_VALUE_DSP'] = this.segmentValueDsp; diff --git a/lib/models/worklist_item_type_model.dart b/lib/models/worklist_item_type_model.dart index 49346c0..b164bd0 100644 --- a/lib/models/worklist_item_type_model.dart +++ b/lib/models/worklist_item_type_model.dart @@ -24,7 +24,7 @@ class WorkListItemTypeModelData { } Map toJson() { - final Map data = {}; + Map data = {}; data['value'] = value; data['name'] = name; data['fullName'] = fullName; diff --git a/lib/models/worklist_response_model.dart b/lib/models/worklist_response_model.dart index 4899d5a..0ab44cf 100644 --- a/lib/models/worklist_response_model.dart +++ b/lib/models/worklist_response_model.dart @@ -100,7 +100,7 @@ class WorkListResponseModel { } Map toJson() { - final Map data = new Map(); + Map data = new Map(); data['BEGIN_DATE'] = this.bEGINDATE; data['DUE_DATE'] = this.dUEDATE; data['END_DATE'] = this.eNDDATE; diff --git a/lib/ui/attendance/add_vacation_rule_screen.dart b/lib/ui/attendance/add_vacation_rule_screen.dart index b7f7f5d..4846053 100644 --- a/lib/ui/attendance/add_vacation_rule_screen.dart +++ b/lib/ui/attendance/add_vacation_rule_screen.dart @@ -526,8 +526,8 @@ class _AddVacationRuleScreenState extends State { ), ); } else { - final DateTime? picked = await showDatePicker(context: context, initialDate: _time, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); - final TimeOfDay? timePicked = await showTimePicker( + DateTime? picked = await showDatePicker(context: context, initialDate: _time, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); + TimeOfDay? timePicked = await showTimePicker( context: context, initialTime: TimeOfDay.fromDateTime(picked!), ); @@ -570,7 +570,7 @@ class _AddVacationRuleScreenState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: dateInput ?? DateTime.now(), initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != dateInput) { time = picked; diff --git a/lib/ui/attendance/monthly_attendance_screen.dart b/lib/ui/attendance/monthly_attendance_screen.dart index 6a73f70..caaf65c 100644 --- a/lib/ui/attendance/monthly_attendance_screen.dart +++ b/lib/ui/attendance/monthly_attendance_screen.dart @@ -694,7 +694,7 @@ class _MonthlyAttendanceScreenState extends State { } List _getDataSource() { - final List meetings = []; + List meetings = []; return meetings; } @@ -792,7 +792,7 @@ class MeetingDataSource extends CalendarDataSource { } Meeting _getMeetingData(int index) { - final dynamic meeting = appointments; + dynamic meeting = appointments; Meeting meetingData; if (meeting is Meeting) { meetingData = meeting; diff --git a/lib/ui/landing/dashboard_screen.dart b/lib/ui/landing/dashboard_screen.dart index da9cb5f..4a6ad82 100644 --- a/lib/ui/landing/dashboard_screen.dart +++ b/lib/ui/landing/dashboard_screen.dart @@ -56,7 +56,7 @@ class _DashboardScreenState extends State { @override Widget build(BuildContext context) { List namesD = ["Nostalgia Perfume Perfume", "Al Nafoura", "AlJadi", "Nostalgia Perfume"]; - final GlobalKey _key = GlobalKey(); // + GlobalKey _key = GlobalKey(); // return Scaffold( key: _scaffoldState, body: Column( diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart index 051d72a..72b0567 100644 --- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart +++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart @@ -736,7 +736,7 @@ class _DynamicInputScreenState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; @@ -768,7 +768,7 @@ class _DynamicInputScreenState extends State { ), ); } else { - final TimeOfDay? picked = await showTimePicker( + TimeOfDay? picked = await showTimePicker( context: context, initialTime: time, builder: (cxt, child) { diff --git a/lib/ui/profile/add_update_family_member.dart b/lib/ui/profile/add_update_family_member.dart index 9a0bd66..6ad82d0 100644 --- a/lib/ui/profile/add_update_family_member.dart +++ b/lib/ui/profile/add_update_family_member.dart @@ -345,7 +345,7 @@ class _AddUpdateFamilyMemberState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; diff --git a/lib/ui/profile/delete_family_member.dart b/lib/ui/profile/delete_family_member.dart index 58ec825..af4601d 100644 --- a/lib/ui/profile/delete_family_member.dart +++ b/lib/ui/profile/delete_family_member.dart @@ -141,7 +141,7 @@ class _DeleteFamilyMemberState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; diff --git a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart index c4dadd2..815db77 100644 --- a/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart +++ b/lib/ui/profile/dynamic_screens/dynamic_input_address_screen.dart @@ -325,7 +325,7 @@ class _DynamicInputScreenState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; diff --git a/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart b/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart index a279305..422d67b 100644 --- a/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart +++ b/lib/ui/profile/dynamic_screens/dynamic_input_basic_details_screen.dart @@ -336,7 +336,7 @@ class _DynamicInputScreenState extends State { ), ); } else { - final DateTime? picked = + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; diff --git a/lib/ui/profile/profile_screen.dart b/lib/ui/profile/profile_screen.dart index cea9f11..8caf637 100644 --- a/lib/ui/profile/profile_screen.dart +++ b/lib/ui/profile/profile_screen.dart @@ -138,7 +138,7 @@ class _ProfileScreenState extends State { } void openGallery(bool isCamera) async { - final XFile? image = await _picker.pickImage(source: isCamera ? ImageSource.camera : ImageSource.gallery); + XFile? image = await _picker.pickImage(source: isCamera ? ImageSource.camera : ImageSource.gallery); if (image != null) { String img = base64.encode(await image!.readAsBytes()); diff --git a/lib/ui/screens/announcements/announcement_details.dart b/lib/ui/screens/announcements/announcement_details.dart index a8b2c2c..06af534 100644 --- a/lib/ui/screens/announcements/announcement_details.dart +++ b/lib/ui/screens/announcements/announcement_details.dart @@ -67,7 +67,7 @@ class _AnnouncementDetailsState extends State { void getRequestID() { if (currentPageNo == 0) { - final arguments = (ModalRoute.of(context)?.settings.arguments ?? {}) as Map; + Map arguments = (ModalRoute.of(context)?.settings.arguments ?? {}) as Map; currentPageNo = arguments["currentPageNo"]; rowID = arguments["rowID"]; getAnnouncementDetails(0, rowID); diff --git a/lib/ui/screens/pending_transactions/pending_transactions.dart b/lib/ui/screens/pending_transactions/pending_transactions.dart index 997ec0d..0a69c60 100644 --- a/lib/ui/screens/pending_transactions/pending_transactions.dart +++ b/lib/ui/screens/pending_transactions/pending_transactions.dart @@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/cupertino.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/date_uitl.dart'; import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/config/routes.dart'; @@ -39,88 +38,74 @@ class _PendingTransactionsState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Colors.white, - appBar: AppBarWidget( - context, - title: LocaleKeys.pendingTransactions.tr(), - ), - body: SingleChildScrollView( - child: Container( - width: double.infinity, - padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), - margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(10), - boxShadow: [ - BoxShadow( - color: const Color(0xff000000).withOpacity(.05), - blurRadius: 26, - offset: const Offset(0, -3), - ), - ], - ), - child: Column( - children: [ - 12.height, - PopupMenuButton( - child: DynamicTextFieldWidget( - LocaleKeys.selectRequestType.tr(), - selectedFunction?.fUNCTIONPROMPT ?? "", - isEnable: false, - isPopup: true, - isInputTypeNum: true, - isReadOnly: false, - ).paddingOnly(bottom: 12), - itemBuilder: (_) => >[ - for (int i = 0; i < getPendingTransactionsFunctions!.length; i++) PopupMenuItem(child: Text(getPendingTransactionsFunctions![i].fUNCTIONPROMPT!), value: i), - ], - onSelected: (int popupIndex) { - selectedFunction = getPendingTransactionsFunctions[popupIndex]; - setState(() {}); - }), - 12.height, - DynamicTextFieldWidget( - LocaleKeys.dateFrom.tr(), - selectedDateFrom.toString().split(" ")[0], - suffixIconData: Icons.calendar_today, - isEnable: false, - onTap: () async { - selectedDateFrom = await _selectDate(context, DateTime.now()); - setState(() {}); - }, - ).paddingOnly(bottom: 12), - 12.height, - DynamicTextFieldWidget( - LocaleKeys.dateTo.tr(), - selectedDateTo.toString().split(" ")[0], - suffixIconData: Icons.calendar_today, - isEnable: false, - onTap: () async { - selectedDateTo = await _selectDate(context, DateTime.now()); + backgroundColor: Colors.white, + appBar: AppBarWidget( + context, + title: LocaleKeys.pendingTransactions.tr(), + ), + body: Column( + children: [ + Column( + children: [ + PopupMenuButton( + child: DynamicTextFieldWidget( + LocaleKeys.requestType.tr(), + selectedFunction?.fUNCTIONPROMPT ?? LocaleKeys.selectRequestType.tr(), + isEnable: false, + isPopup: true, + isInputTypeNum: true, + isReadOnly: false, + ), + itemBuilder: (_) => >[ + for (int i = 0; i < getPendingTransactionsFunctions.length; i++) PopupMenuItem(child: Text(getPendingTransactionsFunctions![i].fUNCTIONPROMPT!), value: i), + ], + onSelected: (int popupIndex) { + selectedFunction = getPendingTransactionsFunctions[popupIndex]; setState(() {}); - }, - ).paddingOnly(bottom: 12), - ], - ), - ), - ), - bottomSheet: Container( - decoration: const BoxDecoration( - color: MyColors.white, - boxShadow: [ - BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3), + }), + 12.height, + DynamicTextFieldWidget( + LocaleKeys.dateFrom.tr(), + selectedDateFrom.toString().split(" ")[0], + suffixIconData: Icons.calendar_today, + isEnable: false, + onTap: () async { + selectedDateFrom = await _selectDate(context, DateTime.now()); + setState(() {}); + }, + ), + 12.height, + DynamicTextFieldWidget( + LocaleKeys.dateTo.tr(), + selectedDateTo.toString().split(" ")[0], + suffixIconData: Icons.calendar_today, + isEnable: false, + onTap: () async { + selectedDateTo = await _selectDate(context, DateTime.now()); + setState(() {}); + }, + ) ], - ), - child: DefaultButton( + ).objectContainerView().expanded, + DefaultButton( LocaleKeys.submit.tr(), selectedFunction == null ? null : () async { - openRequestDetails(); + Navigator.pushNamed( + context, + AppRoutes.pendingTransactionsDetails, + arguments: { + "selectedFunctionID": selectedFunction?.fUNCTIONID, + "dateFrom": DateUtil.convertDateToString(selectedDateFrom), + "dateTo": DateUtil.convertDateToString(selectedDateTo) + }, + ); }) - .insideContainer, - )); + .insideContainer + ], + ), + ); } Future _selectDate(BuildContext context, DateTime selectedDate) async { @@ -144,8 +129,7 @@ class _PendingTransactionsState extends State { ), ); } else { - final DateTime? picked = - await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); + DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101)); if (picked != null && picked != selectedDate) { time = picked; } @@ -163,20 +147,4 @@ class _PendingTransactionsState extends State { Utils.handleException(ex, context, null); } } - - void openRequestDetails() async { - await Navigator.pushNamed(context, AppRoutes.pendingTransactionsDetails, - arguments: {"selectedFunctionID": selectedFunction?.fUNCTIONID, "dateFrom": DateUtil.convertDateToString(selectedDateFrom), "dateTo": DateUtil.convertDateToString(selectedDateTo)}); - } - - void getPendingReqDetails() async { - try { - Utils.showLoading(context); - getPendingTransactionsFunctions = await PendingTransactionsApiClient().getPendingReqFunctions(); - Utils.hideLoading(context); - } catch (ex) { - Utils.hideLoading(context); - Utils.handleException(ex, context, null); - } - } } diff --git a/lib/ui/screens/pending_transactions/pending_transactions_details.dart b/lib/ui/screens/pending_transactions/pending_transactions_details.dart index 2c8895a..0ff7f06 100644 --- a/lib/ui/screens/pending_transactions/pending_transactions_details.dart +++ b/lib/ui/screens/pending_transactions/pending_transactions_details.dart @@ -1,13 +1,13 @@ 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/extensions/widget_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'; +import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart'; class PendingTransactionsDetails extends StatefulWidget { const PendingTransactionsDetails({Key? key}) : super(key: key); @@ -21,7 +21,7 @@ class _PendingTransactionsDetailsState extends State String dateFrom = ""; String dateTo = ""; - List getPendingTransactionsDetails = []; + List? getPendingTransactionsDetails; @override void initState() { @@ -30,7 +30,7 @@ class _PendingTransactionsDetailsState extends State void getFunctionID() { if (functionID == "") { - final arguments = (ModalRoute.of(context)?.settings.arguments ?? {}) as Map; + Map arguments = (ModalRoute.of(context)?.settings.arguments ?? {}) as Map; functionID = arguments["selectedFunctionID"].toString(); dateFrom = arguments["dateFrom"]; dateTo = arguments["dateTo"]; @@ -47,81 +47,27 @@ class _PendingTransactionsDetailsState extends State context, title: LocaleKeys.pendingTransactions.tr(), ), - body: getPendingTransactionsDetails.isNotEmpty - ? Container( - margin: const EdgeInsets.only(top: 10.0), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: ListView.separated( - physics: const BouncingScrollPhysics(), - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) { - return Container( - width: double.infinity, - padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), - margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(10), - boxShadow: [ - BoxShadow( - color: const Color(0xff000000).withOpacity(.05), - blurRadius: 26, - offset: const Offset(0, -3), - ), - ], - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - "Created For ".toText14(color: MyColors.grey57Color), - getPendingTransactionsDetails[index].tRANSACTIONCREATEDFOR!.toText14(color: MyColors.grey57Color), - ], - ), - Column( - children: [ - getPendingTransactionsDetails[index].cREATIONDATE!.split(" ")[0].toText12(color: MyColors.grey70Color), - getPendingTransactionsDetails[index].cREATIONDATE!.split(" ")[1].toText12(color: MyColors.grey70Color), - ], - ), - ], - ), - Container( - child: Row( - children: [ - "Request Name: ".toText14(color: MyColors.grey57Color), - getPendingTransactionsDetails[index].uSERFUNCTIONNAME!.toText12(color: MyColors.grey57Color), - ], - ), - ), - Container( - padding: const EdgeInsets.only(top: 0.0), - child: Row( - children: [ - LocaleKeys.requestType.tr().toText14(color: MyColors.grey57Color), - getPendingTransactionsDetails[index].rEQUESTTYPE!.toText14(color: MyColors.redColor), - ], - ), - ), - ], - ), - ); - }, - separatorBuilder: (BuildContext context, int index) => 12.height, - itemCount: getPendingTransactionsDetails.length ?? 0)) - ], - ), - ) - : Utils.getNoDataWidget(context), + body: getPendingTransactionsDetails == null + ? const SizedBox() + : (getPendingTransactionsDetails!.isNotEmpty + ? ListView.separated( + physics: const BouncingScrollPhysics(), + padding: const EdgeInsets.all(21), + itemBuilder: (BuildContext context, int index) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + ItemDetailView(LocaleKeys.createdFor.tr(), getPendingTransactionsDetails![index].tRANSACTIONCREATEDFOR!), + ItemDetailView(LocaleKeys.creationDate.tr(), getPendingTransactionsDetails![index].cREATIONDATE!), + ItemDetailView(LocaleKeys.requestName.tr(), getPendingTransactionsDetails![index].uSERFUNCTIONNAME!), + ItemDetailView(LocaleKeys.requestType.tr(), getPendingTransactionsDetails![index].rEQUESTTYPE!), + ], + ).objectContainerView(); + }, + separatorBuilder: (BuildContext context, int index) => 12.height, + itemCount: getPendingTransactionsDetails!.length) + : Utils.getNoDataWidget(context)), ); } diff --git a/lib/widgets/circular_step_progress_bar.dart b/lib/widgets/circular_step_progress_bar.dart index 6789aed..b137dc6 100644 --- a/lib/widgets/circular_step_progress_bar.dart +++ b/lib/widgets/circular_step_progress_bar.dart @@ -173,7 +173,7 @@ class CircularStepProgressBar extends StatelessWidget { Widget build(BuildContext context) { // Print warning when arcSize greater than math.pi * 2 which causes steps to overlap if (arcSize > math.pi * 2) print("WARNING (step_progress_indicator): arcSize of CircularStepProgressBar is greater than 360° (math.pi * 2), this will cause some steps to overlap!"); - final TextDirection textDirection = Directionality.of(context); + TextDirection textDirection = Directionality.of(context); return LayoutBuilder( builder: (context, constraints) => SizedBox( @@ -232,7 +232,7 @@ class CircularStepProgressBar extends StatelessWidget { for (int step = 0; step < totalSteps; ++step) { // Consider max between selected and unselected case - final customSizeValue = math.max(customStepSize!(step, false), customStepSize!(step, true)); + var customSizeValue = math.max(customStepSize!(step, false), customStepSize!(step, true)); if (customSizeValue > currentMaxSize) { currentMaxSize = customSizeValue; } @@ -288,19 +288,19 @@ class _CircularIndicatorPainter implements CustomPainter { @override void paint(Canvas canvas, Size size) { - final w = size.width; - final h = size.height; + var w = size.width; + var h = size.height; // Step length is user-defined arcSize // divided by the total number of steps (each step same size) - final stepLength = arcSize / totalSteps; + var stepLength = arcSize / totalSteps; // Define general arc paint Paint paint = Paint() ..style = PaintingStyle.stroke ..strokeWidth = maxDefinedSize; - final rect = Rect.fromCenter( + var rect = Rect.fromCenter( // Rect created from the center of the widget center: Offset(w / 2, h / 2), // For both height and width, subtract maxDefinedSize to fit indicator inside the parent container @@ -313,7 +313,7 @@ class _CircularIndicatorPainter implements CustomPainter { } // Change color selected or unselected based on the circularDirection - final isClockwise = circularDirection == CircularDirection.clockwise; + var isClockwise = circularDirection == CircularDirection.clockwise; // Make a continuous arc without rendering all the steps when possible if (padding == 0 && customColor == null && customStepSize == null && roundedCap == null) { @@ -334,10 +334,10 @@ class _CircularIndicatorPainter implements CustomPainter { double stepAngle = isClockwise ? startingAngle - stepLength : startingAngle; for (; isClockwise ? step >= 0 : step < totalSteps; isClockwise ? stepAngle -= stepLength : stepAngle += stepLength, isClockwise ? --step : ++step) { // Check if the current step is selected or unselected - final isSelectedColor = _isSelectedColor(step, isClockwise); + var isSelectedColor = _isSelectedColor(step, isClockwise); // Size of the step - final indexStepSize = customStepSize != null + var indexStepSize = customStepSize != null // Consider step index inverted when counterclockwise ? customStepSize!(_indexOfStep(step, isClockwise), isSelectedColor) : isSelectedColor @@ -345,7 +345,7 @@ class _CircularIndicatorPainter implements CustomPainter { : unselectedStepSize ?? stepSize; // Use customColor if defined - final stepColor = customColor != null + var stepColor = customColor != null // Consider step index inverted when counterclockwise ? customColor!(_indexOfStep(step, isClockwise)) : isSelectedColor @@ -353,14 +353,14 @@ class _CircularIndicatorPainter implements CustomPainter { : unselectedColor!; // Apply stroke cap to each step - final hasStrokeCap = roundedCap != null ? roundedCap!(_indexOfStep(step, isClockwise), isSelectedColor) : false; - final strokeCap = hasStrokeCap ? StrokeCap.round : StrokeCap.butt; + var hasStrokeCap = roundedCap != null ? roundedCap!(_indexOfStep(step, isClockwise), isSelectedColor) : false; + var strokeCap = hasStrokeCap ? StrokeCap.round : StrokeCap.butt; // Remove extra size caused by rounded stroke cap // https://github.com/SandroMaglione/step-progress-indicator/issues/20#issue-786114745 - final extraCapSize = indexStepSize / 2; - final extraCapAngle = extraCapSize / (rect.width / 2); - final extraCapRemove = hasStrokeCap && removeRoundedCapExtraAngle; + var extraCapSize = indexStepSize / 2; + var extraCapAngle = extraCapSize / (rect.width / 2); + var extraCapRemove = hasStrokeCap && removeRoundedCapExtraAngle; // Draw arc steps of the indicator _drawArcOnCanvas( @@ -379,35 +379,35 @@ class _CircularIndicatorPainter implements CustomPainter { /// Draw optimized continuous indicator instead of multiple steps void _drawContinuousArc(Canvas canvas, Paint paint, Rect rect, bool isClockwise) { // Compute color of the selected and unselected bars - final firstStepColor = isClockwise ? selectedColor : unselectedColor; - final secondStepColor = !isClockwise ? selectedColor : unselectedColor; + var firstStepColor = isClockwise ? selectedColor : unselectedColor; + var secondStepColor = !isClockwise ? selectedColor : unselectedColor; // Selected and unselected step sizes if defined, otherwise use stepSize - final firstStepSize = isClockwise ? selectedStepSize ?? stepSize : unselectedStepSize ?? stepSize; - final secondStepSize = !isClockwise ? selectedStepSize ?? stepSize : unselectedStepSize ?? stepSize; + var firstStepSize = isClockwise ? selectedStepSize ?? stepSize : unselectedStepSize ?? stepSize; + var secondStepSize = !isClockwise ? selectedStepSize ?? stepSize : unselectedStepSize ?? stepSize; // Compute length and starting angle of the selected and unselected bars - final firstArcLength = arcSize * (currentStep / totalSteps); - final secondArcLength = arcSize - firstArcLength; + var firstArcLength = arcSize * (currentStep / totalSteps); + var secondArcLength = arcSize - firstArcLength; // firstArcStartingAngle = startingAngle - final secondArcStartingAngle = startingAngle + firstArcLength; + var secondArcStartingAngle = startingAngle + firstArcLength; // Apply stroke cap to both arcs // NOTE: For continuous circular indicator, it uses 0 and 1 as index to // apply the rounded cap - final firstArcStrokeCap = roundedCap != null + var firstArcStrokeCap = roundedCap != null ? isClockwise ? roundedCap!(0, true) : roundedCap!(1, false) : false; - final secondArcStrokeCap = roundedCap != null + var secondArcStrokeCap = roundedCap != null ? isClockwise ? roundedCap!(1, false) : roundedCap!(0, true) : false; - final firstCap = firstArcStrokeCap ? StrokeCap.round : StrokeCap.butt; - final secondCap = secondArcStrokeCap ? StrokeCap.round : StrokeCap.butt; + var firstCap = firstArcStrokeCap ? StrokeCap.round : StrokeCap.butt; + var secondCap = secondArcStrokeCap ? StrokeCap.round : StrokeCap.butt; // When clockwise, draw the second arc first and the first on top of it // Required when stroke cap is rounded to make the selected step on top of the unselected diff --git a/lib/widgets/location/Location.dart b/lib/widgets/location/Location.dart index 8456fd2..47e2238 100644 --- a/lib/widgets/location/Location.dart +++ b/lib/widgets/location/Location.dart @@ -93,7 +93,7 @@ class _Map { BitmapDescriptor? icon, VoidCallback? onTap, }) { - final MarkerId markerId = MarkerId(id); + MarkerId markerId = MarkerId(id); return Marker( icon: icon ?? BitmapDescriptor.defaultMarker, markerId: markerId, @@ -224,7 +224,7 @@ class _Map { if (bound == null) return; CameraUpdate camera = CameraUpdate.newLatLngBounds(bound, padding!); - final GoogleMapController controller = await mapController!.future; + GoogleMapController controller = await mapController!.future; controller.animateCamera(camera); } diff --git a/lib/widgets/nfc/nfc_reader_sheet.dart b/lib/widgets/nfc/nfc_reader_sheet.dart index 84397ba..53c0d4f 100644 --- a/lib/widgets/nfc/nfc_reader_sheet.dart +++ b/lib/widgets/nfc/nfc_reader_sheet.dart @@ -42,7 +42,7 @@ class _NfcLayoutState extends State { NfcManager.instance.startSession(onDiscovered: (NfcTag tag) async { print(tag.data); var f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22); - final String identifier = f.identifier.map((e) => e.toRadixString(16).padLeft(2, '0')).join(''); + String identifier = f.identifier.map((e) => e.toRadixString(16).padLeft(2, '0')).join(''); // print(identifier); // => 0428fcf2255e81 nfcId = identifier;