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 |
|
|
6e2d640542
|
"In the Manage Building popup (accessed from Project > Project List, by selecting a project and navigating to Infrastructure), the error message is now correctly displayed as 'Building name is required'. A previous issue caused the message 'Expected string, received null' to appear initially."
|
2025-05-17 10:58:14 +00:00 |
|
|
48f013edd5
|
On the Infrastructure tab, the Planned and Completed columns have been merged, and their data is now shown as '2/3'.
|
2025-05-17 10:57:50 +00:00 |
|
|
21b2feb13f
|
Update the Project List component column names:
1.Change 'Planned' to 'Completed/Planned'
2.Change 'Completed' to 'Today's Planned
|
2025-05-17 10:57:50 +00:00 |
|
|
27cf6f2703
|
Modified Manage task popup from project > project list. Change name planned to completed/planned and completed to Today`s planned.
|
2025-05-17 10:57:50 +00:00 |
|
Pramod Mahajan
|
7d07002555
|
visible assign task button in mobile view
|
2025-05-15 05:46:40 +00:00 |
|
|
c8ad72a2da
|
added Assign_view progress task permission.
|
2025-05-13 12:40:10 +05:30 |
|
Pramod Mahajan
|
d398a6cb39
|
added dropdwon for action view
|
2025-05-13 11:32:09 +05:30 |
|
Pramod Mahajan
|
4fb337533e
|
added bootstrap accordation
|
2025-05-13 11:30:43 +05:30 |
|
Pramod Mahajan
|
db098f9fdc
|
manage floor header size for collap
|
2025-05-13 11:29:56 +05:30 |
|
Pramod Mahajan
|
aa2ca6565b
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Enhancement#154
|
2025-05-12 16:36:55 +05:30 |
|
Pramod Mahajan
|
bf797503f5
|
added accordionn for floor
|
2025-05-12 16:34:44 +05:30 |
|
|
e8ac267d46
|
Added a Work Category dropdown in task create/update forms and a new column to display the category in Project Infrastructure and Daily Task Planning views.
|
2025-05-12 14:40:13 +05:30 |
|
Pramod Mahajan
|
2188f109cb
|
disable Edit button and show "Please wait" message during activity update API call
|
2025-05-12 07:58:04 +00:00 |
|
Pramod Mahajan
|
292c920941
|
added loader during submitting form data.
|
2025-05-12 07:58:04 +00:00 |
|
Pramod Mahajan
|
6bb1f98ae7
|
Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207,
|
2025-05-10 19:06:34 +05:30 |
|
Pramod Mahajan
|
ebb5a57b70
|
changed class too className
|
2025-05-10 12:59:33 +05:30 |
|
Pramod Mahajan
|
1dbd8ba317
|
can't update completed is greather than zero
|
2025-05-10 12:54:10 +05:30 |
|