admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity
875 Commits 235 Branches 0 Tags
Commit Graph

875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ashutosh.nehete
bb6c48300c Fixes error where it was showing multiple error in login and forget page 2025-04-21 17:35:42 +05:30
Vikas Nale
d4fed67912 Merge pull request 'pramod_Bug#23EmplAssignToProject' (#44) from pramod_Bug#23EmplAssignToProject into Issues_April_4W 
Reviewed-on: #44
 2025-04-21 11:12:42 +00:00
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
Vikas Nale
c63b261734 Merge pull request 'Fixed the bug where it passes projectId 1 to APIs when we refreshes the page' (#43) from Ashutosh_Bug#96_Passing_Incorrect_ProjectId into Issues_April_4W 
Reviewed-on: #43
 2025-04-21 07:03:59 +00:00
ashutosh.nehete
2473ff5f19 Fixed the bug where it passes projectId 1 to APIs when we refreshes the page 2025-04-21 07:03:59 +00:00
Vikas Nale
e90cbc4912 Merge pull request 'changed Activity Title Name- > Activity, description-> Unit' (#42) from pramod_Enhancement#53Activity-TitleChanged into Issues_April_4W 
Reviewed-on: #42
 2025-04-21 07:02:18 +00:00
Pramod Mahajan
048d9bb118 changed Activity Title Name- > Activity, description-> Unit 2025-04-20 23:18:15 +05:30
Vikas Nale
bbc8d010c8 Merge pull request 'pramod_Bug#65EyeIconShowHide' (#41) from pramod_Bug#65EyeIconShowHide into Issues_April_4W 
Reviewed-on: #41
 2025-04-20 14:09:04 +00:00
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
Vikas Nale
83e835056b Merge pull request 'pramod_Bug#62CreateActivity' (#40) from pramod_Bug#62CreateActivity into Issues_April_4W 
Reviewed-on: #40
 2025-04-20 08:46:48 +00:00
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
Vikas Nale
cacbedeabd Merge pull request 'added limitation for phone no' (#39) from pramod_Bug#27 into Issues_April_4W 
Reviewed-on: #39
 2025-04-20 08:33:59 +00:00
Pramod Mahajan
637b7990f5 added limitation for phone no 2025-04-20 08:33:59 +00:00
Vikas Nale
4ba3b0e5a9 Merge pull request 'Pramod_Bug#80' (#38) from Pramod_Bug#80 into Issues_April_4W 
Reviewed-on: #38
 2025-04-20 08:32:14 +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
Vikas Nale
ebb20b0612 Merge pull request 'Refactor token validation and refresh logic in ProtectedRoute component' (#37) from Vaibhav_Bug-#95 into Issues_April_4W 
Reviewed-on: #37
 2025-04-20 08:27:33 +00:00
Vikas Nale
c6b11b8979 Refresh Token Condition changes 2025-04-20 08:27:33 +00:00
Vaibhav Surve
9dc53d1dba Refactor token validation and refresh logic in ProtectedRoute component 2025-04-20 08:27:33 +00:00
Vikas Nale
c3faca41e2 Merge pull request 'Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components' (#36) from Ashutosh_Bug#94_Rename_CheckList_Variable into Issues_April_4W 
Reviewed-on: #36
 2025-04-20 06:44:08 +00:00
ashutosh.nehete
5ceb7eebaf Renamed variable "check" to "description" in "CreateActivity" and "UpdateActivity" components 2025-04-20 06:44:08 +00:00
Vikas Nale
4f2dc1c6a0 Merge pull request 'added task compeleted and planned work data' (#35) from pramod_Bug#93ProjectOverview into Issues_April_4W 
Reviewed-on: #35
 2025-04-20 06:42:55 +00:00
Pramod Mahajan
aada35e6ea added task compeleted and planned work data 2025-04-20 06:42:55 +00:00
Vikas Nale
ad9358f38e Merge pull request 'Fixed the bug of mismatch dates where dates showing one day earlier than expected' (#34) from Ashutosh_Bug#92_Date_MisMatch into Issues_April_4W 
Reviewed-on: #34
 2025-04-20 06:38:21 +00:00
ashutosh.nehete
68b23c8d5e Fixed the bug of mismatch dates where dates showing one day earlier than expected 2025-04-19 16:36:21 +05:30
Vikas Nale
8d4c9e4f39 Adjust font style for floor in infra grid if no workarea defined 2025-04-19 15:59:26 +05:30
Vikas Nale
7627b13cc8 spell mistake 2025-04-19 12:51:19 +05:30
Vikas Nale
2f09c947a0 Move request demo api to separate market controller 2025-04-19 12:38:29 +05:30
Vikas Nale
ad449d6e5c Modified css ad adjust padding for popup after adding new css 2025-04-19 11:35:02 +05:30
Vikas Nale
e236e4f5bf Merge branch 'Ashutosh_Task#67_Request_Demo' into Feature_Task_Management 2025-04-19 11:06:14 +05:30
Vikas Nale
49cf2db206 Merge pull request 'pramod_Task#69NavigateDailyTaskFormProjectCard' (#33) from pramod_Task#69NavigateDailyTaskFormProjectCard into Feature_Task_Management 
Reviewed-on: #33
 2025-04-19 05:29:34 +00:00
Pramod Mahajan
ef87bd4d64 implement url and add route at /activities/records and enpty 2025-04-19 05:29:34 +00:00
Pramod Mahajan
28437c3a9e this component read projectId from the URL using useSearchParams. 2025-04-19 05:29:34 +00:00
Pramod Mahajan
0fc7f6e404 added activity url with perticular project 2025-04-19 05:29:34 +00:00
Vikas Nale
a38d811603 Merge branch 'pramod_Bug#29InputLimmit' into Feature_Task_Management 2025-04-19 10:58:10 +05:30
Vikas Nale
c5d092802b Merge pull request 'pramod_Bug#87DailyTask' (#31) from pramod_Bug#87DailyTask into Feature_Task_Management 
Reviewed-on: #31
 2025-04-19 04:54:44 +00:00
Pramod Mahajan
b4802ff3c1 updated cache format for one project about 2025-04-19 04:54:44 +00:00
Pramod Mahajan
fb774f45d1 modified cache for immiedtky reflacted on screen. 2025-04-19 04:54:44 +00:00