-
+
{errors.activityName && (
{errors.activityName.message}
@@ -148,93 +239,188 @@ const UpdateActivity = ({ activityData, onClose }) => {
{/* Unit of Measurement */}
-
+
{errors.unitOfMeasurement && (
-
{errors.unitOfMeasurement.message}
+
+ {errors.unitOfMeasurement.message}
+
+ )}
+
+
+ {/* Services */}
+
+
+ {activityData.serviceId != null ? (
+
+ ) : (
+
+ )}
+ {errors.serviceId && (
+
{errors.serviceId.message}
+ )}
+
+
+ {/* Actitvity Group */}
+
+
+
+ {errors.actitvityGroupId && (
+
{errors.actitvityGroupId.message}
)}
{/* Checklist */}
-
{checkListItems.length > 0 ? "Check List" : "Add Check List"}
+
+ {checkListItems.length > 0 ? "Check List" : "Add Check List"}
+
{checkListItems.length > 0 && (
-
+
)}
-
diff --git a/src/components/master/EditActivityGroup.jsx b/src/components/master/EditActivityGroup.jsx
new file mode 100644
index 00000000..8ff4bc10
--- /dev/null
+++ b/src/components/master/EditActivityGroup.jsx
@@ -0,0 +1,187 @@
+import React, { useEffect, useState } from "react";
+import { useForm, Controller } from "react-hook-form";
+import { set, z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { MasterRespository } from "../../repositories/MastersRepository";
+import { cacheData, getCachedData } from "../../slices/apiDataManager";
+import showToast from "../../services/toastService";
+
+const schema = z.object({
+ name: z.string().min(1, { message: "Service Name is required" }),
+ description: z
+ .string()
+ .min(1, { message: "Description is required" })
+ .max(255, { message: "Description cannot exceed 255 characters" }),
+ serviceId: z.string().min(1, { message: "A service selection is required." }),
+});
+
+const EditActivityGroup = ({ data, onClose }) => {
+ const [isLoading, setIsLoading] = useState(false);
+ const [services, setServices] = useState(getCachedData("Services"));
+ const [formData, setFormData] = useState({
+ name: data?.name || "",
+ description: data?.description || "",
+ serviceId: data.serviceId || "",
+ });
+ const {
+ register,
+ handleSubmit,
+ formState: { errors },
+ reset,
+ watch,
+ } = useForm({
+ resolver: zodResolver(schema),
+ defaultValues: {
+ name: data?.name || "",
+ description: data?.description || "",
+ serviceId: data.serviceId || "",
+ },
+ });
+ const selectedServiceId = watch("serviceId");
+ const selectedName = watch("name");
+ const selectedDescription = watch("description");
+
+ // const handleServicesChange = (e) => {
+ // const { value } = e.target;
+ // const service = services.find((b) => b.id === String(value));
+ // reset((prev) => ({
+ // ...prev,
+ // serviceId: String(value),
+ // }));
+ // };
+
+ const onSubmit = (formdata) => {
+ setIsLoading(true);
+ const result = {
+ id: data?.id,
+ name: formdata?.name,
+ description: formdata.description,
+ serviceId: formdata?.serviceId,
+ };
+
+ MasterRespository.updateActivityGroup(data?.id, result)
+ .then((resp) => {
+ setIsLoading(false);
+ showToast("Activity Group Update successfully.", "success");
+ const cachedData = getCachedData("Activity Group");
+ if (cachedData) {
+ const updatedData = cachedData.map((service) =>
+ service.id === data?.id ? { ...service, ...resp.data } : service
+ );
+ cacheData("Activity Group", updatedData);
+ }
+
+ onClose();
+ })
+ .catch((error) => {
+ showToast(error.message, "error");
+ setIsLoading(false);
+ });
+ };
+
+ useEffect(() => {
+ if (!services) {
+ MasterRespository.getServices().then((res) => {
+ setServices(res?.data);
+ cacheData("Services", res?.data);
+ });
+ }
+ reset({
+ name: data?.name,
+ description: data?.description,
+ serviceId: data?.serviceId,
+ });
+ setDescriptionLength(data?.description?.length || 0);
+ }, [data, reset]);
+
+ const [descriptionLength, setDescriptionLength] = useState(
+ data?.description?.length || 0
+ );
+ const maxDescriptionLength = 255;
+
+ return (
+ <>
+
+
+ );
+};
+
+export default EditActivityGroup;
diff --git a/src/components/master/EditServices.jsx b/src/components/master/EditServices.jsx
new file mode 100644
index 00000000..8fbf4b65
--- /dev/null
+++ b/src/components/master/EditServices.jsx
@@ -0,0 +1,135 @@
+import React, { useEffect, useState } from "react";
+import { useForm, Controller } from "react-hook-form";
+import { set, z } from "zod";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { MasterRespository } from "../../repositories/MastersRepository";
+import { cacheData, getCachedData } from "../../slices/apiDataManager";
+import showToast from "../../services/toastService";
+
+const schema = z.object({
+ name: z.string().min(1, { message: "Service Name is required" }),
+ description: z
+ .string()
+ .min(1, { message: "Description is required" })
+ .max(255, { message: "Description cannot exceed 255 characters" }),
+});
+
+const EditServices = ({ data, onClose }) => {
+ const [isLoading, setIsLoading] = useState(false);
+ const {
+ register,
+ handleSubmit,
+ formState: { errors },
+ reset,
+ watch,
+ } = useForm({
+ resolver: zodResolver(schema),
+ defaultValues: {
+ name: data?.name || "",
+ description: data?.description || "",
+ },
+ });
+
+ const selectedName = watch("name")
+ const selectedDescription = watch("description")
+
+ const onSubmit = (formdata) => {
+ setIsLoading(true);
+ const result = {
+ id: data?.id,
+ name: formdata?.name,
+ description: formdata.description,
+ };
+
+ MasterRespository.updateService(data?.id, result)
+ .then((resp) => {
+ setIsLoading(false);
+ showToast("Service Update successfully.", "success");
+ const cachedData = getCachedData("Services");
+ if (cachedData) {
+ const updatedData = cachedData.map((service) =>
+ service.id === data?.id ? { ...service, ...resp.data } : service
+ );
+ cacheData("Services", updatedData);
+ }
+
+ onClose();
+ })
+ .catch((error) => {
+ showToast(error.message, "error");
+ setIsLoading(false);
+ });
+ };
+
+ useEffect(() => {
+ reset({
+ name: data?.name,
+ description: data?.description,
+ });
+ setDescriptionLength(data?.description?.length || 0);
+ }, [data, reset]);
+
+ const [descriptionLength, setDescriptionLength] = useState(
+ data?.description?.length || 0
+ );
+ const maxDescriptionLength = 255;
+
+ return (
+ <>
+
+
+ );
+};
+
+export default EditServices;
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index b3da6dd9..c65a75c0 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -17,6 +17,10 @@ import CreateCategory from "./CreateContactCategory";
import CreateContactTag from "./CreateContactTag";
import EditContactCategory from "./EditContactCategory";
import EditContactTag from "./EditContactTag";
+import CreateServices from "./CreateServices";
+import EditServices from "./EditServices";
+import CreateActivityGroup from "./CreateActivityGroup";
+import EditActivityGroup from "./EditActivityGroup";
const MasterModal = ({ modaldata, closeModal }) => {
@@ -118,6 +122,18 @@ const MasterModal = ({ modaldata, closeModal }) => {
{modaldata.modalType === "Edit-Job Role" && (
)}
+ {modaldata.modalType === "Services" && (
+
+ )}
+ {modaldata.modalType === "Edit-Services" && (
+
+ )}
+ {modaldata.modalType === "Activity Group" && (
+
+ )}
+ {modaldata.modalType === "Edit-Activity Group" && (
+
+ )}
{modaldata.modalType === "Activity" && (
)}
diff --git a/src/data/masters.js b/src/data/masters.js
index e94de7a3..f635aa40 100644
--- a/src/data/masters.js
+++ b/src/data/masters.js
@@ -1,5 +1,5 @@
// it important ------
-export const mastersList = [ {id: 1, name: "Application Role"}, {id: 2, name: "Job Role"}, {id: 3, name: "Activity"},{id: 4, name:"Work Category"},{id:5,name:"Contact Category"},{id:6,name:"Contact Tag"}]
+export const mastersList = [ {id: 1, name: "Application Role"}, {id: 2, name: "Job Role"}, {id: 3, name: "Services"}, {id: 4, name: "Activity Group"}, {id: 5, name: "Activity"},{id: 6, name:"Work Category"},{id:7,name:"Contact Category"},{id:8,name:"Contact Tag"}]
// -------------------
export const dailyTask = [
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index a5c43a51..e79e8cf0 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -43,6 +43,14 @@ const useMaster = (isMa) => {
response = await MasterRespository.getJobRole();
response = response.data
break;
+ case "Services":
+ response = await MasterRespository.getServices();
+ response = response.data
+ break;
+ case "Activity Group":
+ response = await MasterRespository.getActivityGroups();
+ response = response.data
+ break;
case "Activity":
response = await MasterRespository.getActivites();
response = response.data
diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx
index 0126b339..f199ea98 100644
--- a/src/pages/master/MasterTable.jsx
+++ b/src/pages/master/MasterTable.jsx
@@ -16,6 +16,11 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
"tenantId",
"checkLists",
"isSystem",
+ "isActive",
+ "serviceId",
+ "servicesName",
+ "actitvityGroupId",
+ "activityGroupName"
];
const safeData = Array.isArray(data) ? data : [];
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index a2557574..5d818e09 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -30,15 +30,24 @@ export const MasterRespository = {
getJobRole :()=>api.get("/api/roles/jobrole"),
updateJobRole: ( id, data ) => api.put( `/api/roles/jobrole/${ id }`, data ),
+ getServices: () => api.get("api/master/services"),
+ createService: (data) => api.post("api/master/service", data),
+ updateService: (id, data) => api.put(`api/master/service/${id}`, data),
+
+ getActivityGroups: () => api.get("api/master/activity-groups"),
+ createActivityGroup: (data) => api.post("api/master/activity-group", data),
+ updateActivityGroup: (id, data) => api.put(`api/master/activity-group/${id}`, data),
getActivites: () => api.get( 'api/master/activities' ),
createActivity: (data) => api.post( 'api/master/activity',data ),
- updateActivity:(id,data) =>api.post(`api/master/activity/edit/${id}`,data),
+ updateActivity:(id,data) =>api.put(`api/master/activity/${id}`,data),
getIndustries: () => api.get( 'api/master/industries' ),
// delete
"Job Role": ( id ) => api.delete( `/api/roles/jobrole/${ id }` ),
- "Activity": ( id ) => api.delete( `/api/master/activity/delete/${ id }` ),
+ "Services": (id) => api.delete(`/api/master/service/${id}`),
+ "Activity Group": (id) => api.delete(`/api/master/activity-group/${id}`),
+ "Activity": ( id ) => api.delete( `/api/master/activity/${ id }` ),
"Application Role":(id)=>api.delete(`/api/roles/${id}`),
"Work Category": ( id ) => api.delete( `api/master/work-category/${ id }` ),
"Contact Category": ( id ) => api.delete( `/api/master/contact-category` ),