82 Commits

Author SHA1 Message Date
ec14938f1c Add AttendanceFilterBottomSheet and AttendanceLogViewButton components for enhanced attendance filtering and log viewing functionality 2025-05-21 17:51:55 +05:30
5c763d5e60 Merge pull request 'Enhance AttendanceController: add separate loading states for projects, employees, attendance logs, and regularization logs; adjust default date range logic; improve date range picker functionality, restricted todays date selection' (#29) from Vaibhav_Enhancement-#313 into main
Reviewed-on: #29
2025-05-21 12:13:45 +00:00
6ca5ce43aa Enhance AttendanceController: add separate loading states for projects, employees, attendance logs, and regularization logs; adjust default date range logic; improve date range picker functionality, restricted todays date selection 2025-05-21 17:42:29 +05:30
1f221194cf Refactor TopBar: remove unused imports, simplify layout, and integrate employee info display 2025-05-21 16:46:25 +05:30
c6f45b8852 Remove unused UI screens: ModalScreen, NotificationScreen, TabsScreen, ToastMessageScreen 2025-05-21 16:45:46 +05:30
d4465b8fb3 Merge pull request 'Update attendance log display: change header row color and adjust text style for better readability' (#28) from Vaibhav_Enhancement-#283 into main
Reviewed-on: #28
2025-05-17 12:29:18 +00:00
f28f98536c Update attendance log display: change header row color and adjust text style for better readability 2025-05-17 17:58:39 +05:30
c8177f3365 Merge pull request 'Update AttendanceScreen layout: change tab label to 'Today’s', adjust height, and add current date display' (#27) from Vaibhav_Enhancement-#296 into main
Reviewed-on: #27
2025-05-17 12:25:32 +00:00
284e67b433 Update AttendanceScreen layout: change tab label to 'Today’s', adjust height, and add current date display 2025-05-17 17:54:49 +05:30
f076b7b52a Merge pull request 'Refactor DailyTask and ReportTask screens for improved UI and functionality; update project selection and team member display logic.' (#26) from Vaibhav_Enhancement-#267_Bug-#259_Bug-#255_Enhancement-#264 into main
Reviewed-on: #26
2025-05-16 11:23:44 +00:00
19e705f428 Refactor DailyTask and ReportTask screens for improved UI and functionality; update project selection and team member display logic. 2025-05-16 16:53:09 +05:30
8333910de4 Merge pull request 'Refactor EmployeeScreen to use Flexible widget for better layout and enhance project selection display with dropdown icon' (#25) from Vaibhav_Enhancement-#289 into main
Reviewed-on: #25
2025-05-16 11:09:24 +00:00
b66878bc0d Refactor EmployeeScreen to use Flexible widget for better layout and enhance project selection display with dropdown icon 2025-05-16 16:38:43 +05:30
e460b97b43 Merge pull request 'Fix API endpoint for creating an employee by updating the URL to the correct path' (#24) from Vaibhav_Bug-#290 into main
Reviewed-on: #24
2025-05-16 11:04:14 +00:00
f9a2966292 Fix API endpoint for creating an employee by updating the URL to the correct path 2025-05-16 16:33:31 +05:30
8ae5df5a6b Merge pull request 'Refactor AttendanceScreen to improve project selection and refresh logic' (#23) from Vaibhav_Bug-#292 into main
Reviewed-on: #23
2025-05-16 10:54:55 +00:00
501bec819f Refactor AttendanceScreen to improve project selection and refresh logic 2025-05-16 16:24:11 +05:30
2421233b9f Merge pull request 'Add comment task feature with API integration and UI updates' (#22) from Vaibhav_Task#218 into main
Reviewed-on: #22
2025-05-13 11:35:49 +00:00
628aaa0387 Add comment task feature with API integration and UI updates 2025-05-13 17:02:31 +05:30
42935471cf Merge pull request 'Refactor attendance button UI and improve feedback messages' (#21) from Vaibhav_Bug-#220 into main
Reviewed-on: #21
2025-05-13 06:36:36 +00:00
932cfe81e7 Refactor attendance button UI and improve feedback messages 2025-05-13 12:06:00 +05:30
5462f0aa24 Merge pull request 'Add Comment Task feature with controller and UI integration' (#20) from Vaibhav_Task#218 into main
Reviewed-on: #20
2025-05-13 06:34:22 +00:00
f366691b07 Add Comment Task feature with controller and UI integration 2025-05-13 12:03:35 +05:30
c32586f4df Merge pull request 'Vaibhav_Task#218' (#19) from Vaibhav_Task#218 into main
Reviewed-on: #19
2025-05-13 05:09:04 +00:00
a41459f16b Add Report Task feature with controller, model, and UI integration 2025-05-12 16:27:38 +05:30
db0b525e87 Add Daily Task feature with controller, model, and UI integration
- Implement DailyTaskController for managing daily tasks and fetching projects.
- Create TaskModel to represent task data structure.
- Develop DailyTaskScreen for displaying tasks with filtering options.
- Update routes to include Daily Task navigation.
- Enhance DashboardScreen to link to Daily Task.
- Add Daily Task option in the left navigation bar.
2025-05-12 11:13:22 +05:30
809c048de6 Merge pull request 'Enhance attendance functionality by adding optional markTime parameter in uploadAttendanceImage method, and refactor attendance button logic using AttendanceButtonHelper for improved readability and maintainability.' (#18) from Vaibhav_Bug-#211 into main
Reviewed-on: #18
2025-05-10 09:50:48 +00:00
23de99432a Enhance attendance functionality by adding optional markTime parameter in uploadAttendanceImage method, and refactor attendance button logic using AttendanceButtonHelper for improved readability and maintainability. 2025-05-10 15:19:36 +05:30
4ce22b149f Add location permission handling in AttendanceController and improve fetchLogsView method 2025-05-09 20:56:06 +05:30
82dcf0c8fe Merge pull request 'Vaibhav_Task-#200' (#17) from Vaibhav_Task-#200 into main
Reviewed-on: #17
2025-05-09 06:04:01 +00:00
eeddee5168 Refactor loading animation in LoadingComponent to use SingleChildScrollView for better layout handling 2025-05-09 10:49:34 +05:30
fb2823c340 Refactor EmployeeScreen to use Obx for loading state and remove commented-out action buttons 2025-05-09 10:41:30 +05:30
7281794fcf Remove commented-out action buttons from employee list table 2025-05-09 10:19:23 +05:30
db8a811a63 Refactor AddEmployeeScreen for improved readability and consistency 2025-05-09 10:13:00 +05:30
6786610783 Merge pull request 'Add employee management features including controller, models, and UI' (#16) from Vaibhav_Task-#200 into main
Reviewed-on: #16
2025-05-09 04:29:46 +00:00
1ea960b0ec Add employee management features including controller, models, and UI
- Implemented AddEmployeeController for handling employee creation logic.
- Created EmployeeScreen and AddEmployeeScreen for employee management UI.
- Added API endpoints for fetching and creating employees.
- Updated EmployeeModel to include additional fields: jobRole, email, and phoneNumber.
- Refactored MyRefreshWrapper to MyRefreshableContent for consistency.
- Enhanced navigation to include employee management routes.
2025-05-09 09:58:44 +05:30
1ea8447d6c seperated the api service 2025-05-07 10:38:07 +05:30
afc9990180 Merge pull request 'handelled the condition' (#15) from Task-#188 into main
Reviewed-on: #15
2025-05-07 04:42:16 +00:00
fb21885c32 handelled the condition 2025-05-07 10:11:44 +05:30
c077755c59 Merge pull request 'increased date text size' (#14) from Task-#188 into main
Reviewed-on: #14
2025-05-06 12:49:11 +00:00
be96ac0de7 increased date text size 2025-05-06 18:18:51 +05:30
c8e6cc211f Merge pull request 'sorted the log view and removed close button' (#13) from Task-#188 into main
Reviewed-on: #13
2025-05-06 12:39:23 +00:00
6871eb3c92 sorted the log view and removed close button 2025-05-06 18:08:47 +05:30
eab722d5c0 Merge pull request 'Task-#188' (#12) from Task-#188 into main
Reviewed-on: #12
2025-05-06 12:26:54 +00:00
488a921f45 added loading for regularization tab 2025-05-06 17:53:57 +05:30
defd753ab0 made chnages into attendence screen 2025-05-06 17:47:43 +05:30
dd31cdafd0 Merge pull request 'enhanced refresh token handelling' (#11) from Vaibhav_Task-#179 into main
Reviewed-on: #11
2025-05-06 05:21:24 +00:00
e841824f8f enhanced refresh token handelling 2025-05-06 10:50:45 +05:30
e8b580d395 changed default username 2025-05-05 17:32:43 +05:30
2a91ccc323 added loggers 2025-05-05 16:56:58 +05:30