119 Commits

Author SHA1 Message Date
deff7aea7d feat: Add contact picking functionality in employee form and update dependencies 2025-06-04 12:44:27 +05:30
a0761d255f Merge pull request 'fix: Update validation for completed work to allow zero as a valid input' (#44) from Vaibhav_Bug-#451 into main
Reviewed-on: #44
2025-06-04 05:49:23 +00:00
d7680df3a9 fix: Update validation for completed work to allow zero as a valid input 2025-06-04 11:18:07 +05:30
4862e53967 Merge pull request 'fix: Enhance contact number validation in organization form' (#43) from Vaibhav_Bug-#452 into main
Reviewed-on: #43
2025-06-04 05:39:53 +00:00
d99221e800 fix: Enhance contact number validation in organization form 2025-06-04 11:09:15 +05:30
cd29a478a2 Merge pull request 'fix: Add percent indicator for visual progress representation in daily task planning' (#42) from Vaibhav_Task-#428 into main
Reviewed-on: #42
2025-06-03 11:57:13 +00:00
3bd25c1172 fix: Add percent indicator for visual progress representation in daily task planning 2025-06-03 17:26:43 +05:30
eabe48e572 Merge pull request 'fix: Add validation to prevent target exceeding pending tasks in assign task functionality' (#41) from Vaibhav_Bug-#450 into main
Reviewed-on: #41
2025-06-03 11:45:19 +00:00
ba42551b25 fix: Add validation to prevent target exceeding pending tasks in assign task functionality 2025-06-03 17:14:48 +05:30
1a5a084115 Merge pull request 'fix: Refactor login controller to improve form initialization and credential handling' (#40) from Vaibhav_Bug-#437 into main
Reviewed-on: #40
2025-06-03 10:03:49 +00:00
52fbd88252 fix: Refactor login controller to improve form initialization and credential handling 2025-06-03 15:32:47 +05:30
bff814f562 Merge pull request 'fix: Enhance loading state management and error handling in organization form submission' (#39) from Vaibhav_Bug-#427 into main
Reviewed-on: #39
2025-06-03 09:49:31 +00:00
fc9fbaafa9 fix: Enhance loading state management and error handling in organization form submission 2025-06-03 15:17:49 +05:30
f7fed6fe82 Merge pull request 'fix: Add country selection and phone number validation in employee form' (#38) from Vaibhav_Bug-#431 into main
Reviewed-on: #38
2025-06-03 09:35:26 +00:00
a844c758b0 fix: Add country selection and phone number validation in employee form 2025-06-03 15:04:53 +05:30
a7f8ea16b0 Merge pull request 'fix: Improve validation for completed work and display pending work in report task bottom sheet' (#37) from Vaibhav_Bug-#435 into main
Reviewed-on: #37
2025-06-03 06:13:49 +00:00
c474aad1dc fix: Improve validation for completed work and display pending work in report task bottom sheet 2025-06-03 11:43:24 +05:30
2becfc603a Merge pull request 'Vaibhav_Enhancement-#419' (#36) from Vaibhav_Enhancement-#419 into main
Reviewed-on: #36
2025-06-03 05:36:00 +00:00
6fa8858d87 fix: Update project selection logic to fetch task data instead of projects 2025-06-03 11:05:21 +05:30
f1005af7be fix: Enhance login error handling with custom snackbar and update UI for beta environment 2025-06-03 09:46:34 +05:30
22a94a023e Merge pull request 'Vaibhav_Enhancement-#419' (#35) from Vaibhav_Enhancement-#419 into main
Reviewed-on: #35
2025-06-02 07:52:52 +00:00
aca2722ee4 refactor: Update Checkbox fill color handling and enhance agreement toggle interaction 2025-05-31 16:46:10 +05:30
706726c787 refactor: Convert AttendanceFilterBottomSheet to StatefulWidget and enhance state management 2025-05-31 13:08:30 +05:30
9ad8bdc893 fix: Update button onPressed to null and adjust background color in Layout 2025-05-31 12:02:01 +05:30
08991f2095 refactor: Improve LoginController and LoginScreen structure and readability 2025-05-31 10:43:39 +05:30
ad4b24dd78 feat: Add beta environment indicator to layout 2025-05-30 15:12:35 +05:30
d9ad7581bf Merge pull request 'feat: Enhance ReportTaskController with image picking and form field management' (#34) from Vaibhav_Bug-#411 into main
Reviewed-on: #34
2025-05-30 09:12:43 +00:00
938bf58ff6 feat: Enhance ReportTaskController with image picking and form field management
- Added image picking functionality using ImagePicker for selecting images from camera or gallery.
- Refactored form field controllers in ReportTaskController for better management and disposal.
- Updated reportTask and commentTask methods to use the new controller references.
- Implemented image removal functionality in ReportTaskController.
- Modified ReportTaskBottomSheet to clear fields upon initialization and added a callback for successful reports.
- Updated attendance and regularization logs UI for better loading states and error handling.
- Improved logout functionality in LocalStorage and integrated it into layout and left bar components.
- Adjusted initial route logic in main.dart to redirect users based on authentication status.
2025-05-30 14:41:04 +05:30
ba610bf806 Merge pull request '-- Enhance layout with floating action button and navigation improvements' (#33) from Vaibhav_Dev into main
Reviewed-on: #33
2025-05-30 05:15:02 +00:00
8b01161448 Implement forgot password functionality and enhance UI in the authentication flow 2025-05-29 13:11:27 +05:30
915471f4c0 Add date formatting function and display current date in employee list tab 2025-05-28 18:14:46 +05:30
34100a4d9e -- Enhance layout with floating action button and navigation improvements
- Added a floating action button to the Layout widget for better accessibility.
- Updated the left bar navigation items for clarity and consistency.
- Introduced Daily Progress Report and Daily Task Planning screens with comprehensive UI.
- Implemented filtering and refreshing functionalities in task planning.
- Improved user experience with better spacing and layout adjustments.
- Updated pubspec.yaml to include new dependencies for image handling and path management.
2025-05-28 17:35:42 +05:30
75376a1370 Merge pull request 'Add Daily Task Planning navigation item to the left bar' (#32) from Vaibhav_Task-#323 into main
Reviewed-on: #32
2025-05-23 05:38:35 +00:00
6cb8cc8486 Add Daily Task Planning navigation item to the left bar 2025-05-22 14:55:40 +05:30
6db47cce88 Merge pull request 'Refactor code structure for improved readability and maintainability, Changed the Attendance Screen UI' (#31) from Vaibhav_Enhancement-#312 into main
Reviewed-on: #31
2025-05-21 12:27:30 +00:00
8408b67aa0 Refactor code structure for improved readability and maintainability, Changed the Attendance Screen UI 2025-05-21 17:57:09 +05:30
5c2c2995ef Merge pull request 'Add AttendanceFilterBottomSheet and AttendanceLogViewButton components for enhanced attendance filtering and log viewing functionality' (#30) from Vaibhav_Enhancement-#314 into main
Reviewed-on: #30
2025-05-21 12:22:18 +00:00
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