d2b10495bd
Added Services Column in Edit activity modal
2025-09-25 09:00:46 +00:00
ae9c4833b3
Added Activity Group, and implemented sorting for Service, Activity Group, and Activities.
2025-09-25 09:00:46 +00:00
e69efe61cb
Adding Activity-Group in Create Task popup.
2025-09-25 09:00:46 +00:00
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
f3913c2824
Change the UI of all components and add stars for all mandatory fields.
2025-09-03 17:19:29 +05:30
4fc6a5c9f3
dynamically update planned and completed work in ProjectInfra and project list card on activity create/edit/delete
2025-07-15 07:32:29 +00:00
Pramod Mahajan
b39a3d7e97
fixed: visible sub task without refresh page
2025-07-03 19:10:49 +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
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
edcc4438a2
Added new field comment
2025-06-18 18:13:12 +05:30
Pramod Mahajan
7c9607cb78
resolved localCompare error
2025-06-13 18:06:09 +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
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
865cc7a366
Reset Select Activity field and remove used activity after task submission
2025-05-08 10:13:19 +00:00
144f8a0595
Added validation to the Completed Work field to prevent negative values.
2025-05-07 11:11:26 +00:00
Pramod Mahajan
498665c811
conditional rendering for building/floor/work area dropdowns
2025-05-04 22:57:27 +05:30
8718aede85
removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster
2025-05-04 11:54:08 +05:30
1bbc8fd422
Conver Int to Guid
2025-05-03 21:43:15 +05:30
Pramod Mahajan
80f2cce931
prevent unnecessary activity master refresh on task form submission
2025-05-03 13:56:21 +05:30
Pramod Mahajan
7d5d262728
normalize activity data to ensure consistent display names.
2025-05-03 12:25:23 +05:30
Pramod Mahajan
80d64c87c6
Improve safety and sorting for building dropdown
...
- Added optional chaining to safely access project.buildings and prevent errors if undefined.
- Filtered out buildings with invalid or missing 'name' properties.
- Implemented safe sorting using localeCompare, with a fallback to empty string for undefined 'name' values.
- Added fallback message "No buildings found" when there are no valid buildings in the list.
2025-05-03 11:07:57 +05:30
Pramod Mahajan
6496fd7eb2
sorted all dropdown list
2025-05-03 04:40:13 +00:00
Pramod Mahajan
6daf3f8a35
sorted activity list in ascedning order.
2025-05-03 04:40:13 +00:00
Pramod Mahajan
1a98aeb934
added Toast and modal open until not close using button
2025-05-03 04:40:13 +00:00
Pramod Mahajan
a7421eb6dc
removed fetchActivity function , activity was needed for projectInfra, that can pass their child component TaskModel. instead of getting activity from ProjectInfra, Now TaskModel can directly calling to useMaster-Activity
2025-04-11 15:26:50 +05:30
Pramod Mahajan
9c0f98dbaf
Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management
2025-04-08 16:00:11 +05:30
cee8f23fd9
enhance modal handling by adding onClose prop to TaskModel and WorkAreaModel components
2025-04-08 07:53:03 +00:00
Pramod Mahajan
9e17b74ba4
changed font size and removed console.
2025-04-07 18:44:19 +05:30
Pramod Mahajan
93c95e007a
integrated create Task api and handling data caching updated for task.
2025-04-07 17:14:07 +05:30
Pramod Mahajan
ddfbed1020
updated project infra components and added assigntask
2025-04-05 13:10:24 +05:30