From ebbe7173fbfe5e99b103e4b88018e332844bf1fc Mon Sep 17 00:00:00 2001 From: Frank Kopp Date: Fri, 18 Nov 2022 13:42:19 +0100 Subject: [PATCH 1/5] Changed Order of Ground Service page tabs --- src/instruments/src/EFB/Ground/Ground.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instruments/src/EFB/Ground/Ground.tsx b/src/instruments/src/EFB/Ground/Ground.tsx index efa78f5dd9c..1b3ec2882fb 100644 --- a/src/instruments/src/EFB/Ground/Ground.tsx +++ b/src/instruments/src/EFB/Ground/Ground.tsx @@ -17,9 +17,9 @@ export interface StatefulButton { export const Ground = () => { const tabs: PageLink[] = [ { name: 'Services', alias: t('Ground.Services.Title'), component: }, - { name: 'Pushback', alias: t('Ground.Pushback.Title'), component: }, { name: 'Fuel', alias: t('Ground.Fuel.Title'), component: }, { name: 'Payload', alias: t('Ground.Payload.Title'), component: }, + { name: 'Pushback', alias: t('Ground.Pushback.Title'), component: }, ]; return ( From 9c39be5d3388a51f2646468126f804ca442afa43 Mon Sep 17 00:00:00 2001 From: Frank Kopp Date: Fri, 18 Nov 2022 19:38:38 +0100 Subject: [PATCH 2/5] Added Deboarding button and changed boarding icon --- .../src/EFB/Ground/Pages/Payload/Payload.tsx | 57 +++++++++++++++++-- src/instruments/src/EFB/Localization/en.json | 9 ++- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx index 16b1fc06e10..e4919d209bd 100644 --- a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx +++ b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx @@ -1,6 +1,13 @@ /* eslint-disable max-len */ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; -import { BriefcaseFill, CloudArrowDown, PersonFill, PlayFill, StopCircleFill } from 'react-bootstrap-icons'; +import { + ArrowLeftRight, + BoxArrowRight, + BriefcaseFill, + CloudArrowDown, + PersonFill, + StopCircleFill, +} from 'react-bootstrap-icons'; import { useSimVar } from '@instruments/common/simVars'; import { Units } from '@shared/units'; import { usePersistentProperty } from '@instruments/common/persistence'; @@ -18,10 +25,12 @@ import Card from '../../../UtilComponents/Card/Card'; import { SelectGroup, SelectItem } from '../../../UtilComponents/Form/Select'; import { SeatMapWidget } from './Seating/SeatMapWidget'; import { isSimbriefDataLoaded } from '../../../Store/features/simBrief'; +import { PromptModal, useModals } from '../../../UtilComponents/Modals/Modals'; import { useAppSelector } from '../../../Store/store'; export const Payload = () => { const { usingMetric } = Units; + const { showModal } = useModals(); const massUnitForDisplay = usingMetric ? 'KGS' : 'LBS'; @@ -133,7 +142,6 @@ export const Payload = () => { const perBagWeight = Units.kilogramToUser(simbriefBagWeight); setPaxBagWeight(perBagWeight); setPaxWeight(Units.kilogramToUser(simbriefPaxWeight)); - // TODO: Popup showing that maximum passengers number is incorrect if input is greater than maximum pax count setTargetPax(simbriefPax > maxPax ? maxPax : simbriefPax); setTargetCargo(simbriefBag, Units.kilogramToUser(simbriefFreight), perBagWeight); } else { @@ -329,6 +337,25 @@ export const Payload = () => { ...desiredFlags, ...stationSize, ]); + const handleDeboarding = () => { + if (!boardingStarted) { + showModal( + { + setTargetPax(totalPaxDesired < totalPax ? totalPaxDesired : 0); + setTargetCargo(totalPaxDesired < totalPax ? totalPaxDesired : 0, totalCargoDesired < totalCargo ? totalCargoDesired : 0); + setBoardingStarted(true); + }} + />, + ); + } + setBoardingStarted(false); + }; + const boardingStatusClass = useMemo(() => { if (!boardingStarted) { return 'text-theme-highlight'; @@ -726,15 +753,31 @@ export const Payload = () => { + + + + + @@ -746,7 +789,9 @@ export const Payload = () => { && (
diff --git a/src/instruments/src/EFB/Localization/en.json b/src/instruments/src/EFB/Localization/en.json index 830e4aff7b0..5ec0c249aab 100644 --- a/src/instruments/src/EFB/Localization/en.json +++ b/src/instruments/src/EFB/Localization/en.json @@ -153,6 +153,10 @@ "Current": "Current", "Passengers": "Passengers", "Planned": "Planned", + "DeboardConfirmationTitle": "Deboard all Passengers?", + "DeboardConfirmationBody":"Please confirm deboarding all passengers", + "DeboardConfirmationConfirm": "Deboard", + "DeboardConfirmationCancel":"Cancel", "TT": { "AircraftMustBeColdAndDarkToChangeBoardingTimes": "Aircraft Must Be On the Ground and Have Engines Shutdown to Change Boarding Duration", "FillPayloadFromSimbrief": "Fill Payload Information from Simbrief", @@ -162,7 +166,8 @@ "MaxZFWCG": "Maximum ZFWCG", "PerPaxBagWeight": "Per Passenger Bag Weight", "PerPaxWeight": "Per Passenger Weight", - "StartBoarding": "Begin Boarding" + "StartBoarding": "Begin Boarding", + "StartDeboarding": "Begin Deboarding" }, "Title": "Payload", "ZFW": "ZFW", @@ -606,4 +611,4 @@ "Tue": "Tue", "Wed": "Wed" } -} \ No newline at end of file +} From 4cc6e355d303a153dcc107d3558884b56774b134 Mon Sep 17 00:00:00 2001 From: Frank Kopp Date: Sat, 19 Nov 2022 17:22:44 +0100 Subject: [PATCH 3/5] Added CHANGELOG.md entry --- .github/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 13ef6718e9e..b66b4fce2eb 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -100,6 +100,7 @@ 1. [PFD] Improve appearance of L/DEV and V/DEV scales - @tracernz (Mike) 1. [HYD] Implemented Electro Hydrostatic actuators - @Crocket63 (crocket) 1. [FAC] Move Speedscale computation to FAC - @lukecologne (luke) +1. [EFB] Added deboarding button to flyPad Payload - @frankkopp (Frank Kopp) ## 0.8.0 From 8c2cd1fe3d4f6192af33b47c7956e0248f670ffd Mon Sep 17 00:00:00 2001 From: Frank Kopp Date: Sat, 19 Nov 2022 18:02:17 +0100 Subject: [PATCH 4/5] Adds label "Loading Time" to localisation --- src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx | 4 +++- src/instruments/src/EFB/Localization/en.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx index e4919d209bd..dc10208fd05 100644 --- a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx +++ b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx @@ -803,7 +803,9 @@ export const Payload = () => {
-
Loading Time
+
+ {t('Ground.Payload.LoadingTime')} +
Date: Mon, 21 Nov 2022 22:42:11 +0100 Subject: [PATCH 5/5] Changed localisation string from LoadingTime to BoardingTime --- src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx index dc10208fd05..97d1f23ac69 100644 --- a/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx +++ b/src/instruments/src/EFB/Ground/Pages/Payload/Payload.tsx @@ -804,7 +804,7 @@ export const Payload = () => {
- {t('Ground.Payload.LoadingTime')} + {t('Ground.Payload.BoardingTime')}