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

1493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
8676ff24a5 handle to prevent unwanted api calling 2025-07-06 15:51:46 +05:30
Pramod Mahajan
b5b1f9d31f added completedWork , plannedWork for progrss line with formatnumber util 2025-07-06 13:11:15 +05:30
Pramod Mahajan
485c7f2347 format number 2025-07-06 12:39:39 +05:30
Pramod Mahajan
28c226904e closed modal after update activity and format number of plannedwork and completed work at project overview 2025-07-04 12:39:10 +05:30
Pramod Mahajan
eb1c4fc765 show denied msg on Daily Task planning page if don't have manage infra and assign task 2025-07-04 12:37:55 +05:30
Pramod Mahajan
afac84dc9b now displayed cancel and submit button at initially - bug643 2025-07-04 11:47:02 +05:30
Pramod Mahajan
20c9dca759 added formatNumber at globally for reusable 2025-07-04 11:29:24 +05:30
Pramod Mahajan
5949e7c277 improved empty state UI when no projects are found 2025-07-04 11:10:22 +05:30
Pramod Mahajan
a107041153 chnanged status color, becuase Active status is hold success color, therefor chnages success to primary for In-progress status 2025-07-04 10:53:53 +05:30
Pramod Mahajan
ca476d6f6e removed unused code 2025-07-04 10:52:07 +05:30
Pramod Mahajan
2e54ed1dd9 display project Name at header when location have project details 2025-07-04 10:51:41 +05:30
Pramod Mahajan
4c6e0b5c9e added project status - 'In-Progress' 2025-07-04 10:50:57 +05:30
Pramod Mahajan
9961b4aba7 removed unused code 2025-07-04 10:49:35 +05:30
Pramod Mahajan
b39a3d7e97 fixed: visible sub task without refresh page 2025-07-03 19:10:49 +05:30
Pramod Mahajan
094811a8ec floor Name field clear clear after complete edit or create operation 2025-07-03 17:09:31 +05:30
Pramod Mahajan
e6d6f0ac30 Handle undefined 'variables' in employee assignment toast logic 2025-07-03 13:16:01 +05:30
Pramod Mahajan
e24b873677 added projectId , project id was missed 2025-07-03 12:16:35 +05:30
Pramod Mahajan
25b2f6973c fixed format planned vs remaining work values to avoid float precision issues in task UI 2025-07-02 20:07:35 +05:30
Pramod Mahajan
80083aa5db updated some queries and mutation for prevent to duplicates calls 2025-07-02 19:42:43 +05:30
Pramod Mahajan
52c5e3d2d2 integrated reactquery for project infra 2025-07-02 13:20:17 +05:30
Pramod Mahajan
2f110b7ead Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-02 09:49:20 +05:30
Pramod Mahajan
0c8ff7b28c partially integrated react-query in project infra 2025-07-02 01:57:02 +05:30
ashutosh.nehete
c1a31e6b3e Merge pull request 'Issues_Jun_3W' (#226) from Issues_Jun_3W into main 
Reviewed-on: #226
 2025-07-01 10:24:37 +00:00
Vikas Nale
73b693f826 Merge pull request 'Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task' (#225) from Kartik_Bug#521 into Issues_Jun_3W 
Reviewed-on: #225
 2025-07-01 09:36:03 +00:00
Vikas Nale
50f941aef6 Merge pull request '"OTP Sent Successfully" Message Displayed After Sending OTP' (#224) from Kartik_Bug#625 into Issues_Jun_3W 
Reviewed-on: #224
 2025-07-01 09:34:14 +00:00
Vikas Nale
520a0e679e Merge pull request 'Correction in Login Password text box design.' (#223) from Kartik_Bug#627 into Issues_Jun_3W 
Reviewed-on: #223
 2025-07-01 09:33:32 +00:00
Vikas Nale
85d8434c5f Merge pull request '401 Unauthorized Error on Attendance Menu.' (#222) from KartikBug#623 into Issues_Jun_3W 
Reviewed-on: #222
 2025-07-01 09:32:19 +00:00
Pramod Mahajan
a02a33a247 partially implementation of masters in react query hooks 2025-07-01 13:23:16 +05:30
Kartik sharma
2226d54f24 Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task 2025-07-01 12:37:22 +05:30
Kartik sharma
5d99f11297 "OTP Sent Successfully" Message Displayed After Sending OTP 2025-07-01 12:33:57 +05:30
Kartik sharma
390a0b2b67 Correction in Login Password text box design. 2025-07-01 12:29:39 +05:30
Kartik sharma
2c0800f0e3 Unnecessary Blank Space Appears Below Employees in Regularization Tab. 2025-07-01 12:21:49 +05:30
Kartik sharma
e09413b23a 401 Unauthorized Error on Attendance Menu. 2025-07-01 12:19:25 +05:30
Pramod Mahajan
8dbce6dd49 Fixed issue where query remained disabled and cache was undefined 2025-06-30 21:36:54 +05:30
Pramod Mahajan
f848f97d87 implement partial react-query in task assignment flow 2025-06-30 20:20:52 +05:30
Kartik sharma
bb9c351189 Changes in Search text. 2025-06-30 18:29:03 +05:30
Kartik sharma
fb4275fb05 Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:12:28 +05:30
Kartik sharma
be0577e6d8 Changing link of ProjectNames to Projects. 2025-06-30 17:12:05 +05:30
ashutosh.nehete
5861288a9d Merge branch 'Issues_Jun_3W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_Jun_3W 2025-06-30 17:03:56 +05:30
ashutosh.nehete
7615bb9c24 Added line after each module 2025-06-30 17:03:52 +05:30
Vikas Nale
7dffae8957 Merge pull request 'Changes in the employee popup size.' (#221) from Kartik_Bug#524 into Issues_Jun_3W 
Reviewed-on: #221
 2025-06-30 11:16:51 +00:00
Kartik sharma
84563812b7 Adding cross button in Employee popup. 2025-06-30 16:42:58 +05:30
Kartik sharma
562a4ca46d "Changes in the employee popup size." 2025-06-30 16:27:12 +05:30
Pramod Mahajan
7fbbe98373 fixed syntax mistak 2025-06-30 16:20:42 +05:30
Vikas Nale
9c2b2d0b0e Merge pull request 'Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor.' (#220) from Kartik_Enhancement#624 into Issues_Jun_3W 
Reviewed-on: #220
 2025-06-30 10:49:47 +00:00
Kartik sharma
0b54e0b5f1 Changes in Directory Notes Filter. 2025-06-30 10:49:47 +00:00
Kartik sharma
9554caf25f Changes in Directory in Filter, removing unnessary gaps and changing color of HideEditor. 2025-06-30 10:49:47 +00:00
ashutosh.nehete
a96d3696bb Changed the Ids of view infra and manage infra 2025-06-30 13:15:30 +05:30
Vikas Nale
d86c8a2c0b Merge pull request '"Pagination overlaps on '+' (Add) button in Directory – bottom right corner"' (#218) from Kartik_Bug#611 into Issues_Jun_3W 
Reviewed-on: #218
 2025-06-30 06:43:00 +00:00
Kartik sharma
111325968d "Adding margin-bottom to the pagination section in Directory Notes." 2025-06-30 06:41:44 +00:00