afcd1934f9
Integrate the API for Work Area and fetch data filtered by serviceId.
2025-09-21 15:10:31 +05:30
0746e5c349
Merge pull request 'Adding Dropdown in Create Task Popup.' ( #411 ) from Kartik_Task#1230 into Organization_Management
...
Reviewed-on: #411
2025-09-20 06:03:55 +00:00
994f22e8c0
Changes in Infrastructure service dropdown.
2025-09-20 11:29:29 +05:30
00d6774e06
Change the position of Services in Create Task popup in Infrastructure.
2025-09-19 19:26:46 +05:30
54e609883d
Adding Dropdown in Create Task Popup.
2025-09-19 16:13:09 +05:30
ea022d37c8
Merge branch 'Document_Manag' of https://git.marcoaiot.com/admin/marco.pms.web into UI_Changes_PMS
2025-09-08 11:50:58 +05:30
f3913c2824
Change the UI of all components and add stars for all mandatory fields.
2025-09-03 17:19:29 +05:30
e66ce11cd5
changes tage reponse and changed confirm modal format
2025-09-03 16:40:20 +05:30
43e173d0ef
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into react-query-v2
2025-07-21 09:47:09 +05:30
632119cfb9
removed unused code
2025-07-18 18:38:35 +05:30
b84275a7a3
fixed: employee fetching inside assign task
2025-07-18 17:09:49 +05:30
cd23e43a82
removed unused code
2025-07-18 11:57:07 +05:30
839dfa3dc3
removed unused code
2025-07-17 15:42:33 +05:30
6bf33b27a0
Fixed: Prevent brief display of "No activities available" before task data loads
...
- Improved conditional rendering logic in WorkArea component
- Ensured "No activities" message only shows after data is loaded and empty
- Avoided flicker caused by initial undefined or empty task list state
2025-07-17 11:47:23 +05:30
b502b6b31e
removed debugger
2025-07-16 18:35:43 +05:30
0126d38b57
removed scrollbar on dashbord graph
2025-07-15 17:52:56 +05:30
788f0baee4
dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete
2025-07-14 20:18:36 +05:30
Pramod Mahajan
87edce4c3d
added signalr events
2025-07-09 10:42:04 +05:30
Pramod Mahajan
ae07e9629b
reset default correct activity for edit Task
2025-07-08 13:33:43 +05:30
Pramod Mahajan
f24b66ae1c
set default activity initially
2025-07-07 17:01:02 +05:30
Pramod Mahajan
b5b1f9d31f
added completedWork , plannedWork for progrss line with formatnumber util
2025-07-06 13:11:15 +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
afac84dc9b
now displayed cancel and submit button at initially - bug643
2025-07-04 11:47:02 +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
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
Pramod Mahajan
a02a33a247
partially implementation of masters in react query hooks
2025-07-01 13:23:16 +05:30
2226d54f24
Missing Error Message When Required Fields Are Not Selected in Infrastructure > Create Task
2025-07-01 12:37:22 +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
891cbc9620
give relveant name for modal props
2025-06-23 16:13:25 +05:30
Pramod Mahajan
52a578972e
Merge branch 'main' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#505
2025-06-19 16:48:47 +05:30
ad25c4610e
Implemented signalR in project Infrastructure management modules
2025-06-19 09:56:41 +05:30
Pramod Mahajan
edcc4438a2
Added new field comment
2025-06-18 18:13:12 +05:30
Pramod Mahajan
f58aa8cb18
added new modal for create sub task
2025-06-17 20:46:46 +05:30
8431e856aa
Added signalR functionality in Project Infrastructure
2025-06-17 17:18:59 +05:30
Pramod Mahajan
7c9607cb78
resolved localCompare error
2025-06-13 18:06:09 +05:30
Pramod Mahajan
18d6916fb8
first building expanded by default
2025-06-10 18:20:15 +05:30
Pramod Mahajan
78894918c0
first building by default expanded
2025-06-10 18:11:36 +05:30
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
176535f53f
Added Column Today's Planned to Project Infrastructure
2025-06-03 11:59:46 +00:00
493689fb1a
Add progress bar for work area on Infra Page
2025-06-03 11:47:18 +00:00
Pramod Mahajan
80d3434bbf
Display completion percentage for each Work Area header
2025-06-03 11:47:18 +00:00
Pramod Mahajan
628bf006d6
conditionally render Actions column based on permissions and project status
2025-05-31 17:02:36 +05:30
7a1a55f52f
Merge branch 'Kartik_Bug#301' into Issue_May_4W
...
# Conflicts:
# src/components/Project/Infrastructure/FloorModel.jsx
2025-05-24 20:48:37 +05:30
decc388bf1
Error message work Properly.
2025-05-24 10:52:41 +00:00
7804e44b85
Error message in Manage floor popup in Infrastructure.
2025-05-24 15:54:31 +05:30
5cb1e55292
Validation message is not Empty while clicking on Cancel button in Manage Employee popup from Infrastructure from project list.
2025-05-22 06:11:23 +00:00
