diff --git a/.vscode/settings.json b/.vscode/settings.json index 9417e0e0d..8d4121124 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,7 +33,7 @@ "editor.formatOnSave": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.trimTrailingWhitespace": true, "files.insertFinalNewline": true, diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Assets/NoseOutline.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Assets/NoseOutline.tsx index 1b62e8700..9ee0018c3 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Assets/NoseOutline.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Assets/NoseOutline.tsx @@ -2,697 +2,586 @@ import React from 'react'; export const NoseOutline = ({ className }: {className: string}) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - T - e - x - t he - r - e - - - - - EXIT - - - D - ANGER - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - T - O OPEN - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - - - - - - - - - - - - - - - - - - - - - - - T - e - x - t he - r - e - - - - - EXIT - - - D - ANGER - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - T - O OPEN - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - - - - - - - - - - - - - - - - - - - - - - - T - e - x - t he - r - e - - - - - EXIT - - - D - ANGER - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - T - O OPEN - - - Do not e - v - en think about - r - eading thsi - te - x - t because it - ma - k - es no sense - - - - - - - - EXIT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Text here + + + + EXIT + + DANGER + Do not even think about reading thsi text because it makes no sense + + + TO OPEN + Do not even think about reading thsi text because it makes no sense + + + + + + + + + + + + + + + + + + + + + + + + + Text here + + + + EXIT + + DANGER + Do not even think about reading thsi text because it makes no sense + + + TO OPEN + Do not even think about reading thsi text because it makes no sense + + + + + + + + + + + + + + + + + + + + + + + + + Text here + + + + EXIT + + DANGER + Do not even think about reading thsi text because it makes no sense + + + TO OPEN + Do not even think about reading thsi text because it makes no sense + + + + + + + EXIT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + ); diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx index e4074648a..430bc19e6 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Dashboard/Widgets/FlightWidget.tsx @@ -17,8 +17,8 @@ interface InformationEntryProps { } const InformationEntry = ({ title, info }: InformationEntryProps) => ( -
-

{title}

+
+

{title}

{info}

); @@ -30,8 +30,8 @@ interface NoSimBriefDataOverlayProps { } const NoSimBriefDataOverlay = ({ simbriefDataLoaded, simbriefDataPending, fetchData }: NoSimBriefDataOverlayProps) => ( -
-

+
+

{simbriefDataPending ? ( ) : ( @@ -48,7 +48,7 @@ const NoSimBriefDataOverlay = ({ simbriefDataLoaded, simbriefDataPending, fetchD @@ -216,7 +216,7 @@ export const PayloadValueUnitDisplay: React.FC = ({ valu return ( - + {'0'.repeat(leadingZeroCount)} {fixedValue} @@ -231,7 +231,7 @@ export const PayloadPercentUnitDisplay: React.FC<{value: number}> = ({ value }) return ( - + {fixedValue} {' '} @@ -284,15 +284,15 @@ export const PayloadInputTable: React.FC = ( }, ) => ( - + - - - @@ -301,12 +301,12 @@ export const PayloadInputTable: React.FC = ( - - - - - - - - diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx index cb215923b..e0043578c 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx @@ -202,7 +202,7 @@ export const PushbackMap = () => { <> {/* Map Container */}
{ setMouseDown(true); setDragStartCoords({ x: e.pageX, y: e.pageY }); @@ -234,7 +234,7 @@ export const PushbackMap = () => { )} {/* Aircraft and Turning Radius Indicator */} -
+
{centerPlaneMode && !Number.isNaN(turningRadius) && Number.isFinite(turningRadius) && (
{
{/* Map Controls */} -
+
@@ -286,7 +286,7 @@ export const PushbackMap = () => { diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_343/A330Services.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_343/A330Services.tsx index 52640aa03..73d365639 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_343/A330Services.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_343/A330Services.tsx @@ -14,7 +14,7 @@ import { TriangleFill as Chock, Truck, VinylFill as Wheel, - Fan, + Fan } from 'react-bootstrap-icons'; import { ActionCreatorWithOptionalPayload } from '@reduxjs/toolkit'; import { t } from '../../../../translation'; @@ -44,7 +44,7 @@ interface ServiceButtonWrapperProps { // This groups buttons and sets a border and divider line const ServiceButtonWrapper: FC = ({ children, className, xl, xr, y }) => (
{children} @@ -100,11 +100,11 @@ const GroundServiceButton: React.FC = ({ children, nam return (
{children} -

{name}

+

{name}

); }; @@ -510,7 +510,7 @@ export const A330Services: React.FC = () => { gpuButtonState, baggageButtonState, cateringButtonState, - asuButtonState, + asuButtonState ] .every((buttonState) => buttonState === ServiceButtonState.DISABLED) ) { @@ -524,14 +524,13 @@ export const A330Services: React.FC = () => { dispatch(setService1DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setService2DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setCateringButtonState(ServiceButtonState.INACTIVE)); - dispatch(setAsuButtonState(ServiceButtonState.INACTIVE)); } }, [groundServicesAvailable]); const serviceIndicationCss = 'text-2xl font-bold text-utility-amber w-min'; return ( -
+
= 1.0} @@ -539,7 +538,7 @@ export const A330Services: React.FC = () => { midRightStatus={midRightDoorOpen >= 1.0} aftLeftStatus={aftLeftDoorOpen >= 1.0} aftRightStatus={false} - className="text-theme-text inset-x-0 mx-auto h-full w-full" + className="inset-x-0 mx-auto w-full h-full text-theme-text" /> @@ -641,7 +640,7 @@ export const A330Services: React.FC = () => { {/* Wheel Chocks and Security Cones are only visual information. To reuse styling */} {/* the ServiceButtonWrapper has been re-used. */} - + {/* CABIN DOOR */} { {!!wheelChocksEnabled && ( -
-
+
+
-

+

{t('Ground.Services.WheelChocks')}

)} {!!conesEnabled && ( -
+
-

+

{t('Ground.Services.Cones')}

@@ -717,22 +716,22 @@ export const A330Services: React.FC = () => { {cargoDoorOpen >= 1.0 && (
FWD CARGO
AFT CARGO
- BULK + BULK
)} diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx index d411f09ec..b36e7bbd4 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx @@ -10,10 +10,10 @@ export const ServicesPage = () => { const [airframe] = useState(getAirframeType()); switch (airframe) { - case 'A330_343': - default: - return ( - - ); + case 'A330_343': + default: + return ( + + ); } }; diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts b/hdw-a333x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts index fb8c62303..081e92f99 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts +++ b/hdw-a333x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts @@ -82,7 +82,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: -10, overweightProcedureCorrection: 640, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 1360, @@ -95,7 +95,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: -10, overweightProcedureCorrection: 740, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, [AutobrakeMode.Medium]: { @@ -110,7 +110,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: 0, overweightProcedureCorrection: 70, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 1750, @@ -123,7 +123,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: 0, overweightProcedureCorrection: 70, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, [AutobrakeMode.Low]: { @@ -138,7 +138,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 30, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 2340, @@ -151,7 +151,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, }; @@ -169,7 +169,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -20, overweightProcedureCorrection: 500, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1700, @@ -182,7 +182,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -20, overweightProcedureCorrection: 580, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Medium]: { @@ -197,7 +197,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 50, reverserCorrection: -20, overweightProcedureCorrection: 120, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1870, @@ -210,7 +210,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -30, overweightProcedureCorrection: 140, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Low]: { @@ -225,7 +225,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 30, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2340, @@ -238,7 +238,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, }; @@ -256,7 +256,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -40, overweightProcedureCorrection: 570, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1930, @@ -269,7 +269,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 70, reverserCorrection: -50, overweightProcedureCorrection: 660, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Medium]: { @@ -284,7 +284,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 70, reverserCorrection: -60, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2100, @@ -297,7 +297,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 80, reverserCorrection: -60, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Low]: { @@ -312,7 +312,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 50, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2350, @@ -325,7 +325,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, }; @@ -343,7 +343,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 90, reverserCorrection: -60, overweightProcedureCorrection: 530, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2160, @@ -356,7 +356,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 110, reverserCorrection: -70, overweightProcedureCorrection: 620, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, [AutobrakeMode.Medium]: { @@ -371,7 +371,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 100, reverserCorrection: -70, overweightProcedureCorrection: 110, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2310, @@ -384,7 +384,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 120, reverserCorrection: -80, overweightProcedureCorrection: 130, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, [AutobrakeMode.Low]: { @@ -399,7 +399,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 90, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2450, @@ -412,7 +412,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 110, reverserCorrection: -40, overweightProcedureCorrection: 120, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, }; @@ -430,7 +430,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 150, reverserCorrection: -70, overweightProcedureCorrection: 370, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2580, @@ -443,7 +443,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 190, reverserCorrection: -90, overweightProcedureCorrection: 430, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Medium]: { @@ -458,7 +458,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 150, reverserCorrection: -90, overweightProcedureCorrection: 170, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2650, @@ -471,7 +471,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 200, reverserCorrection: -100, overweightProcedureCorrection: 190, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Low]: { @@ -486,7 +486,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 160, reverserCorrection: -50, overweightProcedureCorrection: 160, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2710, @@ -499,7 +499,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 210, reverserCorrection: -80, overweightProcedureCorrection: 180, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, }; @@ -517,7 +517,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 720, reverserCorrection: -200, overweightProcedureCorrection: 360, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 3970, @@ -530,7 +530,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 850, reverserCorrection: -240, overweightProcedureCorrection: 430, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Medium]: { @@ -545,7 +545,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 730, reverserCorrection: -210, overweightProcedureCorrection: 170, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 4050, @@ -558,7 +558,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 860, reverserCorrection: -250, overweightProcedureCorrection: 190, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Low]: { @@ -573,7 +573,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 720, reverserCorrection: -220, overweightProcedureCorrection: 160, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 4100, @@ -586,7 +586,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 860, reverserCorrection: -260, overweightProcedureCorrection: 180, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, }; @@ -641,7 +641,7 @@ const getInterpolatedVlsTableValue = (mass: number, vlsSpeedTable: number[]): nu const upper = vlsSpeedTable[index]; const oneTonSpeedIncrement = (upper - lower) / step; - if (mass % step === 0) return upper; + if(mass % step == 0) return upper; return lower + oneTonSpeedIncrement * (mass % step); }; @@ -744,7 +744,7 @@ export class LandingCalculator { tailWind = 0; } - const weightDifference = Math.floor(((weight / 1000) - 190) / 10); + const weightDifference = Math.floor(((weight / 1000) - 190)/10); let weightCorrection: number; if (weightDifference < 0) { weightCorrection = landingData.weightCorrectionBelow * Math.abs(weightDifference); diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx index 66459abdf..218aa33ba 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx @@ -39,8 +39,8 @@ interface OutputDisplayProps { } const OutputDisplay = (props: OutputDisplayProps) => ( -
-

{props.label}

+
+

{props.label}

{props.value}

@@ -53,7 +53,7 @@ interface LabelProps { } const Label: FC = ({ text, className, children }) => ( -
+

{text}

{children}
@@ -411,19 +411,19 @@ export const LandingWidget = () => { }; return ( -
+
-
+
-
+

{t('Performance.Landing.AirportIcao')}

-
+
-
+
const last = value?.substring(underline); return ( -
+

{title + '\u00A0'.repeat(Math.abs(SPACE_BETWEEN - title.length))}

{first} @@ -70,13 +70,13 @@ export const AboutPage = () => { return ( -

+
-

flyPadOS 3

+

flyPadOS 3

@@ -86,7 +86,7 @@ export const AboutPage = () => {

-
+

© 2020-2022 FlyByWire Simulations and its contributors, all rights reserved.

Licensed under the GNU General Public License Version 3

diff --git a/hdw-a333x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx b/hdw-a333x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx index 8045f5ec2..e002b729b 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx @@ -29,7 +29,7 @@ export const AircraftOptionsPinProgramsPage = () => { const [isisMetricAltitude, setIsisMetricAltitude] = usePersistentNumberProperty('ISIS_METRIC_ALTITUDE', 0); const [vhfSpacing, setVhfSpacing] = usePersistentProperty('RMP_VHF_SPACING_25KHZ', '0'); const [latLonExtended, setLatLonExtended] = usePersistentProperty('LATLON_EXT_FMT', '1'); - // const [satcomEnabled, setsatcomEnabled] = usePersistentNumberProperty('MODEL_SATCOM_ENABLED', 1); + const [satcomEnabled, setsatcomEnabled] = usePersistentNumberProperty('MODEL_SATCOM_ENABLED', 1); const handleSetThrustReductionAlt = (value: string) => { setThrustReductionHeightSetting(value); @@ -92,7 +92,7 @@ export const AircraftOptionsPinProgramsPage = () => { { { { {t('Settings.AircraftOptionsPinPrograms.Select')} diff --git a/hdw-a333x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx b/hdw-a333x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx index 39827e9c6..38fc07456 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx @@ -113,18 +113,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => { }, []); return ( -
+

{`${dayName} ${monthName} ${dayOfMonth}`}

{outdatedVersionFlag ? ( -
+
{t('VersionCheck.StatusBarWarning').toUpperCase()}
) : ''} -
+
{(timeDisplayed === 'utc' || timeDisplayed === 'both') && (

{getZuluFormattedTime(currentUTC)}

)} @@ -139,18 +139,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => {
{(!!showStatusBarFlightProgress && (data !== initialState.data)) && (
setShowSchedTimes((old) => !old)} > -
+

{departingAirport}

{schedOutParsed}

-
-
-
+
+
+
-
+

{arrivingAirport}

{schedInParsed}

diff --git a/hdw-a333x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx b/hdw-a333x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx index 601641a74..70ad20679 100644 --- a/hdw-a333x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx +++ b/hdw-a333x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx @@ -15,7 +15,7 @@ import { t } from '../translation'; import { TooltipWrapper } from '../UtilComponents/TooltipWrapper'; // @ts-ignore -import { HdwLogo } from '../UtilComponents/HdwLogo'; +import { HdwLogo } from "../UtilComponents/HdwLogo"; interface ToolBarButtonProps { to: string; @@ -27,7 +27,7 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => {children} @@ -35,8 +35,8 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => ); export const ToolBar = () => ( -
+ {' '} + {t('Ground.Payload.Planned')} + {t('Ground.Payload.Current')}
+ {t('Ground.Payload.Passengers')} -
+
0 ? maxPax : 999} @@ -323,18 +323,18 @@ export const PayloadInputTable: React.FC = (
+
+ {t('Ground.Payload.Cargo')} -
+
0 ? Math.round(Units.kilogramToUser(maxCargo)) : 99999} @@ -350,20 +350,20 @@ export const PayloadInputTable: React.FC = (
+
+ {displayZfw ? t('Ground.Payload.ZFW') : t('Ground.Payload.GW')} {(displayZfw ? ( -
+
= ( ) : ( -
+
= ( ) )}
+ = (
-
+
+
{t(displayZfw ? 'Ground.Payload.ZFWCG' : 'Ground.Payload.GWCG')}
-
+
{/* TODO FIXME: Setting pax/cargo given desired ZFWCG, ZFW, total pax, total cargo */} -
+
{/* @@ -444,7 +444,7 @@ export const PayloadInputTable: React.FC = (
+
- + - - - @@ -301,12 +301,12 @@ export const PayloadInputTable: React.FC = ( - - - - - - - - diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx b/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx index 844fce07d..d285b1efe 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx @@ -202,7 +202,7 @@ export const PushbackMap = () => { <> {/* Map Container */}
{ setMouseDown(true); setDragStartCoords({ x: e.pageX, y: e.pageY }); @@ -234,7 +234,7 @@ export const PushbackMap = () => { )} {/* Aircraft and Turning Radius Indicator */} -
+
{centerPlaneMode && !Number.isNaN(turningRadius) && Number.isFinite(turningRadius) && (
{
{/* Map Controls */} -
+
@@ -286,7 +286,7 @@ export const PushbackMap = () => { diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_941/A330Services.tsx b/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_941/A330Services.tsx index 52640aa03..73d365639 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_941/A330Services.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/Ground/Pages/Services/A330_941/A330Services.tsx @@ -14,7 +14,7 @@ import { TriangleFill as Chock, Truck, VinylFill as Wheel, - Fan, + Fan } from 'react-bootstrap-icons'; import { ActionCreatorWithOptionalPayload } from '@reduxjs/toolkit'; import { t } from '../../../../translation'; @@ -44,7 +44,7 @@ interface ServiceButtonWrapperProps { // This groups buttons and sets a border and divider line const ServiceButtonWrapper: FC = ({ children, className, xl, xr, y }) => (
{children} @@ -100,11 +100,11 @@ const GroundServiceButton: React.FC = ({ children, nam return (
{children} -

{name}

+

{name}

); }; @@ -510,7 +510,7 @@ export const A330Services: React.FC = () => { gpuButtonState, baggageButtonState, cateringButtonState, - asuButtonState, + asuButtonState ] .every((buttonState) => buttonState === ServiceButtonState.DISABLED) ) { @@ -524,14 +524,13 @@ export const A330Services: React.FC = () => { dispatch(setService1DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setService2DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setCateringButtonState(ServiceButtonState.INACTIVE)); - dispatch(setAsuButtonState(ServiceButtonState.INACTIVE)); } }, [groundServicesAvailable]); const serviceIndicationCss = 'text-2xl font-bold text-utility-amber w-min'; return ( -
+
= 1.0} @@ -539,7 +538,7 @@ export const A330Services: React.FC = () => { midRightStatus={midRightDoorOpen >= 1.0} aftLeftStatus={aftLeftDoorOpen >= 1.0} aftRightStatus={false} - className="text-theme-text inset-x-0 mx-auto h-full w-full" + className="inset-x-0 mx-auto w-full h-full text-theme-text" /> @@ -641,7 +640,7 @@ export const A330Services: React.FC = () => { {/* Wheel Chocks and Security Cones are only visual information. To reuse styling */} {/* the ServiceButtonWrapper has been re-used. */} - + {/* CABIN DOOR */} { {!!wheelChocksEnabled && ( -
-
+
+
-

+

{t('Ground.Services.WheelChocks')}

)} {!!conesEnabled && ( -
+
-

+

{t('Ground.Services.Cones')}

@@ -717,22 +716,22 @@ export const A330Services: React.FC = () => { {cargoDoorOpen >= 1.0 && (
FWD CARGO
AFT CARGO
- BULK + BULK
)} diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts b/hdw-a339x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts index fb8c62303..081e92f99 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts +++ b/hdw-a339x/src/systems/instruments/src/EFB/Performance/Calculators/LandingCalculator.ts @@ -82,7 +82,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: -10, overweightProcedureCorrection: 640, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 1360, @@ -95,7 +95,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: -10, overweightProcedureCorrection: 740, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, [AutobrakeMode.Medium]: { @@ -110,7 +110,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: 0, overweightProcedureCorrection: 70, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 1750, @@ -123,7 +123,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 20, reverserCorrection: 0, overweightProcedureCorrection: 70, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, [AutobrakeMode.Low]: { @@ -138,7 +138,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 30, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 180, + autoLandCorrection: 180 }, [LandingFlapsConfig.Conf3]: { refDistance: 2340, @@ -151,7 +151,7 @@ const dryRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 160, + autoLandCorrection: 160 }, }, }; @@ -169,7 +169,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -20, overweightProcedureCorrection: 500, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1700, @@ -182,7 +182,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -20, overweightProcedureCorrection: 580, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Medium]: { @@ -197,7 +197,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 50, reverserCorrection: -20, overweightProcedureCorrection: 120, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1870, @@ -210,7 +210,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -30, overweightProcedureCorrection: 140, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Low]: { @@ -225,7 +225,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 30, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2340, @@ -238,7 +238,7 @@ const goodRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 40, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, }; @@ -256,7 +256,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -40, overweightProcedureCorrection: 570, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 1930, @@ -269,7 +269,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 70, reverserCorrection: -50, overweightProcedureCorrection: 660, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Medium]: { @@ -284,7 +284,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 70, reverserCorrection: -60, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2100, @@ -297,7 +297,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 80, reverserCorrection: -60, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, [AutobrakeMode.Low]: { @@ -312,7 +312,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 50, reverserCorrection: -20, overweightProcedureCorrection: 100, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2350, @@ -325,7 +325,7 @@ const goodMediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 60, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 190, + autoLandCorrection: 190 }, }, }; @@ -343,7 +343,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 90, reverserCorrection: -60, overweightProcedureCorrection: 530, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2160, @@ -356,7 +356,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 110, reverserCorrection: -70, overweightProcedureCorrection: 620, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, [AutobrakeMode.Medium]: { @@ -371,7 +371,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 100, reverserCorrection: -70, overweightProcedureCorrection: 110, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2310, @@ -384,7 +384,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 120, reverserCorrection: -80, overweightProcedureCorrection: 130, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, [AutobrakeMode.Low]: { @@ -399,7 +399,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 90, reverserCorrection: -30, overweightProcedureCorrection: 110, - autoLandCorrection: 200, + autoLandCorrection: 200 }, [LandingFlapsConfig.Conf3]: { refDistance: 2450, @@ -412,7 +412,7 @@ const mediumRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 110, reverserCorrection: -40, overweightProcedureCorrection: 120, - autoLandCorrection: 200, + autoLandCorrection: 200 }, }, }; @@ -430,7 +430,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 150, reverserCorrection: -70, overweightProcedureCorrection: 370, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2580, @@ -443,7 +443,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 190, reverserCorrection: -90, overweightProcedureCorrection: 430, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Medium]: { @@ -458,7 +458,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 150, reverserCorrection: -90, overweightProcedureCorrection: 170, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2650, @@ -471,7 +471,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 200, reverserCorrection: -100, overweightProcedureCorrection: 190, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Low]: { @@ -486,7 +486,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 160, reverserCorrection: -50, overweightProcedureCorrection: 160, - autoLandCorrection: 240, + autoLandCorrection: 240 }, [LandingFlapsConfig.Conf3]: { refDistance: 2710, @@ -499,7 +499,7 @@ const mediumPoorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 210, reverserCorrection: -80, overweightProcedureCorrection: 180, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, }; @@ -517,7 +517,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 720, reverserCorrection: -200, overweightProcedureCorrection: 360, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 3970, @@ -530,7 +530,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 850, reverserCorrection: -240, overweightProcedureCorrection: 430, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Medium]: { @@ -545,7 +545,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 730, reverserCorrection: -210, overweightProcedureCorrection: 170, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 4050, @@ -558,7 +558,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 860, reverserCorrection: -250, overweightProcedureCorrection: 190, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, [AutobrakeMode.Low]: { @@ -573,7 +573,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 720, reverserCorrection: -220, overweightProcedureCorrection: 160, - autoLandCorrection: 230, + autoLandCorrection: 230 }, [LandingFlapsConfig.Conf3]: { refDistance: 4100, @@ -586,7 +586,7 @@ const poorRunwayLandingData: AutobrakeConfigLandingData = { slopeCorrection: 860, reverserCorrection: -260, overweightProcedureCorrection: 180, - autoLandCorrection: 240, + autoLandCorrection: 240 }, }, }; @@ -641,7 +641,7 @@ const getInterpolatedVlsTableValue = (mass: number, vlsSpeedTable: number[]): nu const upper = vlsSpeedTable[index]; const oneTonSpeedIncrement = (upper - lower) / step; - if (mass % step === 0) return upper; + if(mass % step == 0) return upper; return lower + oneTonSpeedIncrement * (mass % step); }; @@ -744,7 +744,7 @@ export class LandingCalculator { tailWind = 0; } - const weightDifference = Math.floor(((weight / 1000) - 190) / 10); + const weightDifference = Math.floor(((weight / 1000) - 190)/10); let weightCorrection: number; if (weightDifference < 0) { weightCorrection = landingData.weightCorrectionBelow * Math.abs(weightDifference); diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx b/hdw-a339x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx index 8beb7254a..895eb8a41 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/Performance/Widgets/LandingWidget.tsx @@ -435,9 +435,9 @@ export const LandingWidget = () => {
-
+

{t('Performance.Landing.AirportIcao')}

-
+
diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx b/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx index 5203bf177..b4096861c 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx @@ -36,7 +36,7 @@ const BuildInfoEntry = ({ title, value, underline = 0 }: BuildInfoEntryProps) => const last = value?.substring(underline); return ( -
+

{title + '\u00A0'.repeat(Math.abs(SPACE_BETWEEN - title.length))}

{first} @@ -70,13 +70,13 @@ export const AboutPage = () => { return ( -

+
-

flyPadOS 3

+

flyPadOS 3

@@ -86,7 +86,7 @@ export const AboutPage = () => {

-
+

© 2020-2022 FlyByWire Simulations and its contributors, all rights reserved.

Licensed under the GNU General Public License Version 3

diff --git a/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx b/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx index 21fbb28f4..364a1af5c 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx @@ -92,7 +92,7 @@ export const AircraftOptionsPinProgramsPage = () => { { { { {t('Settings.AircraftOptionsPinPrograms.Select')} diff --git a/hdw-a339x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx b/hdw-a339x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx index 39827e9c6..38fc07456 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx @@ -113,18 +113,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => { }, []); return ( -
+

{`${dayName} ${monthName} ${dayOfMonth}`}

{outdatedVersionFlag ? ( -
+
{t('VersionCheck.StatusBarWarning').toUpperCase()}
) : ''} -
+
{(timeDisplayed === 'utc' || timeDisplayed === 'both') && (

{getZuluFormattedTime(currentUTC)}

)} @@ -139,18 +139,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => {
{(!!showStatusBarFlightProgress && (data !== initialState.data)) && (
setShowSchedTimes((old) => !old)} > -
+

{departingAirport}

{schedOutParsed}

-
-
-
+
+
+
-
+

{arrivingAirport}

{schedInParsed}

diff --git a/hdw-a339x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx b/hdw-a339x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx index 601641a74..70ad20679 100644 --- a/hdw-a339x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx +++ b/hdw-a339x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx @@ -15,7 +15,7 @@ import { t } from '../translation'; import { TooltipWrapper } from '../UtilComponents/TooltipWrapper'; // @ts-ignore -import { HdwLogo } from '../UtilComponents/HdwLogo'; +import { HdwLogo } from "../UtilComponents/HdwLogo"; interface ToolBarButtonProps { to: string; @@ -27,7 +27,7 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => {children} @@ -35,8 +35,8 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => ); export const ToolBar = () => ( -
+ {' '} + {t('Ground.Payload.Planned')} + {t('Ground.Payload.Current')}
+ {t('Ground.Payload.Passengers')} -
+
0 ? maxPax : 999} @@ -323,18 +323,18 @@ export const PayloadInputTable: React.FC = (
+
+ {t('Ground.Payload.Cargo')} -
+
0 ? Math.round(Units.kilogramToUser(maxCargo)) : 99999} @@ -350,20 +350,20 @@ export const PayloadInputTable: React.FC = (
+
+ {displayZfw ? t('Ground.Payload.ZFW') : t('Ground.Payload.GW')} {(displayZfw ? ( -
+
= ( ) : ( -
+
= ( ) )}
+ = (
-
+
+
{t(displayZfw ? 'Ground.Payload.ZFWCG' : 'Ground.Payload.GWCG')}
-
+
{/* TODO FIXME: Setting pax/cargo given desired ZFWCG, ZFW, total pax, total cargo */} -
+
{/* @@ -444,7 +444,7 @@ export const PayloadInputTable: React.FC = (
+
- + - - - @@ -301,12 +301,12 @@ export const PayloadInputTable: React.FC = ( - - - - - - - - diff --git a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/CargoWidget.tsx b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/CargoWidget.tsx index a77afd20b..e7aa41c3f 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/CargoWidget.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/CargoWidget.tsx @@ -19,10 +19,10 @@ enum CargoStation { export const CargoWidget: React.FC = ({ cargo, cargoDesired, cargoMap, onClickCargo }) => ( <> -
+
-
+
diff --git a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/SU95Payload.tsx b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/SU95Payload.tsx index 57f238124..a53d35019 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/SU95Payload.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Payload/SU100_95B/SU95Payload.tsx @@ -305,6 +305,7 @@ export const SU95Payload: React.FC = ({ const [aftLeftDoorOpen] = useState(SimVar.GetSimVarValue('A:INTERACTIVE POINT OPEN:2', 'Percent over 100')); const [midRightDoorOpen] = useState(SimVar.GetSimVarValue('A:INTERACTIVE POINT OPEN:3', 'Percent over 100')); + const calculateBoardingTime = useMemo(() => { // factors taken from payload.rs TODO: Simvar let boardingRateMultiplier = 0; @@ -494,19 +495,19 @@ export const SU95Payload: React.FC = ({ return (
-
+
-
+
-
-
-
- +
+
+
+ = ({ setDisplayZfw={setDisplayZfw} />
-
+
= ({ && (
@@ -570,12 +571,12 @@ export const SU95Payload: React.FC = ({ )}
{(gsxPayloadSyncEnabled !== 1) && ( -
- -
+
+ +
{t('Ground.Payload.BoardingTime')} - + ( {remainingTimeString()} ) @@ -619,12 +620,12 @@ export const SU95Payload: React.FC = ({
)} {gsxPayloadSyncEnabled === 1 && ( -
+
{t('Ground.Payload.GSXPayloadSyncEnabled')}
)}
-
+
{ <> {/* Map Container */}
{ setMouseDown(true); setDragStartCoords({ x: e.pageX, y: e.pageY }); @@ -234,7 +234,7 @@ export const PushbackMap = () => { )} {/* Aircraft and Turning Radius Indicator */} -
+
{centerPlaneMode && !Number.isNaN(turningRadius) && Number.isFinite(turningRadius) && (
{
{/* Map Controls */} -
+
@@ -286,7 +286,7 @@ export const PushbackMap = () => { diff --git a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Services/SU100_95/SU95Services.tsx b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Services/SU100_95/SU95Services.tsx index 0086bf60c..6a74bd60a 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Services/SU100_95/SU95Services.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/Ground/Pages/Services/SU100_95/SU95Services.tsx @@ -14,7 +14,7 @@ import { TriangleFill as Chock, Truck, VinylFill as Wheel, - Fan, + Fan } from 'react-bootstrap-icons'; import { ActionCreatorWithOptionalPayload } from '@reduxjs/toolkit'; import { t } from '../../../../translation'; @@ -44,7 +44,7 @@ interface ServiceButtonWrapperProps { // This groups buttons and sets a border and divider line const ServiceButtonWrapper: FC = ({ children, className, xl, xr, y }) => (
{children} @@ -100,11 +100,11 @@ const GroundServiceButton: React.FC = ({ children, nam return (
{children} -

{name}

+

{name}

); }; @@ -510,7 +510,7 @@ export const SU95Services: React.FC = () => { gpuButtonState, baggageButtonState, cateringButtonState, - asuButtonState, + asuButtonState ] .every((buttonState) => buttonState === ServiceButtonState.DISABLED) ) { @@ -524,14 +524,13 @@ export const SU95Services: React.FC = () => { dispatch(setService1DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setService2DoorButtonState(ServiceButtonState.INACTIVE)); dispatch(setCateringButtonState(ServiceButtonState.INACTIVE)); - dispatch(setAsuButtonState(ServiceButtonState.INACTIVE)); } }, [groundServicesAvailable]); const serviceIndicationCss = 'text-2xl font-bold text-utility-amber w-min'; return ( -
+
= 1.0} @@ -539,7 +538,7 @@ export const SU95Services: React.FC = () => { midRightStatus={midRightDoorOpen >= 1.0} aftLeftStatus={aftLeftDoorOpen >= 1.0} aftRightStatus={false} - className="text-theme-text inset-x-0 mx-auto h-full w-full" + className="inset-x-0 mx-auto w-full h-full text-theme-text" /> @@ -641,7 +640,7 @@ export const SU95Services: React.FC = () => { {/* Wheel Chocks and Security Cones are only visual information. To reuse styling */} {/* the ServiceButtonWrapper has been re-used. */} - + {/* CABIN DOOR */} { {!!wheelChocksEnabled && ( -
-
+
+
-

+

{t('Ground.Services.WheelChocks')}

)} {!!conesEnabled && ( -
+
-

+

{t('Ground.Services.Cones')}

@@ -717,22 +716,22 @@ export const SU95Services: React.FC = () => { {cargoDoorOpen >= 1.0 && (
FWD CARGO
AFT CARGO
- BULK + BULK
)} diff --git a/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx b/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx index 5203bf177..b4096861c 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AboutPage.tsx @@ -36,7 +36,7 @@ const BuildInfoEntry = ({ title, value, underline = 0 }: BuildInfoEntryProps) => const last = value?.substring(underline); return ( -
+

{title + '\u00A0'.repeat(Math.abs(SPACE_BETWEEN - title.length))}

{first} @@ -70,13 +70,13 @@ export const AboutPage = () => { return ( -

+
-

flyPadOS 3

+

flyPadOS 3

@@ -86,7 +86,7 @@ export const AboutPage = () => {

-
+

© 2020-2022 FlyByWire Simulations and its contributors, all rights reserved.

Licensed under the GNU General Public License Version 3

diff --git a/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx b/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx index 9c2ce6458..42768ecc6 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/Settings/Pages/AircraftOptionsPinProgramsPage.tsx @@ -29,7 +29,7 @@ export const AircraftOptionsPinProgramsPage = () => { const [isisMetricAltitude, setIsisMetricAltitude] = usePersistentNumberProperty('ISIS_METRIC_ALTITUDE', 0); const [vhfSpacing, setVhfSpacing] = usePersistentProperty('RMP_VHF_SPACING_25KHZ', '0'); const [latLonExtended, setLatLonExtended] = usePersistentProperty('LATLON_EXT_FMT', '0'); - // const [satcomEnabled, setsatcomEnabled] = usePersistentNumberProperty('MODEL_SATCOM_ENABLED', 0); + //const [satcomEnabled, setsatcomEnabled] = usePersistentNumberProperty('MODEL_SATCOM_ENABLED', 0); const handleSetThrustReductionAlt = (value: string) => { setThrustReductionHeightSetting(value); @@ -92,7 +92,7 @@ export const AircraftOptionsPinProgramsPage = () => { { { { handleUsernameInput(value.replace(/\s/g, ''))} onChange={(value) => setSimbriefDisplay(value)} diff --git a/hdw-su95x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx b/hdw-su95x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx index 39827e9c6..38fc07456 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/StatusBar/StatusBar.tsx @@ -113,18 +113,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => { }, []); return ( -
+

{`${dayName} ${monthName} ${dayOfMonth}`}

{outdatedVersionFlag ? ( -
+
{t('VersionCheck.StatusBarWarning').toUpperCase()}
) : ''} -
+
{(timeDisplayed === 'utc' || timeDisplayed === 'both') && (

{getZuluFormattedTime(currentUTC)}

)} @@ -139,18 +139,18 @@ export const StatusBar = ({ batteryLevel, isCharging }: StatusBarProps) => {
{(!!showStatusBarFlightProgress && (data !== initialState.data)) && (
setShowSchedTimes((old) => !old)} > -
+

{departingAirport}

{schedOutParsed}

-
-
-
+
+
+
-
+

{arrivingAirport}

{schedInParsed}

diff --git a/hdw-su95x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx b/hdw-su95x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx index 601641a74..70ad20679 100644 --- a/hdw-su95x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx +++ b/hdw-su95x/src/systems/instruments/src/EFB/ToolBar/ToolBar.tsx @@ -15,7 +15,7 @@ import { t } from '../translation'; import { TooltipWrapper } from '../UtilComponents/TooltipWrapper'; // @ts-ignore -import { HdwLogo } from '../UtilComponents/HdwLogo'; +import { HdwLogo } from "../UtilComponents/HdwLogo"; interface ToolBarButtonProps { to: string; @@ -27,7 +27,7 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => {children} @@ -35,8 +35,8 @@ const ToolBarButton: FC = ({ to, tooltipText, children }) => ); export const ToolBar = () => ( -
+ {' '} + {t('Ground.Payload.Planned')} + {t('Ground.Payload.Current')}
+ {t('Ground.Payload.Passengers')} -
+
0 ? maxPax : 999} @@ -323,18 +323,18 @@ export const PayloadInputTable: React.FC = (
+
+ {t('Ground.Payload.Cargo')} -
+
0 ? Math.round(Units.kilogramToUser(maxCargo)) : 99999} @@ -350,20 +350,20 @@ export const PayloadInputTable: React.FC = (
+
+ {displayZfw ? t('Ground.Payload.ZFW') : t('Ground.Payload.GW')} {(displayZfw ? ( -
+
= ( ) : ( -
+
= ( ) )}
+ = (
-
+
+
{t(displayZfw ? 'Ground.Payload.ZFWCG' : 'Ground.Payload.GWCG')}
-
+
{/* TODO FIXME: Setting pax/cargo given desired ZFWCG, ZFW, total pax, total cargo */} -
+
{/* @@ -444,7 +444,7 @@ export const PayloadInputTable: React.FC = (
+