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

1534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pramod Mahajan
f7f9c4044b cache invalidation for calling fro workItem after assign task for today planne 2025-07-08 13:31:21 +05:30
Pramod Mahajan
2c4ad2ba4a optimized to prevented for maximum deep rendering 2025-07-08 13:30:11 +05:30
Pramod Mahajan
ce37d5f447 added date util fun for UTC to Local zone 2025-07-08 13:29:09 +05:30
Pramod Mahajan
a146d4d15e Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-08 12:28:52 +05:30
Vikas Nale
c4fd04dbac Merge pull request 'Images_gallery_filter' (#234) from Images_gallery_filter into main 
Reviewed-on: #234

deployed feature to production
 2025-07-08 06:47:12 +00:00
Pramod Mahajan
1226006afd added local time zone util fun 2025-07-08 10:18:50 +05:30
Pramod Mahajan
4e1891efdb added projectrepository and toast that was missing. 2025-07-08 09:53:08 +05:30
Pramod Mahajan
5192ce2fc6 rename class to className 2025-07-07 17:02:02 +05:30
Pramod Mahajan
f24b66ae1c set default activity initially 2025-07-07 17:01:02 +05:30
Pramod Mahajan
61b41c3aa4 added utils method that convert UTC TO Local 2025-07-07 15:25:13 +05:30
Pramod Mahajan
76aa9200f7 added Breadcrumb for image gallary 2025-07-07 13:25:44 +05:30
Pramod Mahajan
287d116609 added cosmetic changes 2025-07-07 12:52:43 +05:30
Pramod Mahajan
4f45a805e1 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into Images_gallery_filter 2025-07-07 12:43:24 +05:30
Pramod Mahajan
04ffa0f645 fixed filter button of image galllary 2025-07-07 12:42:19 +05:30
ashutosh.nehete
c88af2441f Added condition to check if number of images uploaded is greater than 0 2025-07-07 11:25:41 +05:30
Pramod Mahajan
58187db80a added default active status at create new project 2025-07-07 11:09:18 +05:30
Pramod Mahajan
9447178985 added format number 2025-07-07 10:59:51 +05:30
ashutosh.nehete
e97031c0e1 Merge pull request 'Changes in Image gallery and integrating singnalR.' (#231) from Kartik_Task#661 into Images_gallery_filter 
Reviewed-on: #231
 2025-07-07 04:35:50 +00:00
Pramod Mahajan
035ef6c099 Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query 2025-07-06 22:18:54 +05:30
Pramod Mahajan
10ee3796d3 Optimized to avoid unnecessary API calls 2025-07-06 22:10:13 +05:30
Pramod Mahajan
8676ff24a5 handle to prevent unwanted api calling 2025-07-06 15:51:46 +05:30
Kartik sharma
9eb8418330 Change the design of Filter drower. 2025-07-06 13:37:42 +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
Vikas Nale
52eeede904 Merge branch 'Issues_July_1W' 2025-07-06 11:21:24 +05:30
Vikas Nale
3be9f7aadb Change brand log and remove some demo css 2025-07-06 11:15:25 +05:30
Kartik sharma
4adfbc8e8e Adding next and previous button hide and correction in filter logic. 2025-07-05 21:59:18 +05:30
Kartik sharma
aebae577df Changes in Image gallery and integrating singnalR. 2025-07-05 18:09:06 +05:30
Vikas Nale
eb1f048059 Merge pull request 'Project Not Visible When Created with "In Progress" Status Selected from Filter' (#230) from Kartik_Bug#641 into Issues_July_1W 
Reviewed-on: #230
 2025-07-05 11:15:39 +00:00
Vikas Nale
0af211a218 Merge pull request 'Image_Gallery' (#229) from Image_Gallery into main 
Reviewed-on: #229
 2025-07-05 11:14:41 +00:00
Vikas Nale
6914b1cd90 Merge pull request 'Reduce the checkbox size and remove unnecessary spacing within the Directory Notes and Contact filters.' (#228) from Kartik_Bug#612 into Issues_July_1W 
Reviewed-on: #228
 2025-07-05 11:13:57 +00:00
Kartik sharma
981a7b121e Project Not Visible When Created with "In Progress" Status Selected from Filter 2025-07-05 11:45:13 +05:30
Kartik sharma
87a7b49948 Changes in Image Gallery creating changing the filter icon adding box at the time of Work Category. 2025-07-04 15:21:18 +05:30
Vikas Nale
1f9dcbbc82 Merge branch 'Issues_July_1W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_1W 
# Conflicts:
#	src/pages/authentication/ChangePassword.jsx
 2025-07-04 14:14:37 +05:30
Vikas Nale
8f9f0091ea modify change password UI 2025-07-04 14:13:19 +05:30
Vikas Nale
115740c4dc modify change password UI 2025-07-04 13:24:47 +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
Kartik sharma
a6169c106f Changes in Filter drower increase its size. 2025-07-04 11:31:35 +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
Kartik sharma
09906420a6 Adding Date Range picker in filter dropdown. 2025-07-04 10:18:18 +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