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

chaange sequence of dashbord widgets

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-28 12:36:23 +05:30
parent f9a0098adb
commit 5818b84760
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/Dashboard/Dashboard.jsx
View File

@ -47,6 +47,20 @@ const Dashboard = () => {
<div className={`${!isAllProjectsSelected ? "col-sm-6 col-lg-6" : "col-sm-6 col-lg-4"}`}>
<TasksCard />
</div>
<div className="col-12 col-xl-4 col-md-6">
<div className="card ">
<ExpenseStatus />
</div>
</div>
<div className="col-12 col-xl-8">
<div className="card h-100">
<ExpenseAnalysis />
</div>
</div>
<div className="col-12 col-md-6">
<ExpenseByProject />
</div>
{isAllProjectsSelected && (
<div className="col-xxl-6 col-lg-6">
@ -69,20 +83,7 @@ const Dashboard = () => {
</div>
</div>
)}
<div className="col-12 col-xl-4 col-md-6">
<div className="card ">
<ExpenseStatus />
</div>
</div>
<div className="col-12 col-xl-8">
<div className="card h-100">
<ExpenseAnalysis />
</div>
</div>
<div className="col-12 col-md-6">
<ExpenseByProject />
</div>
{/* <div className="col-12 col-md-12">
<ServiceJobs />
</div> */}

4
src/components/purchase/DeliveryChallane.jsx
View File

@ -135,9 +135,9 @@ const DeliveryChallane = ({ purchaseId }) => {
control={control}
render={({ field }) => (
<SelectField
label="Select Status"
label="Select Document Type"
options={data ?? []}
placeholder="Choose a Status"
placeholder="Choose Type"
labelKeyKey="name"
valueKeyKey="id"
value={field.value}

8
src/components/purchase/ManagePurchase.jsx
View File

@ -128,7 +128,7 @@ const ManagePurchase = ({ onClose, purchaseId }) => {
return (
<div
id="wizard-property-listing"
className="bs-stepper horizontically mt-2 b-secondry px-1 py-1 shadow-none border-0"
className="bs-stepper horizontically mt-2 b-secondry shadow-none border-0"
>
{/* Header */}
<div className="bs-stepper-header text-start px-0 py-1">
@ -139,7 +139,7 @@ const ManagePurchase = ({ onClose, purchaseId }) => {
return (
<React.Fragment key={step.name}>
<div
className={`step ${isActive ? "active" : ""} ${
className={`step text-truncate ${isActive ? "active" : ""} ${
isCompleted ? "crossed" : ""
}`}
>
@ -168,7 +168,7 @@ const ManagePurchase = ({ onClose, purchaseId }) => {
</div>
{/* Content */}
<div className="bs-stepper-content py-2">
<div className="bs-stepper-content py-2 px-3">
<AppFormProvider {...purchaseOrder}>
<form
onKeyDown={(e) => {
@ -207,7 +207,7 @@ const ManagePurchase = ({ onClose, purchaseId }) => {
onClick={handleNext}
disabled={isPending || isUpdating}
>
Next <i className="bx bx-sm bx-right-arrow"></i>
Next
</button>
) : (
<button

2
src/components/purchase/PurchaseList.jsx
View File

@ -132,7 +132,7 @@ const PurchaseList = ({ searchString }) => {
>
<i className="bx bx-file bx-plus me-2"></i>
<span className="align-left">Add Challan</span>
<span className="align-left">Add Delivery Challan</span>
</a>
</li>
</ul>