admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,692 Commits 251 Branches 0 Tags
Commit Graph

1692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vikas Nale
148058d1d2 Merge branch 'pramod_Bug#99ProjectsDisplays' into Issues_April_4W 2025-04-22 16:07:46 +05:30
Vikas Nale
4354d0f611 Merge pull request 'modified projectBanner padding and fontsize.' (#48) from pramod_Task#73ResizeProjectNameFontSize into Issues_April_4W 
Reviewed-on: #48
 2025-04-22 10:35:58 +00:00
Pramod Mahajan
7f7f05277a modified projectBanner padding and fontsize. 2025-04-22 10:35:58 +00:00
Vikas Nale
a3a827ed78 Merge pull request 'pramod_Enhancement#98' (#47) from pramod_Enhancement#98 into Issues_April_4W 
Reviewed-on: #47
 2025-04-22 10:33: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
Vikas Nale
d64b6c6134 Merge pull request 'fixed correct projectId is used when navigating to DailyTask' (#46) from pramod_Bug#97 into Issues_April_4W 
Reviewed-on: #46
 2025-04-22 10:33:04 +00:00
Pramod Mahajan
461ffeb83d fixed correct projectId is used when navigating to DailyTask 2025-04-22 10:33:04 +00:00
Vikas Nale
b53686ddd5 Merge pull request 'Fixes error where it was showing multiple error in login and forget page' (#45) from Ashutosh_Bug#63_Multiple_Error_Toast into Issues_April_4W 
Reviewed-on: #45
 2025-04-22 10:31:41 +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
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