TFDi_MD-11_QA/xkhofmann-tfdidesign-md11-load-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow GSX state reset

Browse Source 
Fix KG rounding of pax
This commit is contained in:
Kilian Hofmann
2025-09-08 03:06:48 +02:00
parent d75518517a
commit 9000d516ae
8 changed files with 52 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PackageSources/js-bundle/src/components/pax/Pax.tsx
+30 -28
View File
@@ -1,4 +1,4 @@
import { FC, useEffect, useState } from 'react';
import { FC, useEffect, useMemo, useState } from 'react';
import { GSX_SERVICE_CALLED, GSX_SERVICE_FINISHED } from '../../constants';
import { LoadingState } from '../../types/general';
import { WASMDataPax } from '../../types/WASMData';
@@ -21,17 +21,13 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
const [deboardingState, setDeboardingState] = useState(1);
useEffect(() => {
console.log('GSX boarding state changed', boardingState, WASMData.GSX.boardingState);
if (WASMData.GSX.boardingState < GSX_SERVICE_CALLED) return;
if (WASMData.GSX.boardingState > 1 && WASMData.GSX.boardingState < GSX_SERVICE_CALLED) return;
setBoardingState(WASMData.GSX.boardingState);
setDeboardingState(1);
}, [WASMData.GSX.boardingState]);
useEffect(() => {
console.log('GSX deboarding state changed', deboardingState, WASMData.GSX.deboardingState);
if (WASMData.GSX.deboardingState < GSX_SERVICE_CALLED) return;
if (WASMData.GSX.deboardingState > 1 && WASMData.GSX.deboardingState < GSX_SERVICE_CALLED) return;
setBoardingState(1);
setDeboardingState(WASMData.GSX.deboardingState);
@@ -58,27 +54,27 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
return WASMData.livePayload.economy2;
};
const lower1 = () => {
if (loadingState !== 'loaded' && !GSXActive()) return Math.round(WASMData.targetPayload.forwardCargo);
if (loadingState !== 'loaded' && !GSXActive) return Math.round(WASMData.targetPayload.forwardCargo);
return Math.round(WASMData.livePayload.forwardCargo);
};
const lower2 = () => {
if (loadingState !== 'loaded' && !GSXActive()) return Math.round(WASMData.targetPayload.rearCargo);
if (loadingState !== 'loaded' && !GSXActive) return Math.round(WASMData.targetPayload.rearCargo);
return Math.round(WASMData.livePayload.rearCargo);
};
const OEW = () => {
if (loadingState !== 'loaded' && !GSXActive()) return Math.round(WASMData.targetPayload.empty);
if (loadingState !== 'loaded' && !GSXActive) return Math.round(WASMData.targetPayload.empty);
return Math.round(WASMData.livePayload.empty);
};
const crew = () => {
if (loadingState !== 'loaded' && !GSXActive()) return Math.round(WASMData.targetPayload.crew);
if (loadingState !== 'loaded' && !GSXActive) return Math.round(WASMData.targetPayload.crew);
return Math.round(WASMData.livePayload.crew);
};
const GSXActive = () => {
const GSXActive = useMemo(() => {
// Cases when active:
// BOARDING called, running or done
// DEBOARDING called, running or done
@@ -87,14 +83,20 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
// DEBOARDING not called, disabled
// BOTH done
console.log(
'GSXActive',
(boardingState >= GSX_SERVICE_CALLED || deboardingState >= GSX_SERVICE_CALLED) &&
deboardingState !== GSX_SERVICE_FINISHED
);
return (
(boardingState >= GSX_SERVICE_CALLED || deboardingState >= GSX_SERVICE_CALLED) &&
deboardingState !== GSX_SERVICE_FINISHED
);
};
}, [boardingState, deboardingState]);
const CGs = (): [string, boolean, string, boolean] => {
if (loadingState !== 'loaded' && !GSXActive()) {
if (loadingState !== 'loaded' && !GSXActive) {
return [
WASMData.targetPayload.ZFWCG.toFixed(1),
WASMData.targetPayload.ZFWCG < WASMData.limits.minCG || WASMData.targetPayload.ZFWCG > WASMData.limits.maxCG,
@@ -103,7 +105,7 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
];
}
if (WASMData.options.GSXSync && GSXActive() && boardingState !== GSX_SERVICE_FINISHED) {
if (WASMData.options.GSXSync && GSXActive && boardingState !== GSX_SERVICE_FINISHED) {
return [
WASMData.targetPayload.ZFWCG.toFixed(1),
WASMData.targetPayload.ZFWCG < WASMData.limits.minCG || WASMData.targetPayload.ZFWCG > WASMData.limits.maxCG,
@@ -129,20 +131,20 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
<Profile
type="PAX"
isER={WASMData.userData.isER}
upper1={`${upper1(GSXActive() ? 'loaded' : loadingState)}`}
upper1max={loadingState === 'loaded' || GSXActive() ? `${upper1('preview')}` : `${WASMData.limits.business1}`}
upper2={`${upper2(GSXActive() ? 'loaded' : loadingState)}`}
upper2max={loadingState === 'loaded' || GSXActive() ? `${upper2('preview')}` : `${WASMData.limits.business2}`}
upper3={`${upper3(GSXActive() ? 'loaded' : loadingState)}`}
upper3max={loadingState === 'loaded' || GSXActive() ? `${upper3('preview')}` : `${WASMData.limits.economy1}`}
upper4={`${upper4(GSXActive() ? 'loaded' : loadingState)}`}
upper4max={loadingState === 'loaded' || GSXActive() ? `${upper4('preview')}` : `${WASMData.limits.economy2}`}
upper1={`${upper1(GSXActive ? 'loaded' : loadingState)}`}
upper1max={loadingState === 'loaded' || GSXActive ? `${upper1('preview')}` : `${WASMData.limits.business1}`}
upper2={`${upper2(GSXActive ? 'loaded' : loadingState)}`}
upper2max={loadingState === 'loaded' || GSXActive ? `${upper2('preview')}` : `${WASMData.limits.business2}`}
upper3={`${upper3(GSXActive ? 'loaded' : loadingState)}`}
upper3max={loadingState === 'loaded' || GSXActive ? `${upper3('preview')}` : `${WASMData.limits.economy1}`}
upper4={`${upper4(GSXActive ? 'loaded' : loadingState)}`}
upper4max={loadingState === 'loaded' || GSXActive ? `${upper4('preview')}` : `${WASMData.limits.economy2}`}
lower1={`${lower1()}`}
lower2={`${lower2()}`}
OEW={`${OEW()}`}
crew={`${crew()}`}
unit={WASMData.userData.isImperial ? 'LBS' : 'KG'}
inPreview={loadingState !== 'loaded' && !GSXActive()}
inPreview={loadingState !== 'loaded' && !GSXActive}
CGs={CGs()}
done={
WASMData.options.GSXSync
@@ -162,7 +164,7 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
WASMData={WASMData}
loadingState={loadingState}
setLoadingState={setLoadingState}
gsxActive={GSXActive()}
gsxActive={GSXActive}
/>
)}
{((username && selectedTab === 1) || (!username && selectedTab === 0)) && (
@@ -170,7 +172,7 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
WASMData={WASMData}
loadingState={loadingState}
setLoadingState={setLoadingState}
gsxActive={GSXActive()}
gsxActive={GSXActive}
/>
)}
{((username && selectedTab === 2) || (!username && selectedTab === 1)) && (
@@ -178,11 +180,11 @@ const Pax: FC<PaxProps> = ({ WASMData, username }) => {
WASMData={WASMData}
loadingState={loadingState}
setLoadingState={setLoadingState}
gsxActive={GSXActive()}
gsxActive={GSXActive}
/>
)}
{((username && selectedTab === 3) || (!username && selectedTab === 2)) && (
<OptionsPax WASMData={WASMData} loadingState={loadingState} />
<OptionsPax WASMData={WASMData} loadingState={loadingState} gsxActive={GSXActive} />
)}
</>
);