diff --git a/PackageSources/js-bundle/package.json b/PackageSources/js-bundle/package.json index 36b6983..a9b6f09 100644 --- a/PackageSources/js-bundle/package.json +++ b/PackageSources/js-bundle/package.json @@ -1,6 +1,6 @@ { "name": "tfdidesign-md11-load-manager", - "version": "0.1.86", + "version": "0.1.98", "description": "", "main": "index.js", "type": "module", @@ -10,7 +10,7 @@ "licenses": "license-report --output=markdown > ./src/assets/licenses_node.md", "debugger": "cd \"%MSFS_SDK%\\Tools\\CoherentGT Debugger\" && Debugger.exe", "locale": "cd \"%MSFS_SDK%\\Tools\\MSFS_Localization\" && MSFSLocalizationManager.exe", - "clean": "rimraf ..\\html_ui\\Pages\\VCockpit\\Instruments\\aircraft_efb\\TFDi_MD11_efb", + "clean": "rimraf ..\\html_ui\\Pages\\VCockpit\\Instruments\\aircraft_efb\\KH_TFDi_MD11_efb", "dev": "npx rollup -c -w", "build": "npm version patch && npx rollup -c && pnpm efb", "release": "pnpm types && pnpm lint && pnpm run licenses && pnpm clean && npm version patch && cross-env NODE_ENV=production npx rollup -c && pnpm efb", diff --git a/PackageSources/js-bundle/src/assets/licenses_node.md b/PackageSources/js-bundle/src/assets/licenses_node.md index 28a9816..0329632 100644 --- a/PackageSources/js-bundle/src/assets/licenses_node.md +++ b/PackageSources/js-bundle/src/assets/licenses_node.md @@ -1,39 +1,38 @@ | Department | Related to | Name | License period | Material not material | License type | Link | Remote version | Installed version | Defined version | Author | | :--------- | :--------- | :------------------------------- | :------------- | :-------------------- | :----------- | :------------------------------------------------------------------------ | :------------- | :---------------- | :-------------- | :---------------------------------------------------------- | -| kessler | stuff | react | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.1.0 | 19.1.0 | ^19.1.0 | n/a | -| kessler | stuff | react-dom | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.1.0 | 19.1.0 | ^19.1.0 | n/a | +| kessler | stuff | react | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.1.1 | 19.1.0 | ^19.1.0 | n/a | +| kessler | stuff | react-dom | perpetual | material | MIT | git+https://github.com/facebook/react.git | 19.1.1 | 19.1.0 | ^19.1.0 | n/a | | kessler | stuff | uuid | perpetual | material | MIT | git+https://github.com/uuidjs/uuid.git | 11.1.0 | 11.1.0 | ^11.1.0 | n/a | | kessler | stuff | @microsoft/msfs-types | perpetual | material | MIT | git+https://github.com/microsoft/msfs-avionics-mirror.git | 1.14.6 | 1.14.6 | ^1.14.6 | Asobo Studio / Working Title Simulations | -| kessler | stuff | @rollup/plugin-commonjs | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 28.0.5 | 28.0.3 | ^28.0.3 | Rich Harris | +| kessler | stuff | @rollup/plugin-commonjs | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 28.0.6 | 28.0.3 | ^28.0.3 | Rich Harris | | kessler | stuff | @rollup/plugin-json | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.1.0 | 6.1.0 | ^6.1.0 | rollup | | kessler | stuff | @rollup/plugin-node-resolve | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 16.0.1 | 16.0.1 | ^16.0.1 | Rich Harris | | kessler | stuff | @rollup/plugin-replace | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 6.0.2 | 6.0.2 | ^6.0.2 | Rich Harris | | kessler | stuff | @rollup/plugin-terser | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 0.4.4 | 0.4.4 | ^0.4.4 | Peter Placzek | -| kessler | stuff | @rollup/plugin-typescript | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 12.1.2 | 12.1.2 | ^12.1.2 | Oskar Segersvärd | -| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.1.8 | 19.1.6 | ^19.1.6 | n/a | -| kessler | stuff | @types/react-dom | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.1.6 | 19.1.6 | ^19.1.6 | n/a | +| kessler | stuff | @rollup/plugin-typescript | perpetual | material | MIT | git+https://github.com/rollup/plugins.git | 12.1.4 | 12.1.2 | ^12.1.2 | Oskar Segersvärd | +| kessler | stuff | @types/react | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.1.12 | 19.1.6 | ^19.1.6 | n/a | +| kessler | stuff | @types/react-dom | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 19.1.9 | 19.1.6 | ^19.1.6 | n/a | | kessler | stuff | @types/uuid | perpetual | material | MIT | https://github.com/DefinitelyTyped/DefinitelyTyped.git | 10.0.0 | 10.0.0 | ^10.0.0 | n/a | | kessler | stuff | @typescript-eslint/eslint-plugin | perpetual | material | MIT | git+https://github.com/typescript-eslint/typescript-eslint.git | 6.21.0 | 6.21.0 | ^6.21.0 | n/a | | kessler | stuff | @typescript-eslint/parser | perpetual | material | BSD-2-Clause | git+https://github.com/typescript-eslint/typescript-eslint.git | 6.21.0 | 6.21.0 | ^6.21.0 | n/a | | kessler | stuff | autoprefixer | perpetual | material | MIT | git+https://github.com/postcss/autoprefixer.git | 10.4.21 | 10.4.21 | ^10.4.21 | Andrey Sitnik | | kessler | stuff | cross-env | perpetual | material | MIT | git+https://github.com/kentcdodds/cross-env.git | 7.0.3 | 7.0.3 | ^7.0.3 | Kent C. Dodds (https://kentcdodds.com) | | kessler | stuff | eslint | perpetual | material | MIT | git+https://github.com/eslint/eslint.git | 8.57.1 | 8.57.1 | ^8.57.1 | Nicholas C. Zakas | -| kessler | stuff | eslint-plugin-import | perpetual | material | MIT | git+https://github.com/import-js/eslint-plugin-import.git | 2.31.0 | 2.31.0 | ^2.31.0 | Ben Mosher | +| kessler | stuff | eslint-plugin-import | perpetual | material | MIT | git+https://github.com/import-js/eslint-plugin-import.git | 2.32.0 | 2.31.0 | ^2.31.0 | Ben Mosher | | kessler | stuff | eslint-plugin-react | perpetual | material | MIT | git+https://github.com/jsx-eslint/eslint-plugin-react.git | 7.37.5 | 7.37.5 | ^7.37.5 | Yannick Croissant | | kessler | stuff | eslint-plugin-react-hooks | perpetual | material | MIT | git+https://github.com/facebook/react.git | 4.6.2 | 4.6.2 | ^4.6.2 | n/a | | kessler | stuff | license-report | perpetual | material | MIT | git+https://github.com/kessler/license-report.git | 6.8.0 | 6.7.2 | ^6.7.2 | Yaniv Kessler | -| kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.5.5 | 8.5.4 | ^8.5.4 | Andrey Sitnik | -| kessler | stuff | postcss-import | perpetual | material | MIT | git+https://github.com/postcss/postcss-import.git | 16.1.0 | 16.1.0 | ^16.1.0 | Maxime Thirouin | -| kessler | stuff | prettier | perpetual | material | MIT | git+https://github.com/prettier/prettier.git | 3.5.3 | 3.5.3 | ^3.5.3 | James Long | -| kessler | stuff | prettier-plugin-organize-imports | perpetual | material | MIT | git+https://github.com/simonhaenisch/prettier-plugin-organize-imports.git | 4.1.0 | 4.1.0 | ^4.1.0 | Simon Haenisch (https://github.com/simonhaenisch) | +| kessler | stuff | postcss | perpetual | material | MIT | git+https://github.com/postcss/postcss.git | 8.5.6 | 8.5.4 | ^8.5.4 | Andrey Sitnik | +| kessler | stuff | postcss-import | perpetual | material | MIT | git+https://github.com/postcss/postcss-import.git | 16.1.1 | 16.1.0 | ^16.1.0 | Maxime Thirouin | +| kessler | stuff | prettier | perpetual | material | MIT | git+https://github.com/prettier/prettier.git | 3.6.2 | 3.5.3 | ^3.5.3 | James Long | +| kessler | stuff | prettier-plugin-organize-imports | perpetual | material | MIT | git+https://github.com/simonhaenisch/prettier-plugin-organize-imports.git | 4.2.0 | 4.1.0 | ^4.1.0 | Simon Haenisch (https://github.com/simonhaenisch) | | kessler | stuff | rimraf | perpetual | material | ISC | git://github.com/isaacs/rimraf.git | 6.0.1 | 6.0.1 | ^6.0.1 | Isaac Z. Schlueter (http://blog.izs.me/) | -| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.43.0 | 4.42.0 | ^4.42.0 | Rich Harris | +| kessler | stuff | rollup | perpetual | material | MIT | git+https://github.com/rollup/rollup.git | 4.50.0 | 4.42.0 | ^4.42.0 | Rich Harris | | kessler | stuff | rollup-plugin-copy | perpetual | material | MIT | git+https://github.com/vladshcherbin/rollup-plugin-copy.git | 3.5.0 | 3.5.0 | ^3.5.0 | Vlad Shcherbin | | kessler | stuff | rollup-plugin-postcss | perpetual | material | MIT | git+https://github.com/egoist/rollup-plugin-postcss.git | 4.0.2 | 4.0.2 | ^4.0.2 | EGOIST <0x142857@gmail.com> | | kessler | stuff | rollup-plugin-react-svg | perpetual | material | MIT | git+https://github.com/boopathi/react-svg-loader.git | 3.0.3 | 3.0.3 | ^3.0.3 | boopathi | | kessler | stuff | rollup-plugin-version-injector | perpetual | material | ISC | git+https://github.com/djhouseknecht/rollup-plugin-version-injector.git | 1.3.3 | 1.3.3 | ^1.3.3 | David Houseknecht | -| kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.89.2 | 1.89.1 | ^1.89.1 | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 | -| kessler | stuff | svg-slim | perpetual | material | MIT | git+https://github.com/benboba/svg-slim.git | 2.0.5 | 2.0.5 | ^2.0.5 | Wang Feng | +| kessler | stuff | sass | perpetual | material | MIT | git+https://github.com/sass/dart-sass.git | 1.92.0 | 1.89.1 | ^1.89.1 | Natalie Weizenbaum nweiz@google.com https://github.com/nex3 | | kessler | stuff | tslib | perpetual | material | 0BSD | git+https://github.com/Microsoft/tslib.git | 2.8.1 | 2.8.1 | ^2.8.1 | Microsoft Corp. | | kessler | stuff | typed-scss-modules | perpetual | material | MIT | git+https://github.com/skovy/typed-scss-modules.git | 8.1.1 | 8.1.1 | ^8.1.1 | Spencer Miskoviak | | kessler | stuff | typescript | perpetual | material | Apache-2.0 | git+https://github.com/microsoft/TypeScript.git | 5.8.3 | 5.8.3 | 5.8.3 | Microsoft Corp. | diff --git a/PackageSources/js-bundle/src/components/freighter/Freighter.tsx b/PackageSources/js-bundle/src/components/freighter/Freighter.tsx index 3cdee3c..107193a 100644 --- a/PackageSources/js-bundle/src/components/freighter/Freighter.tsx +++ b/PackageSources/js-bundle/src/components/freighter/Freighter.tsx @@ -76,6 +76,15 @@ const Freighter: FC = ({ WASMData, username }) => { ]; } + if (WASMData.options.GSXSync && GSXActive() && WASMData.GSX.boardingState !== GSX_SERVICE_FINISHED) { + return [ + WASMData.targetPayload.ZFWCG.toFixed(1), + WASMData.targetPayload.ZFWCG < WASMData.limits.minCG || WASMData.targetPayload.ZFWCG > WASMData.limits.maxCG, + WASMData.targetPayload.TOCG.toFixed(1), + WASMData.targetPayload.TOCG < WASMData.limits.minCG || WASMData.targetPayload.TOCG > WASMData.limits.maxCG, + ]; + } + return [ WASMData.livePayload.ZFWCG.toFixed(1), WASMData.livePayload.ZFWCG < WASMData.limits.minCG || WASMData.livePayload.ZFWCG > WASMData.limits.maxCG, @@ -104,6 +113,12 @@ const Freighter: FC = ({ WASMData, username }) => { unit={WASMData.userData.isImperial ? 'LBS' : 'KG'} inPreview={loadingState !== 'loaded' && !GSXActive()} CGs={CGs()} + done={ + WASMData.options.GSXSync + ? WASMData.GSX.boardingState === GSX_SERVICE_FINISHED && + WASMData.GSX.deboardingState !== GSX_SERVICE_FINISHED + : loadingState !== 'preview' + } /> = ({ WASMData, loadingState }) => { <>

SimBrief Profile Settings - Normal variant

- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Max Passengers0
Passenger Weight1 {WASMData.userData.isImperial ? 'lbs' : 'kg'}
Bag Weight0 {WASMData.userData.isImperial ? 'lbs' : 'kg'}
Empty Weight{WASMData.userData.isImperial ? '249137 lbs' : '113006 kg'}
Max Zero Fuel Weight{WASMData.userData.isImperial ? '451300 lbs' : '204706 kg'}
Max Takeoff Weight{WASMData.userData.isImperial ? '625500 lbs' : '283722 kg'}
Max Fuel Capacity{WASMData.userData.isImperial ? '256207 lbs' : '116213 kg'}
Max Passengers0
Passenger Weight1 {WASMData.userData.isImperial ? 'lbs' : 'kg'}
Bag Weight0 {WASMData.userData.isImperial ? 'lbs' : 'kg'}
Empty Weight{WASMData.userData.isImperial ? '249137 lbs' : '113006 kg'}
Max Zero Fuel Weight{WASMData.userData.isImperial ? '451300 lbs' : '204706 kg'}
Max Takeoff Weight{WASMData.userData.isImperial ? '625500 lbs' : '283722 kg'}
Max Fuel Capacity{WASMData.userData.isImperial ? '256207 lbs' : '116213 kg'}
)} diff --git a/PackageSources/js-bundle/src/components/options/OptionsPax.tsx b/PackageSources/js-bundle/src/components/options/OptionsPax.tsx index ef5c5ba..113c1ed 100644 --- a/PackageSources/js-bundle/src/components/options/OptionsPax.tsx +++ b/PackageSources/js-bundle/src/components/options/OptionsPax.tsx @@ -131,38 +131,40 @@ const OptionsPax: FC = ({ WASMData, loadingState }) => { <>

SimBrief Profile Settings - Normal variant

- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Max Passengers298
Passenger Weight - {WASMData.options.paxWeight} {WASMData.userData.isImperial ? 'lbs' : 'kg'} -
Bag Weight - {WASMData.options.bagWeight} {WASMData.userData.isImperial ? 'lbs' : 'kg'} -
Empty Weight{WASMData.userData.isImperial ? '285875 lbs' : '129671 kg'}
Max Zero Fuel Weight{WASMData.userData.isImperial ? '400000 lbs' : '181437 kg'}
Max Takeoff Weight{WASMData.userData.isImperial ? '625500 lbs' : '283722 kg'}
Max Fuel Capacity{WASMData.userData.isImperial ? '256207 lbs' : '116213 kg'}
Max Passengers298
Passenger Weight + {WASMData.options.paxWeight} {WASMData.userData.isImperial ? 'lbs' : 'kg'} +
Bag Weight + {WASMData.options.bagWeight} {WASMData.userData.isImperial ? 'lbs' : 'kg'} +
Empty Weight{WASMData.userData.isImperial ? '285875 lbs' : '129671 kg'}
Max Zero Fuel Weight{WASMData.userData.isImperial ? '400000 lbs' : '181437 kg'}
Max Takeoff Weight{WASMData.userData.isImperial ? '625500 lbs' : '283722 kg'}
Max Fuel Capacity{WASMData.userData.isImperial ? '256207 lbs' : '116213 kg'}
)} diff --git a/PackageSources/js-bundle/src/components/pax/Pax.tsx b/PackageSources/js-bundle/src/components/pax/Pax.tsx index ae6d688..51be5d7 100644 --- a/PackageSources/js-bundle/src/components/pax/Pax.tsx +++ b/PackageSources/js-bundle/src/components/pax/Pax.tsx @@ -76,6 +76,15 @@ const Pax: FC = ({ WASMData, username }) => { ]; } + if (WASMData.options.GSXSync && GSXActive() && WASMData.GSX.boardingState !== GSX_SERVICE_FINISHED) { + return [ + WASMData.targetPayload.ZFWCG.toFixed(1), + WASMData.targetPayload.ZFWCG < WASMData.limits.minCG || WASMData.targetPayload.ZFWCG > WASMData.limits.maxCG, + WASMData.targetPayload.TOCG.toFixed(1), + WASMData.targetPayload.TOCG < WASMData.limits.minCG || WASMData.targetPayload.TOCG > WASMData.limits.maxCG, + ]; + } + return [ WASMData.livePayload.ZFWCG.toFixed(1), WASMData.livePayload.ZFWCG < WASMData.limits.minCG || WASMData.livePayload.ZFWCG > WASMData.limits.maxCG, @@ -108,6 +117,12 @@ const Pax: FC = ({ WASMData, username }) => { unit={WASMData.userData.isImperial ? 'LBS' : 'KG'} inPreview={loadingState !== 'loaded' && !GSXActive()} CGs={CGs()} + done={ + WASMData.options.GSXSync + ? WASMData.GSX.boardingState === GSX_SERVICE_FINISHED && + WASMData.GSX.deboardingState !== GSX_SERVICE_FINISHED + : loadingState !== 'preview' + } /> = ({ @@ -40,10 +41,12 @@ const Profile: FC = ({ CGs, unit, inPreview, + done, }) => { const previewClass = inPreview ? styles['fill-neutral-500'] : undefined; - const ZFWCGClass = CGs[1] ? styles['fill-red-500'] : previewClass; - const TOCGClass = CGs[3] ? styles['fill-red-500'] : previewClass; + const doneClass = done ? undefined : styles['fill-neutral-500']; + const ZFWCGClass = CGs[1] ? styles['fill-red-500'] : doneClass; + const TOCGClass = CGs[3] ? styles['fill-red-500'] : doneClass; return ( @@ -113,17 +116,17 @@ const Profile: FC = ({ - ZFWCG: - - - {CGs[0]} - - TOCG: - + {CGs[2]} + + ZFWCG: + + + {CGs[0]} +