From fd7c0d4ee0c78542f52c13252f2fba8c7740ac98 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Fri, 30 May 2025 19:11:54 +0900
Subject: [PATCH 01/13] =?UTF-8?q?wip=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/FireEquipment.stories.tsx   | 22 ++++++++++++
 .../FireEquipment/FireEquipment.tsx           | 24 +++++++++++++
 .../components/FireEquipmentForm.tsx          | 14 ++++++++
 .../components/FireEquipmentFormView.tsx      | 34 +++++++++++++++++++
 .../FireEquipment/components/index.ts         |  2 ++
 .../Applications/FireEquipment/index.ts       |  1 +
 6 files changed, 97 insertions(+)
 create mode 100644 user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
 create mode 100644 user/src/components/Applications/FireEquipment/FireEquipment.tsx
 create mode 100644 user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
 create mode 100644 user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
 create mode 100644 user/src/components/Applications/FireEquipment/components/index.ts
 create mode 100644 user/src/components/Applications/FireEquipment/index.ts

diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
new file mode 100644
index 000000000..a7b625007
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
@@ -0,0 +1,22 @@
+import '@globals';
+import { Meta, StoryObj } from '@storybook/react';
+import Power from './FireEquipment';
+
+export default {
+  title: 'Components/Power',
+  tags: ['autodocs'],
+  component: Power,
+  parameters: {
+    docs: {
+      source: {
+        type: 'auto',
+      },
+    },
+  },
+} as Meta<typeof Power>;
+
+type Story = StoryObj<typeof Power>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
new file mode 100644
index 000000000..be4a2ec8f
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
@@ -0,0 +1,24 @@
+import { FC } from 'react';
+import AccordionMenu from '@/components/AccordionMenu';
+import { FireEquipmentFormView } from './components';
+
+type FireEquipmentProps = {
+  isDeadline?: boolean;
+  isRegistered?: boolean | undefined;
+  groupId: number;
+};
+
+const FireEquipment: FC<FireEquipmentProps> = () => {
+  return (
+    <AccordionMenu
+      title={'火器使用申請'}
+      isEdit={false}
+      isExist={false}
+      required={true}
+    >
+      <FireEquipmentFormView />
+    </AccordionMenu>
+  );
+};
+
+export default FireEquipment;
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
new file mode 100644
index 000000000..9ccf501d1
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -0,0 +1,14 @@
+import { FC } from 'react';
+import FormContainer from '@/components/FormContainer';
+
+const FireEquipmentForm: FC = () => {
+  return (
+    <FormContainer>
+      <div className="flex flex-col">
+        <div className="flex flex-col gap-10 text-[#484848]"></div>
+      </div>
+    </FormContainer>
+  );
+};
+
+export default FireEquipmentForm;
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
new file mode 100644
index 000000000..b1c0e9f74
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -0,0 +1,34 @@
+import { FC } from 'react';
+import Button from '@/components/Button/Button';
+import Radio from '@/components/Form/Radio/Radio';
+import FireEquipmentForm from './FireEquipmentForm';
+
+export const FireEquipmentFormView: FC = () => {
+  return (
+    <div className="flex flex-col gap-6">
+      <Radio
+        label="火器申請を使用しますか？"
+        value={'1'}
+        onChange={() => {}}
+        required
+        options={[
+          { id: 1, name: 'はい' },
+          { id: 2, name: 'いいえ' },
+        ]}
+      />
+
+      <form>
+        <div className="flex w-full flex-col gap-10">
+          <FireEquipmentForm />
+        </div>
+        <div className="mt-6 flex flex-col items-center gap-4">
+          <div className="flex justify-center gap-4">
+            <Button type="submit" size="pc" color="main">
+              登録
+            </Button>
+          </div>
+        </div>
+      </form>
+    </div>
+  );
+};
diff --git a/user/src/components/Applications/FireEquipment/components/index.ts b/user/src/components/Applications/FireEquipment/components/index.ts
new file mode 100644
index 000000000..28055b1bb
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/components/index.ts
@@ -0,0 +1,2 @@
+export { default as FireEquipment } from './FireEquipmentForm';
+export * from './FireEquipmentFormView';
diff --git a/user/src/components/Applications/FireEquipment/index.ts b/user/src/components/Applications/FireEquipment/index.ts
new file mode 100644
index 000000000..ee70669c4
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/index.ts
@@ -0,0 +1 @@
+export { default } from './FireEquipment';

From 94dc77f776dc54c89364514f0677c1f40dde9f75 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Sun, 1 Jun 2025 17:30:50 +0900
Subject: [PATCH 02/13] =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=AEUI=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/FireEquipment.tsx           |  8 +-
 .../components/FireEquipmentForm.tsx          | 85 ++++++++++++++++++-
 .../src/components/Form/TextArea/TextArea.tsx |  6 +-
 user/src/pages/home/index.tsx                 |  2 +
 4 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
index be4a2ec8f..224a633d9 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
@@ -8,15 +8,19 @@ type FireEquipmentProps = {
   groupId: number;
 };
 
+const Content: FC = () => {
+  return <FireEquipmentFormView />;
+};
+
 const FireEquipment: FC<FireEquipmentProps> = () => {
   return (
     <AccordionMenu
       title={'火器使用申請'}
-      isEdit={false}
+      isEdit={true}
       isExist={false}
       required={true}
     >
-      <FireEquipmentFormView />
+      <Content />
     </AccordionMenu>
   );
 };
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index 9ccf501d1..5b24b65a9 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -1,11 +1,92 @@
-import { FC } from 'react';
+import { FC, useState } from 'react';
+import { FireEquipmentFuel } from '@/api/fireEquipmentApi';
+import Radio from '@/components/Form/Radio/Radio';
+import Selector from '@/components/Form/Selector/Selector';
+import TextArea from '@/components/Form/TextArea/TextArea';
+import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
 
 const FireEquipmentForm: FC = () => {
+  const [canTakeHome, setCanTakeHome] = useState<string>('');
+  const [remarks, setRemarks] = useState<string>('');
+  const [equipmentName, setEquipmentName] = useState<string>('');
+  const [equipmentCount, setEquipmentCount] = useState<number | ''>('');
+  const [fuel, setFuel] = useState<number>(1);
+  const [usage, setUsage] = useState<string>('');
+
   return (
     <FormContainer>
       <div className="flex flex-col">
-        <div className="flex flex-col gap-10 text-[#484848]"></div>
+        <div className="flex flex-col gap-10 text-[#484848]">
+          <TextBox
+            label="火器の名称"
+            required
+            value={equipmentName}
+            onChange={setEquipmentName}
+          />
+          <TextBox
+            label="火器の台数"
+            required
+            type="number"
+            value={String(equipmentCount)}
+            note="半角数字のみ"
+            onChange={(e) => setEquipmentCount(e ? Number(e) : '')}
+          />
+          <Selector
+            label="燃料"
+            required
+            options={[
+              {
+                id: Number(FireEquipmentFuel.GAS_BOTTLE),
+                name: 'カセットガス',
+                disabled: false,
+              },
+              {
+                id: Number(FireEquipmentFuel.LP_GAS),
+                name: 'LPガス',
+                disabled: false,
+              },
+              {
+                id: Number(FireEquipmentFuel.CHARCOAL),
+                name: '炭',
+                disabled: false,
+              },
+            ]}
+            value={fuel}
+            onChange={(e) => setFuel(Number(e))}
+          />
+          <TextArea
+            label="使用用途"
+            required
+            value={usage}
+            onChange={setUsage}
+          />
+          <Radio
+            label="火器を毎日テントから持ち帰ることができますか？"
+            options={[
+              { id: 1, name: 'はい' },
+              { id: 2, name: 'いいえ' },
+            ]}
+            value={canTakeHome}
+            onChange={setCanTakeHome}
+          />
+          <p className="max-w-[400px] break-words text-xs text-sub">
+            火器は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
+            <br />
+            火器はテント内に残す行為は火事の原因になります。
+          </p>
+          <p className="max-w-[400px] break-words text-xs text-sub">
+            いいえを押した場合は火器の備考欄に理由を記載して下さい。
+          </p>
+          <TextArea
+            label="備考"
+            // 「火器を毎日テントから持ち帰ることができますか？」の質問で必須にするかしないか判定する
+            required
+            requireMessage="いいえを押した場合必須"
+            value={remarks}
+            onChange={setRemarks}
+          />
+        </div>
       </div>
     </FormContainer>
   );
diff --git a/user/src/components/Form/TextArea/TextArea.tsx b/user/src/components/Form/TextArea/TextArea.tsx
index 21a2bca86..15cf48813 100644
--- a/user/src/components/Form/TextArea/TextArea.tsx
+++ b/user/src/components/Form/TextArea/TextArea.tsx
@@ -5,6 +5,7 @@ type TextAreaProps = {
   value: string;
   onChange: (value: string) => void;
   required?: boolean;
+  requireMessage?: string;
   note?: string;
   error?: string;
 };
@@ -14,19 +15,20 @@ const TextArea: FC<TextAreaProps> = ({
   value,
   onChange,
   required,
+  requireMessage,
   note,
   error,
 }) => {
   const handleChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
     onChange(event.target.value);
   };
-
+  const requiredMessage = requireMessage ? `※${requireMessage}` : '※必須';
   return (
     <>
       <label>
         <div className="mb-[4px] flex items-center gap-6">
           <p className="text-base text-font">{label}</p>
-          {required && <p className="text-xs text-alert">※必須</p>}
+          {required && <p className="text-xs text-alert">{requiredMessage}</p>}
         </div>
         <textarea
           value={value}
diff --git a/user/src/pages/home/index.tsx b/user/src/pages/home/index.tsx
index 112435f7d..35b858f1e 100644
--- a/user/src/pages/home/index.tsx
+++ b/user/src/pages/home/index.tsx
@@ -1,6 +1,7 @@
 import { useGetCheckAllRegisteredGroups } from '@/api/checkAllRegisteredApi';
 import { useGetGroupByUserId } from '@/api/groupApi';
 import { useGetUserPageSettings } from '@/api/userPageSettingAPI';
+import FireEquipment from '@/components/Applications/FireEquipment';
 import Group from '@/components/Applications/Group';
 import RentItems from '@/components/Applications/MultiItemForms/RentItems';
 import Power from '@/components/Applications/Power';
@@ -130,6 +131,7 @@ export default function HomePage() {
               mutateCheckAllRegisteredGroups={mutateCheckAllRegisteredGroups}
             />
             <GroupCategoryContent />
+            <FireEquipment groupId={0} />
           </>
         )}
       </div>

From 8a20d381ecbd6b90b33aede3d0e3f9f915b397a4 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Sun, 1 Jun 2025 19:18:24 +0900
Subject: [PATCH 03/13] =?UTF-8?q?=E3=83=90=E3=83=AA=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FireEquipmentForm.tsx          | 65 +++++++++++++------
 .../components/FireEquipmentFormView.tsx      | 10 ++-
 .../FireEquipment/components/hooks.ts         | 40 ++++++++++++
 .../FireEquipment/components/schema.ts        | 32 +++++++++
 4 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 user/src/components/Applications/FireEquipment/components/hooks.ts
 create mode 100644 user/src/components/Applications/FireEquipment/components/schema.ts

diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index 5b24b65a9..bdb80ab94 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -1,19 +1,24 @@
-import { FC, useState } from 'react';
+import { FC } from 'react';
 import { FireEquipmentFuel } from '@/api/fireEquipmentApi';
+import { FieldErrors, UseFormSetValue } from 'react-hook-form';
 import Radio from '@/components/Form/Radio/Radio';
 import Selector from '@/components/Form/Selector/Selector';
 import TextArea from '@/components/Form/TextArea/TextArea';
 import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
+import { FireEquipmentSchemaForm } from './schema';
 
-const FireEquipmentForm: FC = () => {
-  const [canTakeHome, setCanTakeHome] = useState<string>('');
-  const [remarks, setRemarks] = useState<string>('');
-  const [equipmentName, setEquipmentName] = useState<string>('');
-  const [equipmentCount, setEquipmentCount] = useState<number | ''>('');
-  const [fuel, setFuel] = useState<number>(1);
-  const [usage, setUsage] = useState<string>('');
+type FireEquipmentFormProps = {
+  values: FireEquipmentSchemaForm;
+  errors: FieldErrors<FireEquipmentSchemaForm>;
+  setValue: UseFormSetValue<FireEquipmentSchemaForm>;
+};
 
+const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
+  values,
+  errors,
+  setValue,
+}) => {
   return (
     <FormContainer>
       <div className="flex flex-col">
@@ -21,21 +26,28 @@ const FireEquipmentForm: FC = () => {
           <TextBox
             label="火器の名称"
             required
-            value={equipmentName}
-            onChange={setEquipmentName}
+            value={values.name}
+            onChange={(value) => setValue('name', value)}
+            error={errors.name?.message}
           />
           <TextBox
             label="火器の台数"
             required
             type="number"
-            value={String(equipmentCount)}
+            value={values.quantity.toString()}
             note="半角数字のみ"
-            onChange={(e) => setEquipmentCount(e ? Number(e) : '')}
+            onChange={(value) => setValue('quantity', Number(value))}
+            error={errors.quantity?.message}
           />
           <Selector
             label="燃料"
             required
             options={[
+              {
+                id: 0,
+                name: '選択してください',
+                disabled: true,
+              },
               {
                 id: Number(FireEquipmentFuel.GAS_BOTTLE),
                 name: 'カセットガス',
@@ -52,14 +64,18 @@ const FireEquipmentForm: FC = () => {
                 disabled: false,
               },
             ]}
-            value={fuel}
-            onChange={(e) => setFuel(Number(e))}
+            value={values.fuel}
+            onChange={(value) =>
+              setValue('fuel', Number(value) as FireEquipmentFuel)
+            }
+            error={errors.fuel?.message}
           />
           <TextArea
             label="使用用途"
             required
-            value={usage}
-            onChange={setUsage}
+            value={values.usage}
+            onChange={(value) => setValue('usage', value)}
+            error={errors.usage?.message}
           />
           <Radio
             label="火器を毎日テントから持ち帰ることができますか？"
@@ -67,8 +83,12 @@ const FireEquipmentForm: FC = () => {
               { id: 1, name: 'はい' },
               { id: 2, name: 'いいえ' },
             ]}
-            value={canTakeHome}
-            onChange={setCanTakeHome}
+            value={convertToBoolToString(values.isTakeaway)}
+            onChange={(value) => {
+              setValue('isTakeaway', value === '1');
+            }}
+            required
+            error={errors.isTakeaway?.message}
           />
           <p className="max-w-[400px] break-words text-xs text-sub">
             火器は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
@@ -83,8 +103,9 @@ const FireEquipmentForm: FC = () => {
             // 「火器を毎日テントから持ち帰ることができますか？」の質問で必須にするかしないか判定する
             required
             requireMessage="いいえを押した場合必須"
-            value={remarks}
-            onChange={setRemarks}
+            value={values.remarks || ''}
+            onChange={(value) => setValue('remarks', value)}
+            error={errors.remarks?.message}
           />
         </div>
       </div>
@@ -93,3 +114,7 @@ const FireEquipmentForm: FC = () => {
 };
 
 export default FireEquipmentForm;
+
+const convertToBoolToString = (value: boolean): '1' | '2' => {
+  return value ? '1' : '2';
+};
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index b1c0e9f74..e1c455190 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -2,8 +2,10 @@ import { FC } from 'react';
 import Button from '@/components/Button/Button';
 import Radio from '@/components/Form/Radio/Radio';
 import FireEquipmentForm from './FireEquipmentForm';
+import { useFireEquipmentOrder } from './hooks';
 
 export const FireEquipmentFormView: FC = () => {
+  const { values, errors, setValue, submitHandler } = useFireEquipmentOrder();
   return (
     <div className="flex flex-col gap-6">
       <Radio
@@ -17,9 +19,13 @@ export const FireEquipmentFormView: FC = () => {
         ]}
       />
 
-      <form>
+      <form onSubmit={submitHandler}>
         <div className="flex w-full flex-col gap-10">
-          <FireEquipmentForm />
+          <FireEquipmentForm
+            values={values}
+            errors={errors}
+            setValue={setValue}
+          />
         </div>
         <div className="mt-6 flex flex-col items-center gap-4">
           <div className="flex justify-center gap-4">
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
new file mode 100644
index 000000000..6a9e7c640
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -0,0 +1,40 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { toast } from 'react-toastify';
+import './schema';
+import { FireEquipmentSchema, FireEquipmentSchemaForm } from './schema';
+
+export const useFireEquipmentOrder = () => {
+  const {
+    handleSubmit,
+    formState: { errors },
+    setValue,
+    watch,
+  } = useForm<FireEquipmentSchemaForm>({
+    resolver: zodResolver(FireEquipmentSchema),
+    defaultValues: {
+      name: '',
+      quantity: 0,
+      fuel: 0,
+      usage: '',
+      isTakeaway: true,
+      remarks: '',
+    },
+  });
+
+  const values = watch();
+
+  const onSubmit = async (formData: FireEquipmentSchemaForm) => {
+    console.log('Submitted Data:', formData);
+    toast.success('火器申請が送信されました！');
+  };
+
+  const submitHandler = handleSubmit(onSubmit);
+
+  return {
+    values,
+    errors,
+    setValue,
+    submitHandler,
+  };
+};
diff --git a/user/src/components/Applications/FireEquipment/components/schema.ts b/user/src/components/Applications/FireEquipment/components/schema.ts
new file mode 100644
index 000000000..ff9129522
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/components/schema.ts
@@ -0,0 +1,32 @@
+import { FireEquipmentFuel } from '@/api/fireEquipmentApi';
+import { z } from 'zod';
+
+// バリデーションスキーマ
+const fireEquipmentFuelArray = Object.values(FireEquipmentFuel).filter(
+  (v) => typeof v === 'number'
+) as number[];
+
+export const FireEquipmentSchema = z
+  .object({
+    id: z.number().optional(),
+    name: z.string().min(1, '入力してください'),
+    quantity: z.number().min(1, '1以上の数字を入力してください'),
+    fuel: z.number().refine((value) => fireEquipmentFuelArray.includes(value), {
+      message: '燃料を選択してください',
+    }),
+    usage: z.string().min(1, '入力してください'),
+    isTakeaway: z.boolean(),
+    remarks: z.string().optional(),
+  })
+  .superRefine((data, ctx) => {
+    // 持ち帰りが「いいえ」の場合、備考欄は必須
+    if (!data.isTakeaway && data.remarks == '') {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: '持ち帰りが「いいえ」の場合、備考欄は必須です',
+        path: ['remarks'],
+      });
+    }
+  });
+
+export type FireEquipmentSchemaForm = z.infer<typeof FireEquipmentSchema>;

From 446794e53128a6b1e42f3f3d7443dec026748143 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Sun, 1 Jun 2025 19:23:44 +0900
Subject: [PATCH 04/13] =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=82=92=E7=A7=BB?=
 =?UTF-8?q?=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/components/FireEquipmentForm.tsx           | 5 +----
 .../Applications/FireEquipment/components/hooks.ts           | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index bdb80ab94..abfc411f2 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -6,6 +6,7 @@ import Selector from '@/components/Form/Selector/Selector';
 import TextArea from '@/components/Form/TextArea/TextArea';
 import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
+import { convertToBoolToString } from './hooks';
 import { FireEquipmentSchemaForm } from './schema';
 
 type FireEquipmentFormProps = {
@@ -114,7 +115,3 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
 };
 
 export default FireEquipmentForm;
-
-const convertToBoolToString = (value: boolean): '1' | '2' => {
-  return value ? '1' : '2';
-};
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index 6a9e7c640..8f8867e19 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -38,3 +38,7 @@ export const useFireEquipmentOrder = () => {
     submitHandler,
   };
 };
+
+export const convertToBoolToString = (value: boolean): '1' | '2' => {
+  return value ? '1' : '2';
+};

From 3c00ca813cfe893c94ab42a24f2711dbc5eb89df Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Mon, 2 Jun 2025 23:12:38 +0900
Subject: [PATCH 05/13] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=8C=B2=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/FireEquipment.stories.tsx   | 12 +--
 .../FireEquipment/FireEquipment.tsx           |  8 +-
 .../components/FireEquipmentFormView.tsx      | 77 +++++++++++++------
 .../FireEquipment/components/hooks.ts         | 59 ++++++++++++--
 .../FireEquipment/components/schema.ts        |  9 +++
 user/src/components/Form/Radio/Radio.tsx      |  2 +-
 user/src/pages/home/index.tsx                 |  2 +-
 user/src/utils/constant.ts                    | 14 ++++
 8 files changed, 142 insertions(+), 41 deletions(-)
 create mode 100644 user/src/utils/constant.ts

diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
index a7b625007..1c3c90eb4 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
@@ -1,11 +1,11 @@
 import '@globals';
 import { Meta, StoryObj } from '@storybook/react';
-import Power from './FireEquipment';
+import FireEquipment from './FireEquipment';
 
 export default {
   title: 'Components/Power',
   tags: ['autodocs'],
-  component: Power,
+  component: FireEquipment,
   parameters: {
     docs: {
       source: {
@@ -13,10 +13,12 @@ export default {
       },
     },
   },
-} as Meta<typeof Power>;
+} as Meta<typeof FireEquipment>;
 
-type Story = StoryObj<typeof Power>;
+type Story = StoryObj<typeof FireEquipment>;
 
 export const Default: Story = {
-  args: {},
+  args: {
+    groupId: 0,
+  },
 };
diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
index 224a633d9..88551f7b4 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
@@ -8,11 +8,11 @@ type FireEquipmentProps = {
   groupId: number;
 };
 
-const Content: FC = () => {
-  return <FireEquipmentFormView />;
+const Content: FC<FireEquipmentProps> = ({ groupId }) => {
+  return <FireEquipmentFormView groupId={groupId} />;
 };
 
-const FireEquipment: FC<FireEquipmentProps> = () => {
+const FireEquipment: FC<FireEquipmentProps> = ({ groupId }) => {
   return (
     <AccordionMenu
       title={'火器使用申請'}
@@ -20,7 +20,7 @@ const FireEquipment: FC<FireEquipmentProps> = () => {
       isExist={false}
       required={true}
     >
-      <Content />
+      <Content groupId={groupId} />
     </AccordionMenu>
   );
 };
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index e1c455190..8c799b72c 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -1,40 +1,69 @@
 import { FC } from 'react';
+import { NO_ID_STRING, RADIO_OPTIONS, YES_ID_STRING } from '@/utils/constant';
 import Button from '@/components/Button/Button';
 import Radio from '@/components/Form/Radio/Radio';
 import FireEquipmentForm from './FireEquipmentForm';
 import { useFireEquipmentOrder } from './hooks';
 
-export const FireEquipmentFormView: FC = () => {
-  const { values, errors, setValue, submitHandler } = useFireEquipmentOrder();
+type FireEquipmentFormViewProps = {
+  groupId: number;
+};
+export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
+  groupId,
+}) => {
+  const {
+    isRegister,
+    submitUnregisteredHandler,
+    errorsUnregistered,
+    isRegisterValue,
+    setIsRegisterValue,
+    values,
+    errors,
+    setValue,
+    submitHandler,
+  } = useFireEquipmentOrder(groupId);
+
   return (
     <div className="flex flex-col gap-6">
-      <Radio
-        label="火器申請を使用しますか？"
-        value={'1'}
-        onChange={() => {}}
-        required
-        options={[
-          { id: 1, name: 'はい' },
-          { id: 2, name: 'いいえ' },
-        ]}
-      />
-
-      <form onSubmit={submitHandler}>
-        <div className="flex w-full flex-col gap-10">
-          <FireEquipmentForm
-            values={values}
-            errors={errors}
-            setValue={setValue}
-          />
-        </div>
-        <div className="mt-6 flex flex-col items-center gap-4">
-          <div className="flex justify-center gap-4">
+      <form onSubmit={submitUnregisteredHandler}>
+        <Radio
+          label="火器申請を使用しますか？"
+          value={isRegisterValue}
+          onChange={(value) => {
+            setIsRegisterValue(
+              value as typeof YES_ID_STRING | typeof NO_ID_STRING
+            );
+          }}
+          required
+          options={RADIO_OPTIONS}
+          error={errorsUnregistered.isRegister?.message}
+        />
+        {!isRegister && (
+          <div className="flex flex-col items-center gap-4">
             <Button type="submit" size="pc" color="main">
               登録
             </Button>
           </div>
-        </div>
+        )}
       </form>
+      {isRegister && (
+        <form onSubmit={submitHandler}>
+          <div className="flex w-full flex-col gap-10">
+            <FireEquipmentForm
+              values={values}
+              errors={errors}
+              setValue={setValue}
+            />
+          </div>
+          <div className="mt-6 flex flex-col items-center gap-4">
+            <div className="flex justify-center gap-4">
+              <Button type="submit" size="pc" color="main">
+                登録
+              </Button>
+            </div>
+          </div>
+        </form>
+      )}
     </div>
   );
 };
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index 8f8867e19..5c2909f22 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -1,10 +1,29 @@
+import { NO_ID_STRING, YES_ID_STRING } from '@/utils/constant';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import './schema';
-import { FireEquipmentSchema, FireEquipmentSchemaForm } from './schema';
+import {
+  FireEquipmentSchema,
+  FireEquipmentSchemaForm,
+  UnRegisteredFireEquipmentSchema,
+  UnRegisteredFireEquipmentSchemaForm,
+} from './schema';
+
+export const useFireEquipmentOrder = (groupId: number) => {
+  const {
+    handleSubmit: handleSubmitUnregistered,
+    formState: { errors: errorsUnregistered },
+    setValue: setValueUnregistered,
+    watch: watchUnregistered,
+  } = useForm<UnRegisteredFireEquipmentSchemaForm>({
+    resolver: zodResolver(UnRegisteredFireEquipmentSchema),
+    defaultValues: {
+      groupId: groupId,
+      isRegister: true,
+    },
+  });
 
-export const useFireEquipmentOrder = () => {
   const {
     handleSubmit,
     formState: { errors },
@@ -22,16 +41,44 @@ export const useFireEquipmentOrder = () => {
     },
   });
 
+  const valuesUnregistered = watchUnregistered();
+  const isRegister = valuesUnregistered.isRegister;
+  const isRegisterValue = isRegister ? YES_ID_STRING : NO_ID_STRING;
+  const setIsRegisterValue = (
+    value: typeof YES_ID_STRING | typeof NO_ID_STRING
+  ) => {
+    setValueUnregistered('isRegister', value === YES_ID_STRING);
+  };
+
+  const onSubmitUnregistered = async (
+    formData: UnRegisteredFireEquipmentSchemaForm
+  ) => {
+    if (formData.isRegister) {
+      // trueの場合は、未登録には登録しないのでreturn
+      return;
+    }
+    console.log('Unregistered Data:', formData);
+
+    toast.success('火器申請を行わない登録が完了しました');
+  };
+  const submitUnregisteredHandler =
+    handleSubmitUnregistered(onSubmitUnregistered);
+
   const values = watch();
 
-  const onSubmit = async (formData: FireEquipmentSchemaForm) => {
+  const onSubmitFireEquipment = async (formData: FireEquipmentSchemaForm) => {
     console.log('Submitted Data:', formData);
     toast.success('火器申請が送信されました！');
   };
 
-  const submitHandler = handleSubmit(onSubmit);
+  const submitHandler = handleSubmit(onSubmitFireEquipment);
 
   return {
+    isRegister,
+    submitUnregisteredHandler,
+    errorsUnregistered,
+    isRegisterValue,
+    setIsRegisterValue,
     values,
     errors,
     setValue,
@@ -39,6 +86,6 @@ export const useFireEquipmentOrder = () => {
   };
 };
 
-export const convertToBoolToString = (value: boolean): '1' | '2' => {
-  return value ? '1' : '2';
+export const convertToBoolToString = (value: boolean) => {
+  return value ? YES_ID_STRING : NO_ID_STRING;
 };
diff --git a/user/src/components/Applications/FireEquipment/components/schema.ts b/user/src/components/Applications/FireEquipment/components/schema.ts
index ff9129522..6ee8a4c9d 100644
--- a/user/src/components/Applications/FireEquipment/components/schema.ts
+++ b/user/src/components/Applications/FireEquipment/components/schema.ts
@@ -30,3 +30,12 @@ export const FireEquipmentSchema = z
   });
 
 export type FireEquipmentSchemaForm = z.infer<typeof FireEquipmentSchema>;
+
+export const UnRegisteredFireEquipmentSchema = z.object({
+  groupId: z.number().min(1, 'グループを選択してください'),
+  isRegister: z.boolean().default(true),
+});
+
+export type UnRegisteredFireEquipmentSchemaForm = z.infer<
+  typeof UnRegisteredFireEquipmentSchema
+>;
diff --git a/user/src/components/Form/Radio/Radio.tsx b/user/src/components/Form/Radio/Radio.tsx
index 2ee7e60a9..d676d4062 100644
--- a/user/src/components/Form/Radio/Radio.tsx
+++ b/user/src/components/Form/Radio/Radio.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react';
 
-type Option = {
+export type Option = {
   id: number;
   name: string;
 };
diff --git a/user/src/pages/home/index.tsx b/user/src/pages/home/index.tsx
index 35b858f1e..5df60c5ba 100644
--- a/user/src/pages/home/index.tsx
+++ b/user/src/pages/home/index.tsx
@@ -131,7 +131,7 @@ export default function HomePage() {
               mutateCheckAllRegisteredGroups={mutateCheckAllRegisteredGroups}
             />
             <GroupCategoryContent />
-            <FireEquipment groupId={0} />
+            <FireEquipment groupId={groupId} />
           </>
         )}
       </div>
diff --git a/user/src/utils/constant.ts b/user/src/utils/constant.ts
new file mode 100644
index 000000000..d48d07a17
--- /dev/null
+++ b/user/src/utils/constant.ts
@@ -0,0 +1,14 @@
+import { type Option } from '@/components/Form/Radio/Radio';
+
+export const YES_ID = 1;
+export const NO_ID = 2;
+export const YES_ID_STRING = '1' as const;
+export const NO_ID_STRING = '2' as const;
+export const YES_NAME = 'はい';
+export const NO_NAME = 'いいえ';
+
+// 登録・未登録の選択肢
+export const RADIO_OPTIONS: Option[] = [
+  { id: YES_ID, name: YES_NAME },
+  { id: NO_ID, name: NO_NAME },
+];

From 0e3fd87f7b3e6d9c0d19e58343e0b43bcc3a0cf6 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Jun 2025 00:26:53 +0900
Subject: [PATCH 06/13] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/FireEquipment.tsx           | 43 +++++++++++--
 .../components/FireEquipmentForm.tsx          | 43 +++++++++++--
 .../components/FireEquipmentFormView.tsx      | 19 +++---
 .../FireEquipment/components/hooks.ts         | 44 ++++++++++---
 .../Applications/FireEquipment/constant.ts    |  8 +++
 .../Applications/FireEquipment/hooks.ts       | 63 +++++++++++++++++++
 user/src/pages/home/index.tsx                 |  5 +-
 7 files changed, 195 insertions(+), 30 deletions(-)
 create mode 100644 user/src/components/Applications/FireEquipment/constant.ts
 create mode 100644 user/src/components/Applications/FireEquipment/hooks.ts

diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
index 88551f7b4..564c66c7c 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
@@ -1,6 +1,8 @@
 import { FC } from 'react';
 import AccordionMenu from '@/components/AccordionMenu';
+import FormList from '@/components/FormList';
 import { FireEquipmentFormView } from './components';
+import { useFireEquipmentHooks } from './hooks';
 
 type FireEquipmentProps = {
   isDeadline?: boolean;
@@ -8,19 +10,48 @@ type FireEquipmentProps = {
   groupId: number;
 };
 
-const Content: FC<FireEquipmentProps> = ({ groupId }) => {
-  return <FireEquipmentFormView groupId={groupId} />;
+const Content: FC<FireEquipmentProps> = ({ groupId, isDeadline }) => {
+  const { isEditing, handleEditClick, formItem, fireEquipment } =
+    useFireEquipmentHooks(groupId);
+
+  // 締め切り後に表示する画面
+  if (isDeadline) {
+    return <FormList items={formItem} />;
+  }
+
+  // 未登録の場合は、フォームを表示
+  if (!fireEquipment) {
+    return <FireEquipmentFormView groupId={groupId} />;
+  }
+
+  // 編集モードでない場合は、フォームリストを表示
+  if (!isEditing) {
+    return <FormList items={formItem} isEdit onEdit={handleEditClick} />; // Display existing fire equipment details
+  }
+
+  // 編集モードの場合は、フォームを表示
+  return (
+    <FireEquipmentFormView
+      groupId={groupId}
+      fireEquipmentData={fireEquipment}
+      handleEditCancel={handleEditClick}
+    />
+  );
 };
 
-const FireEquipment: FC<FireEquipmentProps> = ({ groupId }) => {
+const FireEquipment: FC<FireEquipmentProps> = ({
+  groupId,
+  isDeadline,
+  isRegistered,
+}) => {
   return (
     <AccordionMenu
       title={'火器使用申請'}
-      isEdit={true}
-      isExist={false}
+      isEdit={!isDeadline}
+      isExist={isRegistered}
       required={true}
     >
-      <Content groupId={groupId} />
+      <Content groupId={groupId} isDeadline={isDeadline} />
     </AccordionMenu>
   );
 };
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index abfc411f2..76827a664 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -1,11 +1,13 @@
 import { FC } from 'react';
 import { FireEquipmentFuel } from '@/api/fireEquipmentApi';
 import { FieldErrors, UseFormSetValue } from 'react-hook-form';
+import Button from '@/components/Button';
 import Radio from '@/components/Form/Radio/Radio';
 import Selector from '@/components/Form/Selector/Selector';
 import TextArea from '@/components/Form/TextArea/TextArea';
 import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
+import { fireEquipmentFormFields } from '../constant';
 import { convertToBoolToString } from './hooks';
 import { FireEquipmentSchemaForm } from './schema';
 
@@ -13,26 +15,32 @@ type FireEquipmentFormProps = {
   values: FireEquipmentSchemaForm;
   errors: FieldErrors<FireEquipmentSchemaForm>;
   setValue: UseFormSetValue<FireEquipmentSchemaForm>;
+  isEditing: boolean;
+  handleEditCancel?: () => void;
+  validate?: () => boolean;
 };
 
 const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
   values,
   errors,
   setValue,
+  isEditing,
+  handleEditCancel,
+  validate,
 }) => {
   return (
     <FormContainer>
       <div className="flex flex-col">
         <div className="flex flex-col gap-10 text-[#484848]">
           <TextBox
-            label="火器の名称"
+            label={fireEquipmentFormFields.NAME}
             required
             value={values.name}
             onChange={(value) => setValue('name', value)}
             error={errors.name?.message}
           />
           <TextBox
-            label="火器の台数"
+            label={fireEquipmentFormFields.QUANTITY}
             required
             type="number"
             value={values.quantity.toString()}
@@ -41,7 +49,7 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             error={errors.quantity?.message}
           />
           <Selector
-            label="燃料"
+            label={fireEquipmentFormFields.FUEL}
             required
             options={[
               {
@@ -72,14 +80,14 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             error={errors.fuel?.message}
           />
           <TextArea
-            label="使用用途"
+            label={fireEquipmentFormFields.USAGE}
             required
             value={values.usage}
             onChange={(value) => setValue('usage', value)}
             error={errors.usage?.message}
           />
           <Radio
-            label="火器を毎日テントから持ち帰ることができますか？"
+            label={fireEquipmentFormFields.IS_TAKEAWAY}
             options={[
               { id: 1, name: 'はい' },
               { id: 2, name: 'いいえ' },
@@ -100,7 +108,7 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             いいえを押した場合は火器の備考欄に理由を記載して下さい。
           </p>
           <TextArea
-            label="備考"
+            label={fireEquipmentFormFields.REMARK}
             // 「火器を毎日テントから持ち帰ることができますか？」の質問で必須にするかしないか判定する
             required
             requireMessage="いいえを押した場合必須"
@@ -109,6 +117,29 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             error={errors.remarks?.message}
           />
         </div>
+        <div className="mt-10 flex w-full items-center justify-center">
+          {isEditing && (
+            <div className="mr-4">
+              <Button
+                size="pc"
+                color="main"
+                variant
+                type="button"
+                onClick={handleEditCancel}
+              >
+                キャンセル
+              </Button>
+            </div>
+          )}
+          <Button
+            size="pc"
+            color="main"
+            type="submit"
+            isDisable={validate && validate()}
+          >
+            {isEditing ? '修正' : '登録'}
+          </Button>
+        </div>
       </div>
     </FormContainer>
   );
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index 8c799b72c..30a202534 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -1,4 +1,5 @@
 import { FC } from 'react';
+import { FireEquipmentResponse } from '@/api/fireEquipmentApi';
 import { NO_ID_STRING, RADIO_OPTIONS, YES_ID_STRING } from '@/utils/constant';
 import Button from '@/components/Button/Button';
 import Radio from '@/components/Form/Radio/Radio';
@@ -7,9 +8,13 @@ import { useFireEquipmentOrder } from './hooks';
 
 type FireEquipmentFormViewProps = {
   groupId: number;
+  fireEquipmentData?: FireEquipmentResponse;
+  handleEditCancel?: () => void;
 };
 export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
   groupId,
+  fireEquipmentData,
+  handleEditCancel,
 }) => {
   const {
     isRegister,
@@ -21,7 +26,9 @@ export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
     errors,
     setValue,
     submitHandler,
-  } = useFireEquipmentOrder(groupId);
+    isEditing,
+    validate,
+  } = useFireEquipmentOrder(groupId, fireEquipmentData);
 
   return (
     <div className="flex flex-col gap-6">
@@ -53,15 +60,11 @@ export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
               values={values}
               errors={errors}
               setValue={setValue}
+              isEditing={isEditing}
+              handleEditCancel={handleEditCancel}
+              validate={validate}
             />
           </div>
-          <div className="mt-6 flex flex-col items-center gap-4">
-            <div className="flex justify-center gap-4">
-              <Button type="submit" size="pc" color="main">
-                登録
-              </Button>
-            </div>
-          </div>
         </form>
       )}
     </div>
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index 5c2909f22..007056228 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -1,3 +1,4 @@
+import { FireEquipmentResponse } from '@/api/fireEquipmentApi';
 import { NO_ID_STRING, YES_ID_STRING } from '@/utils/constant';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
@@ -10,7 +11,10 @@ import {
   UnRegisteredFireEquipmentSchemaForm,
 } from './schema';
 
-export const useFireEquipmentOrder = (groupId: number) => {
+export const useFireEquipmentOrder = (
+  groupId: number,
+  fireEquipmentData?: FireEquipmentResponse
+) => {
   const {
     handleSubmit: handleSubmitUnregistered,
     formState: { errors: errorsUnregistered },
@@ -24,6 +28,18 @@ export const useFireEquipmentOrder = (groupId: number) => {
     },
   });
 
+  // 既存の火器申請データがある場合は、編集モードにする
+  const isEditing = !!fireEquipmentData;
+
+  const defaultValues: FireEquipmentSchemaForm = {
+    name: fireEquipmentData?.name || '',
+    quantity: fireEquipmentData?.quantity || 0,
+    fuel: fireEquipmentData?.fuel || 0,
+    usage: fireEquipmentData?.usage || '',
+    isTakeaway: fireEquipmentData?.is_takeaway || true,
+    remarks: fireEquipmentData?.remark || '',
+  };
+
   const {
     handleSubmit,
     formState: { errors },
@@ -31,14 +47,7 @@ export const useFireEquipmentOrder = (groupId: number) => {
     watch,
   } = useForm<FireEquipmentSchemaForm>({
     resolver: zodResolver(FireEquipmentSchema),
-    defaultValues: {
-      name: '',
-      quantity: 0,
-      fuel: 0,
-      usage: '',
-      isTakeaway: true,
-      remarks: '',
-    },
+    defaultValues: defaultValues,
   });
 
   const valuesUnregistered = watchUnregistered();
@@ -66,6 +75,17 @@ export const useFireEquipmentOrder = (groupId: number) => {
 
   const values = watch();
 
+  const validate = () => {
+    return (
+      defaultValues.name === values.name &&
+      defaultValues.quantity === values.quantity &&
+      defaultValues.fuel === values.fuel &&
+      defaultValues.usage === values.usage &&
+      defaultValues.isTakeaway === values.isTakeaway &&
+      defaultValues.remarks === values.remarks
+    );
+  };
+
   const onSubmitFireEquipment = async (formData: FireEquipmentSchemaForm) => {
     console.log('Submitted Data:', formData);
     toast.success('火器申請が送信されました！');
@@ -74,15 +94,21 @@ export const useFireEquipmentOrder = (groupId: number) => {
   const submitHandler = handleSubmit(onSubmitFireEquipment);
 
   return {
+    // 未登録周り
     isRegister,
     submitUnregisteredHandler,
     errorsUnregistered,
     isRegisterValue,
     setIsRegisterValue,
+    // 火器申請周り
     values,
     errors,
     setValue,
     submitHandler,
+    // 既存の火器申請データがあるかどうか
+    isEditing,
+    // バリデーション
+    validate,
   };
 };
 
diff --git a/user/src/components/Applications/FireEquipment/constant.ts b/user/src/components/Applications/FireEquipment/constant.ts
new file mode 100644
index 000000000..36214ba1a
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/constant.ts
@@ -0,0 +1,8 @@
+export enum fireEquipmentFormFields {
+  NAME = '火器の名称',
+  QUANTITY = '火器の台数',
+  FUEL = '燃料',
+  USAGE = '使用用途',
+  IS_TAKEAWAY = '火器を毎日テントから持ち帰ることができますか？',
+  REMARK = '備考',
+}
diff --git a/user/src/components/Applications/FireEquipment/hooks.ts b/user/src/components/Applications/FireEquipment/hooks.ts
new file mode 100644
index 000000000..dd637beaf
--- /dev/null
+++ b/user/src/components/Applications/FireEquipment/hooks.ts
@@ -0,0 +1,63 @@
+import { useState } from 'react';
+import {
+  FireEquipmentFuel,
+  FireEquipmentResponse,
+} from '@/api/fireEquipmentApi';
+import { FormItem } from '@/components/FormList/type';
+import { fireEquipmentFormFields } from './constant';
+
+export const useFireEquipmentHooks = (groupId: number) => {
+  const isRegistered = false;
+  const fireEquipment: FireEquipmentResponse | undefined = isRegistered
+    ? {
+        group_id: groupId,
+        name: 'ガスコンロ',
+        quantity: 1,
+        fuel: FireEquipmentFuel.GAS_BOTTLE,
+        usage: 'バーベキュー',
+        is_takeaway: true,
+        remark: '',
+      }
+    : undefined;
+
+  const formItem: FormItem[] = fireEquipment
+    ? [
+        {
+          label: fireEquipmentFormFields.NAME,
+          content: fireEquipment?.name || '',
+        },
+        {
+          label: fireEquipmentFormFields.QUANTITY,
+          content: fireEquipment?.quantity.toString() || '',
+        },
+        {
+          label: fireEquipmentFormFields.FUEL,
+          content: fireEquipment?.fuel.toString() || '',
+        },
+        {
+          label: fireEquipmentFormFields.USAGE,
+          content: fireEquipment?.usage || '',
+        },
+        {
+          label: fireEquipmentFormFields.IS_TAKEAWAY,
+          content: fireEquipment?.is_takeaway ? 'はい' : 'いいえ',
+        },
+        {
+          label: fireEquipmentFormFields.REMARK,
+          content: fireEquipment?.remark || '',
+        },
+      ]
+    : [];
+
+  const [isEditing, setIsEditing] = useState(false);
+  const handleEditClick = () => {
+    setIsEditing((prev) => !prev);
+  };
+
+  return {
+    isEditing,
+    formItem,
+    handleEditClick,
+    fireEquipment,
+  };
+};
diff --git a/user/src/pages/home/index.tsx b/user/src/pages/home/index.tsx
index 5df60c5ba..d74455955 100644
--- a/user/src/pages/home/index.tsx
+++ b/user/src/pages/home/index.tsx
@@ -131,7 +131,10 @@ export default function HomePage() {
               mutateCheckAllRegisteredGroups={mutateCheckAllRegisteredGroups}
             />
             <GroupCategoryContent />
-            <FireEquipment groupId={groupId} />
+            <FireEquipment
+              groupId={groupId}
+              isRegistered={checkAllRegisteredGroups?.fireEquipmentOrder}
+            />
           </>
         )}
       </div>

From 1b4e3728cfc32a65bc4c3ae0f24887d04791ab0d Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Jun 2025 00:29:30 +0900
Subject: [PATCH 07/13] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 user/src/components/Applications/FireEquipment/hooks.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user/src/components/Applications/FireEquipment/hooks.ts b/user/src/components/Applications/FireEquipment/hooks.ts
index dd637beaf..d37b18574 100644
--- a/user/src/components/Applications/FireEquipment/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/hooks.ts
@@ -7,7 +7,8 @@ import { FormItem } from '@/components/FormList/type';
 import { fireEquipmentFormFields } from './constant';
 
 export const useFireEquipmentHooks = (groupId: number) => {
-  const isRegistered = false;
+  // NOTE:API繋いでないのでフラグで登録済みを判定、TODO: API実装後に削除
+  const isRegistered = true;
   const fireEquipment: FireEquipmentResponse | undefined = isRegistered
     ? {
         group_id: groupId,

From f7f9eba3fb84ee9e53daa36a15f3d77dc732171a Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Jun 2025 00:35:10 +0900
Subject: [PATCH 08/13] =?UTF-8?q?storybook=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Applications/FireEquipment/FireEquipment.stories.tsx      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
index 1c3c90eb4..a9b38304b 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.stories.tsx
@@ -3,7 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 import FireEquipment from './FireEquipment';
 
 export default {
-  title: 'Components/Power',
+  title: 'Components/FireEquipment',
   tags: ['autodocs'],
   component: FireEquipment,
   parameters: {
@@ -20,5 +20,7 @@ type Story = StoryObj<typeof FireEquipment>;
 export const Default: Story = {
   args: {
     groupId: 0,
+    isDeadline: false,
+    isRegistered: false,
   },
 };

From a5371edafc1449e87e51a155f1b8233727332b66 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Jun 2025 21:04:26 +0900
Subject: [PATCH 09/13] =?UTF-8?q?=E7=81=AB=E6=B0=97=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 user/src/api/fireEquipmentApi.ts              |  2 +-
 .../FireEquipment/FireEquipment.tsx           | 20 +++++++++++++++----
 .../components/FireEquipmentForm.tsx          |  8 ++++----
 .../components/FireEquipmentFormView.tsx      |  2 +-
 .../FireEquipment/components/hooks.ts         | 10 +++++-----
 .../Applications/FireEquipment/constant.ts    |  6 +++---
 .../Applications/FireEquipment/hooks.ts       | 11 +++++++++-
 .../Form/CheckBox/Checkbox.stories.tsx        |  2 +-
 8 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/user/src/api/fireEquipmentApi.ts b/user/src/api/fireEquipmentApi.ts
index 8d0ba69c0..0e4eaac4f 100644
--- a/user/src/api/fireEquipmentApi.ts
+++ b/user/src/api/fireEquipmentApi.ts
@@ -28,7 +28,7 @@ const API_ENDPOINTS = {
   FIRE_EQUIPMENT_ORDERS: '/fire_equipment_orders',
 };
 
-// グループIDで火器使用申請を取得
+// グループIDで火気使用申請を取得
 export const useGetFireEquipmentOrderByGroupId = (
   groupId: number | undefined
 ) => {
diff --git a/user/src/components/Applications/FireEquipment/FireEquipment.tsx b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
index 564c66c7c..7329bb1dd 100644
--- a/user/src/components/Applications/FireEquipment/FireEquipment.tsx
+++ b/user/src/components/Applications/FireEquipment/FireEquipment.tsx
@@ -11,16 +11,28 @@ type FireEquipmentProps = {
 };
 
 const Content: FC<FireEquipmentProps> = ({ groupId, isDeadline }) => {
-  const { isEditing, handleEditClick, formItem, fireEquipment } =
-    useFireEquipmentHooks(groupId);
+  const {
+    isEditing,
+    handleEditClick,
+    formItem,
+    fireEquipment,
+    hasUnregistered,
+    noApplicationItems,
+  } = useFireEquipmentHooks(groupId);
 
   // 締め切り後に表示する画面
   if (isDeadline) {
     return <FormList items={formItem} />;
   }
+  // 未登録がある場合は、フォームリストを表示
+  if (hasUnregistered) {
+    return (
+      <FormList items={noApplicationItems} isEdit onEdit={handleEditClick} />
+    );
+  }
 
   // 未登録の場合は、フォームを表示
-  if (!fireEquipment) {
+  if (!fireEquipment && !hasUnregistered) {
     return <FireEquipmentFormView groupId={groupId} />;
   }
 
@@ -46,7 +58,7 @@ const FireEquipment: FC<FireEquipmentProps> = ({
 }) => {
   return (
     <AccordionMenu
-      title={'火器使用申請'}
+      title={'火気使用申請'}
       isEdit={!isDeadline}
       isExist={isRegistered}
       required={true}
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index 76827a664..81ec306c4 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -100,16 +100,16 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             error={errors.isTakeaway?.message}
           />
           <p className="max-w-[400px] break-words text-xs text-sub">
-            火器は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
+            火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
             <br />
-            火器はテント内に残す行為は火事の原因になります。
+            火気はテント内に残す行為は火事の原因になります。
           </p>
           <p className="max-w-[400px] break-words text-xs text-sub">
-            いいえを押した場合は火器の備考欄に理由を記載して下さい。
+            いいえを押した場合は火気の備考欄に理由を記載して下さい。
           </p>
           <TextArea
             label={fireEquipmentFormFields.REMARK}
-            // 「火器を毎日テントから持ち帰ることができますか？」の質問で必須にするかしないか判定する
+            // 「火気を毎日テントから持ち帰ることができますか？」の質問で必須にするかしないか判定する
             required
             requireMessage="いいえを押した場合必須"
             value={values.remarks || ''}
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index 30a202534..394365aa6 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -34,7 +34,7 @@ export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
     <div className="flex flex-col gap-6">
       <form onSubmit={submitUnregisteredHandler}>
         <Radio
-          label="火器申請を使用しますか？"
+          label="火気申請を使用しますか？"
           value={isRegisterValue}
           onChange={(value) => {
             setIsRegisterValue(
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index 007056228..e61e1817f 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -28,7 +28,7 @@ export const useFireEquipmentOrder = (
     },
   });
 
-  // 既存の火器申請データがある場合は、編集モードにする
+  // 既存の火気申請データがある場合は、編集モードにする
   const isEditing = !!fireEquipmentData;
 
   const defaultValues: FireEquipmentSchemaForm = {
@@ -68,7 +68,7 @@ export const useFireEquipmentOrder = (
     }
     console.log('Unregistered Data:', formData);
 
-    toast.success('火器申請を行わない登録が完了しました');
+    toast.success('火気申請を行わない登録が完了しました');
   };
   const submitUnregisteredHandler =
     handleSubmitUnregistered(onSubmitUnregistered);
@@ -88,7 +88,7 @@ export const useFireEquipmentOrder = (
 
   const onSubmitFireEquipment = async (formData: FireEquipmentSchemaForm) => {
     console.log('Submitted Data:', formData);
-    toast.success('火器申請が送信されました！');
+    toast.success('火気申請が送信されました！');
   };
 
   const submitHandler = handleSubmit(onSubmitFireEquipment);
@@ -100,12 +100,12 @@ export const useFireEquipmentOrder = (
     errorsUnregistered,
     isRegisterValue,
     setIsRegisterValue,
-    // 火器申請周り
+    // 火気申請周り
     values,
     errors,
     setValue,
     submitHandler,
-    // 既存の火器申請データがあるかどうか
+    // 既存の火気申請データがあるかどうか
     isEditing,
     // バリデーション
     validate,
diff --git a/user/src/components/Applications/FireEquipment/constant.ts b/user/src/components/Applications/FireEquipment/constant.ts
index 36214ba1a..86f3baed5 100644
--- a/user/src/components/Applications/FireEquipment/constant.ts
+++ b/user/src/components/Applications/FireEquipment/constant.ts
@@ -1,8 +1,8 @@
 export enum fireEquipmentFormFields {
-  NAME = '火器の名称',
-  QUANTITY = '火器の台数',
+  NAME = '火気の名称',
+  QUANTITY = '火気の台数',
   FUEL = '燃料',
   USAGE = '使用用途',
-  IS_TAKEAWAY = '火器を毎日テントから持ち帰ることができますか？',
+  IS_TAKEAWAY = '火気を毎日テントから持ち帰ることができますか？',
   REMARK = '備考',
 }
diff --git a/user/src/components/Applications/FireEquipment/hooks.ts b/user/src/components/Applications/FireEquipment/hooks.ts
index d37b18574..cde9ea40f 100644
--- a/user/src/components/Applications/FireEquipment/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/hooks.ts
@@ -20,7 +20,7 @@ export const useFireEquipmentHooks = (groupId: number) => {
         remark: '',
       }
     : undefined;
-
+  const hasUnregistered = false; // TODO: API実装後に修正
   const formItem: FormItem[] = fireEquipment
     ? [
         {
@@ -55,7 +55,16 @@ export const useFireEquipmentHooks = (groupId: number) => {
     setIsEditing((prev) => !prev);
   };
 
+  const noApplicationItems: FormItem[] = [
+    {
+      label: '火気申請は不要（登録済み）',
+      content: '火気は使用しません。',
+    },
+  ];
+
   return {
+    hasUnregistered,
+    noApplicationItems,
     isEditing,
     formItem,
     handleEditClick,
diff --git a/user/src/components/Form/CheckBox/Checkbox.stories.tsx b/user/src/components/Form/CheckBox/Checkbox.stories.tsx
index fb7567550..2ebd0eb3b 100644
--- a/user/src/components/Form/CheckBox/Checkbox.stories.tsx
+++ b/user/src/components/Form/CheckBox/Checkbox.stories.tsx
@@ -27,7 +27,7 @@ const options: Option[] = [
   { id: '1', name: 'ゴミ箱の設置位置を記載しました。' },
   { id: '2', name: '保存場所を記載しました。' },
   { id: '3', name: '申請した物品をすべて平面図に記載しました。' },
-  { id: '4', name: '火器・電化製品の使用場所を明記しました。' },
+  { id: '4', name: '火気・電化製品の使用場所を明記しました。' },
 ];
 
 export const Default: Story = {

From 9bb5a0fa42b8e001449b0565f9ecbdc289f34d31 Mon Sep 17 00:00:00 2001
From: Kubosaka <s223301@stn.nagaokaut.ac.jp>
Date: Tue, 3 Jun 2025 21:12:54 +0900
Subject: [PATCH 10/13] =?UTF-8?q?=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E5=91=A8=E3=82=8A=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FireEquipment/components/FireEquipmentForm.tsx            | 4 ++--
 .../FireEquipment/components/FireEquipmentFormView.tsx        | 3 +++
 .../components/Applications/FireEquipment/components/hooks.ts | 4 ++++
 user/src/components/Applications/FireEquipment/hooks.ts       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index 81ec306c4..dec2cf06a 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -99,12 +99,12 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             required
             error={errors.isTakeaway?.message}
           />
-          <p className="max-w-[400px] break-words text-xs text-sub">
+          <p className="max-w-[400px] break-words text-xs text-[#484848]">
             火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
             <br />
             火気はテント内に残す行為は火事の原因になります。
           </p>
-          <p className="max-w-[400px] break-words text-xs text-sub">
+          <p className="max-w-[400px] break-words text-xs text-[#484848]">
             いいえを押した場合は火気の備考欄に理由を記載して下さい。
           </p>
           <TextArea
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index 394365aa6..1bdc9142f 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -45,6 +45,9 @@ export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
           options={RADIO_OPTIONS}
           error={errorsUnregistered.isRegister?.message}
         />
+        <p className="max-w-[400px] break-words text-xs text-[#484848]">
+          電気ホットプレートとIHは含まれません。
+        </p>
         {!isRegister && (
           <div className="flex flex-col items-center gap-4">
             <Button type="submit" size="pc" color="main">
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index e61e1817f..7d9eeecb1 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -76,6 +76,10 @@ export const useFireEquipmentOrder = (
   const values = watch();
 
   const validate = () => {
+    if (!fireEquipmentData) {
+      return false; // 既存の火気申請データがない場合は常に有効
+    }
+
     return (
       defaultValues.name === values.name &&
       defaultValues.quantity === values.quantity &&
diff --git a/user/src/components/Applications/FireEquipment/hooks.ts b/user/src/components/Applications/FireEquipment/hooks.ts
index cde9ea40f..799f6a6bd 100644
--- a/user/src/components/Applications/FireEquipment/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/hooks.ts
@@ -8,7 +8,7 @@ import { fireEquipmentFormFields } from './constant';
 
 export const useFireEquipmentHooks = (groupId: number) => {
   // NOTE:API繋いでないのでフラグで登録済みを判定、TODO: API実装後に削除
-  const isRegistered = true;
+  const isRegistered = false;
   const fireEquipment: FireEquipmentResponse | undefined = isRegistered
     ? {
         group_id: groupId,

From 243feb0af205bdbb1b2247c643289e94ef20c273 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 3 Jan 2026 12:20:37 +0000
Subject: [PATCH 11/13] chore: auto format code

---
 user/src/pages/home/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/src/pages/home/index.tsx b/user/src/pages/home/index.tsx
index 013ce6ebb..65b47768e 100644
--- a/user/src/pages/home/index.tsx
+++ b/user/src/pages/home/index.tsx
@@ -1,10 +1,10 @@
 import { useGetCheckAllRegisteredGroups } from '@/api/checkAllRegisteredApi';
 import { useGetGroupByUserId } from '@/api/groupApi';
 import { useGetUserPageSettings } from '@/api/userPageSettingAPI';
-import FireEquipment from '@/components/Applications/FireEquipment';
 import { GROUP_CATEGORY } from '@/utils/constants';
 import CookingProcessOrder from '@/components/Applications/CookingProcessOrder';
 import Employees from '@/components/Applications/Employees/Employees';
+import FireEquipment from '@/components/Applications/FireEquipment';
 import FoodProduct from '@/components/Applications/FoodProduct';
 import Group from '@/components/Applications/Group';
 import RentItems from '@/components/Applications/MultiItemForms/RentItems';

From c2b0a8965dd0699e9c6dc12d52165fbb1eb6bade Mon Sep 17 00:00:00 2001
From: haruto-kamijo <kamijoharuto@gmail.com>
Date: Sat, 3 Jan 2026 23:27:26 +0900
Subject: [PATCH 12/13] =?UTF-8?q?[fix&feat]=20UI=E3=81=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82API?=
 =?UTF-8?q?=E5=9E=8B=E3=81=A8Form=E5=9E=8B=E3=81=AE=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E3=81=AB=E4=B8=80=E8=B2=AB=E6=80=A7=E3=82=92=E4=BB=98=E3=81=91?=
 =?UTF-8?q?=E3=81=9F=E3=80=82=E3=83=9E=E3=82=B8=E3=83=83=E3=82=AF=E3=83=8A?=
 =?UTF-8?q?=E3=83=B3=E3=83=90=E3=83=BC=E3=81=A8=E8=AA=AC=E6=98=8E=E6=96=87?=
 =?UTF-8?q?=E3=82=92=E5=85=A8=E3=81=A6constant.ts=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FireEquipmentForm.tsx          | 33 +++++++----
 .../components/FireEquipmentFormView.tsx      |  2 +-
 .../FireEquipment/components/hooks.ts         | 40 ++++++-------
 .../FireEquipment/components/schema.ts        | 58 +++++++++----------
 .../Applications/FireEquipment/constant.ts    |  8 +++
 5 files changed, 79 insertions(+), 62 deletions(-)

diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index dec2cf06a..487f0604e 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -7,14 +7,18 @@ import Selector from '@/components/Form/Selector/Selector';
 import TextArea from '@/components/Form/TextArea/TextArea';
 import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
-import { fireEquipmentFormFields } from '../constant';
+import {
+  fireEquipmentFormFields,
+  FIRE_EQUIPMENT_INSTRUCTIONS,
+  FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID,
+} from '../constant';
 import { convertToBoolToString } from './hooks';
-import { FireEquipmentSchemaForm } from './schema';
+import { FireEquipmentFormValues } from './schema';
 
 type FireEquipmentFormProps = {
-  values: FireEquipmentSchemaForm;
-  errors: FieldErrors<FireEquipmentSchemaForm>;
-  setValue: UseFormSetValue<FireEquipmentSchemaForm>;
+  values: FireEquipmentFormValues;
+  errors: FieldErrors<FireEquipmentFormValues>;
+  setValue: UseFormSetValue<FireEquipmentFormValues>;
   isEditing: boolean;
   handleEditCancel?: () => void;
   validate?: () => boolean;
@@ -53,7 +57,7 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             required
             options={[
               {
-                id: 0,
+                id: FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID,
                 name: '選択してください',
                 disabled: true,
               },
@@ -99,13 +103,18 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
             required
             error={errors.isTakeaway?.message}
           />
-          <p className="max-w-[400px] break-words text-xs text-[#484848]">
-            火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。
-            <br />
-            火気はテント内に残す行為は火事の原因になります。
+          <p className="-mt-10 max-w-[400px] break-words text-xs text-[#484848]">
+            {FIRE_EQUIPMENT_INSTRUCTIONS.TAKEAWAY_NOTICE.split('\n').map(
+                (line, index) => (
+                    <span key={index}>
+                {line}
+                      {index === 0 && <br />}
+              </span>
+                )
+            )}
           </p>
           <p className="max-w-[400px] break-words text-xs text-[#484848]">
-            いいえを押した場合は火気の備考欄に理由を記載して下さい。
+            {FIRE_EQUIPMENT_INSTRUCTIONS.REMARK_NOTICE}
           </p>
           <TextArea
             label={fireEquipmentFormFields.REMARK}
@@ -145,4 +154,4 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
   );
 };
 
-export default FireEquipmentForm;
+export default FireEquipmentForm;
\ No newline at end of file
diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
index 1bdc9142f..da6735982 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentFormView.tsx
@@ -49,7 +49,7 @@ export const FireEquipmentFormView: FC<FireEquipmentFormViewProps> = ({
           電気ホットプレートとIHは含まれません。
         </p>
         {!isRegister && (
-          <div className="flex flex-col items-center gap-4">
+          <div className="mt-8 flex flex-col items-center gap-4">
             <Button type="submit" size="pc" color="main">
               登録
             </Button>
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index 7d9eeecb1..c527d25c5 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -6,22 +6,22 @@ import { toast } from 'react-toastify';
 import './schema';
 import {
   FireEquipmentSchema,
-  FireEquipmentSchemaForm,
-  UnRegisteredFireEquipmentSchema,
-  UnRegisteredFireEquipmentSchemaForm,
+  FireEquipmentFormValues,
+  UnregisteredFireEquipmentSchema,
+  UnregisteredFireEquipmentFormValues,
 } from './schema';
 
 export const useFireEquipmentOrder = (
-  groupId: number,
-  fireEquipmentData?: FireEquipmentResponse
+    groupId: number,
+    fireEquipmentData?: FireEquipmentResponse
 ) => {
   const {
     handleSubmit: handleSubmitUnregistered,
     formState: { errors: errorsUnregistered },
     setValue: setValueUnregistered,
     watch: watchUnregistered,
-  } = useForm<UnRegisteredFireEquipmentSchemaForm>({
-    resolver: zodResolver(UnRegisteredFireEquipmentSchema),
+  } = useForm<UnregisteredFireEquipmentFormValues>({
+    resolver: zodResolver(UnregisteredFireEquipmentSchema),
     defaultValues: {
       groupId: groupId,
       isRegister: true,
@@ -31,7 +31,7 @@ export const useFireEquipmentOrder = (
   // 既存の火気申請データがある場合は、編集モードにする
   const isEditing = !!fireEquipmentData;
 
-  const defaultValues: FireEquipmentSchemaForm = {
+  const defaultValues: FireEquipmentFormValues = {
     name: fireEquipmentData?.name || '',
     quantity: fireEquipmentData?.quantity || 0,
     fuel: fireEquipmentData?.fuel || 0,
@@ -45,7 +45,7 @@ export const useFireEquipmentOrder = (
     formState: { errors },
     setValue,
     watch,
-  } = useForm<FireEquipmentSchemaForm>({
+  } = useForm<FireEquipmentFormValues>({
     resolver: zodResolver(FireEquipmentSchema),
     defaultValues: defaultValues,
   });
@@ -54,13 +54,13 @@ export const useFireEquipmentOrder = (
   const isRegister = valuesUnregistered.isRegister;
   const isRegisterValue = isRegister ? YES_ID_STRING : NO_ID_STRING;
   const setIsRegisterValue = (
-    value: typeof YES_ID_STRING | typeof NO_ID_STRING
+      value: typeof YES_ID_STRING | typeof NO_ID_STRING
   ) => {
     setValueUnregistered('isRegister', value === YES_ID_STRING);
   };
 
   const onSubmitUnregistered = async (
-    formData: UnRegisteredFireEquipmentSchemaForm
+      formData: UnregisteredFireEquipmentFormValues
   ) => {
     if (formData.isRegister) {
       // trueの場合は、未登録には登録しないのでreturn
@@ -71,7 +71,7 @@ export const useFireEquipmentOrder = (
     toast.success('火気申請を行わない登録が完了しました');
   };
   const submitUnregisteredHandler =
-    handleSubmitUnregistered(onSubmitUnregistered);
+      handleSubmitUnregistered(onSubmitUnregistered);
 
   const values = watch();
 
@@ -81,16 +81,16 @@ export const useFireEquipmentOrder = (
     }
 
     return (
-      defaultValues.name === values.name &&
-      defaultValues.quantity === values.quantity &&
-      defaultValues.fuel === values.fuel &&
-      defaultValues.usage === values.usage &&
-      defaultValues.isTakeaway === values.isTakeaway &&
-      defaultValues.remarks === values.remarks
+        defaultValues.name === values.name &&
+        defaultValues.quantity === values.quantity &&
+        defaultValues.fuel === values.fuel &&
+        defaultValues.usage === values.usage &&
+        defaultValues.isTakeaway === values.isTakeaway &&
+        defaultValues.remarks === values.remarks
     );
   };
 
-  const onSubmitFireEquipment = async (formData: FireEquipmentSchemaForm) => {
+  const onSubmitFireEquipment = async (formData: FireEquipmentFormValues) => {
     console.log('Submitted Data:', formData);
     toast.success('火気申請が送信されました！');
   };
@@ -118,4 +118,4 @@ export const useFireEquipmentOrder = (
 
 export const convertToBoolToString = (value: boolean) => {
   return value ? YES_ID_STRING : NO_ID_STRING;
-};
+};
\ No newline at end of file
diff --git a/user/src/components/Applications/FireEquipment/components/schema.ts b/user/src/components/Applications/FireEquipment/components/schema.ts
index 6ee8a4c9d..e8effe4bc 100644
--- a/user/src/components/Applications/FireEquipment/components/schema.ts
+++ b/user/src/components/Applications/FireEquipment/components/schema.ts
@@ -3,39 +3,39 @@ import { z } from 'zod';
 
 // バリデーションスキーマ
 const fireEquipmentFuelArray = Object.values(FireEquipmentFuel).filter(
-  (v) => typeof v === 'number'
+    (v) => typeof v === 'number'
 ) as number[];
 
 export const FireEquipmentSchema = z
-  .object({
-    id: z.number().optional(),
-    name: z.string().min(1, '入力してください'),
-    quantity: z.number().min(1, '1以上の数字を入力してください'),
-    fuel: z.number().refine((value) => fireEquipmentFuelArray.includes(value), {
-      message: '燃料を選択してください',
-    }),
-    usage: z.string().min(1, '入力してください'),
-    isTakeaway: z.boolean(),
-    remarks: z.string().optional(),
-  })
-  .superRefine((data, ctx) => {
-    // 持ち帰りが「いいえ」の場合、備考欄は必須
-    if (!data.isTakeaway && data.remarks == '') {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: '持ち帰りが「いいえ」の場合、備考欄は必須です',
-        path: ['remarks'],
-      });
-    }
-  });
+    .object({
+        id: z.number().optional(),
+        name: z.string().min(1, '入力してください'),
+        quantity: z.number().min(1, '1以上の数字を入力してください'),
+        fuel: z.number().refine((value) => fireEquipmentFuelArray.includes(value), {
+            message: '燃料を選択してください',
+        }),
+        usage: z.string().min(1, '入力してください'),
+        isTakeaway: z.boolean(),
+        remarks: z.string().optional(),
+    })
+    .superRefine((data, ctx) => {
+        // 持ち帰りが「いいえ」の場合、備考欄は必須
+        if (!data.isTakeaway && data.remarks == '') {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: '持ち帰りが「いいえ」の場合、備考欄は必須です',
+                path: ['remarks'],
+            });
+        }
+    });
 
-export type FireEquipmentSchemaForm = z.infer<typeof FireEquipmentSchema>;
+export type FireEquipmentFormValues = z.infer<typeof FireEquipmentSchema>;
 
-export const UnRegisteredFireEquipmentSchema = z.object({
-  groupId: z.number().min(1, 'グループを選択してください'),
-  isRegister: z.boolean().default(true),
+export const UnregisteredFireEquipmentSchema = z.object({
+    groupId: z.number().min(1, 'グループを選択してください'),
+    isRegister: z.boolean().default(true),
 });
 
-export type UnRegisteredFireEquipmentSchemaForm = z.infer<
-  typeof UnRegisteredFireEquipmentSchema
->;
+export type UnregisteredFireEquipmentFormValues = z.infer<
+    typeof UnregisteredFireEquipmentSchema
+>;
\ No newline at end of file
diff --git a/user/src/components/Applications/FireEquipment/constant.ts b/user/src/components/Applications/FireEquipment/constant.ts
index 86f3baed5..03dd54a96 100644
--- a/user/src/components/Applications/FireEquipment/constant.ts
+++ b/user/src/components/Applications/FireEquipment/constant.ts
@@ -6,3 +6,11 @@ export enum fireEquipmentFormFields {
   IS_TAKEAWAY = '火気を毎日テントから持ち帰ることができますか？',
   REMARK = '備考',
 }
+
+export const FIRE_EQUIPMENT_INSTRUCTIONS = {
+  TAKEAWAY_NOTICE:
+      '火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。\n火気はテント内に残す行為は火事の原因になります。',
+  REMARK_NOTICE: 'いいえを押した場合は火気の備考欄に理由を記載して下さい。',
+};
+
+export const FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID = 0;
\ No newline at end of file

From f575e55f537d48431692985877005f986075da52 Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Sat, 3 Jan 2026 14:30:14 +0000
Subject: [PATCH 13/13] chore: auto format code

---
 .../components/FireEquipmentForm.tsx          | 18 +++----
 .../FireEquipment/components/hooks.ts         | 28 +++++-----
 .../FireEquipment/components/schema.ts        | 52 +++++++++----------
 .../Applications/FireEquipment/constant.ts    |  4 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
index 487f0604e..9513f0cb4 100644
--- a/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
+++ b/user/src/components/Applications/FireEquipment/components/FireEquipmentForm.tsx
@@ -8,9 +8,9 @@ import TextArea from '@/components/Form/TextArea/TextArea';
 import TextBox from '@/components/Form/TextBox/TextBox';
 import FormContainer from '@/components/FormContainer';
 import {
-  fireEquipmentFormFields,
-  FIRE_EQUIPMENT_INSTRUCTIONS,
   FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID,
+  FIRE_EQUIPMENT_INSTRUCTIONS,
+  fireEquipmentFormFields,
 } from '../constant';
 import { convertToBoolToString } from './hooks';
 import { FireEquipmentFormValues } from './schema';
@@ -105,12 +105,12 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
           />
           <p className="-mt-10 max-w-[400px] break-words text-xs text-[#484848]">
             {FIRE_EQUIPMENT_INSTRUCTIONS.TAKEAWAY_NOTICE.split('\n').map(
-                (line, index) => (
-                    <span key={index}>
-                {line}
-                      {index === 0 && <br />}
-              </span>
-                )
+              (line, index) => (
+                <span key={index}>
+                  {line}
+                  {index === 0 && <br />}
+                </span>
+              )
             )}
           </p>
           <p className="max-w-[400px] break-words text-xs text-[#484848]">
@@ -154,4 +154,4 @@ const FireEquipmentForm: FC<FireEquipmentFormProps> = ({
   );
 };
 
-export default FireEquipmentForm;
\ No newline at end of file
+export default FireEquipmentForm;
diff --git a/user/src/components/Applications/FireEquipment/components/hooks.ts b/user/src/components/Applications/FireEquipment/components/hooks.ts
index c527d25c5..992f0552c 100644
--- a/user/src/components/Applications/FireEquipment/components/hooks.ts
+++ b/user/src/components/Applications/FireEquipment/components/hooks.ts
@@ -5,15 +5,15 @@ import { useForm } from 'react-hook-form';
 import { toast } from 'react-toastify';
 import './schema';
 import {
-  FireEquipmentSchema,
   FireEquipmentFormValues,
-  UnregisteredFireEquipmentSchema,
+  FireEquipmentSchema,
   UnregisteredFireEquipmentFormValues,
+  UnregisteredFireEquipmentSchema,
 } from './schema';
 
 export const useFireEquipmentOrder = (
-    groupId: number,
-    fireEquipmentData?: FireEquipmentResponse
+  groupId: number,
+  fireEquipmentData?: FireEquipmentResponse
 ) => {
   const {
     handleSubmit: handleSubmitUnregistered,
@@ -54,13 +54,13 @@ export const useFireEquipmentOrder = (
   const isRegister = valuesUnregistered.isRegister;
   const isRegisterValue = isRegister ? YES_ID_STRING : NO_ID_STRING;
   const setIsRegisterValue = (
-      value: typeof YES_ID_STRING | typeof NO_ID_STRING
+    value: typeof YES_ID_STRING | typeof NO_ID_STRING
   ) => {
     setValueUnregistered('isRegister', value === YES_ID_STRING);
   };
 
   const onSubmitUnregistered = async (
-      formData: UnregisteredFireEquipmentFormValues
+    formData: UnregisteredFireEquipmentFormValues
   ) => {
     if (formData.isRegister) {
       // trueの場合は、未登録には登録しないのでreturn
@@ -71,7 +71,7 @@ export const useFireEquipmentOrder = (
     toast.success('火気申請を行わない登録が完了しました');
   };
   const submitUnregisteredHandler =
-      handleSubmitUnregistered(onSubmitUnregistered);
+    handleSubmitUnregistered(onSubmitUnregistered);
 
   const values = watch();
 
@@ -81,12 +81,12 @@ export const useFireEquipmentOrder = (
     }
 
     return (
-        defaultValues.name === values.name &&
-        defaultValues.quantity === values.quantity &&
-        defaultValues.fuel === values.fuel &&
-        defaultValues.usage === values.usage &&
-        defaultValues.isTakeaway === values.isTakeaway &&
-        defaultValues.remarks === values.remarks
+      defaultValues.name === values.name &&
+      defaultValues.quantity === values.quantity &&
+      defaultValues.fuel === values.fuel &&
+      defaultValues.usage === values.usage &&
+      defaultValues.isTakeaway === values.isTakeaway &&
+      defaultValues.remarks === values.remarks
     );
   };
 
@@ -118,4 +118,4 @@ export const useFireEquipmentOrder = (
 
 export const convertToBoolToString = (value: boolean) => {
   return value ? YES_ID_STRING : NO_ID_STRING;
-};
\ No newline at end of file
+};
diff --git a/user/src/components/Applications/FireEquipment/components/schema.ts b/user/src/components/Applications/FireEquipment/components/schema.ts
index e8effe4bc..a45940a1b 100644
--- a/user/src/components/Applications/FireEquipment/components/schema.ts
+++ b/user/src/components/Applications/FireEquipment/components/schema.ts
@@ -3,39 +3,39 @@ import { z } from 'zod';
 
 // バリデーションスキーマ
 const fireEquipmentFuelArray = Object.values(FireEquipmentFuel).filter(
-    (v) => typeof v === 'number'
+  (v) => typeof v === 'number'
 ) as number[];
 
 export const FireEquipmentSchema = z
-    .object({
-        id: z.number().optional(),
-        name: z.string().min(1, '入力してください'),
-        quantity: z.number().min(1, '1以上の数字を入力してください'),
-        fuel: z.number().refine((value) => fireEquipmentFuelArray.includes(value), {
-            message: '燃料を選択してください',
-        }),
-        usage: z.string().min(1, '入力してください'),
-        isTakeaway: z.boolean(),
-        remarks: z.string().optional(),
-    })
-    .superRefine((data, ctx) => {
-        // 持ち帰りが「いいえ」の場合、備考欄は必須
-        if (!data.isTakeaway && data.remarks == '') {
-            ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                message: '持ち帰りが「いいえ」の場合、備考欄は必須です',
-                path: ['remarks'],
-            });
-        }
-    });
+  .object({
+    id: z.number().optional(),
+    name: z.string().min(1, '入力してください'),
+    quantity: z.number().min(1, '1以上の数字を入力してください'),
+    fuel: z.number().refine((value) => fireEquipmentFuelArray.includes(value), {
+      message: '燃料を選択してください',
+    }),
+    usage: z.string().min(1, '入力してください'),
+    isTakeaway: z.boolean(),
+    remarks: z.string().optional(),
+  })
+  .superRefine((data, ctx) => {
+    // 持ち帰りが「いいえ」の場合、備考欄は必須
+    if (!data.isTakeaway && data.remarks == '') {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: '持ち帰りが「いいえ」の場合、備考欄は必須です',
+        path: ['remarks'],
+      });
+    }
+  });
 
 export type FireEquipmentFormValues = z.infer<typeof FireEquipmentSchema>;
 
 export const UnregisteredFireEquipmentSchema = z.object({
-    groupId: z.number().min(1, 'グループを選択してください'),
-    isRegister: z.boolean().default(true),
+  groupId: z.number().min(1, 'グループを選択してください'),
+  isRegister: z.boolean().default(true),
 });
 
 export type UnregisteredFireEquipmentFormValues = z.infer<
-    typeof UnregisteredFireEquipmentSchema
->;
\ No newline at end of file
+  typeof UnregisteredFireEquipmentSchema
+>;
diff --git a/user/src/components/Applications/FireEquipment/constant.ts b/user/src/components/Applications/FireEquipment/constant.ts
index 03dd54a96..57e2f1b3f 100644
--- a/user/src/components/Applications/FireEquipment/constant.ts
+++ b/user/src/components/Applications/FireEquipment/constant.ts
@@ -9,8 +9,8 @@ export enum fireEquipmentFormFields {
 
 export const FIRE_EQUIPMENT_INSTRUCTIONS = {
   TAKEAWAY_NOTICE:
-      '火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。\n火気はテント内に残す行為は火事の原因になります。',
+    '火気は毎日持って帰ることができない場合を除き、基本的に持ち帰ってください。\n火気はテント内に残す行為は火事の原因になります。',
   REMARK_NOTICE: 'いいえを押した場合は火気の備考欄に理由を記載して下さい。',
 };
 
-export const FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID = 0;
\ No newline at end of file
+export const FIRE_EQUIPMENT_FUEL_PLACEHOLDER_ID = 0;