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

1492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Umesh Desai
ef47bbf8a4 When hovering over the login form's password box, it appears divided, with the text box and hide button becoming separate. 2025-06-09 06:00:26 +00:00
Vikas Nale
061c110524 Merge pull request 'Changes in Reset Password Page and adding field in Dialog box is " Change Password"' (#186) from Kartik_Task#470 into Issue_Jun_1W_2 
Reviewed-on: #186
 2025-06-09 05:48:47 +00:00
Vikas Nale
d5158a2151 Merge pull request 'Hide Page Number on Website Until Data Exceeds Records Limit.' (#188) from Kartik_Bug#475 into Issue_Jun_1W_2 
Reviewed-on: #188
 2025-06-09 05:46:12 +00:00
Umesh Desai
b6330502cb Hide Page Number on Website Until Data Exceeds Records Limit. 2025-06-09 05:46:12 +00:00
Vikas Nale
c999307a5f Merge pull request 'Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity.' (#187) from Kartik_Task#472 into Issue_Jun_1W_2 
Reviewed-on: #187
 2025-06-09 05:39:43 +00:00
Umesh Desai
26191bccfe Adding Filter Icon on Daily Progress Report and performing a filteration according to building, floor and activity. 2025-06-09 05:39:43 +00:00
Pramod Mahajan
662d464271 changed class to className 2025-06-09 11:08:06 +05:30
Pramod Mahajan
99863442a6 resolve React key duplication warning in Breadcrumb component 2025-06-09 10:58:41 +05:30
pramod.mahajan
2386bd0e74 Merge pull request 'pramod_Task-#444 : Add "Assign Project" Feature in Employee Action Menu' (#191) from pramod_Task-#444 into Feature_Directory 
Reviewed-on: #191
 2025-06-09 05:18:39 +00:00
Pramod Mahajan
b1253bed88 changed icon 2025-06-09 10:10:06 +05:30
Pramod Mahajan
f129645386 Updated to make sure the client sends the correct request. Unnecessary requests are no longer sent. 2025-06-09 10:03:32 +05:30
Pramod Mahajan
0b46dc0f1f added refetch function for recall after takng any assign or unassign project for update 2025-06-09 10:01:58 +05:30
Pramod Mahajan
fe87e0dbd4 added update assign project api 2025-06-08 18:40:40 +05:30
Pramod Mahajan
fa4f784b6b Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_Jun_1W_2 2025-06-07 23:42:15 +05:30
Pramod Mahajan
ab6316ef56 Merge branch 'Issue_Jun_1W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#482 2025-06-07 17:42:16 +05:30
Pramod Mahajan
d345977fdc set constant time for expire time for OTP 2025-06-07 17:41:24 +05:30
Pramod Mahajan
8640a96901 set new route login through OTP 2025-06-07 17:40:49 +05:30
Pramod Mahajan
beeba834e2 added send and verify OTP api 2025-06-07 17:40:24 +05:30
Pramod Mahajan
def6524566 created new component for verify OTP 2025-06-07 17:40:03 +05:30
Pramod Mahajan
194087c0a3 added login with otp feature, added send otp api 2025-06-07 17:39:37 +05:30
Pramod Mahajan
74a5c05481 added api's for fetching projects by employee and update project assigning for employee 2025-06-07 00:10:36 +05:30
Pramod Mahajan
7baffac11a added modal for AssignToProject 2025-06-07 00:09:23 +05:30
Pramod Mahajan
a3dcd9bee3 created component for assign and unassign projects for employee 2025-06-07 00:08:25 +05:30
Pramod Mahajan
d19652a98e added new hook for fetching projects associated by perticular employee 2025-06-07 00:07:42 +05:30
Vikas Nale
40f4f2f254 Merge branch 'Kartik_Task#470' into Issue_Jun_1W_2 2025-06-06 18:37:40 +05:30
Umesh Desai
0053dbaf56 Changes in Reset Password Page and adding field in Dialog box is " Change Password" 2025-06-06 13:05:55 +00:00
Vikas Nale
b00fe50bae Merge pull request 'Creating a Change Password Page and adding Change Password field in Dialog box.' (#185) from Kartik_Task#467 into Issue_Jun_1W_2 
Reviewed-on: #185
 2025-06-06 13:05:17 +00:00
Umesh Desai
96ed0428c4 Changes in Reset Password Page and adding field in Dialog box is " Change Password" 2025-06-05 18:06:58 +05:30
Umesh Desai
f3b16a9fc0 Creating a Change Password Page and adding Change Password field in Dialog box. 2025-06-05 17:57:53 +05:30
Vikas Nale
43270c6bf3 Merge pull request 'Todays date is not visible in Daily Progress Report.' (#183) from Kartik_Bug#449 into Issue_Jun_1W 
Reviewed-on: #183
 2025-06-05 05:26:06 +00:00
Umesh Desai
101baa2b78 Todays date is not visible in Daily Progress Report. 2025-06-05 05:26:06 +00:00
Vikas Nale
c553b36e25 Merge pull request 'In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come.' (#184) from Kartik_Bug#457 into Issue_Jun_1W 
Reviewed-on: #184
 2025-06-05 05:24:28 +00:00
Umesh Desai
4345c55247 In Create Task popup from Infrastructure tab when we Select Activity then Excepted string message will come. 2025-06-04 17:11:55 +05:30
Vikas Nale
655db6ac74 Merge pull request 'Added Column Today's Planned to Project Infrastructure' (#182) from Ashutosh_Enhancement#276_TodaysPlanned into Issue_Jun_1W 
Reviewed-on: #182
 2025-06-03 11:59:46 +00:00
ashutosh.nehete
176535f53f Added Column Today's Planned to Project Infrastructure 2025-06-03 11:59:46 +00:00
Vikas Nale
cfd5486fe2 Merge pull request 'In Teams Tab when we Assign a project then this dropdown not change its state .' (#181) from Kartik_Bug#442 into Issue_Jun_1W 
Reviewed-on: #181
 2025-06-03 11:56:04 +00:00
Umesh Desai
3486a6bc3a In Teams Tab when we Assign a project then this dropdown not change its state . 2025-06-03 11:56:04 +00:00
Vikas Nale
412125e422 Merge pull request 'Adding a error message on InActive selection on Teams tab on Projects.' (#180) from Kartik_Bug#441 into Issue_Jun_1W 
Reviewed-on: #180
 2025-06-03 11:54:33 +00:00
Umesh Desai
cf8a67bc2c Adding a error message on InActive selection on Teams tab on Projects. 2025-06-03 11:54:33 +00:00
Vikas Nale
18d848b697 Merge pull request 'In Report popup when we take value = 0 then giv error but now it is resolved.' (#179) from Kartik_Bug#436 into Issue_Jun_1W 
Reviewed-on: #179
 2025-06-03 11:53:32 +00:00
Vikas Nale
78bc8802d7 Merge pull request 'In Employee Management when we select Project then this toggle button will be disabled.' (#178) from Kartik_Bug#432 into Issue_Jun_1W 
Reviewed-on: #178
 2025-06-03 11:52:53 +00:00
Umesh Desai
5df397488a In Employee Management when we select Project then this toggle button will be disabled. 2025-06-03 11:52:53 +00:00
Vikas Nale
2b015947ef Merge pull request 'pramod_Bug-#433 :Show "No Contact Found" Message When Directory Is Empty' (#177) from pramod_Bug-#433 into Feature_Directory 
Reviewed-on: #177
 2025-06-03 11:50:29 +00:00
Vikas Nale
fed6711ece Merge pull request 'pramod_Bug-#391 : Click on Contact Name this Not Navigating to Details Page in Directory' (#176) from pramod_Bug-#391 into Feature_Directory 
Reviewed-on: #176
 2025-06-03 11:49:41 +00:00
Pramod Mahajan
6b5aa5fb1a enable contact name click to open contact profile 2025-06-03 11:49:41 +00:00
Vikas Nale
1ca50afc74 Merge pull request 'pramod_Task-#439 : Edit and Delete Contact Tag' (#175) from pramod_Task-#439 into Feature_Directory 
Reviewed-on: #175
 2025-06-03 11:48:39 +00:00
Pramod Mahajan
e83eafddd2 added editcontact tag form inside master modal 2025-06-03 11:48:39 +00:00
Pramod Mahajan
1bd050f919 correct delete contact tag url 2025-06-03 11:48:39 +00:00
Vikas Nale
4d1d3f8cca Merge pull request 'Display completion percentage for each Work Area header' (#174) from pramod_Task-#438 into Issue_Jun_1W 
Reviewed-on: #174
 2025-06-03 11:47:18 +00:00
Vikas Nale
493689fb1a Add progress bar for work area on Infra Page 2025-06-03 11:47:18 +00:00