606 Commits

Author SHA1 Message Date
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
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
Pramod Mahajan
3c9e68f91b created new progressBar component 2025-04-23 10:48:47 +05:30
Pramod Mahajan
3e71511d8e Merge branch 'Issues_April_4W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Feature#51ProjectLisFilter 2025-04-22 16:23:38 +05:30
148058d1d2 Merge branch 'pramod_Bug#99ProjectsDisplays' into Issues_April_4W 2025-04-22 16:07:46 +05:30
Pramod Mahajan
7f7f05277a modified projectBanner padding and fontsize. 2025-04-22 10:35:58 +00:00
Pramod Mahajan
fc2f69f429 selected employee list will empty after submission and close model perfectly 2025-04-22 10:33:58 +00:00
Pramod Mahajan
b15f5df8e7 added assign task button for mobile view 2025-04-22 10:33:58 +00:00
Pramod Mahajan
a5d74a0b34 updated a employee list and selected employe list 2025-04-22 10:33:58 +00:00
Pramod Mahajan
450c8143ff removed extra padding. 2025-04-22 10:33:58 +00:00
Pramod Mahajan
461ffeb83d fixed correct projectId is used when navigating to DailyTask 2025-04-22 10:33:04 +00:00
Pramod Mahajan
1caeeb890d added filter, only display logged user associated projects 2025-04-22 13:01:31 +05:30
Pramod Mahajan
a096f3d743 Set default project to the first one associated with the logged-in user. 2025-04-22 13:00:32 +05:30
Pramod Mahajan
b4d2fd86f7 imported projectLisComponent 2025-04-22 10:45:03 +05:30
Pramod Mahajan
1cdfb47c39 created new projectListView component 2025-04-22 10:44:41 +05:30
bb6c48300c Fixes error where it was showing multiple error in login and forget page 2025-04-21 17:35:42 +05:30
Pramod Mahajan
977dfcefe8 handled employee not avaible for project. employee list is empty 2025-04-21 16:00:22 +05:30
Pramod Mahajan
6c2a6ca7f9 employee assign perfectly with job role. 2025-04-21 15:41:37 +05:30
Pramod Mahajan
a4285388f8 model open on single click. 2025-04-21 15:40:36 +05:30
Pramod Mahajan
b81c3c9eab removed this file, not needed 2025-04-21 15:38:37 +05:30
2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page 2025-04-21 07:03:59 +00:00
Pramod Mahajan
048d9bb118 changed Activity Title Name- > Activity, description-> Unit 2025-04-20 23:18:15 +05:30
Pramod Mahajan
e97bbdeee6 removed unnecessary code 2025-04-20 16:04:04 +05:30
Pramod Mahajan
dc21e578de Replaced the btn class with input-group-text because broken click even in classt input-group 2025-04-20 15:54:39 +05:30
Pramod Mahajan
e46a94dd1a modified model size for application role 2025-04-20 15:51:17 +05:30
Pramod Mahajan
4ffab89aac added tooltip 2025-04-20 15:50:30 +05:30
Pramod Mahajan
9170d35652 Added tooltip 2025-04-20 15:50:19 +05:30
Pramod Mahajan
18729e960c removed condiational vaiable and added tooltip for edit and delet icon. 2025-04-20 08:46:48 +00:00
Pramod Mahajan
ebc03cb9eb Fetched workItem from cache instead of props to resolve state inconsistency issue. 2025-04-20 08:46:48 +00:00
Pramod Mahajan
df7303b724 Fixed state sync issue by clearing cache and re-fetching project data after task creation. 2025-04-20 08:46:48 +00:00
Pramod Mahajan
637b7990f5 added limitation for phone no 2025-04-20 08:33:59 +00:00
Pramod Mahajan
f76a3660cc added icons for dropdown 2025-04-20 08:32:14 +00:00
Pramod Mahajan
4182cd9077 modified response format 2025-04-20 08:32:14 +00:00
Pramod Mahajan
80fe6d64d1 modified response format 2025-04-20 08:32:14 +00:00
Pramod Mahajan
0798a12598 added character limitation 2025-04-20 08:32:14 +00:00
Pramod Mahajan
5e40817f3c clear cache after update or new create employee. and added character limitation for address and email 2025-04-20 08:32:14 +00:00
c6b11b8979 Refresh Token Condition changes 2025-04-20 08:27:33 +00:00
9dc53d1dba Refactor token validation and refresh logic in ProtectedRoute component 2025-04-20 08:27:33 +00:00
5ceb7eebaf Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components 2025-04-20 06:44:08 +00:00
Pramod Mahajan
aada35e6ea added task compeleted and planned work data 2025-04-20 06:42:55 +00:00
68b23c8d5e Fixed the bug of mismatch dates where dates showing one day earlier than expected 2025-04-19 16:36:21 +05:30
8d4c9e4f39 Adjust font style for floor in infra grid if no workarea defined 2025-04-19 15:59:26 +05:30
7627b13cc8 spell mistake 2025-04-19 12:51:19 +05:30