|
|
58fe364821
|
Merge pull request 'React Query Integration for Server State Sync in Clinet' (#245) from react-query into main
Reviewed-on: #245
|
2025-07-11 11:32:18 +00:00 |
|
Pramod Mahajan
|
5f54f5e29a
|
added project status label that was missing, during changed structure of project details
|
2025-07-10 18:12:45 +05:30 |
|
Pramod Mahajan
|
c018ffa455
|
if assigned employee to project, that employees should display instantly inside Assigned task view and employee list
|
2025-07-10 13:18:04 +05:30 |
|
Pramod Mahajan
|
fe4426af9e
|
fixed project updation in project about
|
2025-07-09 16:59:36 +05:30 |
|
Pramod Mahajan
|
01591c429e
|
added generic modal for edit profile
|
2025-07-09 16:37:09 +05:30 |
|
Pramod Mahajan
|
bba4315a8e
|
clear button class changed primary to secondary in manage employee form
|
2025-07-09 16:28:14 +05:30 |
|
Pramod Mahajan
|
2d33eede45
|
changed class to clasName
|
2025-07-09 16:26:40 +05:30 |
|
Pramod Mahajan
|
710af87db1
|
removed custome hook for loading state, becuase react-hook provide own state
|
2025-07-09 16:04:39 +05:30 |
|
Pramod Mahajan
|
fca3f03a44
|
fixed searching for employee
|
2025-07-09 14:33:21 +05:30 |
|
Pramod Mahajan
|
d818ea9265
|
vissible data after updated inside projecr details page
|
2025-07-09 11:48:42 +05:30 |
|
Pramod Mahajan
|
87edce4c3d
|
added signalr events
|
2025-07-09 10:42:04 +05:30 |
|
Pramod Mahajan
|
cb7df469c2
|
added aspect ratio for image view in task comment
|
2025-07-08 15:24:18 +05:30 |
|
Pramod Mahajan
|
3968a47d98
|
fixed : project updation issue
|
2025-07-08 15:11:03 +05:30 |
|
Pramod Mahajan
|
ae07e9629b
|
reset default correct activity for edit Task
|
2025-07-08 13:33:43 +05:30 |
|
Pramod Mahajan
|
16c7e971b1
|
updateed payload for createdTask fun , for getting workAreaId
|
2025-07-08 13:32:37 +05:30 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
52eeede904
|
Merge branch 'Issues_July_1W'
|
2025-07-06 11:21:24 +05:30 |
|
|
|
3be9f7aadb
|
Change brand log and remove some demo css
|
2025-07-06 11:15:25 +05:30 |
|
|
|
4adfbc8e8e
|
Adding next and previous button hide and correction in filter logic.
|
2025-07-05 21:59:18 +05:30 |
|
|
|
aebae577df
|
Changes in Image gallery and integrating singnalR.
|
2025-07-05 18:09:06 +05:30 |
|
|
|
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 |
|
|
|
0af211a218
|
Merge pull request 'Image_Gallery' (#229) from Image_Gallery into main
Reviewed-on: #229
|
2025-07-05 11:14:41 +00:00 |
|
|
|
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 |
|
|
|
981a7b121e
|
Project Not Visible When Created with "In Progress" Status Selected from Filter
|
2025-07-05 11:45:13 +05:30 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8f9f0091ea
|
modify change password UI
|
2025-07-04 14:13:19 +05:30 |
|
