From 2428f15f3533229de43f0fba7fb532c13890c010 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 10 Apr 2025 03:03:38 +0530
Subject: [PATCH] integrated activity api and fetch in master seaction.

---
 src/data/masters.js                    | 2 +-
 src/hooks/masterHook/useMaster.js      | 5 +++--
 src/pages/master/MasterTable.jsx       | 4 ++--
 src/repositories/MastersRepository.jsx | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/data/masters.js b/src/data/masters.js
index e3b20fe9..dcf0c834 100644
--- a/src/data/masters.js
+++ b/src/data/masters.js
@@ -1,4 +1,4 @@
-export const  mastersList = [{id:1, name: "Role"},{id:2, name: "Job Role"}]
+export const  mastersList = [{id:1, name: "Role"},{id:2, name: "Job Role"},{id:3,name:"Activity"}]
 
 export const dailyTask = [
     {
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index 5f9eb161..dbe420e8 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -43,8 +43,9 @@ const useMaster = () => {
               response = await MasterRespository.getJobRole();
               response = response.data
                 break;
-            case "Module":
-              response = [{description: null,module:"Module 1",featurePermission: null,id: "08dd4761-363c-49ed-8851-3d2489a3e98d"},{description: null,module:"Module 2",featurePermission: null,id: "08dy9761-363c-49ed-8851-3d2489a3e98d"},{description: null,module:"Module 3",featurePermission: null,id: "08dy7761-263c-49ed-8851-3d2489a3e98d"}];
+            case "Activity":
+              response = await MasterRespository.getActivites();
+              response = response.data
               break;
             case "Status":
               response = [{description: null,featurePermission: null,id: "02dd4761-363c-49ed-8851-3d2489a3e98d",status:"status 1"},{description: null,featurePermission: null,id: "03dy9761-363c-49ed-8851-3d2489a3e98d",status:"status 2"},{description: null,featurePermission: null,id: "03dy7761-263c-49ed-8851-3d2489a3e98d",status:"Status 3"}];
diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx
index be575e5e..04e04e97 100644
--- a/src/pages/master/MasterTable.jsx
+++ b/src/pages/master/MasterTable.jsx
@@ -28,7 +28,7 @@ const MasterTable = ( {data, columns, loading, handleModalData} ) =>
     .map((col) => ({
       ...col,
       label:
-        col.key === "role" || col.key === "module" || col.key === "status" ? "Name" : col.label,
+        col.key === "role" || col.key === "Activity" || col.key === "status" ? "Name" : col.label,
     }));
 
   return (
@@ -46,7 +46,7 @@ const MasterTable = ( {data, columns, loading, handleModalData} ) =>
           <tr>
             <th></th>
                 <th>{ selectedMaster} Name</th>
-                <th>{selectedMaster } Description</th>
+                <th>{selectedMaster} {selectedMaster === "Activity" ? "Unit":"Description" }</th>
                 <th className={` ${!hasMasterPermission && 'd-none'}`}>Actions</th>
           </tr>
         </thead>
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index 5cbab52b..92fa9ade 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -27,7 +27,9 @@ export const MasterRespository = {
 
   createJobRole:(data)=>api.post('api/roles/jobrole',data),
   getJobRole :()=>api.get("/api/roles/jobrole"),
-  updateJobRole:(id,data)=>api.put(`/api/roles/jobrole/${id}`,data)
+  updateJobRole: ( id, data ) => api.put( `/api/roles/jobrole/${ id }`, data ),
+  
+  getActivites: () => api.get( 'api/task/activities' ),
   
   
 }
\ No newline at end of file