diff --git a/src/pages/nearle/dispatch/Dispatch.js b/src/pages/nearle/dispatch/Dispatch.js index 3787672..ae9ee3d 100644 --- a/src/pages/nearle/dispatch/Dispatch.js +++ b/src/pages/nearle/dispatch/Dispatch.js @@ -3064,23 +3064,36 @@ const Dispatch = ({ )} - {(o.kms != null || o.riderkms != null || estMeters !== null) && ( + {(o.plannedkms != null || o.kms != null || o.actualkms != null || o.riderkms != null || estMeters !== null) && (
- {o.kms != null && o.kms !== '' && ( + {(o.plannedkms != null && o.plannedkms !== '') ? ( +
+ + Planned + {parseFloat(o.plannedkms).toFixed(1)} km +
+ ) : o.kms != null && o.kms !== '' ? (
Planned {parseFloat(o.kms).toFixed(1)} km
+ ) : null} + {o.actualkms != null && o.actualkms !== '' && ( +
+ + Actual + {parseFloat(o.actualkms).toFixed(1)} km +
)} {o.riderkms != null && o.riderkms !== '' && (
- Actual + Rider KMs {parseFloat(o.riderkms).toFixed(1)} km
)} - {estMeters !== null && ( +{estMeters !== null && (
Est. to Drop @@ -4297,9 +4310,9 @@ const Dispatch = ({ <>
{focusedRider.riderName}
{(() => { - const totalKm = focusedRider.orders.reduce((s, o) => s + parseFloat(o.actualkms || o.kms || 0), 0); - const totalProfit = focusedRider.orders.reduce((s, o) => s + parseFloat(o.profit || 0), 0); - const isLoss = totalProfit < 0; + const actualKm = focusedRider.orders.reduce((s, o) => s + parseFloat(o.actualkms || 0), 0); + const riderKm = focusedRider.orders.reduce((s, o) => s + parseFloat(o.riderkms || 0), 0); + const cumulativeKm = focusedRider.orders.reduce((s, o) => s + parseFloat(o.cumulativekms || 0), 0); return (
@@ -4309,15 +4322,18 @@ const Dispatch = ({
-
{totalKm.toFixed(1)}km
-
Distance
+
{actualKm.toFixed(1)}km
+
Actual KMs
-
-
{isLoss ? : }
-
- {isLoss ? '-' : ''}₹{Math.abs(totalProfit).toFixed(0)} -
-
{isLoss ? 'Loss' : 'Revenue'}
+
+
+
{riderKm.toFixed(1)}km
+
Rider KMs
+
+
+
+
{cumulativeKm.toFixed(1)}km
+
Cumulative KMs
);