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

2082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kartik sharma
99601095b5 To show ImageGallery in our project. 2025-07-02 18:28:08 +05:30
Vikas Nale
5bb27b6106 Modify project landing page 2025-07-02 15:11:31 +05:30
ashutosh.nehete
fb1dec6c93 Added new field in contact create and update form 2025-07-02 15:06:01 +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
475f7b564e Merge pull request 'In Attendance Log Tab date Range show set to today -1 to past 7 days.' (#227) from Kartik_Bug#629 into Issues_July_1W 
Reviewed-on: #227
 2025-07-01 12:24:53 +00:00
Kartik sharma
b74c863794 Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters. 2025-07-01 17:14:03 +05:30
Kartik sharma
e85dfb3922 In Attendance Log Tab date Range show set to today -1 to past 7 days. 2025-07-01 16:47:03 +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
Kartik sharma
baf6a4cf54 "Pagination overlaps on '+' (Add) button in Directory – bottom right corner" 2025-06-30 06:41:44 +00:00
Vikas Nale
a1b45c341a Merge pull request '"Directory filter popup closes on 'Clear' button click – it should remain open"' (#219) from Kartik_Bug#613 into Issues_Jun_3W 
Reviewed-on: #219
 2025-06-30 06:38:51 +00:00
Kartik sharma
da69ae6fec "In the Directory Notes, applying a filter changes the Clear button's state and color." 2025-06-30 06:38:51 +00:00
Kartik sharma
48d1592b8c "Directory filter popup closes on 'Clear' button click – it should remain open" 2025-06-30 06:38:51 +00:00
Vikas Nale
4700ba38cd Merge pull request '"Search field height mismatch in Directory – should match Card and List view height"' (#217) from Kartik_Bug#608 into Issues_Jun_3W 
Reviewed-on: #217
 2025-06-30 05:18:47 +00:00
Pramod Mahajan
467d5d4b13 integrate React Query for project details and real-time updates 2025-06-29 00:55:02 +05:30
Kartik sharma
67b694c697 "Search field height mismatch in Directory – should match Card and List view height" 2025-06-28 15:06:54 +05:30
Pramod Mahajan
22e65c167e prevent unnwanted api calling 2025-06-28 10:38:01 +05:30
ashutosh.nehete
2bdaed1d83 Merge pull request 'Enhanced the Directory module by adding Notes and Contacts tabs, with view-specific controls, export options, and search functionality for Notes.' (#215) from Kartik_Task#513 into Issues_Jun_3W 
Reviewed-on: #215
 2025-06-27 11:43:30 +00:00
Kartik sharma
af22b95316 Merge branch 'Kartik_Task#513' of https://git.marcoaiot.com/admin/marco.pms.web into Kartik_Task#513 2025-06-27 17:13:06 +05:30
Kartik sharma
58c17ffe37 remove divider line. 2025-06-27 17:13:02 +05:30