281 Commits

Author SHA1 Message Date
717f0c92af feat: Add CompactPurchaseInvoiceDashboard widget and integrate into dashboard screen
- Implemented a new widget for displaying purchase invoice metrics with internal dummy data.
- Integrated the CompactPurchaseInvoiceDashboard into the dashboard screen layout.
- Updated imports in dashboard_screen.dart to include the new purchase invoice dashboard widget.
2025-12-04 17:54:48 +05:30
633a75fe92 fix: Update base URL in ApiEndpoints and increment app version to 1.0.0+18 2025-12-03 17:38:20 +05:30
8fb32c7c8e Refactor dashboard screen layout and improve loading state handling
- Simplified initialization of DynamicMenuController.
- Added loading skeleton for employee quick action cards.
- Removed daily task planning and daily progress report from card order.
- Adjusted grid layout parameters for better responsiveness.
- Cleaned up code formatting for improved readability.
2025-12-03 17:08:25 +05:30
3dfa6e5877 feat: Add infrastructure project details and list models
- Implemented ProjectDetailsResponse and ProjectData models for handling project details.
- Created ProjectsResponse and ProjectsPageData models for listing infrastructure projects.
- Added InfraProjectScreen and InfraProjectDetailsScreen for displaying project information.
- Integrated search functionality in InfraProjectScreen to filter projects.
- Updated DailyTaskPlanningScreen and DailyProgressReportScreen to accept projectId as a parameter.
- Removed unnecessary dependencies and cleaned up code for better maintainability.
2025-12-03 16:49:46 +05:30
03e3e7b5db feat: Enhance Dashboard with Attendance and Infra Projects
- Added employee attendance fetching in DashboardController.
- Introduced loading state for employees in the dashboard.
- Updated API endpoints to include attendance for the dashboard.
- Created a new InfraProjectsMainScreen with tab navigation for task planning and progress reporting.
- Improved UI components for better user experience in the dashboard.
- Refactored project selection and quick actions in the dashboard.
- Added permission constants for infrastructure projects.
2025-12-03 13:09:48 +05:30
cf85c17d75 Update base URL in ApiEndpoints to point to the correct API endpoint 2025-12-01 15:13:44 +05:30
012d40cd57 Implement job comments feature: add comment widget, API endpoints, and controller methods for fetching and posting comments 2025-12-01 14:38:58 +05:30
c9e73771b0 Refactor CustomAppBar to StatefulWidget; implement project selection dropdown and improve UI interactions 2025-11-29 15:02:03 +05:30
37ce612fca Enhance attendance management with tabbed navigation and permission handling; improve UI consistency and loading states 2025-11-29 12:34:22 +05:30
7bef2e9d89 Add job status management to service project details screen 2025-11-28 18:30:08 +05:30
341d779499 Refactor service project job handling and improve tag management 2025-11-28 15:34:13 +05:30
65fbef3441 Enhance UI and Navigation
- Added navigation to the dashboard after applying the theme in ThemeController.
- Introduced a new PillTabBar widget for a modern tab design across multiple screens.
- Updated dashboard screen to improve button actions and UI consistency.
- Refactored contact detail screen to streamline layout and enhance gradient effects.
- Implemented PillTabBar in directory main screen, expense screen, and payment request screen for consistent tab navigation.
- Improved layout structure in user document screen and employee profile screen for better user experience.
- Enhanced service project details screen with a modern tab bar implementation.
2025-11-28 14:48:39 +05:30
259f2aa928 Refactor UI components to use CustomAppBar and improve layout consistency
- Replaced existing AppBar implementations with CustomAppBar in multiple screens including PaymentRequestDetailScreen, PaymentRequestMainScreen, ServiceProjectDetailsScreen, JobDetailsScreen, DailyProgressReportScreen, DailyTaskPlanningScreen, and ServiceProjectScreen.
- Enhanced visual hierarchy by adding gradient backgrounds behind app bars for better aesthetics.
- Streamlined SafeArea usage to ensure proper content display across different devices.
- Improved code readability and maintainability by removing redundant code and consolidating UI elements.
2025-11-27 19:07:24 +05:30
18fbfaa42d enhacement of UI for mobile screen responsiveness 2025-11-25 15:32:00 +05:30
3fa578f1b4 feat: update Kotlin plugin version and modify API endpoints for improved functionality 2025-11-25 13:19:00 +05:30
516d6b0489 feat: enhance notification action handling and add refresh indicators in ServiceProjectDetailsScreen 2025-11-22 16:17:17 +05:30
e9075dcdf5 feat: add project name support in CustomAppBar and related screens for improved context 2025-11-22 15:15:38 +05:30
5c53a3f4be Refactor project structure and rename from 'marco' to 'on field work'
- Updated import paths across multiple files to reflect the new package name.
- Changed application name and identifiers in CMakeLists.txt, Runner.rc, and other configuration files.
- Modified web index.html and manifest.json to update the app title and name.
- Adjusted macOS and Windows project settings to align with the new application name.
- Ensured consistency in naming across all relevant files and directories.
2025-11-22 14:20:37 +05:30
fc78806af2 feat: implement job search functionality and archived job toggle in JobsTab; refactor ServiceProjectDetailsScreen to integrate JobsTab 2025-11-21 16:33:09 +05:30
cf7021a982 feat: refactor ExpenseDetailScreen to use tagged controller for improved state management 2025-11-20 18:02:03 +05:30
765f537cf9 feat: enhance tenant fetching logic to handle empty responses and invalid JSON gracefully 2025-11-20 16:33:08 +05:30
87a7d19672 feat: enhance job detail screen to display project branch information and improve payment request handling 2025-11-20 16:21:41 +05:30
02ef996753 feat: update projectBranchId field in API service and increment version to 1.0.0+14 2025-11-20 09:58:36 +05:30
92c739045c feat: rename Expense Type to Expense Category across controllers, models, and views for consistency 2025-11-19 17:20:44 +05:30
8edd189479 feat: add branch selection functionality and API integration for service project jobs 2025-11-19 16:36:32 +05:30
bbadcc4139 feat: update API endpoints and enhance attendance log handling in job detail screen 2025-11-19 15:44:55 +05:30
d05e26bc87 feat: enhance date range picker logic to restrict date selection and improve validation 2025-11-19 12:19:47 +05:30
253aa55a80 added manage team 2025-11-18 17:44:12 +05:30
919310644d added tag in tag out api and code 2025-11-17 17:36:11 +05:30
4d47ee3002 fixed issues 2025-11-17 15:23:51 +05:30
f506bd1bfc Merge branch 'OH_Dev_Manish' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into OH_Dev_Manish 2025-11-17 15:16:01 +05:30
39abfa2260 Rebase issues solved 2025-11-17 15:15:13 +05:30
ed88e0dfc9 implementation of Manage reporting 2025-11-17 15:14:48 +05:30
a910d37f22 All Employees fetching task done in advance payment screen 2025-11-17 15:14:13 +05:30
ceee12df33 implementation of Manage reporting 2025-11-17 15:14:12 +05:30
01f3cd24da added service projet screen 2025-11-17 15:14:12 +05:30
a8b31b3a95 All Employees fetching task done in advance payment screen 2025-11-17 15:13:51 +05:30
58c6a3f9af All Employees fetching task done in advance payment screen 2025-11-17 15:13:30 +05:30
3974ae8a4c Merge branch 'OH_Dev_Manish' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into OH_Dev_Manish 2025-11-17 15:09:21 +05:30
68ed97b64a Rebase issues solved 2025-11-17 15:08:18 +05:30
793eeec7fa Rebase issues solved 2025-11-17 15:07:46 +05:30
29af4e53a9 implementation of Manage reporting 2025-11-17 15:07:13 +05:30
0b894a5091 All Employees fetching task done in advance payment screen 2025-11-17 15:06:39 +05:30
bcfa29c0ed implementation of Manage reporting 2025-11-17 15:06:39 +05:30
3bae3429c6 added service projet screen 2025-11-17 15:06:38 +05:30
52da540271 Merge branch 'Service_Project_Feature' of https://git.marcoaiot.com/admin/marco.pms.mobileapp into Service_Project_Feature 2025-11-17 15:00:04 +05:30
b2619eabe9 added edit job fucntioanllity 2025-11-17 14:59:01 +05:30
b21c00faac added service project job details screen 2025-11-17 14:58:27 +05:30
083eece75b added edit job api 2025-11-17 14:56:29 +05:30
bc62bc903d added service project job details screen 2025-11-17 14:56:29 +05:30