53 Commits

Author SHA1 Message Date
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
e2897e4dde reenhancement of employee selector 2025-11-25 15:32:00 +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
cf7021a982 feat: refactor ExpenseDetailScreen to use tagged controller for improved state management 2025-11-20 18:02:03 +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
5dd09869ad feat: enhance ExpenseDetailModel and ExpenseDetailScreen with additional fields and improved UI structure 2025-11-19 17:17:04 +05:30
5db53c29df added validation for payment request in and expense reumbersemrnt bottomsheet 2025-11-12 11:23:13 +05:30
b1f5fb8d78 chnaged expense type to category 2025-11-10 16:39:25 +05:30
1c253df5f9 fixed the expense screen neigation build issue 2025-11-10 10:26:03 +05:30
ac7a75c92f Refactor date handling in controllers and UI components
- Updated `user_document_controller.dart` to use DateTime for start and end dates.
- Enhanced `daily_task_controller.dart` with Rx fields for date range and added methods to update date ranges.
- Reverted API base URL in `api_endpoints.dart` to stage environment.
- Introduced `date_range_picker.dart` widget for reusable date selection.
- Integrated `DateRangePickerWidget` in attendance and daily task filter bottom sheets.
- Simplified date range selection logic in `attendance_filter_sheet.dart`, `daily_progress_report_filter.dart`, and `user_document_filter_bottom_sheet.dart`.
- Updated expense filter bottom sheet to utilize the new date range picker.
2025-11-04 14:15:21 +05:30
7007a86ac7 Refactor button color references to use 'primary' instead of 'buttonColor' across multiple files
- Updated AttendanceButtonHelper to rename getButtonColor to getprimary.
- Changed button color references in AttendanceActionButton, ReusableListCard, UserDocumentFilterBottomSheet, and various auth screens to use contentTheme.primary.
- Adjusted color references in employee detail, expense, and directory views to align with the new primary color scheme.
- Removed unused ThemeOption class in UserProfileBar and updated color references accordingly.
- Ensured consistency in color usage for buttons and icons throughout the application.
2025-10-29 11:29:11 +05:30
04da062f4f Refactor UI components to use contentTheme colors
- Updated various screens to replace hardcoded color values with contentTheme.buttonColor for consistency.
- Changed icons in NotesView, UserDocumentsPage, EmployeeDetailPage, EmployeesScreen, ExpenseDetailScreen, and others to use updated icon styles.
- Refactored OfflineScreen and TenantSelectionScreen to utilize new wave background widget.
- Introduced ThemeEditorWidget in UserProfileBar for dynamic theme adjustments.
- Enhanced logout confirmation dialog styling to align with new theme colors.
2025-10-28 17:38:19 +05:30
45bc492683 fixed tenant issue 2025-10-08 11:06:39 +05:30
83d9d0689a feat: Implement tabbed navigation and enhance UI for expense and directory views 2025-09-24 17:16:38 +05:30
6863769b8a feat: Add organization selection and related API integration in attendance module 2025-09-21 18:17:00 +05:30
bbe7f4a215 feat: Add InvoiceLogs widget to display expense logs in the detail screen 2025-09-19 06:54:28 +00:00
f5d4ab8415 feat: Add attendance log screen and related functionalities
- Implemented AttendenceLogScreen to display employee attendance logs.
- Created RegularizationRequestsTab to manage regularization requests.
- Added TodaysAttendanceTab for viewing today's attendance.
- Removed outdated dashboard chart implementation.
- Updated dashboard screen to integrate new attendance overview and project progress charts.
- Refactored employee detail and employee screens to use updated controllers.
- Organized expense-related imports and components for better structure.
- Adjusted daily progress report to use the correct controller.
2025-08-29 15:53:19 +05:30
91184b48bb Refactor employee model imports and restructure employee-related files
- Updated import paths for employee model files to reflect new directory structure.
- Deleted obsolete models: JobRecentApplicationModel, LeadReportModel, Product, ProductOrderModal, ProjectSummaryModel, RecentOrderModel, TaskListModel, TimeLineModel, User, VisitorByChannelsModel.
- Introduced new AttendanceLogModel, AttendanceLogViewModel, AttendanceModel, TaskModel, TaskListModel, EmployeeInfo, and EmployeeModel with comprehensive fields and JSON serialization methods.
- Enhanced data handling in attendance and task management features.
2025-08-26 11:53:53 +05:30
5977fef261 chore: update dependencies, adjust minimum SDK version, and refactor date formatting 2025-08-26 11:09:51 +05:30
311002f3ba Refactor expense deletion confirmation dialog and add validation to add expense form
- Replaced the custom delete confirmation dialog with a reusable ConfirmDialog widget for better code organization and reusability.
- Improved the add expense bottom sheet by implementing form validation using a GlobalKey and TextFormField.
- Enhanced user experience by adding validation for required fields and specific formats (e.g., GST, transaction ID).
- Updated the expense list to reflect changes in the confirmation dialog and improved the handling of attachments.
- Cleaned up code by removing unnecessary comments and ensuring consistent formatting.
2025-08-26 11:09:50 +05:30
6187d63ccc feat: enhance expense detail model and screen with activity logs and new dependencies 2025-08-18 12:04:07 +00:00
9feb9d1b4b displayed comma seperated amount on expenses 2025-08-09 19:08:01 +05:30
2fb3c36ba4 added pull down refresh 2025-08-08 15:19:29 +05:30
7175ade940 made chnages for all employee 2025-08-07 17:14:04 +05:30
d205cc2014 added condition to accept date 2025-08-06 17:45:37 +05:30
754f919cdc added infinite loading 2025-08-06 16:18:50 +05:30
b0c9a2c45f added add expense permission 2025-08-06 16:09:35 +05:30
3195fdd4a0 chnaged the pai by in sheet 2025-08-06 15:18:51 +05:30
aa76ec60cb made changes for employee get method 2025-08-05 20:35:22 +05:30
0401b41b3c Dynamic edit and Add expense title 2025-08-05 17:47:12 +05:30
0acd619d78 added edit functioanllity in expense 2025-08-05 17:41:36 +05:30
f1220cc018 handelled the loading 2025-08-05 10:24:42 +05:30
84811635d0 resolved the not opening detail screen o tap of non content 2025-08-05 10:14:43 +05:30
7dbc9138c6 refactor: Enhance ExpenseDetailController and ExpenseDetailScreen to support optional comments during expense status updates and improve code readability 2025-08-05 10:09:34 +05:30
0150400092 refactor: Replace Get.snackbar with showAppSnackbar for consistent error handling and improve code readability across expense-related controllers and views. 2025-08-02 17:39:08 +05:30
2518b65cb7 feat: Implement delete expense functionality with confirmation dialog 2025-08-02 14:57:34 +05:30
f5eed0a0b9 Refactor Expense Filter Bottom Sheet for improved readability and maintainability
- Extracted widget builders for Project, Expense Status, Date Range, Paid By, and Created By filters into separate methods.
- Simplified date selection logic by creating a reusable _selectDate method.
- Centralized input decoration for text fields.
- Updated Expense Screen to use local state for search query and history view toggle.
- Enhanced filtering logic for expenses based on search query and date.
- Improved UI elements in Daily Progress Report and Daily Task Planning screens, including padding and border radius adjustments.
2025-08-01 16:21:24 +05:30
31966f4bc5 feat: add permission handling in ExpenseDetailScreen and enhance ExpenseDetailController with permission parsing 2025-07-31 16:44:05 +05:30
29f759ca9d Refactor expense reimbursement and filter UI components
- Updated ReimbursementBottomSheet to use BaseBottomSheet for consistent styling and functionality.
- Improved input field decorations and added spacing helpers for better layout.
- Simplified the employee selection process and integrated it into the new design.
- Refactored ExpenseDetailScreen to utilize controller initialization method.
- Enhanced ExpenseFilterBottomSheet with a cleaner structure and improved field handling.
- Removed unnecessary wrapper for ExpenseFilterBottomSheet and integrated it directly into the expense screen.
2025-07-31 13:13:00 +05:30
adf5e1437e feat: make statusId dynamic in reimbursement handling and update related components 2025-07-31 11:09:25 +05:30
9d49f2a92d feat: implement reimbursement functionality in ExpenseDetailController and add ReimbursementBottomSheet for expense reimbursement entry 2025-07-30 19:19:18 +05:30
154cfdb471 refactor: adjust font weights and sizes in ToggleButton and ExpenseList for improved UI consistency 2025-07-30 16:52:25 +05:30
d28332b55d feat: implement ExpenseDetailModel and update ExpenseDetailController and Screen for improved expense detail handling 2025-07-30 16:45:21 +05:30
e5b3616245 Refactor expense models and detail screen for improved error handling and data validation
- Enhanced `ExpenseResponse` and `ExpenseData` models to handle null values and provide default values.
- Introduced a new `Filter` class to encapsulate filtering logic for expenses.
- Updated `ExpenseDetailScreen` to utilize a controller for fetching expense details and managing loading states.
- Improved UI responsiveness with loading skeletons and error messages.
- Refactored filter bottom sheet to streamline filter selection and reset functionality.
- Added visual indicators for filter application in the main expense screen.
- Enhanced expense detail display with better formatting and status color handling.
2025-07-28 12:09:13 +05:30
586d18565f feat(expense): implement expense filtering functionality with UI integration 2025-07-25 10:45:22 +05:30
e0ed35a671 feat(expense): implement update expense status functionality and UI integration 2025-07-25 10:45:22 +05:30
debc12bc1b feat(expense): add refresh functionality to expense list 2025-07-25 10:45:22 +05:30
d7b62323d6 fix(expense): remove unnecessary hit test behavior from expense list item 2025-07-25 10:45:22 +05:30
ff01c05a73 feat(expense): improve expense submission validation and UI feedback 2025-07-25 10:45:22 +05:30