|
|
26ab62cb3b
|
Merge pull request 'pramod_Bug#128' (#54) from pramod_Bug#128 into Issues_April_5W
Reviewed-on: #54
|
2025-04-30 11:25:39 +00:00 |
|
Pramod Mahajan
|
047fcc3222
|
Safe jobRoleId filter in AssignRoleModel and ensure onClose works in form submit
|
2025-04-30 11:25:39 +00:00 |
|
Pramod Mahajan
|
655967746f
|
handle modal visibility with React state instead of Bootstrap
|
2025-04-30 11:25:39 +00:00 |
|
|
|
84f0e52f90
|
Merge pull request 'pramod_Bug#126ManageRole - Role selection UI bugs, empty state handling, and async refactor' (#53) from pramod_Bug#126ManageRole into Issues_April_5W
Reviewed-on: #53
|
2025-04-30 11:25:17 +00:00 |
|
Pramod Mahajan
|
ee2d44b5fc
|
fixed useEmployeeRoles to return [] when employee has no roles and some changed for fetching logic to use async/await
|
2025-04-30 00:03:08 +05:30 |
|
Pramod Mahajan
|
75507707c0
|
Handle role deselection and employee switching
- Reset checkboxes when employee changes
- Allow submission when no roles are selected
- Fixed zod validation to support empty selections
|
2025-04-29 23:56:36 +05:30 |
|
Pramod Mahajan
|
fec6de8a54
|
removed console
|
2025-04-29 23:54:59 +05:30 |
|
Pramod Mahajan
|
0b797a8c58
|
Add ErrorPage component to handle route errors
|
2025-04-29 11:05:18 +05:30 |
|
Pramod Mahajan
|
7e45f6c429
|
Fixed issue where logged-in users couldn't select future time slots
|
2025-04-29 11:04:21 +05:30 |
|
Pramod Mahajan
|
c53aa1ec92
|
Add activity column to logs for clearer action tracking
|
2025-04-29 00:56:01 +05:30 |
|
Pramod Mahajan
|
4f1cf7c0a5
|
Update logs to reflect check-in/check-out operations immediately
|
2025-04-29 00:54:31 +05:30 |
|
Pramod Mahajan
|
054ef8fd17
|
Updated TimePicker to disable future times and allow only current or past selections
|
2025-04-29 00:51:31 +05:30 |
|
Pramod Mahajan
|
5b88c86df5
|
added Spinning Animation for refresh button
|
2025-04-29 00:49:52 +05:30 |
|
Pramod Mahajan
|
f42b2d2724
|
clean up unused code
|
2025-04-29 00:48:58 +05:30 |
|
Pramod Mahajan
|
6b241b14de
|
Optimize attendance logs and regularization APIs to fetch data only when their respective tabs are active
|
2025-04-29 00:47:32 +05:30 |
|
Pramod Mahajan
|
6dc30f8e2a
|
modified project/team api, it can fromdate to todate
|
2025-04-29 00:43:10 +05:30 |
|
Pramod Mahajan
|
bf7adc2cc6
|
immediately update log attendances after marking attendance
|
2025-04-29 00:41:16 +05:30 |
|
Pramod Mahajan
|
9b742a2f7f
|
removed console
|
2025-04-28 12:04:33 +05:30 |
|
Pramod Mahajan
|
4a2dcd82d4
|
comment default option -select a Job role.
|
2025-04-28 12:02:40 +05:30 |
|
Pramod Mahajan
|
d88fd3180f
|
modified request for manage role.
|
2025-04-28 11:36:34 +05:30 |
|
Pramod Mahajan
|
a84cb355c8
|
changed image and directory icons
|
2025-04-28 09:27:49 +05:30 |
|
Pramod Mahajan
|
fbc9ba7ae4
|
updated master activity api url
|
2025-04-28 09:27:05 +05:30 |
|
Pramod Mahajan
|
b595fe6a0f
|
added id in roles obj request
|
2025-04-26 22:56:59 +05:30 |
|
Pramod Mahajan
|
66703de72e
|
changed btn size. to sm
|
2025-04-26 18:43:06 +05:30 |
|
Pramod Mahajan
|
1ca337067a
|
fixed previous role feature to current user role.
|
2025-04-26 18:31:20 +05:30 |
|
Pramod Mahajan
|
3777d4b7c5
|
set default view is cards
|
2025-04-26 18:25:02 +05:30 |
|
Pramod Mahajan
|
c0a766e7e1
|
Email field will be empty once response is received.
|
2025-04-26 18:17:56 +05:30 |
|
Pramod Mahajan
|
c900dc80a9
|
hide uneccessary msg or fixed loading condition for create new employee
|
2025-04-26 18:15:49 +05:30 |
|
|
|
162c91c1aa
|
Merge pull request 'pramod_Task#105' (#52) from pramod_Task#105 into Issues_April_4W
Reviewed-on: #52
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
dbd84def0d
|
remove unnecessary stuff
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
8c96edea17
|
added new directory page for conatct -list page
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
98a327fbb6
|
added new one route -directory
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
c3e75f3f48
|
changed Status-filter icon size
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
d08b64dc3b
|
added new directory tab
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
a1a3da61db
|
new directory components
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
786a5a689e
|
made custome TagInput.
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
3160da69d2
|
added one more css property radius
|
2025-04-25 11:02:03 +00:00 |
|
Pramod Mahajan
|
a7e9605ae3
|
added css for scroll bar modified
|
2025-04-25 11:02:03 +00:00 |
|
|
|
a2f6d77dcd
|
Merge pull request 'pramod_Feature#51ProjectLisFilter' (#51) from pramod_Feature#51ProjectLisFilter into Issues_April_4W
Reviewed-on: #51
|
2025-04-25 11:00:43 +00:00 |
|
Pramod Mahajan
|
a92a041333
|
Prevent multiple API calls and display correct data for selected project
|
2025-04-25 11:00:43 +00:00 |
|
Pramod Mahajan
|
d2d1c3cc86
|
default project should not be set during the initial fetch. It will be set later based on specific conditions or user actions.
|
2025-04-25 11:00:43 +00:00 |
|
Pramod Mahajan
|
f2f7898970
|
joining date will no wrap
|
2025-04-25 11:00:43 +00:00 |
|
|
|
b30f3b8d98
|
Merge pull request 'pramod_Feature#51ProjectLisFilter' (#50) from pramod_Feature#51ProjectLisFilter into Issues_April_4W
Reviewed-on: #50
|
2025-04-23 09:05:08 +00:00 |
|
Pramod Mahajan
|
3ee5a71cc9
|
added status and search filter filter
|
2025-04-23 12:16:40 +05:30 |
|
Pramod Mahajan
|
c61cb3bb63
|
added userPermissions
|
2025-04-23 12:14:30 +05:30 |
|
Pramod Mahajan
|
38fbc6dc84
|
reafactor code for reuasability
|
2025-04-23 11:08:02 +05:30 |
|
Pramod Mahajan
|
c38a92b8b7
|
added list view component
|
2025-04-23 11:01:14 +05:30 |
|
Pramod Mahajan
|
d9f4bc47f6
|
added new functions ,getProjectStatusName and getProjectStatusColor
|
2025-04-23 11:00:10 +05:30 |
|
Pramod Mahajan
|
099098d39a
|
changed getProjectStatusName getProjectStatusColor location. added these fun in Utils folder
|
2025-04-23 10:52:55 +05:30 |
|
Pramod Mahajan
|
c76045d39e
|
chanaged getProjectStatusName
|
2025-04-23 10:49:31 +05:30 |
|
