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

Correction in Collection list and AttendancePage.

Browse Source
This commit is contained in:
Kartik Sharma 2025-12-08 11:16:21 +05:30
parent 9a6197a87f
commit 001bdc553c
6 changed files with 91 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Documents/Documents.jsx
View File

@ -142,7 +142,7 @@ const Documents = ({ Document_Entity, Entity }) => {
return ( return (
<DocumentContext.Provider value={contextValues}> <DocumentContext.Provider value={contextValues}>
<div className="mt-2"> <div className="mt-2">
<div className="card page-min-h d-flex p-5"> <div className="card page-min-h table-responsive d-flex p-5">
<DocumentFilterChips filters={filters} filterData={filterData} removeFilterChip={removeFilterChip} /> <DocumentFilterChips filters={filters} filterData={filterData} removeFilterChip={removeFilterChip} />
<div className="row align-items-center"> <div className="row align-items-center">
{/* Search */} {/* Search */}

2
src/components/Documents/DocumentsList.jsx
View File

@ -178,7 +178,7 @@ const DocumentsList = ({
/> />
)} )}
<div className="table-responsive"> <div className="">
<table className="table border-top dataTable text-nowrap"> <table className="table border-top dataTable text-nowrap">
<thead> <thead>
<tr className="shadow-sm"> <tr className="shadow-sm">

4
src/components/Employee/EmpAttendance.jsx
View File

@ -71,7 +71,7 @@ const EmpAttendance = () => {
<AttendLogs Id={attendanceId} /> <AttendLogs Id={attendanceId} />
</GlobalModel> </GlobalModel>
)} )}
<div className="card px-4 mt-3 py-2 " style={{ minHeight: "500px" }}> <div className="table-responsive card px-4 mt-3 py-2 " style={{ minHeight: "500px" }}>
<div <div
className="dataTables_length text-start py-2 d-flex justify-content-between " className="dataTables_length text-start py-2 d-flex justify-content-between "
id="DataTables_Table_0_length" id="DataTables_Table_0_length"
@ -84,7 +84,7 @@ const EmpAttendance = () => {
</> </>
</div> </div>
</div> </div>
<div className="table-responsive text-nowrap"> <div className="text-nowrap">
{!loading && data.length === 0 && ( {!loading && data.length === 0 && (
<div className="text-center py-5">No employee logs</div> <div className="text-center py-5">No employee logs</div>
)} )}

15
src/components/Organization/OrganizationsList.jsx
View File

@ -5,17 +5,17 @@ import Avatar from "../common/Avatar";
import { useDebounce } from "../../utils/appUtils"; import { useDebounce } from "../../utils/appUtils";
import Pagination from "../common/Pagination"; import Pagination from "../common/Pagination";
const OrganizationsList = ({searchText}) => { const OrganizationsList = ({ searchText }) => {
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const searchString = useDebounce(searchText,500) const searchString = useDebounce(searchText, 500)
const { const {
data = [], data = [],
isLoading, isLoading,
isFetching, isFetching,
isError, isError,
error, error,
} = useOrganizationsList(ITEMS_PER_PAGE, 1, true,null,searchString); } = useOrganizationsList(ITEMS_PER_PAGE, 1, true, null, searchString);
const {onClose, startStep, flowType, onOpen,orgData } = useOrganizationModal(); const { onClose, startStep, flowType, onOpen, orgData } = useOrganizationModal();
const organizationsColumns = [ const organizationsColumns = [
{ {
@ -94,7 +94,6 @@ const OrganizationsList = ({searchText}) => {
return ( return (
<div <div
className="card-datatable table-responsive overflow-auto"
id="horizontal-example" id="horizontal-example"
> >
<div className="dataTables_wrapper no-footer px-2 "> <div className="dataTables_wrapper no-footer px-2 ">
@ -132,8 +131,8 @@ const OrganizationsList = ({searchText}) => {
))} ))}
<td className="sticky-action-column "> <td className="sticky-action-column ">
<div className="d-flex justify-content-center gap-2"> <div className="d-flex justify-content-center gap-2">
<i className="bx bx-show text-primary cursor-pointer" onClick={()=>onOpen({startStep:5,orgData:org.id,flowType:"view"})}></i> <i className="bx bx-show text-primary cursor-pointer" onClick={() => onOpen({ startStep: 5, orgData: org.id, flowType: "view" })}></i>
<i className="bx bx-edit text-secondary cursor-pointer" onClick={()=>onOpen({startStep:4,orgData:org,flowType:"edit"})}></i> <i className="bx bx-edit text-secondary cursor-pointer" onClick={() => onOpen({ startStep: 4, orgData: org, flowType: "edit" })}></i>
<i className="bx bx-trash text-danger cursor-not-allowed"></i> <i className="bx bx-trash text-danger cursor-not-allowed"></i>
</div> </div>
</td> </td>
@ -145,7 +144,7 @@ const OrganizationsList = ({searchText}) => {
colSpan={organizationsColumns.length + 1} colSpan={organizationsColumns.length + 1}
className="text-center" className="text-center"
> >
<p className="fw-semibold">{isLoading ? "Loading....":"Not Found Organization"}</p> <p className="fw-semibold">{isLoading ? "Loading...." : "Not Found Organization"}</p>
</td> </td>
</tr> </tr>
)} )}

2
src/pages/Activities/AttendancePage.jsx
View File

@ -202,7 +202,7 @@ const AttendancePage = () => {
</div> </div>
{/* Search + Organization filter */} {/* Search + Organization filter */}
<div className="col-12 col-md-auto mb-2 mt-md-0 ms-md-auto nav"> <div className="col-12 col-md-auto mb-2 mt-3 mt-md-0 ms-md-auto nav">
<div className="row g-2"> <div className="row g-2">
<div className="col-12 col-sm-6"> <div className="col-12 col-sm-6">
<select <select

4
src/pages/Organization/OrganizationPage.jsx
View File

@ -47,10 +47,12 @@ const OrganizationPage = () => {
</div> </div>
</div> </div>
</div> </div>
<div className="card page-min-h px-sm-4"> <div className="card table-responsive page-min-h">
<div className="card-body">
<OrganizationsList searchText={searchText} /> <OrganizationsList searchText={searchText} />
</div> </div>
</div> </div>
</div>
); );
}; };