admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#207

Browse Source
This commit is contained in:
Pramod Mahajan 2025-05-10 17:07:30 +05:30
commit 2892b803d5
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/Activities/ReportTask.jsx
View File

@ -26,7 +26,8 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
const { const {
register, register,
handleSubmit, handleSubmit,
formState: { errors }, formState: {errors},
reset
} = useForm({ } = useForm({
resolver: zodResolver(schema), resolver: zodResolver(schema),
defaultValues: { completedTask: 0, comment: "" }, defaultValues: { completedTask: 0, comment: "" },
@ -43,11 +44,15 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
}; };
let response = await TasksRepository.reportTask(reportData); let response = await TasksRepository.reportTask(reportData);
showToast("Task reported successfully.", "success"); showToast("Task Reported Successfully.", "success");
refetch(); refetch();
reset()
setloading(false);
closeModal(); closeModal();
} catch (error) { } catch ( error )
showToast("Somthing wrog", "error"); {
const msg = error.response.data.message || error.message || "Error Occur During Api Call"
showToast(msg, "error");
} }
}; };
const handleClose = () => { const handleClose = () => {

6
src/components/Activities/ReportTaskComments.jsx
View File

@ -102,7 +102,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
style={{ maxHeight: "400px" }} style={{ maxHeight: "400px" }}
> >
{comments && {comments &&
comments.map((data) => { comments?.map((data) => {
const fullName = `${data?.employee?.firstName} ${data?.employee?.lastName}`; const fullName = `${data?.employee?.firstName} ${data?.employee?.lastName}`;
const bgClass = getBgClassFromHash(fullName); const bgClass = getBgClassFromHash(fullName);
return ( return (
@ -116,10 +116,10 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
<span <span
className={`avatar-initial rounded-circle bg-label-primary}`} className={`avatar-initial rounded-circle bg-label-primary}`}
> >
{`${data?.employee?.firstName.slice( {`${data?.employee?.firstName?.slice(
0, 0,
1 1
)} ${data?.employee?.lastName.slice(0, 1)}`} )} ${data?.employee?.lastName?.slice(0, 1)}`}
</span> </span>
</div> </div>

7
src/components/Project/AssignRole.jsx
View File

@ -40,7 +40,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const selectedProject = useSelector( const selectedProject = useSelector(
(store) => store.localVariables.projectId (store) => store.localVariables.projectId
); );
const { employees } = useEmployeesAllOrByProjectId(selectedProject,false); const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false);
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { data, loading } = useMaster();
@ -67,7 +67,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const handleRoleChange = (event) => { const handleRoleChange = (event) => {
reset(); reset();
setSelectedEmployees([]); // setSelectedEmployees([]);
setSelectedRole(event.target.value); setSelectedRole(event.target.value);
}; };
@ -188,7 +188,8 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<div className="divider text-start"> <div className="divider text-start">
<div className="divider-text">Employee</div> <div className="divider-text">Employee</div>
</div> </div>
{filteredEmployees?.length === 0 && employees && ( {employeeLoading && <div>Loading...</div>}
{!employeeLoading && filteredEmployees?.length === 0 && employees && (
<div>No employees found</div> <div>No employees found</div>
)} )}

2
src/components/Project/ManageProjectInfo.jsx
View File

@ -101,8 +101,8 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
const onSubmitForm = (updatedProject) => { const onSubmitForm = (updatedProject) => {
setLoading(true); setLoading(true);
handleSubmitForm( updatedProject, setLoading,reset );
handleSubmitForm( updatedProject ,setLoading);
}; };

6
src/pages/project/ProjectList.jsx
View File

@ -66,13 +66,15 @@ const ProjectList = () => {
} }
}, [loginUser, HasManageProjectPermission]); }, [loginUser, HasManageProjectPermission]);
const handleSubmitForm = (newProject) => { const handleSubmitForm = (newProject,setloading,reset) => {
ProjectRepository.manageProject(newProject) ProjectRepository.manageProject(newProject)
.then((response) => { .then((response) => {
const cachedProjects = getCachedData("projectslist") || []; const cachedProjects = getCachedData("projectslist") || [];
const updatedProjects = [...cachedProjects, response.data]; const updatedProjects = [...cachedProjects, response.data];
cacheData("projectslist", updatedProjects); cacheData("projectslist", updatedProjects);
setProjectList((prev) => [...prev, response.data]); setProjectList( ( prev ) => [ ...prev, response.data ] );
setloading( false )
reset()
showToast("Project Created successfully.", "success"); showToast("Project Created successfully.", "success");
setShowModal(false); setShowModal(false);
}) })