Commit Graph

533 Commits

Author SHA1 Message Date
a.ghabeli b801d75f99 Merge pull request 'Enhance authentication flow and user role management' (#218) from fixed_role_bug into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/218
2025-10-14 12:26:41 +03:30
amirrezaghabeli 38222afcfa Enhance authentication flow and user role management
- Updated AuthViewModel to hydrate user data from storage on initialization.
- Added method to AuthRepository for retrieving stored customer data.
- Enhanced AuthService to save and retrieve customer data from SharedPreferences.
- Refactored UI components to use context.watch for user role updates in MeetingTimeDialog, TenderDetailActions, and TendersPage.
- Improved navigation logic in final completion pages to handle user interactions more effectively.
2025-10-14 12:24:04 +03:30
a.ghabeli a343cf2469 Merge pull request 'Implement role-based navigation in MeetingTimeDialog' (#217) from change_navigate into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/217
2025-10-14 10:25:57 +03:30
amirrezaghabeli cc16d28195 Implement role-based navigation in MeetingTimeDialog
- Added user role retrieval from AuthViewModel in MeetingTimeDialog.
- Updated navigation logic to conditionally push routes based on user role (admin or non-admin) when confirming meeting time.
2025-10-14 10:24:06 +03:30
a.ghabeli 63ec080e3b Merge pull request 'Enhance Customer model to include role attribute and update related components' (#216) from fixes into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/216
2025-10-14 09:14:05 +03:30
amirrezaghabeli 13dbb5fae5 Enhance Customer model to include role attribute and update related components
- Added a new `role` attribute to the `Customer` model in `customer.dart` and updated the corresponding generated files.
- Modified the `AuthViewModel` to set the user role based on the logged-in user's role.
- Updated UI components in `TenderDetailActions` and `DesktopTendersPage` to conditionally render elements based on the user's role.
- Refactored tests to validate the new role attribute in the `Customer` model.
2025-10-14 09:12:24 +03:30
a.ghabeli 504fa1e80a Merge pull request 'fix_bugs' (#215) from fix_bugs into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/215
2025-10-13 16:18:48 +03:30
amirrezaghabeli f37ddd1b88 Refactor tender status handling in desktop and tablet pages
- Updated the status checks in `_YourTendersDesktopPageState` and `_YourTendersTabletPageState` to use `TenderFeedback` values instead of string constants for better maintainability.
2025-10-13 16:18:13 +03:30
amirrezaghabeli f0cbe00b2f Update dependencies, enhance API endpoints, and refactor UI components
- Updated `pubspec.lock` to new package versions for `async`, `fake_async`, `leak_tracker`, and `vm_service`.
- Modified API endpoint for unread notifications to include `event_type=PUSH`.
- Refactored `CompletionOfDocumentsMobilePage` layout for improved structure.
- Simplified `DetailDropDown` widget by removing unnecessary animations.
- Updated `CommentBox` styling and adjusted padding for better UI consistency.
- Replaced deprecated `FormCard` implementation in final completion pages with a new widget structure.
- Enhanced button styles across various dialogs and pages for a cohesive design.
2025-10-13 16:10:18 +03:30
a.ghabeli 2c5db7f297 Merge pull request 'added web tablet pages' (#214) from completion_of_documents into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/214
2025-10-13 14:52:20 +03:30
amirrezaghabeli 919b9fb2ed Refactor completion of documents routing and UI components
- Removed unused mobile route for completion of documents.
- Updated app routes to reflect the removal of the mobile route.
- Enhanced the desktop and mobile pages for completion of documents with improved layout and added TabletDesktopAppbar.
- Introduced meeting time handling in TenderDetailActions, integrating new bottom sheet and dialog components for better user interaction.
- Added meeting time state management in TenderDetailViewModel.
- Cleaned up deprecated files related to meeting time selection.
2025-10-13 14:51:39 +03:30
llsajjad be6b0bbe98 added web tablet pages 2025-10-13 11:54:23 +03:30
a.ghabeli d3c5ea7c9a Merge pull request 'Modified TenderDetailHeader to conditionally display the estimated value container based on its presence' (#213) from detail_budget into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/213
2025-10-12 15:36:43 +03:30
amirrezaghabeli 495e2db384 Modified TenderDetailHeader to conditionally display the estimated value container based on its presence 2025-10-12 15:36:02 +03:30
a.ghabeli 5b0536aae8 Merge pull request 'dialogs_fix' (#212) from dialogs_fix into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/212
2025-10-12 15:30:34 +03:30
amirrezaghabeli 79a0ecd87f Refactor tender dialogs to utilize ViewModel and improve state management
- Updated `TendersFilterDialog` and `TendersSortDialog` to use a stateful approach, allowing for better management of selected filters and sorting options.
- Integrated `TendersViewModel` into both dialogs, enabling direct interaction with the view model for setting date ranges and statuses.
- Enhanced the UI to reflect changes in state, ensuring a more responsive user experience when applying filters and sorting.
- Updated the `d_tenders_page.dart` to pass the view model and handle filter and sort actions appropriately.
2025-10-12 15:29:54 +03:30
amirrezaghabeli 6d674a4a1b Update dependencies and enhance tender approval status handling
- Updated `pubspec.lock` to reflect new versions for several packages, including `async`, `fake_async`, `leak_tracker`, and `vm_service`.
- Modified `TenderApprovalStatus` enum to include a new status `approved`.
- Updated routing for `YourTendersRouteData` to accept a status parameter and pass it to the `YourTendersScreen`.
- Adjusted API calls and view models to utilize the new status handling, ensuring proper filtering and display of tender data based on approval status.
- Enhanced filter dialog to support new status options and improved user feedback in the UI for submitted and approved tenders.
2025-10-12 14:57:33 +03:30
a.ghabeli 5e382e78ad Merge pull request 'Fixed icon color of web and tablet pagination' (#211) from w_t_web_pagination_icon into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/211
2025-10-12 11:38:09 +03:30
llsajjad ecd6f863c2 Fixed icon color of web and tablet pagination 2025-10-12 11:36:24 +03:30
a.ghabeli 6d247b0476 Merge pull request 'fixed web build failed' (#210) from fix_build into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/210
2025-10-11 11:15:47 +03:30
amirrezaghabeli f7fd3826f5 fixed web build failed 2025-10-11 11:15:04 +03:30
Yashar Panahi cccd637771 Merge pull request 'test_response' (#209) from test_response into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/209
2025-10-07 08:15:43 +03:30
llsajjad 69623d82ba work on test models part 1 2025-10-06 16:26:53 +03:30
a.ghabeli 7eba8f7e11 Merge pull request 'Add forgot password, reset password, and verify OTP providers and view models' (#208) from refactor_auth into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/208
2025-10-06 15:39:38 +03:30
amirrezaghabeli cee5e6c6d6 Add forgot password, reset password, and verify OTP providers and view models
- Implemented `ForgotPasswordViewModel`, `ResetPasswordViewModel`, and `VerifyOtpViewModel` for handling respective functionalities.
- Created provider functions for lazy loading of these view models in the app.
- Updated routing to utilize the new providers for managing state in the forgot password flow.
- Refactored UI components to integrate with the new view models, ensuring proper state management and user feedback during operations.
2025-10-06 15:39:08 +03:30
a.ghabeli b522bc77a9 Merge pull request 'Refactor provider initialization to load only essential providers at startup. Introduce TabNavigationService for managing tab state and update screens to respond to tab changes. Clean up view models and navigation logic for improved performance and mai…' (#207) from refactor into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/207
2025-10-06 14:13:33 +03:30
amirrezaghabeli b43ebf885b Refactor provider initialization to load only essential providers at startup. Introduce TabNavigationService for managing tab state and update screens to respond to tab changes. Clean up view models and navigation logic for improved performance and maintainability. 2025-10-06 14:12:40 +03:30
a.ghabeli 645247183b Merge pull request 'refactors' (#206) from refactors into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/206
2025-10-06 12:34:46 +03:30
amirrezaghabeli 7560402632 Refactor dependency injection to use lazy loading for providers in the core configuration. Remove unused logout method from AuthViewModel and adjust ProfileViewModel to call localLogout directly from AuthRepository. Clean up constructor parameters in ProfileViewModel and TenderDetailViewModel by removing unnecessary dependencies. 2025-10-06 12:24:18 +03:30
amirrezaghabeli 42f2e93a8e Update .gitignore to exclude Firebase configuration files and refactor notification handling in the app. Removed redundant logging and notification data storage in SharedPreferences. Introduced NotificationCheckService and NotificationStateService for improved notification management. Updated view models and UI components to utilize the new services, enhancing notification state tracking and user experience. 2025-10-06 11:59:54 +03:30
a.ghabeli 17634744f7 Merge pull request 'auth_view_model' (#205) from auth_view_model into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/205
2025-10-06 10:33:38 +03:30
amirrezaghabeli 7e1240dffb some fixes 2025-10-06 10:32:58 +03:30
a.ghabeli df203b874e Merge pull request 'filter notifications based on event type which should be PUSH' (#204) from notification_filter into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/204
2025-10-06 09:48:22 +03:30
amirrezaghabeli 06fc708e21 filter notifications based on event type which should be PUSH 2025-10-06 09:47:20 +03:30
amirrezaghabeli 0653cdb6d7 changes 2025-10-06 08:58:36 +03:30
llsajjad 2367899b54 test for response data 2025-10-06 08:28:58 +03:30
a.ghabeli 15f34e7006 Merge pull request 'added sized box' (#203) from m_notification into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/203
2025-10-05 10:29:40 +03:30
amirrezaghabeli 0600572804 added sized box 2025-10-05 10:29:08 +03:30
a.ghabeli 77d1d44eb9 Merge pull request 'Refactor loading and error handling in DesktopHomePage; improve notification click handling in service worker' (#202) from some_fixes into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/202
2025-10-05 10:24:19 +03:30
amirrezaghabeli d050aab728 Refactor loading and error handling in DesktopHomePage; improve notification click handling in service worker 2025-10-05 10:23:29 +03:30
a.ghabeli f74f20a4f8 Merge pull request 'tender detail changes' (#201) from tender_detail_changes_ui into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/201
2025-10-04 10:38:30 +03:30
amirrezaghabeli 56620d4c1b tender detail changes 2025-10-04 10:37:49 +03:30
a.ghabeli fd8c969690 Merge pull request 'fixed jira tm-172 and pagination dialog design changed' (#200) from TM-172 into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/200
2025-10-02 10:10:44 +03:30
amirrezaghabeli 5f1b939d95 fixed jira tm-172 and pagination dialog design changed 2025-10-02 10:10:13 +03:30
a.ghabeli 720682105d Merge pull request 'fixed TM-173 jira task' (#199) from TM-173 into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/199
2025-10-01 14:40:38 +03:30
amirrezaghabeli 48b998f281 fixed TM-173 jira task 2025-10-01 14:40:02 +03:30
a.ghabeli 04d2f7ad94 Merge pull request 'fixed profile logout bug' (#198) from logout_bug into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/198
2025-10-01 14:26:43 +03:30
amirrezaghabeli 9305d85d01 fixed profile logout bug 2025-10-01 14:26:12 +03:30
a.ghabeli b65f4f5690 Merge pull request 'fixed TM-171 jira task' (#197) from TM-171 into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/197
2025-10-01 14:12:32 +03:30
amirrezaghabeli 006b421a9e fixed TM-171 jira task 2025-10-01 14:11:53 +03:30