Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wheels and chocks element clash #8226

Merged
merged 4 commits into from
Oct 3, 2023
Merged

fix: wheels and chocks element clash #8226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ae4e15
fix: wheels and chocks element clash
2hwk Sep 23, 2023
8090369
fix: lint
2hwk Sep 24, 2023
aa21601
Merge branch 'master' into 2c-fix-efb-chocks-cones
2hwk Sep 29, 2023
05afb0e
Merge branch 'master' into 2c-fix-efb-chocks-cones
2hwk Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Services/A320_251N/A320Services.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,30 @@ export const A320Services: React.FC = () => {
>
<DoorClosedFill size={36} />
</GroundServiceButton>

{/* Wheel Chocks and Security Cones are only visual information. To reuse styling */}
{/* the ServiceButtonWrapper has been re-used. */}
{!!wheelChocksEnabled && (
<div className={`flex flex-row items-center space-x-6 py-6 px-6 cursor-pointer ${(wheelChocksVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<div className={`flex justify-center items-end -ml-2 -mr-[2px] ${(wheelChocksVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<Chock size="12" stroke="4" />
<Wheel size="36" stroke="5" className="-mx-0.5" />
<Chock size="12" stroke="4" />
</div>
<h1 className="flex-shrink-0 text-2xl font-medium text-current">
{t('Ground.Services.WheelChocks')}
</h1>
</div>
)}

{!!conesEnabled && (
<div className={`flex flex-row items-center space-x-6 py-6 px-6 cursor-pointer ${(conesVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<ConeStriped size="38" stroke="1.5" className="mr-2" />
<h1 className="flex-shrink-0 text-2xl font-medium text-current">
{t('Ground.Services.Cones')}
</h1>
</div>
)}
</ServiceButtonWrapper>

<ServiceButtonWrapper xl={900} y={24} className="">
Expand Down Expand Up @@ -624,32 +648,6 @@ export const A320Services: React.FC = () => {

</ServiceButtonWrapper>

{/* Wheel Chocks and Security Cones are only visual information. To reuse styling */}
{/* the ServiceButtonWrapper has been re-used. */}
<ServiceButtonWrapper xr={800} y={600} className="border-0 divide-y-0">
{!!wheelChocksEnabled && (
<div className={`flex flex-row items-center space-x-6 py-6 px-6 cursor-pointer ${(wheelChocksVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<div className={`flex justify-center items-end -ml-2 -mr-[2px] ${(wheelChocksVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<Chock size="12" stroke="4" />
<Wheel size="36" stroke="5" className="-mx-0.5" />
<Chock size="12" stroke="4" />
</div>
<h1 className="flex-shrink-0 text-2xl font-medium text-current">
{t('Ground.Services.WheelChocks')}
</h1>
</div>
)}

{!!conesEnabled && (
<div className={`flex flex-row items-center space-x-6 py-6 px-6 cursor-pointer ${(conesVisible) ? 'text-green-500' : 'text-gray-500'}`}>
<ConeStriped size="38" stroke="1.5" className="mr-2" />
<h1 className="flex-shrink-0 text-2xl font-medium text-current">
{t('Ground.Services.Cones')}
</h1>
</div>
)}
</ServiceButtonWrapper>

{/* Visual indications for tug and doors */}
{!!pushBackAttached && (
<div
Expand Down
12 changes: 9 additions & 3 deletions fbw-a32nx/src/systems/instruments/src/EFB/Ground/Pages/Services/A380_842/A380Services.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import React, { FC, useEffect, useRef } from 'react';
import { useSimVar } from '@flybywiresim/fbw-sdk';
import {
ArchiveFill,
ConeStriped,
// ConeStriped,
DoorClosedFill,
HandbagFill,
PersonPlusFill,
PlugFill,
TriangleFill as Chock,
// TriangleFill as Chock,
Truck,
VinylFill as Wheel,
// VinylFill as Wheel,
} from 'react-bootstrap-icons';
import { ActionCreatorWithOptionalPayload } from '@reduxjs/toolkit';
import { t } from '../../../../translation';
Expand Down Expand Up @@ -126,11 +126,14 @@ export const A380Services: React.FC = () => {
const [gpuActive] = useSimVar('A:INTERACTIVE POINT OPEN:19', 'Percent over 100', 200);

// Wheel Chocks and Cones
// TODO FIXME: Reenable
/*
const [isGroundEquipmentVisible] = useSimVar('L:A32NX_GND_EQP_IS_VISIBLE', 'bool', 500);
const [wheelChocksEnabled] = useSimVar('L:A32NX_MODEL_WHEELCHOCKS_ENABLED', 'bool', 500);
const [conesEnabled] = useSimVar('L:A32NX_MODEL_CONES_ENABLED', 'bool', 500);
const wheelChocksVisible = wheelChocksEnabled && isGroundEquipmentVisible;
const conesVisible = conesEnabled && isGroundEquipmentVisible;
*/

// Service events
const toggleMain1LeftDoor = () => SimVar.SetSimVarValue('K:TOGGLE_AIRCRAFT_EXIT', 'enum', 1);
Expand Down Expand Up @@ -626,8 +629,10 @@ export const A380Services: React.FC = () => {

</ServiceButtonWrapper>

{/* TODO FIXME: Redesign chocks and security cones UI */}
{/* Wheel Chocks and Security Cones are only visual information. To reuse styling */}
{/* the ServiceButtonWrapper has been re-used. */}
{/*
<ServiceButtonWrapper xr={800} y={600} className="border-0 divide-y-0">
{!!wheelChocksEnabled && (
<div className={`flex flex-row items-center space-x-6 py-6 px-6 cursor-pointer ${(wheelChocksVisible) ? 'text-green-500' : 'text-gray-500'}`}>
Expand All @@ -651,6 +656,7 @@ export const A380Services: React.FC = () => {
</div>
)}
</ServiceButtonWrapper>
*/}

{/* Visual indications for tug and doors */}
{!!pushBackAttached && (
Expand Down
Loading