コードの整理

This commit is contained in:
harukin-expo-dev-env 2024-11-29 01:57:45 +00:00
parent 1575b643f7
commit 2e95a35fce

View File

@ -44,13 +44,13 @@ export const EachData: FC<Props> = (props) => {
const { currentTrain } = useCurrentTrain(); const { currentTrain } = useCurrentTrain();
const { originalStationList } = useStationList(); const { originalStationList } = useStationList();
const stationList = const stationList =
originalStationList && originalStationList &&
lineList.map((d) => lineList.map((d) =>
originalStationList[d].map((a) => ({ originalStationList[d].map((a) => ({
StationNumber: a.StationNumber, StationNumber: a.StationNumber,
StationName: a.Station_JP, StationName: a.Station_JP,
})) }))
); );
const openTrainInfo = (d: { const openTrainInfo = (d: {
train: string; train: string;
lastStation: string; lastStation: string;
@ -137,12 +137,7 @@ export const EachData: FC<Props> = (props) => {
const [stationNumberInput, setStationNumberInput] = useState(""); const [stationNumberInput, setStationNumberInput] = useState("");
return ( return (
<> <>
<Dialog <Dialog isVisible={dialog} onBackdropPress={() => setDialog(false)}>
isVisible={dialog}
onBackdropPress={() => {
setDialog(false);
}}
>
<Text>: {currentTrainData?.Line}</Text> <Text>: {currentTrainData?.Line}</Text>
<Text>ID: {currentTrainData?.PosNum}</Text> <Text>ID: {currentTrainData?.PosNum}</Text>
<Text>: {stationInput}</Text> <Text>: {stationInput}</Text>
@ -162,25 +157,27 @@ export const EachData: FC<Props> = (props) => {
<Button <Button
title="送信" title="送信"
onPress={() => { onPress={() => {
fetch( fetch(`https://n8n.haruk.in/webhook/JR-shikoku-PosID`, {
`https://n8n.haruk.in/webhook/JR-shikoku-PosID`,{ method: "POST",
method: "POST", headers: { "Content-Type": "application/json" },
headers: { body: JSON.stringify({
"Content-Type": "application/json", PosId: currentTrainData?.PosNum,
}, lineName: currentTrainData?.Line,
body: JSON.stringify({ PlatformNum: parseInt(posInput),
PosId: currentTrainData?.PosNum, Description: descInput,
lineName: currentTrainData?.Line, StationName: station.Station_JP,
PlatformNum: parseInt(posInput), StationId: station.StationNumber,
Description: descInput, }),
StationName: station.Station_JP, })
StationId: station.StationNumber .then(() => {
}), alert("位置情報データを送信しました。");
} setDialog(false);
); setPosInput("");
setDialog(false); setDescInput("");
setPosInput(""); })
setDescInput(""); .catch(() => {
alert("位置情報データの送信に失敗しました。");
});
}} }}
/> />
</Dialog> </Dialog>
@ -220,7 +217,9 @@ export const EachData: FC<Props> = (props) => {
const { isBetween, Pos } = trainPosition(currentTrainData); const { isBetween, Pos } = trainPosition(currentTrainData);
if (isBetween === true) return; if (isBetween === true) return;
setStationInput(Pos.Pos); setStationInput(Pos.Pos);
setStationNumberInput(getStationID(currentTrainData?.Pos, stationList)); setStationNumberInput(
getStationID(currentTrainData?.Pos, stationList)
);
setDescInput(platformDescription || ""); setDescInput(platformDescription || "");
setPosInput(platformNumber?.toString() || ""); setPosInput(platformNumber?.toString() || "");
setDialog(true); setDialog(true);