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

Organization_Management : Organization Hierarchy #443

Merged
pramod.mahajan merged 180 commits from Organization_Management into main 2025-09-30 09:07:31 +00:00
Conversation 0 Commits 180 Files Changed 149 +43 -62
6 changed files with 43 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84f9cb2e29 - Show all commits

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

@ -149,30 +149,11 @@ 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,
@ -180,7 +161,10 @@ const Documents = ({ Document_Entity, Entity }) => {
}) })
} }
> >
<i className="bx bx-plus fs-4 text-white"></i> <i className="bx bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">
Add New Document
</span>
</button> </button>
)} )}
</div> </div>

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

@ -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"> <div className="dataTables_filter d-inline-flex align-items-center ms-2">x``
<input <input
type="search" type="search"
className="form-control form-control-sm me-4" className="form-control form-control-sm me-4"

8
src/pages/Expense/ExpensePage.jsx
View File

@ -131,9 +131,8 @@ 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,
@ -141,7 +140,10 @@ const ExpensePage = () => {
}) })
} }
> >
<i className="bx bx-plus fs-4 text-white"></i> <i className="bx bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">
Add New Expense
</span>
</button> </button>
)} )}
</div> </div>

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

@ -31,12 +31,14 @@ 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"
className="p-1 me-1 m-sm-0 bg-primary rounded-circle"
title="Add New Organization"
onClick={() => onOpen({ startStep: 2, flowType: "default" })} onClick={() => onOpen({ startStep: 2, flowType: "default" })}
> >
<i className="bx bx-plus fs-4 text-white"></i> <i className="bx bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">
Add New Organization
</span>
</button> </button>
</div> </div>
</div> </div>

11
src/pages/Tenant/TenantPage.jsx
View File

@ -146,19 +146,20 @@ const TenantPage = () => {
> >
Refresh{" "} Refresh{" "}
<i <i
className={`bx bx-refresh ms-1 ${ className={`bx bx-refresh ms-1 ${isRefetching ? "bx-spin" : ""
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 fs-4 text-white"></i> <i className="bx bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">
Add New Tenant
</span>
</button> </button>
</div> </div>
</div> </div>

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

@ -168,8 +168,7 @@ 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 ${ className={`btn btn-sm p-1 ${!listView ? "btn-primary" : "btn-outline-primary"
!listView ? "btn-primary" : "btn-outline-primary"
}`} }`}
onClick={() => setListView(false)} onClick={() => setListView(false)}
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
@ -180,8 +179,7 @@ const ProjectList = () => {
</button> </button>
<button <button
type="button" type="button"
className={`btn btn-sm p-1 ${ className={`btn btn-sm p-1 ${listView ? "btn-primary" : "btn-outline-primary"
listView ? "btn-primary" : "btn-outline-primary"
}`} }`}
onClick={() => setListView(true)} onClick={() => setListView(true)}
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
@ -243,18 +241,14 @@ 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 fs-4 text-white"></i> <i className="bx bx-plus-circle me-2"></i>
<span className="d-none d-md-inline-block">
Add New Project
</span>
</button> </button>
</div> </div>
</div> </div>
@ -333,8 +327,7 @@ const ProjectList = () => {
</div> </div>
</th> </th>
<th <th
className={`mx-2 ${ className={`mx-2 ${HasManageProject ? "d-sm-table-cell" : "d-none"
HasManageProject ? "d-sm-table-cell" : "d-none"
}`} }`}
> >
Action Action
@ -403,8 +396,7 @@ const ProjectList = () => {
</li> </li>
))} ))}
<li <li
className={`page-item ${ className={`page-item ${currentPage === totalPages && "disabled"
currentPage === totalPages && "disabled"
}`} }`}
> >
<button <button