Compare commits
No commits in common. "451d0a785fecf4111e8d73447437ca6e2b0e0b15" and "9d9ca28badd29ba01d0de32b50513fda4d93ad05" have entirely different histories.
451d0a785f
...
9d9ca28bad
@ -149,11 +149,30 @@ const Documents = ({ Document_Entity, Entity }) => {
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Actions */}
|
||||||
<div className="col-6 col-md-6 col-lg-8 text-end">
|
<div className="col-6 col-md-6 col-lg-8 text-end">
|
||||||
|
{/* <span
|
||||||
|
className="text-tiny text-muted p-1 border-0 bg-none lead mx-3 cursor-pointer"
|
||||||
|
disabled={isRefetching}
|
||||||
|
onClick={() => {
|
||||||
|
setSearchText("");
|
||||||
|
setFilter(DocumentFilterDefaultValues);
|
||||||
|
refetchFn && refetchFn();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Refresh
|
||||||
|
<i
|
||||||
|
className={`bx bx-refresh ms-1 ${
|
||||||
|
isRefetching ? "bx-spin" : ""
|
||||||
|
}`}
|
||||||
|
></i>
|
||||||
|
</span> */}
|
||||||
|
|
||||||
{(isSelf || canUploadDocument) && (
|
{(isSelf || canUploadDocument) && (
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-primary me-3"
|
|
||||||
type="button"
|
type="button"
|
||||||
|
title="Add New Document"
|
||||||
|
className="p-1 bg-primary rounded-circle cursor-pointer"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
setManageDoc({
|
setManageDoc({
|
||||||
document: null,
|
document: null,
|
||||||
@ -161,10 +180,7 @@ const Documents = ({ Document_Entity, Entity }) => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle me-2"></i>
|
<i className="bx bx-plus fs-4 text-white"></i>
|
||||||
<span className="d-none d-md-inline-block">
|
|
||||||
Add New Document
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -308,7 +308,7 @@ const Teams = () => {
|
|||||||
{activeEmployee ? "Active Employees" : "Inactive Employees"}
|
{activeEmployee ? "Active Employees" : "Inactive Employees"}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div className="dataTables_filter d-inline-flex align-items-center ms-2">x``
|
<div className="dataTables_filter d-inline-flex align-items-center ms-2">
|
||||||
<input
|
<input
|
||||||
type="search"
|
type="search"
|
||||||
className="form-control form-control-sm me-4"
|
className="form-control form-control-sm me-4"
|
||||||
|
|||||||
@ -131,8 +131,9 @@ const ExpensePage = () => {
|
|||||||
<div className="col-6 text-end mt-2 mt-sm-0">
|
<div className="col-6 text-end mt-2 mt-sm-0">
|
||||||
{IsCreatedAble && (
|
{IsCreatedAble && (
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
type="button"
|
type="button"
|
||||||
|
className="p-1 me-1 m-sm-0 bg-primary rounded-circle"
|
||||||
|
title="Add New Expense"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
setManageExpenseModal({
|
setManageExpenseModal({
|
||||||
IsOpen: true,
|
IsOpen: true,
|
||||||
@ -140,10 +141,7 @@ const ExpensePage = () => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle me-2"></i>
|
<i className="bx bx-plus fs-4 text-white"></i>
|
||||||
<span className="d-none d-md-inline-block">
|
|
||||||
Add New Expense
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -4,9 +4,9 @@ import { useOrganizationModal } from "../../hooks/useOrganization";
|
|||||||
import OrganizationsList from "../../components/Organization/OrganizationsList";
|
import OrganizationsList from "../../components/Organization/OrganizationsList";
|
||||||
|
|
||||||
const OrganizationPage = () => {
|
const OrganizationPage = () => {
|
||||||
const { isOpen, orgData, startStep, onOpen, flowType } =
|
const { isOpen, orgData, startStep, onOpen, flowType } =
|
||||||
useOrganizationModal();
|
useOrganizationModal();
|
||||||
const [searchText, setSearchText] = useState("")
|
const [searchText,setSearchText] = useState("")
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container-fluid">
|
<div className="container-fluid">
|
||||||
@ -21,7 +21,7 @@ const OrganizationPage = () => {
|
|||||||
<input
|
<input
|
||||||
type="search"
|
type="search"
|
||||||
value={searchText}
|
value={searchText}
|
||||||
onChange={(e) => setSearchText(e.target.value)}
|
onChange={(e)=>setSearchText(e.target.value)}
|
||||||
className="form-control form-control-sm w-auto"
|
className="form-control form-control-sm w-auto"
|
||||||
placeholder="Search Organization"
|
placeholder="Search Organization"
|
||||||
aria-describedby="search-label"
|
aria-describedby="search-label"
|
||||||
@ -31,20 +31,18 @@ const OrganizationPage = () => {
|
|||||||
|
|
||||||
<div className="col-6 text-end mt-2 mt-sm-0">
|
<div className="col-6 text-end mt-2 mt-sm-0">
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => onOpen({ startStep: 2, flowType: "default" })}
|
className="p-1 me-1 m-sm-0 bg-primary rounded-circle"
|
||||||
|
title="Add New Organization"
|
||||||
|
onClick={()=>onOpen({ startStep: 2,flowType:"default" })}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle me-2"></i>
|
<i className="bx bx-plus fs-4 text-white"></i>
|
||||||
<span className="d-none d-md-inline-block">
|
|
||||||
Add New Organization
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<OrganizationsList searchText={searchText} />
|
<OrganizationsList searchText={searchText}/>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -146,20 +146,19 @@ const TenantPage = () => {
|
|||||||
>
|
>
|
||||||
Refresh{" "}
|
Refresh{" "}
|
||||||
<i
|
<i
|
||||||
className={`bx bx-refresh ms-1 ${isRefetching ? "bx-spin" : ""
|
className={`bx bx-refresh ms-1 ${
|
||||||
}`}
|
isRefetching ? "bx-spin" : ""
|
||||||
|
}`}
|
||||||
></i>
|
></i>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
type="button"
|
type="button"
|
||||||
|
title="Add New Tenant"
|
||||||
|
className="p-1 bg-primary rounded-circle cursor-pointer"
|
||||||
onClick={handleNewTenant}
|
onClick={handleNewTenant}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle me-2"></i>
|
<i className="bx bx-plus fs-4 text-white"></i>
|
||||||
<span className="d-none d-md-inline-block">
|
|
||||||
Add New Tenant
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -168,8 +168,9 @@ const ProjectList = () => {
|
|||||||
<div className="d-flex gap-2 mb-2">
|
<div className="d-flex gap-2 mb-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={`btn btn-sm p-1 ${!listView ? "btn-primary" : "btn-outline-primary"
|
className={`btn btn-sm p-1 ${
|
||||||
}`}
|
!listView ? "btn-primary" : "btn-outline-primary"
|
||||||
|
}`}
|
||||||
onClick={() => setListView(false)}
|
onClick={() => setListView(false)}
|
||||||
data-bs-toggle="tooltip"
|
data-bs-toggle="tooltip"
|
||||||
data-bs-custom-class="tooltip"
|
data-bs-custom-class="tooltip"
|
||||||
@ -179,8 +180,9 @@ const ProjectList = () => {
|
|||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={`btn btn-sm p-1 ${listView ? "btn-primary" : "btn-outline-primary"
|
className={`btn btn-sm p-1 ${
|
||||||
}`}
|
listView ? "btn-primary" : "btn-outline-primary"
|
||||||
|
}`}
|
||||||
onClick={() => setListView(true)}
|
onClick={() => setListView(true)}
|
||||||
data-bs-toggle="tooltip"
|
data-bs-toggle="tooltip"
|
||||||
data-bs-custom-class="tooltip"
|
data-bs-custom-class="tooltip"
|
||||||
@ -190,7 +192,7 @@ const ProjectList = () => {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="dropdown mt-1">
|
<div className="dropdown mt-1">
|
||||||
<a
|
<a
|
||||||
className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 "
|
className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 "
|
||||||
data-bs-toggle="dropdown"
|
data-bs-toggle="dropdown"
|
||||||
@ -241,14 +243,18 @@ const ProjectList = () => {
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<button
|
<button
|
||||||
className="btn btn-sm btn-primary"
|
|
||||||
type="button"
|
type="button"
|
||||||
|
data-bs-toggle="tooltip"
|
||||||
|
data-bs-offset="0,8"
|
||||||
|
data-bs-placement="top"
|
||||||
|
data-bs-custom-class="tooltip"
|
||||||
|
title="Add New Project"
|
||||||
|
className={`p-1 me-2 bg-primary rounded-circle ${
|
||||||
|
!HasManageProject && "d-none"
|
||||||
|
}`}
|
||||||
onClick={handleShow}
|
onClick={handleShow}
|
||||||
>
|
>
|
||||||
<i className="bx bx-plus-circle me-2"></i>
|
<i className="bx bx-plus fs-4 text-white"></i>
|
||||||
<span className="d-none d-md-inline-block">
|
|
||||||
Add New Project
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -327,8 +333,9 @@ const ProjectList = () => {
|
|||||||
</div>
|
</div>
|
||||||
</th>
|
</th>
|
||||||
<th
|
<th
|
||||||
className={`mx-2 ${HasManageProject ? "d-sm-table-cell" : "d-none"
|
className={`mx-2 ${
|
||||||
}`}
|
HasManageProject ? "d-sm-table-cell" : "d-none"
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
Action
|
Action
|
||||||
</th>
|
</th>
|
||||||
@ -396,8 +403,9 @@ const ProjectList = () => {
|
|||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
<li
|
<li
|
||||||
className={`page-item ${currentPage === totalPages && "disabled"
|
className={`page-item ${
|
||||||
}`}
|
currentPage === totalPages && "disabled"
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
className="page-link"
|
className="page-link"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user