- Attendance logs for{" "} - {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "} - on {formatUTCToLocalTime(logs[0]?.activityTime)} +
+ Showing logs for{" "} + + {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName} + {" "} + on {formatUTCToLocalTime(logs[0]?.activityTime)}
)}| Activity | Date | Time | -Activity | Location | Recored By | Description | @@ -156,11 +159,16 @@ const AttendLogs = ({ Id }) => { .sort((a, b) => b.id - a.id) .map((log, index) => (|||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {formatUTCToLocalTime(log.activityTime)} | -{convertShortTime(log.activityTime)} | {whichActivityPerform(log.activity, log.activityTime)} | +
+
+ {formatUTCToLocalTime(log.activityTime)}
+
+ |
+ {convertShortTime(log.activityTime)} | +{log?.latitude != 0 ? ( { )} | - {`${log?.updatedByEmployee?.firstName ?? ""} ${ - log?.updatedByEmployee?.lastName ?? "" - }`} + {`${log?.updatedByEmployee?.firstName ?? ""} ${log?.updatedByEmployee?.lastName ?? "" + }`} |
{log?.comment?.length > 50
diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index b7ddfaff..681434df 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -11,6 +11,7 @@ import { useSelector } from "react-redux";
import { useQueryClient } from "@tanstack/react-query";
import eventBus from "../../services/eventBus";
import { useSelectedProject } from "../../slices/apiDataManager";
+import { SpinnerLoader } from "../common/Loader";
const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizationId, }) => {
const queryClient = useQueryClient();
@@ -110,28 +111,41 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
return (
<>
+
+ {/* Left side - Date */}
+
+ Date: {formatUTCToLocalTime(todayDate)}
+
+
+ {/* Right side - Pending Attendance toggle */}
+
+ setShowPending(e.target.checked)}
+ />
+
+
+
-
- Date : {formatUTCToLocalTime(todayDate)}
-
{attLoading ? (
-
- setShowPending(e.target.checked)}
- />
-
-
- Loading...
+
+
) : currentItems?.length > 0 ? (
+
<>
- Loading chart...
- {/* Replace this with a skeleton or spinner if you prefer */}
+
);
}
diff --git a/src/components/Charts/LineChart.jsx b/src/components/Charts/LineChart.jsx
index 6eb4840c..be8b5ebe 100644
--- a/src/components/Charts/LineChart.jsx
+++ b/src/components/Charts/LineChart.jsx
@@ -1,6 +1,7 @@
import React from "react";
import ReactApexChart from "react-apexcharts";
import PropTypes from "prop-types";
+import { SpinnerLoader } from "../common/Loader";
const LineChart = ({
seriesData = [],
@@ -9,24 +10,28 @@ const LineChart = ({
loading = false,
lineChartCategoriesDates = [],
}) => {
- const hasValidData =
- Array.isArray(seriesData) &&
- seriesData.length > 0 &&
- Array.isArray(categories) &&
- categories.length > 0;
+ const hasValidData =
+ Array.isArray(seriesData) &&
+ seriesData.length > 0 &&
+ Array.isArray(categories) &&
+ categories.length > 0;
- if (loading) {
- return (
-
+
-
- Loading chart...
-
- );
- }
+ if (loading) {
+ return (
+
+
+ );
+ }
- if (!hasValidData) {
- return
+
+ No data to display ;
- }
+ if (!hasValidData) {
+ return No data to display ;
+ }
const chartOptions = {
chart: {
@@ -129,16 +134,16 @@ const LineChart = ({
};
LineChart.propTypes = {
- seriesData: PropTypes.arrayOf(
- PropTypes.shape({
- name: PropTypes.string.isRequired,
- data: PropTypes.arrayOf(PropTypes.number).isRequired
- })
- ),
- categories: PropTypes.arrayOf(PropTypes.string),
- colors: PropTypes.arrayOf(PropTypes.string),
- title: PropTypes.string,
- loading: PropTypes.bool
+ seriesData: PropTypes.arrayOf(
+ PropTypes.shape({
+ name: PropTypes.string.isRequired,
+ data: PropTypes.arrayOf(PropTypes.number).isRequired
+ })
+ ),
+ categories: PropTypes.arrayOf(PropTypes.string),
+ colors: PropTypes.arrayOf(PropTypes.string),
+ title: PropTypes.string,
+ loading: PropTypes.bool
};
export default LineChart;
diff --git a/src/components/DailyProgressRport/TaskReportFilterPanel.jsx b/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
index 2af3636d..8394a158 100644
--- a/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
+++ b/src/components/DailyProgressRport/TaskReportFilterPanel.jsx
@@ -54,6 +54,7 @@ const TaskReportFilterPanel = ({ handleFilter }) => {
+
{/* Header */}
-
+ Attendance OverviewRole-wise present count @@ -117,18 +118,16 @@ const AttendanceOverview = () => {
+
{loading ? (
- {error} + ) : attendanceOverviewData.length === 0 || + attendanceOverviewData.every((item) => item.present === 0) ? ( +No data found
) : view === "chart" ? (
- Role
- |
+ Role |
{dates.map((date, idx) => (
{
))}
| {role} |
{tableData.map((row, idx) => {
const value = row[role];
- const cellStyle =
- value > 0 ? { backgroundColor: "#d5d5d5" } : {};
+ const cellStyle = value > 0 ? { backgroundColor: "#d5d5d5" } : {};
return (
{value}
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index 4c09056a..ad5ead8c 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -12,11 +12,11 @@ import Teams from "./Teams";
import TasksCard from "./Tasks";
import ProjectCompletionChart from "./ProjectCompletionChart";
import ProjectProgressChart from "./ProjectProgressChart";
-import ProjectOverview from "../Project/ProjectOverview";
-import AttendanceOverview from "./AttendanceChart";
+import AttendanceOverview from "./AttendanceOverview";
import ExpenseAnalysis from "./ExpenseAnalysis";
import ExpenseStatus from "./ExpenseStatus";
import ExpenseByProject from "./ExpenseByProject";
+import ProjectStatistics from "../Project/ProjectStatistics";
const Dashboard = () => {
@@ -29,16 +29,16 @@ const Dashboard = () => {
|
{isAllProjectsSelected && (
)}
-
- {!isAllProjectsSelected && (
-
-
)}
-
-
{isAllProjectsSelected && (
@@ -46,32 +46,31 @@ const Dashboard = () => {
-
- )}
-
-
-
+ )}
+ {!isAllProjectsSelected && (
+
+
-
+
+ )}
-
+
+
- )}
+
-
-
-
- Expense Breakdown- {/*Category Wise Expense Breakdown */} -{projectName} -
-
+
+
+
- {/* Card body */}
- Expense Breakdown+{projectName}
- {isLoading && (
-
- {!isLoading && report.length === 0 && (
-
- Loading...
-
- )}
+
+
+ No data found
- )}
+
+ {isLoading && (
+
+
+ )}
- {!isLoading && report.length > 0 && (
- <>
- {isFetching && (
-
- Loading...
-
- )}
+ {!isLoading && report.length === 0 && (
+
+ No data found
+
+ )}
-
+ {!isLoading && report.length > 0 && (
+ <>
+ {isFetching && (
+
+ Loading...
+
+ )}
+
+
+ {/* Chart Column */}
+
);
};
diff --git a/src/components/Dashboard/ExpenseByProject.jsx b/src/components/Dashboard/ExpenseByProject.jsx
index 96e3fb56..c589bc45 100644
--- a/src/components/Dashboard/ExpenseByProject.jsx
+++ b/src/components/Dashboard/ExpenseByProject.jsx
@@ -1,12 +1,13 @@
import React, { useState, useEffect } from "react";
import Chart from "react-apexcharts";
-import { useExpenseType } from "../../hooks/masterHook/useMaster";
import { useSelector } from "react-redux";
import { useExpenseDataByProject } from "../../hooks/useDashboard_Data";
import { formatCurrency } from "../../utils/appUtils";
import { formatDate_DayMonth } from "../../utils/dateUtils";
import { useProjectName } from "../../hooks/useProjects";
import { useSelectedProject } from "../../slices/apiDataManager";
+import { SpinnerLoader } from "../common/Loader";
+import { useExpenseCategory } from "../../hooks/masterHook/useMaster";
const ExpenseByProject = () => {
const projectId = useSelector((store) => store.localVariables.projectId);
@@ -18,7 +19,7 @@ const ExpenseByProject = () => {
const [chartData, setChartData] = useState({ categories: [], data: [] });
const selectedProject = useSelectedProject();
- const { ExpenseTypes, loading: typeLoading } = useExpenseType();
+ const {expenseCategories , loading: typeLoading } = useExpenseCategory();
const { data: expenseApiData, isLoading } = useExpenseDataByProject(
projectId,
@@ -49,7 +50,7 @@ const ExpenseByProject = () => {
const getSelectedTypeName = () => {
if (!selectedType) return "All Types";
- const found = ExpenseTypes.find((t) => t.id === selectedType);
+ const found = expenseCategories?.find((t) => t.id === selectedType);
return found ? found.name : "All Types";
};
@@ -63,6 +64,12 @@ const ExpenseByProject = () => {
categories: chartData.categories,
labels: { style: { fontSize: "12px" }, rotate: -45 },
},
+ yaxis: {
+ labels: {
+ formatter: (val) => formatCurrency(val),
+ style: { fontSize: "12px", colors: "#555" },
+ },
+ },
tooltip: {
y: {
formatter: (val) => `${formatCurrency(val)} (${getSelectedTypeName()})`,
@@ -82,15 +89,15 @@ const ExpenseByProject = () => {
];
return (
-
-
+
+ )}
+
+ {/* Data/Legend Column */}
+
-
- {/* Header */}
-
+
+
-
- )}
-
{report.map((item, idx) => (
-
+
))}
-
+
+ {item.projectName}
+
+
-
-
-
-
- {item.projectName}
-
{formatCurrency(item.totalApprovedAmount)}
+
{/* Header */}
-
+ Monthly Expense -{projectName}
+
= 3 ? "text-xl" : "text-2xl"
+ className={`text-royalblue ${countDigit(item?.count || 0) >= 3 ? "text-xl" : "text-xl"
} text-gray-500`}
>
{item?.count || 0}
@@ -122,7 +122,7 @@ const ExpenseStatus = () => {
{isManageExpense && (
handleNavigate(EXPENSE_STATUS.process_pending)}
+ onClick={() => handleNavigate(EXPENSE_STATUS.payment_processed)}
>
-
{
3 ? "text-" : "text-3xl"
+ className={`text-end text-royalblue ${countDigit(data?.totalAmount || 0) > 3 ? "text-xl" : "text-3xl"
} text-md`}
>
{formatCurrency(data?.totalAmount || 0)}
diff --git a/src/components/Dashboard/ProjectCompletionChart.jsx b/src/components/Dashboard/ProjectCompletionChart.jsx
index decf7918..b8c656b8 100644
--- a/src/components/Dashboard/ProjectCompletionChart.jsx
+++ b/src/components/Dashboard/ProjectCompletionChart.jsx
@@ -1,15 +1,16 @@
-import React from "react";
+import React, { useState } from "react";
import HorizontalBarChart from "../Charts/HorizontalBarChart";
import { useProjects } from "../../hooks/useProjects";
+import { ITEMS_PER_PAGE } from "../../utils/constants";
const ProjectCompletionChart = () => {
- const { data: projects = [], isLoading: loading, isError, error } = useProjects();
-
+ const [currentPage, setCurrentPage] = useState(1);
+ const { data: projects, isLoading: loading, isError, error } = useProjects(50,currentPage);
// Bar chart logic
- const projectNames = projects?.map((p) => p.name) || [];
+ const projectNames = projects?.data?.map((p) => p.name) || [];
const projectProgress =
- projects?.map((p) => {
+ projects?.data?.map((p) => {
const completed = p.completedWork || 0;
const planned = p.plannedWork || 1;
const percent = planned ? (completed / planned) * 100 : 0;
@@ -24,7 +25,7 @@ const ProjectCompletionChart = () => {
Projects Completion Status
+
+
{/* Total Tasks */}
-
+
diff --git a/src/components/Directory/NoteCardDirectoryEditable.jsx b/src/components/Directory/NoteCardDirectoryEditable.jsx
index 5ef8d08f..bc6ff517 100644
--- a/src/components/Directory/NoteCardDirectoryEditable.jsx
+++ b/src/components/Directory/NoteCardDirectoryEditable.jsx
@@ -87,7 +87,7 @@ const NoteCardDirectoryEditable = ({
/>
{formatFigure(tasksCardData?.totalTasks ?? 0, { notation: "compact", @@ -56,7 +56,7 @@ const TasksCard = () => {
+
@@ -408,6 +408,7 @@ const ManageContact = ({ contactId, closeModal }) => {
label="Tags"
options={contactTags}
isRequired={true}
+ placeholder="Enter Tag"
/>
{errors.tags && (
{errors.tags.message}
@@ -482,7 +483,7 @@ const ManageContact = ({ contactId, closeModal }) => {
-
+
{formatFigure(tasksCardData?.completedTasks ?? 0, { notation: "compact", diff --git a/src/components/Directory/CardViewContact.jsx b/src/components/Directory/CardViewContact.jsx index 8e6c8068..0b446da0 100644 --- a/src/components/Directory/CardViewContact.jsx +++ b/src/components/Directory/CardViewContact.jsx @@ -61,7 +61,7 @@ const CardViewContact = ({ (contact?.name || "").trim().split(" ")[1]?.charAt(0) || "" } />{" "} - {contact?.name} + {contact?.name}
{IsActive && (
diff --git a/src/components/Directory/ManageContact.jsx b/src/components/Directory/ManageContact.jsx
index 56d45e32..f55ed858 100644
--- a/src/components/Directory/ManageContact.jsx
+++ b/src/components/Directory/ManageContact.jsx
@@ -23,7 +23,7 @@ import Label from "../common/Label";
const ManageContact = ({ contactId, closeModal }) => {
// fetch master data
const { buckets, loading: bucketsLoaging } = useBuckets();
- const { data:projects, loading: projectLoading } = useProjects();
+ const { data: projects, loading: projectLoading } = useProjects();
const { contactCategory, loading: contactCategoryLoading } =
useContactCategory();
const { organizationList } = useOrganization();
@@ -205,12 +205,12 @@ const ManageContact = ({ contactId, closeModal }) => {
-
contactProfile(noteItem.contactId)}
>
@@ -98,7 +98,7 @@ const NoteCardDirectoryEditable = ({
-
+
by{" "}
@@ -184,7 +184,7 @@ const NoteCardDirectoryEditable = ({
) : (
)}
diff --git a/src/components/Documents/DocumentFilterPanel.jsx b/src/components/Documents/DocumentFilterPanel.jsx
index edc613e1..04f54956 100644
--- a/src/components/Documents/DocumentFilterPanel.jsx
+++ b/src/components/Documents/DocumentFilterPanel.jsx
@@ -13,230 +13,236 @@ import { useParams } from "react-router-dom";
const DocumentFilterPanel = forwardRef(
({ entityTypeId, onApply, setFilterdata }, ref) => {
- const [resetKey, setResetKey] = useState(0);
- const { status } = useParams();
+ const [resetKey, setResetKey] = useState(0);
+ const { status } = useParams();
- const { data, isError, isLoading, error } =
- useDocumentFilterEntities(entityTypeId);
+ const { data, isError, isLoading, error } =
+ useDocumentFilterEntities(entityTypeId);
- //changes
+ useEffect(() => {
+ return () => {
+ closePanel();
+ };
+ }, []);
- const dynamicDocumentFilterDefaultValues = useMemo(() => {
- return {
- ...DocumentFilterDefaultValues,
- uploadedByIds: DocumentFilterDefaultValues.uploadedByIds || [],
- documentCategoryIds: DocumentFilterDefaultValues.documentCategoryIds || [],
- documentTypeIds: DocumentFilterDefaultValues.documentTypeIds || [],
- documentTagIds: DocumentFilterDefaultValues.documentTagIds || [],
- startDate: DocumentFilterDefaultValues.startDate,
- endDate: DocumentFilterDefaultValues.endDate,
+ //changes
+
+ const dynamicDocumentFilterDefaultValues = useMemo(() => {
+ return {
+ ...DocumentFilterDefaultValues,
+ uploadedByIds: DocumentFilterDefaultValues.uploadedByIds || [],
+ documentCategoryIds: DocumentFilterDefaultValues.documentCategoryIds || [],
+ documentTypeIds: DocumentFilterDefaultValues.documentTypeIds || [],
+ documentTagIds: DocumentFilterDefaultValues.documentTagIds || [],
+ startDate: DocumentFilterDefaultValues.startDate,
+ endDate: DocumentFilterDefaultValues.endDate,
+ };
+
+ }, [status]);
+
+ const methods = useForm({
+ resolver: zodResolver(DocumentFilterSchema),
+ defaultValues: dynamicDocumentFilterDefaultValues,
+ });
+
+ const { handleSubmit, reset, setValue, watch } = methods;
+
+ // Watch values from form
+ const isUploadedAt = watch("isUploadedAt");
+ const isVerified = watch("isVerified");
+
+ // Close the offcanvas (bootstrap specific)
+ const closePanel = () => {
+ document.querySelector(".offcanvas.show .btn-close")?.click();
};
- }, [status]);
+ useImperativeHandle(ref, () => ({
+ resetFieldValue: (name, value) => {
+ if (value !== undefined) {
+ setValue(name, value);
+ } else {
+ reset({ ...methods.getValues(), [name]: DocumentFilterDefaultValues[name] });
+ }
+ },
+ getValues: methods.getValues, // optional, to read current filter state
+ }));
- const methods = useForm({
- resolver: zodResolver(DocumentFilterSchema),
- defaultValues: dynamicDocumentFilterDefaultValues,
- });
-
- const { handleSubmit, reset, setValue, watch } = methods;
-
- // Watch values from form
- const isUploadedAt = watch("isUploadedAt");
- const isVerified = watch("isVerified");
-
- // Close the offcanvas (bootstrap specific)
- const closePanel = () => {
- document.querySelector(".offcanvas.show .btn-close")?.click();
- };
-
- useImperativeHandle(ref, () => ({
- resetFieldValue: (name, value) => {
- if (value !== undefined) {
- setValue(name, value);
- } else {
- reset({ ...methods.getValues(), [name]: DocumentFilterDefaultValues[name] });
+ //changes
+ useEffect(() => {
+ if (data && setFilterdata) {
+ setFilterdata(data);
}
- },
- getValues: methods.getValues, // optional, to read current filter state
- }));
+ }, [data, setFilterdata]);
- //changes
- useEffect(() => {
- if (data && setFilterdata) {
- setFilterdata(data);
- }
- }, [data, setFilterdata]);
+ const onSubmit = (values) => {
+ onApply({
+ ...values,
+ startDate: values.startDate
+ ? moment.utc(values.startDate, "DD-MM-YYYY").toISOString()
+ : null,
+ endDate: values.endDate
+ ? moment.utc(values.endDate, "DD-MM-YYYY").toISOString()
+ : null,
+ });
+ // closePanel();
+ };
- const onSubmit = (values) => {
- onApply({
- ...values,
- startDate: values.startDate
- ? moment.utc(values.startDate, "DD-MM-YYYY").toISOString()
- : null,
- endDate: values.endDate
- ? moment.utc(values.endDate, "DD-MM-YYYY").toISOString()
- : null,
- });
- // closePanel();
- };
+ const onClear = () => {
+ reset(DocumentFilterDefaultValues);
+ setResetKey((prev) => prev + 1);
+ onApply(DocumentFilterDefaultValues);
+ // closePanel();
+ };
- const onClear = () => {
- reset(DocumentFilterDefaultValues);
- setResetKey((prev) => prev + 1);
- onApply(DocumentFilterDefaultValues);
- // closePanel();
- };
+ if (isLoading) return Loading... ;
+ if (isError)
+ return Error: {error?.message || "Something went wrong!"} ;
- if (isLoading) return Loading... ;
- if (isError)
- return Error: {error?.message || "Something went wrong!"} ;
-
- const {
- uploadedBy = [],
- documentCategory = [],
- documentType = [],
- documentTag = [],
- } = data?.data || {};
+ const {
+ uploadedBy = [],
+ documentCategory = [],
+ documentType = [],
+ documentTag = [],
+ } = data?.data || {};
- return (
-
diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx
index fe22d913..926d880b 100644
--- a/src/pages/project/ProjectDetails.jsx
+++ b/src/pages/project/ProjectDetails.jsx
@@ -2,12 +2,12 @@ import React, { useState, useEffect, useCallback } from "react";
import { useDispatch } from "react-redux";
import { useNavigate } from "react-router-dom";
-import ProjectOverview from "../../components/Project/ProjectOverview";
+import ProjectOverview from "../../components/Project/ProjectStatistics";
import AboutProject from "../../components/Project/AboutProject";
import ProjectNav from "../../components/Project/ProjectNav";
import Teams from "../../components/Project/Team/Teams";
import ProjectInfra from "../../components/Project/ProjectInfra";
-import Loader from "../../components/common/Loader";
+import { SpinnerLoader } from "../../components/common/Loader";
import WorkPlan from "../../components/Project/WorkPlan";
import Breadcrumb from "../../components/common/Breadcrumb";
import { useSelectedProject } from "../../slices/apiDataManager";
@@ -15,12 +15,12 @@ import { useProjectDetails, useProjectName } from "../../hooks/useProjects";
import { ComingSoonPage } from "../Misc/ComingSoonPage";
import eventBus from "../../services/eventBus";
import ProjectProgressChart from "../../components/Dashboard/ProjectProgressChart";
-import AttendanceOverview from "../../components/Dashboard/AttendanceChart";
+import AttendanceOverview from "../../components/Dashboard/AttendanceOverview";
import { setProjectId } from "../../slices/localVariablesSlice";
import ProjectDocuments from "../../components/Project/ProjectDocuments";
import ProjectSetting from "../../components/Project/ProjectSetting";
import DirectoryPage from "../Directory/DirectoryPage";
-import { useProjectAccess } from "../../hooks/useProjectAccess";
+import { useProjectAccess } from "../../hooks/useProjectAccess";
import "./ProjectDetails.css";
import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
@@ -66,7 +66,14 @@ const ProjectDetails = () => {
};
if (projectLoading || permsLoading || !projects_Details) {
- return
+
+ );
}
const renderContent = () => {
diff --git a/src/pages/project/ProjectPage.jsx b/src/pages/project/ProjectPage.jsx
index a85d6f58..d9557f48 100644
--- a/src/pages/project/ProjectPage.jsx
+++ b/src/pages/project/ProjectPage.jsx
@@ -1,14 +1,22 @@
import React, { createContext, useContext, useEffect, useState } from "react";
import Breadcrumb from "../../components/common/Breadcrumb";
-import { ITEMS_PER_PAGE, MANAGE_PROJECT, PROJECT_STATUS } from "../../utils/constants";
+import {
+ ITEMS_PER_PAGE,
+ MANAGE_PROJECT,
+ PROJECT_STATUS,
+} from "../../utils/constants";
import ProjectListView from "../../components/Project/ProjectListView";
import GlobalModel from "../../components/common/GlobalModel";
import ManageProjectInfo from "../../components/Project/ManageProjectInfo";
import ProjectCardView from "../../components/Project/ProjectCardView";
import usePagination from "../../hooks/usePagination";
import { useProjects } from "../../hooks/useProjects";
-import Loader from "../../components/common/Loader";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
+import { SpinnerLoader } from "../../components/common/Loader";
+import { useServiceProjects } from "../../hooks/useServiceProject";
+import ManageServiceProject from "../../components/ServiceProject/ManageServiceProject";
+import ProjectsDisplay from "./ProjectsDisplay";
+import ServiceProjectDisplay from "../ServiceProject/ServiceProjectDisplay";
const ProjectContext = createContext();
export const useProjectContext = () => {
@@ -22,41 +30,26 @@ export const useProjectContext = () => {
const ProjectPage = () => {
const [manageProject, setMangeProject] = useState({
isOpen: false,
- Project: null,
+ project: null,
+ });
+ const [manageServiceProject, setManageServiceProject] = useState({
+ isOpen: false,
+ project: null,
});
const [projectList, setProjectList] = useState([]);
const [listView, setListView] = useState(false);
const [searchTerm, setSearchTerm] = useState("");
+ const [coreProjects, setCoreProjects] = useState(() => {
+ const storedValue = sessionStorage.getItem('whichProjectDisplay');
+ return storedValue === 'true';
+ });
const HasManageProject = useHasUserPermission(MANAGE_PROJECT);
const [selectedStatuses, setSelectedStatuses] = useState(
PROJECT_STATUS.map((s) => s.id)
);
-
- const { data, isLoading, isError, error } = useProjects();
-
- const contextDispatcher = {
- setMangeProject,
- };
-
- const filteredProjects = projectList.filter((project) => {
- const matchesStatus = selectedStatuses.includes(project.projectStatusId);
- const matchesSearch = project.name
- .toLowerCase()
- .includes(searchTerm.toLowerCase());
- return matchesStatus && matchesSearch;
- });
-
- const totalPages = Math.ceil(filteredProjects.length / ITEMS_PER_PAGE);
-
- const { currentItems, currentPage, paginate, setCurrentPage } = usePagination(
- filteredProjects,
- ITEMS_PER_PAGE
- );
-
const handleStatusChange = (statusId) => {
- setCurrentPage(1);
setSelectedStatuses((prev) =>
prev.includes(statusId)
? prev.filter((id) => id !== statusId)
@@ -64,40 +57,20 @@ const ProjectPage = () => {
);
};
- const sortingProject = (projects) => {
- if (!isLoading && Array.isArray(projects)) {
- const grouped = {};
-
- projects.forEach((project) => {
- const statusId = project.projectStatusId;
- if (!grouped[statusId]) grouped[statusId] = [];
- grouped[statusId].push(project);
- });
-
- const sortedGrouped = selectedStatuses
- .filter((statusId) => grouped[statusId])
- .flatMap((statusId) =>
- grouped[statusId].sort((a, b) =>
- a.name.toLowerCase().localeCompare(b.name.toLowerCase())
- )
- );
-
- setProjectList((prev) => {
- const isSame = JSON.stringify(prev) === JSON.stringify(sortedGrouped);
- return isSame ? prev : sortedGrouped;
- });
- }
+ const contextDispatcher = {
+ setMangeProject,
+ setManageServiceProject,
+ manageProject,
+ manageServiceProject,
};
- useEffect(() => {
- if (!isLoading && data) {
- sortingProject(data);
- }
- }, [data, isLoading, selectedStatuses]);
+
+ const handleToggleProject = (value) => {
+ setCoreProjects(value);
+ sessionStorage.setItem("whichProjectDisplay", String(value));
+ };
- if (isLoading) return {error.message}
@@ -109,10 +82,39 @@ const ProjectPage = () => {
/>
-
-
-
-
+
+
);
diff --git a/src/pages/project/ProjectsDisplay.jsx b/src/pages/project/ProjectsDisplay.jsx
new file mode 100644
index 00000000..db3deaec
--- /dev/null
+++ b/src/pages/project/ProjectsDisplay.jsx
@@ -0,0 +1,134 @@
+import React, { useEffect, useState } from "react";
+import ProjectListView from "../../components/Project/ProjectListView";
+import ProjectCardView from "../../components/Project/ProjectCardView";
+import GlobalModel from "../../components/common/GlobalModel";
+import ManageServiceProject from "../../components/ServiceProject/ManageServiceProject";
+import { useProjectContext } from "./ProjectPage";
+import { SpinnerLoader } from "../../components/common/Loader";
+import { useProjects } from "../../hooks/useProjects";
+import { useServiceProjects } from "../../hooks/useServiceProject";
+import { ITEMS_PER_PAGE, PROJECT_STATUS } from "../../utils/constants";
+import usePagination from "../../hooks/usePagination";
+import ManageProjectInfo from "../../components/Project/ManageProjectInfo";
+
+const ProjectsDisplay = ({
+ listView,
+ searchTerm,
+ selectedStatuses,
+ handleStatusChange,
+}) => {
+ const [currentPage, setCurrentPage] = useState(1);
+ const {
+ manageProject,
+ manageServiceProject,
+ setMangeProject,
+ setManageServiceProject,
+ } = useProjectContext();
+
+ const [projectList, setProjectList] = useState([]);
+
+ const { data, isLoading, isError, error } = useProjects(ITEMS_PER_PAGE, 1);
+
+ const filteredProjects =
+ data?.data?.filter((project) => {
+ const statusId =
+ project.projectStatusId ?? project?.status?.id ?? project?.statusId;
+
+ const matchesStatus = selectedStatuses.includes(statusId);
+
+ const matchesSearch = project?.name
+ ?.toLowerCase()
+ ?.includes(searchTerm?.toLowerCase());
+
+ return matchesStatus && matchesSearch;
+ }) ?? [];
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+
+ const sortingProject = (projects) => {
+ if (!isLoading && Array.isArray(projects)) {
+ const grouped = {};
+
+ projects.forEach((project) => {
+ const statusId = project.projectStatusId ?? project?.status?.id;
+ if (!grouped[statusId]) grouped[statusId] = [];
+ grouped[statusId].push(project);
+ });
+
+ const sortedGrouped = selectedStatuses
+ .filter((statusId) => grouped[statusId])
+ .flatMap((statusId) =>
+ grouped[statusId].sort((a, b) =>
+ a?.name?.toLowerCase()?.localeCompare(b?.name?.toLowerCase())
+ )
+ );
+
+ setProjectList((prev) => {
+ const isSame = JSON.stringify(prev) === JSON.stringify(sortedGrouped);
+ return isSame ? prev : sortedGrouped;
+ });
+ }
+ };
+
+ useEffect(() => {
+ if (!isLoading && data?.data) {
+ sortingProject(data.data);
+ }
+ }, [data?.data, isLoading, selectedStatuses]);
+
+ if (isLoading)
+ return (
+
+ {/* LEFT SIDE — DATE TOGGLE BUTTONS */}
+
- {/* Project Render here */}
- {listView ? (
-
+
+
+
+ {/* RIGHT SIDE — SEARCH + CARD/LIST + DROPDOWN */}
+
+ {/* Service Project Button */}
+
+ {/* Organization Project Button */}
+
+
+
+
+
+ {/* Search */}
+
{
/>
-
+ {/* Card/List Buttons */}
+
+
-
+ {/* Dropdown Filter */}
+
-
+
+
- {HasManageProject && (
-
+ {HasManageProject && (
-
- )}
+ )}
+
+
+ );
+
+ if (isError)
+ return (
+
+
+ );
+
+ return (
+ {error.message} +
+ {listView ? (
+
+ );
+};
+
+export default ProjectsDisplay;
diff --git a/src/pages/project/ProjectsDisplayGround.jsx b/src/pages/project/ProjectsDisplayGround.jsx
new file mode 100644
index 00000000..43c5bf08
--- /dev/null
+++ b/src/pages/project/ProjectsDisplayGround.jsx
@@ -0,0 +1,154 @@
+import React, { useEffect, useState } from "react";
+import ProjectListView from "../../components/Project/ProjectListView";
+import ProjectCardView from "../../components/Project/ProjectCardView";
+import GlobalModel from "../../components/common/GlobalModel";
+import ManageServiceProject from "../../components/ServiceProject/ManageServiceProject";
+import { useProjectContext } from "./ProjectPage";
+import { SpinnerLoader } from "../../components/common/Loader";
+import { useProjects } from "../../hooks/useProjects";
+import { useServiceProjects } from "../../hooks/useServiceProject";
+import { ITEMS_PER_PAGE, PROJECT_STATUS } from "../../utils/constants";
+import usePagination from "../../hooks/usePagination";
+
+const ProjectsDisplayGround = ({ listView, searchTerm }) => {
+ const {
+ manageProject,
+ manageServiceProject,
+ setMangeProject,
+ setManageServiceProject,
+ } = useProjectContext();
+ const [projectList, setProjectList] = useState([]);
+
+ const [selectedStatuses, setSelectedStatuses] = useState(
+ PROJECT_STATUS.map((s) => s.id)
+ );
+
+ const contextDispatcher = {
+ setMangeProject,
+ setManageServiceProject,
+ };
+ const { data, isLoading, isError, error } = useProjects(ITEMS_PER_PAGE, 1);
+ const filteredProjects = data?.data?.filter((project) => {
+ const matchesStatus = selectedStatuses.includes(project.projectStatusId);
+ const matchesSearch = project?.name
+ ?.toLowerCase()
+ ?.includes(searchTerm?.toLowerCase());
+ return matchesStatus && matchesSearch;
+ });
+
+ const totalPages = Math.ceil(filteredProjects?.length / ITEMS_PER_PAGE);
+
+ const { currentItems, currentPage, paginate, setCurrentPage } = usePagination(
+ filteredProjects,
+ ITEMS_PER_PAGE
+ );
+
+ const handleStatusChange = (statusId) => {
+ setCurrentPage(1);
+ setSelectedStatuses((prev) =>
+ prev.includes(statusId)
+ ? prev.filter((id) => id !== statusId)
+ : [...prev, statusId]
+ );
+ };
+
+ const sortingProject = (projects) => {
+ if (!isLoading && Array.isArray(projects)) {
+ const grouped = {};
+
+ projects.forEach((project) => {
+ const statusId = project.projectStatusId ?? project?.status?.id;
+ if (!grouped[statusId]) grouped[statusId] = [];
+ grouped[statusId].push(project);
+ });
+
+ const sortedGrouped = selectedStatuses
+ .filter((statusId) => grouped[statusId])
+ .flatMap((statusId) =>
+ grouped[statusId].sort((a, b) =>
+ a?.name?.toLowerCase()?.localeCompare(b?.name?.toLowerCase())
+ )
+ );
+
+ setProjectList((prev) => {
+ const isSame = JSON.stringify(prev) === JSON.stringify(sortedGrouped);
+ return isSame ? prev : sortedGrouped;
+ });
+ }
+ };
+ useEffect(() => {
+ if (!isLoading && data) {
+ sortingProject([data.data]);
+ }
+ }, [data?.data, isLoading, selectedStatuses]);
+
+ if (isLoading)
+ return (
+
+
+ );
+
+ if (isError)
+ return (
+
+
+ );
+ return (
+ {error.message} +
+ {/* Project Render here */}
+ {listView ? (
+
+ );
+};
+
+export default ProjectsDisplayGround;
diff --git a/src/repositories/AuthRepository.jsx b/src/repositories/AuthRepository.jsx
index ba68946e..dcc2c0dc 100644
--- a/src/repositories/AuthRepository.jsx
+++ b/src/repositories/AuthRepository.jsx
@@ -11,6 +11,9 @@ const AuthRepository = {
register: (data) => api.postPublic("/api/auth/register", data),
sendMail: (data) => api.postPublic("/api/auth/sendmail", data),
getSubscription:(frequency)=> api.getPublic(`/api/market/list/subscription-plan?frequency=${frequency}`),
+ createSuscription:(data)=>api.post(`/api/Tenant/self/create`,data), // this will put entry inside enquiry table
+ selfCreateSubscription:(data)=>api.post(`/api/Tenant/self/subscription`,data),
+
// Protected routes (require auth token)
logout: (data) => api.post("/api/auth/logout", data),
diff --git a/src/repositories/ColllectionRepository.jsx b/src/repositories/ColllectionRepository.jsx
index 8eb512da..04db4369 100644
--- a/src/repositories/ColllectionRepository.jsx
+++ b/src/repositories/ColllectionRepository.jsx
@@ -4,26 +4,46 @@ import { DirectoryRepository } from "./DirectoryRepository";
export const CollectionRepository = {
createNewCollection: (data) =>
api.post(`/api/Collection/invoice/create`, data),
- updateCollection:(id,data)=>{
- api.put(`/api/Collection/invoice/edit/${id}`,data)
+ updateCollection: (id, data) => {
+ api.put(`/api/Collection/invoice/edit/${id}`, data)
},
- getCollections: (pageSize, pageNumber,fromDate,toDate, isPending,isActive,projectId, searchString) => {
- let url = `/api/Collection/invoice/list?pageSize=${pageSize}&pageNumber=${pageNumber}&isPending=${isPending}&isActive=${isActive}&searchString=${searchString}`;
+ // getCollections: (pageSize, pageNumber,fromDate,toDate, isPending,isActive,projectId, searchString) => {
+ // let url = `/api/Collection/invoice/list?pageSize=${pageSize}&pageNumber=${pageNumber}&isPending=${isPending}&isActive=${isActive}&searchString=${searchString}`;
+ // const params = [];
+ // if (fromDate) params.push(`fromDate=${fromDate}`);
+ // if (toDate) params.push(`toDate=${toDate}`);
+ // if(projectId) params.push(`projectId=${projectId}`)
+
+ // if (params.length > 0) {
+ // url += `&${params.join("&")}`;
+ // }
+ // return api.get(url);
+ // },
+
+ getCollections: (projectId, searchString, fromDate, toDate, pageSize, pageNumber, isActive, isPending) => {
+ let url = `/api/Collection/invoice/list`;
const params = [];
- if (fromDate) params.push(`fromDate=${fromDate}`);
- if (toDate) params.push(`toDate=${toDate}`);
- if(projectId) params.push(`projectId=${projectId}`)
+
+ if (projectId) params.push(`projectId=${projectId}`);
+ if (searchString) params.push(`search=${searchString}`);
+ if (fromDate) params.push(`dateFrom=${fromDate}`);
+ if (toDate) params.push(`dateTo=${toDate}`);
+ if (pageSize) params.push(`pageSize=${pageSize}`);
+ if (pageNumber) params.push(`pageNumber=${pageNumber}`);
+ if (isActive) params.push(`isActive=${isActive}`);
+ if (isPending) params.push(`isPending=${isPending}`);
if (params.length > 0) {
- url += `&${params.join("&")}`;
+ url += "?" + params.join("&");
}
- return api.get(url);
+
+ return api.get(url);
},
- makeReceivePayment:(data)=> api.post(`/api/Collection/invoice/payment/received`,data),
- markPaymentReceived:(invoiceId)=>api.put(`/api/Collection/invoice/marked/completed/${invoiceId}`),
- getCollection:(id)=>api.get(`/api/Collection/invoice/details/${id}`),
- addComment:(data)=>api.post(`/api/Collection/invoice/add/comment`,data)
+ makeReceivePayment: (data) => api.post(`/api/Collection/invoice/payment/received`, data),
+ markPaymentReceived: (invoiceId) => api.put(`/api/Collection/invoice/marked/completed/${invoiceId}`),
+ getCollection: (id) => api.get(`/api/Collection/invoice/details/${id}`),
+ addComment: (data) => api.post(`/api/Collection/invoice/add/comment`, data)
};
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index d257825b..da51038c 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -10,18 +10,20 @@ const EmployeeRepository = {
updateEmployee: (id, data) => api.put(`/users/${id}`, data),
// deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
- deleteEmployee: (id,active) => api.delete(`/api/employee/${id}?active=${active}`),
- getEmployeeName: (projectId, search,allEmployee) => {
- const params = new URLSearchParams();
+ deleteEmployee: (id, active) => api.delete(`/api/employee/${id}?active=${active}`),
+ getEmployeeName: (projectId, search, allEmployee) => {
+ const params = new URLSearchParams();
- if (projectId) params.append("projectId", projectId);
- if (search) params.append("searchString", search);
- if(allEmployee) params.append("allEmployee",allEmployee)
+ if (projectId) params.append("projectId", projectId);
+ if (search) params.append("searchString", search);
+ if (allEmployee) params.append("allEmployee", allEmployee)
- const query = params.toString();
- return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);
-}
+ const query = params.toString();
+ return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);
+ },
+ getOrganizaionHierarchy: (employeeId) => api.get(`/api/organization/hierarchy/list/${employeeId}`),
+ manageOrganizationHierarchy: (employeeId, data) => api.post(`/api/organization/hierarchy/manage/${employeeId}`, data),
};
export default EmployeeRepository;
diff --git a/src/repositories/ExpsenseRepository.jsx b/src/repositories/ExpsenseRepository.jsx
index ef15940a..5e30bf76 100644
--- a/src/repositories/ExpsenseRepository.jsx
+++ b/src/repositories/ExpsenseRepository.jsx
@@ -1,24 +1,78 @@
import { api } from "../utils/axiosClient";
-
const ExpenseRepository = {
- GetExpenseList: ( pageSize, pageNumber, filter,searchString ) => {
+ //#region Expense
+ GetExpenseList: (pageSize, pageNumber, filter, searchString) => {
const payloadJsonString = JSON.stringify(filter);
-
-
-
- return api.get(`/api/expense/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`);
+ return api.get(
+ `/api/expense/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`
+ );
},
-
- GetExpenseDetails:(id)=>api.get(`/api/Expense/details/${id}`),
- CreateExpense:(data)=>api.post("/api/Expense/create",data),
- UpdateExpense:(id,data)=>api.put(`/api/Expense/edit/${id}`,data),
- DeleteExpense:(id)=>api.delete(`/api/Expense/delete/${id}`),
+ GetExpenseDetails: (id) => api.get(`/api/Expense/details/${id}`),
+ CreateExpense: (data) => api.post("/api/Expense/create", data),
+ UpdateExpense: (id, data) => api.put(`/api/Expense/edit/${id}`, data),
+ DeleteExpense: (id) => api.delete(`/api/Expense/delete/${id}`),
+ ActionOnExpense: (data) => api.post("/api/expense/action", data),
+ GetExpenseFilter: () => api.get("/api/Expense/filter"),
- ActionOnExpense:(data)=>api.post('/api/expense/action',data),
-
- GetExpenseFilter:()=>api.get('/api/Expense/filter')
+ //#endregion
-}
+
+
+ //#region Payment Request
+ GetPaymentRequestList: (
+ pageSize,
+ pageNumber,
+ filter,
+ isActive,
+ searchString
+ ) => {
+ const payloadJsonString = JSON.stringify(filter);
+ return api.get(
+ `/api/Expense/get/payment-requests/list?isActive=${isActive}&pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`
+ );
+ },
+ CreatePaymentRequest: (data) =>
+ api.post("/api/expense/payment-request/create", data),
+ UpdatePaymentRequest: (id, data) =>
+ api.put(`/api/Expense/payment-request/edit/${id}`, data),
+ GetPaymentRequest: (id) =>
+ api.get(`/api/Expense/get/payment-request/details/${id}`),
+ GetPaymentRequestFilter: () => api.get("/api/Expense/payment-request/filter"),
+ ActionOnPaymentRequest: (data) =>
+ api.post("/api/Expense/payment-request/action", data),
+ DeletePaymentRequest: () => api.get("delete here come"),
+ CreatePaymentRequestExpense: (data) =>
+ api.post("/api/Expense/payment-request/expense/create", data),
+ GetPayee:()=>api.get('/api/Expense/payment-request/payee'),
+ //#endregion
+
+
+
+ //#region Recurring Expense
+ GetRecurringExpenseList:(pageSize, pageNumber, filter,isActive, searchString) => {
+ const payloadJsonString = JSON.stringify(filter);
+ return api.get(
+ `/api/expense/get/recurring-payment/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&isActive=${isActive}&searchString=${searchString}`
+ );
+ },
+ CreateRecurringExpense: (data) =>
+ api.post("/api/Expense/recurring-payment/create", data),
+ UpdateRecurringExpense: (id, data) =>
+ api.put(`/api/Expense/recurring-payment/edit/${id}`, data),
+ GetRecurringExpense: (id) =>
+ api.get(`/api/Expense/get/recurring-payment/details/${id}`),
+ //#endregion
+
+
+
+
+ //#region Advance Payment
+ GetTranctionList: (employeeId) =>
+ api.get(`/api/Expense/get/transactions/${employeeId}`),
+ //#endregion
+
+
+};
export default ExpenseRepository;
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index d197c11c..72b3e2a0 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -50,7 +50,10 @@ export const MasterRespository = {
"Contact Category": (id) => api.delete(`/api/master/contact-category/${id}`),
"Contact Tag": (id) => api.delete(`/api/master/contact-tag/${id}`),
"Expense Type": (id, isActive) =>
- api.delete(`/api/Master/expenses-type/delete/${id}`, (isActive = false)),
+ api.delete(
+ `/api/Master/expenses-category/delete/${id}`,
+ (isActive = false)
+ ),
"Payment Mode": (id, isActive) =>
api.delete(`/api/Master/payment-mode/delete/${id}`, (isActive = false)),
"Expense Status": (id, isActive) =>
@@ -58,7 +61,11 @@ export const MasterRespository = {
"Document Type": (id) => api.delete(`/api/Master/document-type/delete/${id}`),
"Document Category": (id) =>
api.delete(`/api/Master/document-category/delete/${id}`),
- "Payment Adjustment Head":(id,isActive)=>api.delete(`/api/Master/payment-adjustment-head/delete/${id}`,(isActive=false)),
+ "Payment Adjustment Head": (id, isActive) =>
+ api.delete(
+ `/api/Master/payment-adjustment-head/delete/${id}`,
+ (isActive = false)
+ ),
getWorkCategory: () => api.get(`/api/master/work-categories`),
createWorkCategory: (data) => api.post(`/api/master/work-category`, data),
@@ -78,10 +85,11 @@ export const MasterRespository = {
getAuditStatus: () => api.get("/api/Master/work-status"),
- getExpenseType: () => api.get("/api/Master/expenses-types"),
- createExpenseType: (data) => api.post("/api/Master/expenses-type", data),
- updateExpenseType: (id, data) =>
- api.put(`/api/Master/expenses-type/edit/${id}`, data),
+ getExpenseCategories: () => api.get("/api/Master/expenses-categories"),
+ createExpenseCategory: (data) =>
+ api.post("/api/Master/expenses-category", data),
+ updateExpenseCategory: (id, data) =>
+ api.put(`/api/Master/expenses-category/edit/${id}`, data),
getPaymentMode: () => api.get("/api/Master/payment-modes"),
createPaymentMode: (data) => api.post(`/api/Master/payment-mode`, data),
@@ -134,6 +142,19 @@ export const MasterRespository = {
getPaymentAdjustmentHead: (isActive) =>
api.get(`/api/Master/payment-adjustment-head/list?isActive=${isActive}`),
- createPaymentAjustmentHead:(data)=>api.post(`/api/Master/payment-adjustment-head`, data),
- updatePaymentAjustmentHead:(id,data)=>api.put(`/api/Master/payment-adjustment-head/edit/${id}`, data)
+ createPaymentAjustmentHead: (data) =>
+ api.post(`/api/Master/payment-adjustment-head`, data),
+ updatePaymentAjustmentHead: (id, data) =>
+ api.put(`/api/Master/payment-adjustment-head/edit/${id}`, data),
+
+ getCurrencies: () => api.get(`/api/Master/currencies/list`),
+
+ getRecurringStatus: () => api.get(`/api/Master/recurring-status/list`),
+ // Service Job JobTickets Status
+ getJobStatus: (statusId,projectId) =>
+ api.get(
+ `/api/Master/job-status/list?statusId=${statusId}&projectId=${projectId}`
+ ),
+
+ getTeamRole: () => api.get(`/api/Master/team-roles/list`),
};
diff --git a/src/repositories/PaymentRepository.jsx b/src/repositories/PaymentRepository.jsx
new file mode 100644
index 00000000..7aa877bf
--- /dev/null
+++ b/src/repositories/PaymentRepository.jsx
@@ -0,0 +1,7 @@
+import { api } from "../utils/axiosClient";
+
+
+export const PaymentRepository = {
+ makePayment: (data) => api.post(`/api/Payment/create-order`,data),
+ verifyPayment: (data) => api.post(`/api/Payment/verify-payment`,data),
+};
diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx
index 06d33c58..86e59955 100644
--- a/src/repositories/ProjectRepository.jsx
+++ b/src/repositories/ProjectRepository.jsx
@@ -1,17 +1,24 @@
import { api } from "../utils/axiosClient";
const ProjectRepository = {
- getProjectList: () => api.get("/api/project/list"),
+ getProjectList: (pageSize, pageNumber) =>
+ api.get(`/api/project/list?pageSize=${pageSize}&pageNumber=${pageNumber}`),
getProjectByprojectId: (projetid) =>
api.get(`/api/project/details/${projetid}`),
- getProjectAllocation: (projectId, serviceId, organizationId, employeeStatus) => {
+ getProjectAllocation: (
+ projectId,
+ serviceId,
+ organizationId,
+ employeeStatus
+ ) => {
let url = `/api/project/allocation/${projectId}`;
const params = [];
if (organizationId) params.push(`organizationId=${organizationId}`);
if (serviceId) params.push(`serviceId=${serviceId}`);
- if (employeeStatus !== undefined) params.push(`includeInactive=${employeeStatus}`);
+ if (employeeStatus !== undefined)
+ params.push(`includeInactive=${employeeStatus}`);
if (params.length > 0) {
url += `?${params.join("&")}`;
@@ -20,7 +27,6 @@ const ProjectRepository = {
return api.get(url);
},
-
getEmployeesByProject: (projectId) =>
api.get(`/api/Project/employees/get/${projectId}`),
@@ -40,10 +46,13 @@ const ProjectRepository = {
api.get(`/api/project/allocation-histery/${id}`),
updateProjectsByEmployee: (id, data) =>
api.post(`/api/project/assign-projects/${id}`, data),
- projectNameList: (provideAll) => api.get(`/api/project/list/basic?provideAll=${provideAll}`),
+ projectNameList: (provideAll) =>
+ api.get(`/api/project/list/basic?provideAll=${provideAll}`),
+ projectNameListAll: (searchString) =>
+ api.get(`/api/project/list/basic/all?searchString=${searchString}`),
getProjectDetails: (id) => api.get(`/api/project/details/${id}`),
-
+
getProjectInfraByproject: (projectId, serviceId) => {
let url = `/api/project/infra-details/${projectId}`;
if (serviceId) {
@@ -85,7 +94,7 @@ const ProjectRepository = {
api.get(`/api/Project/get/assigned/services/${projectId}`),
getProjectAssignedOrganizations: (projectId) =>
api.get(`/api/Project/get/assigned/organization/${projectId}`),
- getProjectAssignedOrganizationsName: (projectId) =>
+ getProjectAssignedOrganizationsName: (projectId) =>
api.get(`/api/Project/get/assigned/organization/dropdown/${projectId}`),
getEmployeeForTaskAssign: (projectId, serviceId, organizationId) => {
diff --git a/src/repositories/ServiceProjectRepository.jsx b/src/repositories/ServiceProjectRepository.jsx
new file mode 100644
index 00000000..94ef3c8e
--- /dev/null
+++ b/src/repositories/ServiceProjectRepository.jsx
@@ -0,0 +1,38 @@
+import { api } from "../utils/axiosClient";
+
+export const ServiceProjectRepository = {
+ CreateServiceProject: (data) => api.post("/api/ServiceProject/create", data),
+ GetServiceProjects: (pageSize, pageNumber) =>
+ api.get(
+ `/api/ServiceProject/list?pageSize=${pageSize}&pageNumber=${pageNumber}`
+ ),
+ GetServiceProject: (id) => api.get(`/api/ServiceProject/details/${id}`),
+ UpdateServiceProject: (id, data) =>
+ api.put(`/api/ServiceProject/edit/${id}`, data),
+ DeleteServiceProject: (id, isActive = false) =>
+ api.delete(`/api/ServiceProject/delete/${id}?isActive=${isActive}`),
+ AllocateEmployee: (data) =>
+ api.post(`/api/ServiceProject/manage/allocation`, data),
+ GetAllocatedEmployees: (projectId, isActive) =>
+ api.get(
+ `/api/ServiceProject/get/allocation/list?projectId=${projectId}&isActive=${isActive} `
+ ),
+ //#region Job
+
+ CreateJob: (data) => api.post(`/api/ServiceProject/job/create`, data),
+ GetJobList: (pageSize, pageNumber, isActive, projectId) =>
+ api.get(
+ `/api/ServiceProject/job/list?pageSize=${pageSize}&pageNumber=${pageNumber}&isActive=${isActive}&projectId=${projectId}`
+ ),
+ GetJobDetails: (id) => api.get(`/api/ServiceProject/job/details/${id}`),
+ AddComment: (data) => api.post("/api/ServiceProject/job/add/comment", data),
+ GetJobComment: (jobTicketId, pageSize, pageNumber) =>
+ api.get(
+ `/api/ServiceProject/job/comment/list?jobTicketId=${jobTicketId}&pageSize=${pageSize}&pageNumber=${pageNumber}`
+ ),
+ GetJobTags: () => api.get(`/api/ServiceProject/job/tag/list`),
+ UpdateJob: (id, patchData) =>
+ api.patch(`/api/ServiceProject/job/edit/${id}`, patchData, {
+ "Content-Type": "application/json-patch+json",
+ }),
+};
diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx
index 51cc761e..762264ca 100644
--- a/src/router/AppRoutes.jsx
+++ b/src/router/AppRoutes.jsx
@@ -54,8 +54,13 @@ import ProjectPage from "../pages/project/ProjectPage";
import { ComingSoonPage } from "../pages/Misc/ComingSoonPage";
import ImageGalleryPage from "../pages/Gallary/ImageGallaryPage";
import CollectionPage from "../pages/collections/CollectionPage";
-import DemoBOQGrid from "../services/pmsGrid/BasicTable";
-
+import SubscriptionSummary from "../pages/Home/SubscriptionSummary";
+import MakeSubscription from "../pages/Home/MakeSubscription";
+import PaymentRequestPage from "../pages/PaymentRequest/PaymentRequestPage";
+import RecurringExpensePage from "../pages/RecurringExpense/RecurringExpensePage";
+import AdvancePaymentPage from "../pages/AdvancePayment/AdvancePaymentPage";
+import ServiceProjectDetail from "../pages/ServiceProject/ServiceProjectDetail";
+import ManageJob from "../components/ServiceProject/ManageJob";
const router = createBrowserRouter(
[
{
@@ -77,6 +82,10 @@ const router = createBrowserRouter(
{ path: "/auth/switch/org", element:
+ `,
+ css: {
+ backgroundColor: 'transparent',
+ border: '0',
+ color: '#fff',
+ },
+ overlayCSS: {
+ opacity: 0.5,
+ cursor: 'wait',
+ },
+ });
+ }
+};
+
+export const unblockUI = () => {
+ if (window.$ && window.$.unblockUI) {
+ window.$.unblockUI();
+ }
+};
diff --git a/src/utils/constants.jsx b/src/utils/constants.jsx
index 22061add..2375b010 100644
--- a/src/utils/constants.jsx
+++ b/src/utils/constants.jsx
@@ -1,12 +1,13 @@
+export const BASE_URL = process.env.VITE_BASE_URL;
+
+// export const BASE_URL = "https://api.marcoaiot.com";
+
+
export const THRESH_HOLD = 48; // hours
export const DURATION_TIME = 10; // minutes
export const ITEMS_PER_PAGE = 20;
export const OTP_EXPIRY_SECONDS = 300; // OTP time
-export const BASE_URL = process.env.VITE_BASE_URL;
-
-// export const BASE_URL = "https://api.marcoaiot.com";
-
export const MANAGE_MASTER = "588a8824-f924-4955-82d8-fc51956cf323";
export const VIEW_MASTER = "5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d";
@@ -49,7 +50,7 @@ export const DIRECTORY_ADMIN = "4286a13b-bb40-4879-8c6d-18e9e393beda";
export const DIRECTORY_MANAGER = "62668630-13ce-4f52-a0f0-db38af2230c5";
export const DIRECTORY_USER = "0f919170-92d4-4337-abd3-49b66fc871bb";
-// ========================Finance=========================================================
+
// -----------------------Expense----------------------------------------
export const VIEW_SELF_EXPENSE = "385be49f-8fde-440e-bdbc-3dffeb8dd116";
@@ -63,7 +64,9 @@ export const APPROVE_EXPENSE = "eaafdd76-8aac-45f9-a530-315589c6deca";
export const PROCESS_EXPENSE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11";
-export const EXPENSE_MANAGE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11";
+export const EXPENSE_MANAGE = "bdee29a2-b73b-402d-8dd1-c4b1f81ccbc3";
+
+
// --------------------------------Collection----------------------------
@@ -73,15 +76,6 @@ export const CREATE_COLLECTION = "b93141fd-dbd3-4051-8f57-bf25d18e3555";
export const EDIT_COLLECTION = "455187b4-fef1-41f9-b3d0-025d0b6302c3";
export const ADDPAYMENT_COLLECTION = "061d9ccd-85b4-4cb0-be06-2f9f32cebb72";
-// ==========================================================================================
-
-export const EXPENSE_REJECTEDBY = [
- "d1ee5eec-24b6-4364-8673-a8f859c60729",
- "965eda62-7907-4963-b4a1-657fb0b2724b",
-];
-
-export const EXPENSE_DRAFT = "297e0d8f-f668-41b5-bfea-e03b354251c8";
-
// ----------------------------Tenant-------------------------
export const SUPPER_TENANT = "d032cb1a-3f30-462c-bef0-7ace73a71c0b";
export const MANAGE_TENANTS = "00e20637-ce8d-4417-bec4-9b31b5e65092";
@@ -97,9 +91,16 @@ export const DOWNLOAD_DOCUMENT = "404373d0-860f-490e-a575-1c086ffbce1d";
export const VERIFY_DOCUMENT = "13a1f30f-38d1-41bf-8e7a-b75189aab8e0";
// -------------------Application Role------------------------------
-// 1 - Expense Manage
+// 1 - Expense Manage- Status
+export const EXPENSE_REJECTEDBY = [
+ "965eda62-7907-4963-b4a1-657fb0b2724b",
+ "d1ee5eec-24b6-4364-8673-a8f859c60729",
+];
+export const EXPENSE_DRAFT = "297e0d8f-f668-41b5-bfea-e03b354251c8";
export const EXPENSE_MANAGEMENT = "a4e25142-449b-4334-a6e5-22f70e4732d7";
-
+export const EXPENSE_CREATE = "b8586f67-dc19-49c3-b4af-224149efe1d3"
+export const INR_CURRENCY_CODE = "78e96e4a-7ce0-4164-ae3a-c833ad45ec2c";
+export const EXPENSE_PROCESSED = "61578360-3a49-4c34-8604-7b35a3787b95";
export const TENANT_STATUS = [
{ id: "62b05792-5115-4f99-8ff5-e8374859b191", name: "Active" },
{ id: "c0b5def8-087e-4235-b3a4-8e2f0ed91b94", name: "In Active" },
@@ -155,12 +156,58 @@ export const PROJECT_STATUS = [
},
];
-export const EXPENSE_STATUS = {
- daft:"297e0d8f-f668-41b5-bfea-e03b354251c8",
- review_pending:"6537018f-f4e9-4cb3-a210-6c3b2da999d7",
- payment_pending:"f18c5cfd-7815-4341-8da2-2c2d65778e27",
- approve_pending:"4068007f-c92f-4f37-a907-bc15fe57d4d8",
- process_pending:"61578360-3a49-4c34-8604-7b35a3787b95"
+export const DEFAULT_CURRENCY = "78e96e4a-7ce0-4164-ae3a-c833ad45ec2c";
+export const EXPENSE_STATUS = {
+ daft: "297e0d8f-f668-41b5-bfea-e03b354251c8",
+ review_pending: "6537018f-f4e9-4cb3-a210-6c3b2da999d7",
+ payment_pending: "f18c5cfd-7815-4341-8da2-2c2d65778e27",
+ approve_pending: "4068007f-c92f-4f37-a907-bc15fe57d4d8",
+ payment_processed: "61578360-3a49-4c34-8604-7b35a3787b95",
+ payment_done: "b8586f67-dc19-49c3-b4af-224149efe1d3",
}
+
+export const UUID_REGEX =
+ /^\/employee\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
+
+export const ALLOW_PROJECTSTATUS_ID = [
+ "603e994b-a27f-4e5d-a251-f3d69b0498ba",
+ "cdad86aa-8a56-4ff4-b633-9c629057dfef",
+ "b74da4c2-d07e-46f2-9919-e75e49b12731",
+];
+
export const DEFAULT_EMPTY_STATUS_ID = "00000000-0000-0000-0000-000000000000";
+
+export const FREQUENCY_FOR_RECURRING = {
+ 0: "Monthly",
+ 1: "Quarterly",
+ 2: "Half-Yearly",
+ 3: "Yearly",
+ 4: "Daily",
+ 5: "Weekly"
+};
+
+export const PAYEE_RECURRING_EXPENSE = [
+ {
+ id: "da462422-13b2-45cc-a175-910a225f6fc8",
+ label: "Active",
+ },
+ {
+ id: "306856fb-5655-42eb-bf8b-808bb5e84725",
+ label: "Completed",
+ },
+ {
+ id: "3ec864d2-8bf5-42fb-ba70-5090301dd816",
+ label: "De-Activited",
+ },
+ {
+ id: "8bfc9346-e092-4a80-acbf-515ae1ef6868",
+ label: "Paused",
+ },
+];
+
+
+//#region Service Project and Jobs
+export const STATUS_JOB_CLOSED = "3ddeefb5-ae3c-4e10-a922-35e0a452bb69"
+
+//#endregion
\ No newline at end of file
+
+
+
+
+
+
+ ${message} + | |||||||||