From 9a377b4aa08b75a77cb709119d8fb2c741c9553e Mon Sep 17 00:00:00 2001
From: "Haru.Kusano" <haru.kusano@ivis.co.jp>
Date: Mon, 9 Jun 2025 12:00:39 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E9=9A=99=E9=96=93=E3=82=92=E8=BF=BD=E5=8A=A0(=E4=BB=AE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TaskListPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx
index adaa8e9..03c9a2e 100644
--- a/frontend/src/pages/TaskListPage.tsx
+++ b/frontend/src/pages/TaskListPage.tsx
@@ -179,6 +179,7 @@ const TaskListPage: React.FC = () => {
                   <IconButton
                     edge="end"
                     aria-label="食材情報追加"
+                    sx={{ marginLeft: 2 }}
                     onClick={() => {
                       setOpenInfoDialog(true)
                       setSelectedTask(tobuy.tobuy_id)

From 0376de189c34b75c9463d10a4f6ce249a2eece42 Mon Sep 17 00:00:00 2001
From: "Haru.Kusano" <haru.kusano@ivis.co.jp>
Date: Mon, 9 Jun 2025 16:08:02 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E8=AA=AC=E6=98=8E=E6=96=87=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TaskListPage.tsx | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx
index 03c9a2e..58ac36a 100644
--- a/frontend/src/pages/TaskListPage.tsx
+++ b/frontend/src/pages/TaskListPage.tsx
@@ -58,7 +58,7 @@ const TaskListPage: React.FC = () => {
 
   //在庫登録ダイアログの表示状態
   const [openInfoDialog, setOpenInfoDialog] = useState(false);
-  
+
   const [selectedTask, setSelectedTask] = useState<ToBuy["tobuy_id"]>(0);
 
   const [newToBuy, setNewToBuy] = useState(EMPTY_TASK);
@@ -219,7 +219,11 @@ const TaskListPage: React.FC = () => {
         </List>
       </div>
       {/* 新規材料作成ボタン - 画面下部に固定表示 */}
-      <Tooltip title="材料のみ追加">
+      <Box sx={{ textAlign: 'center', position: 'fixed', bottom: 76, left: '40%', transform: 'translateX(-50%)' }}>
+        <Typography variant="caption" color="textSecondary">
+          材料のみ追加
+        </Typography>
+        </Box>
         <Fab
           color="primary"
           sx={{ position: 'fixed', bottom: 16, left: '40%', transform: 'translateX(-50%)' }}
@@ -227,22 +231,25 @@ const TaskListPage: React.FC = () => {
         >
           <AddIcon />
         </Fab>
-      </Tooltip>
+      
       {/*新規料理追加ボタン - 画面下部に固定表示 */}
-      <Tooltip title="料理から追加">
+      <Box sx={{ textAlign: 'center', position: 'fixed', bottom: 76, left: '60%', transform: 'translateX(-50%)' }}>
+        <Typography variant="caption" color="textSecondary">
+          料理から追加
+        </Typography>
+        </Box>
         <Fab
           color="primary"
           sx={{ position: 'fixed', bottom: 16, left: '60%', transform: 'translateX(-50%)' }}
-          onClick={() => {setOpenDialog(true);
-                        //handleNavigate('/AddDishies1');
+          onClick={() => {
+            setOpenDialog(true);
+            //handleNavigate('/AddDishies1');
           }}
-          //selected={isSelected('/test')}
-
-          
+        //selected={isSelected('/test')}
         >
           <SoupKitchenIcon />
         </Fab>
-      </Tooltip>
+      
 
       {/* 新規タスク作成ダイアログ */}
       <Dialog open={openDialog} onClose={() => setOpenDialog(false)} disableScrollLock={true}>
@@ -266,7 +273,7 @@ const TaskListPage: React.FC = () => {
               <Select
                 labelId="demo-simple-select-label"
                 value={newToBuy.category}
-                onChange={(e) => onChangeCategory(e.target.value) }
+                onChange={(e) => onChangeCategory(e.target.value)}
               >
                 <MenuItem value="乳製品">乳製品</MenuItem>
                 <MenuItem value="魚・肉">魚・肉</MenuItem>

From 8a5bd92092ee1997055e61ced0df9b10b61d004b Mon Sep 17 00:00:00 2001
From: "Haru.Kusano" <haru.kusano@ivis.co.jp>
Date: Mon, 9 Jun 2025 17:04:07 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E9=96=93=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TaskListPage.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx
index 3b29dfe..7ab3160 100644
--- a/frontend/src/pages/TaskListPage.tsx
+++ b/frontend/src/pages/TaskListPage.tsx
@@ -200,7 +200,7 @@ const TaskListPage: React.FC = () => {
                   <IconButton
                     edge="end"
                     aria-label="食材情報追加"
-                    sx={{ marginLeft: 2 }}
+                    //sx={{ marginRight: 2 }}
                     onClick={() => {
                       setOpenInfoDialog(true)
                       setSelectedTask(tobuy.tobuyId)
@@ -210,6 +210,7 @@ const TaskListPage: React.FC = () => {
                     <ShoppingBasketIcon />
                   </IconButton>
                 </Tooltip>
+                
                 {/* 買い物リスト：食材削除ボタン */}
                 <Tooltip title="項目を削除"
                   componentsProps={{
@@ -227,6 +228,7 @@ const TaskListPage: React.FC = () => {
 
                   <IconButton
                     edge="end"
+                    sx={{ marginLeft: 3 }}
                     aria-label="delete"
                     onClick={() => handleDeleteTask(tobuy.tobuyId)}
                   >

From aaa0ef605a27bf495d35c7f1b539f0f9f56d0fae Mon Sep 17 00:00:00 2001
From: "Haru.Kusano" <haru.kusano@ivis.co.jp>
Date: Tue, 10 Jun 2025 10:19:18 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TaskListPage.tsx | 79 +++++++++++++++++------------
 1 file changed, 47 insertions(+), 32 deletions(-)

diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx
index 7ab3160..807287f 100644
--- a/frontend/src/pages/TaskListPage.tsx
+++ b/frontend/src/pages/TaskListPage.tsx
@@ -32,7 +32,7 @@ import {
 } from '@mui/material';
 import {
   Add as AddIcon, Delete as DeleteIcon, ShoppingBasket as ShoppingBasketIcon,
-  SoupKitchen as SoupKitchenIcon
+  SoupKitchen as SoupKitchenIcon, Edit as EditIcon
 } from '@mui/icons-material';
 import { ToBuy, Stuff, Stock } from '../types/types';
 import { TOBUY_ERRORS } from '../constants/errorMessages';
@@ -64,7 +64,7 @@ const TaskListPage: React.FC = () => {
 
   //在庫登録ダイアログの表示状態
   const [openInfoDialog, setOpenInfoDialog] = useState(false);
-  
+
   const [selectedTask, setSelectedTask] = useState<ToBuy["tobuyId"]>(0);
 
   const [newToBuy, setNewToBuy] = useState(EMPTY_TOBUY);
@@ -126,14 +126,14 @@ const TaskListPage: React.FC = () => {
       console.error(`${TOBUY_ERRORS.DELETE_FAILED}:`, error);
     }
   };
-  
+
   /**
    * 買うものリストの在庫登録（購入処理）を行うハンドラー
    */
   const handleBuy = async (tobuyId: number) => {
     try {
       const today = new Date().toISOString().substring(0, 10);
-      await toBuyApi.buy({tobuyId, ...newStock, lastUpdate: today});
+      await toBuyApi.buy({ tobuyId, ...newStock, lastUpdate: today });
       fetchTasks(); // 削除後の買うもの一覧を再取得
     } catch (error) {
       console.error(`${TOBUY_ERRORS.BUY_FAILED}:`, error);
@@ -194,13 +194,28 @@ const TaskListPage: React.FC = () => {
                   textDecoration: false ? 'line-through' : 'none',
                 }}
               />
-              {/* 買い物リスト：食材情報記入ボタン */}
               <ListItemSecondaryAction>
+                {/* 買い物リスト：数量変更ボタン */}
+                <Tooltip title="数量変更">
+                  <IconButton
+                    edge="end"
+                    aria-label="数量変更"
+                    sx={{ marginRight: 2 }}
+                    onClick={() => {
+                      setOpenInfoDialog(true)
+                      //setSelectedTask(tobuy.tobuyId)
+                      // handleDeleteTask(tobuy.tobuyId)
+                    }}
+                  >
+                    <EditIcon />
+                  </IconButton>
+                </Tooltip>
+                {/* 買い物リスト：食材情報記入ボタン */}
                 <Tooltip title="食材情報追加">
                   <IconButton
                     edge="end"
                     aria-label="食材情報追加"
-                    //sx={{ marginRight: 2 }}
+                    //sx={{ marginRight: 3 }}
                     onClick={() => {
                       setOpenInfoDialog(true)
                       setSelectedTask(tobuy.tobuyId)
@@ -210,7 +225,7 @@ const TaskListPage: React.FC = () => {
                     <ShoppingBasketIcon />
                   </IconButton>
                 </Tooltip>
-                
+
                 {/* 買い物リスト：食材削除ボタン */}
                 <Tooltip title="項目を削除"
                   componentsProps={{
@@ -246,33 +261,33 @@ const TaskListPage: React.FC = () => {
         <Typography variant="caption" color="textSecondary">
           材料のみ追加
         </Typography>
-        </Box>
-        <Fab
-          color="primary"
-          sx={{ position: 'fixed', bottom: 16, left: '40%', transform: 'translateX(-50%)' }}
-          onClick={() => setOpenDialog(true)}
-        >
-          <AddIcon />
-        </Fab>
-      
+      </Box>
+      <Fab
+        color="primary"
+        sx={{ position: 'fixed', bottom: 16, left: '40%', transform: 'translateX(-50%)' }}
+        onClick={() => setOpenDialog(true)}
+      >
+        <AddIcon />
+      </Fab>
+
       {/*新規料理追加ボタン - 画面下部に固定表示 */}
       <Box sx={{ textAlign: 'center', position: 'fixed', bottom: 76, left: '60%', transform: 'translateX(-50%)' }}>
         <Typography variant="caption" color="textSecondary">
           料理から追加
         </Typography>
-        </Box>
-        <Fab
-          color="primary"
-          sx={{ position: 'fixed', bottom: 16, left: '60%', transform: 'translateX(-50%)' }}
-          onClick={() => {
-            setOpenDialog(true);
-            //handleNavigate('/AddDishies1');
-          }}
-        //selected={isSelected('/test')}
-        >
-          <SoupKitchenIcon />
-        </Fab>
-      
+      </Box>
+      <Fab
+        color="primary"
+        sx={{ position: 'fixed', bottom: 16, left: '60%', transform: 'translateX(-50%)' }}
+        onClick={() => {
+          setOpenDialog(true);
+          //handleNavigate('/AddDishies1');
+        }}
+      //selected={isSelected('/test')}
+      >
+        <SoupKitchenIcon />
+      </Fab>
+
 
       {/* 新規タスク作成ダイアログ */}
       <Dialog open={openDialog} onClose={() => setOpenDialog(false)} disableScrollLock={true}>
@@ -371,7 +386,7 @@ const TaskListPage: React.FC = () => {
               label="価格"
               fullWidth
               value={newStock.price}
-              onChange={(e) => setNewStock({...newStock, price: parseInt(e.target.value)})}
+              onChange={(e) => setNewStock({ ...newStock, price: parseInt(e.target.value) })}
             />
             {/* 消費・賞味期限入力フィールド */}
             <TextField
@@ -380,7 +395,7 @@ const TaskListPage: React.FC = () => {
               fullWidth
               multiline
               value={newStock.expDate}
-              onChange={(e) => setNewStock({...newStock, expDate: e.target.value})}
+              onChange={(e) => setNewStock({ ...newStock, expDate: e.target.value })}
             />
             {/* 購入日入力フィールド */}
             <TextField
@@ -389,7 +404,7 @@ const TaskListPage: React.FC = () => {
               fullWidth
               multiline
               value={newStock.buyDate}
-              onChange={(e) => setNewStock({...newStock, buyDate: e.target.value})}
+              onChange={(e) => setNewStock({ ...newStock, buyDate: e.target.value })}
             />
           </Box>
         </DialogContent>

From ba36fe74b3737060691165be37b9db661dcf7e2d Mon Sep 17 00:00:00 2001
From: "Haru.Kusano" <haru.kusano@ivis.co.jp>
Date: Tue, 10 Jun 2025 17:18:55 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B2=B7=E3=81=84=E7=89=A9=E3=83=AA?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E7=B7=A8=E9=9B=86=E6=A9=9F=E8=83=BD=E3=81=AE?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/TaskListPage.tsx | 97 +++++++++++++++++++++++++++--
 frontend/src/services/api.ts        | 21 ++++++-
 2 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/TaskListPage.tsx b/frontend/src/pages/TaskListPage.tsx
index 807287f..db7cfa3 100644
--- a/frontend/src/pages/TaskListPage.tsx
+++ b/frontend/src/pages/TaskListPage.tsx
@@ -64,9 +64,20 @@ const TaskListPage: React.FC = () => {
 
   //在庫登録ダイアログの表示状態
   const [openInfoDialog, setOpenInfoDialog] = useState(false);
+  //数量変更ダイアログの表示状態
+  const [openAmountDialog, setOpenAmountDialog] = useState(false);
 
   const [selectedTask, setSelectedTask] = useState<ToBuy["tobuyId"]>(0);
 
+  const [selectedEditingTask, setSelectedEditingTask] = useState<ToBuy>({
+  tobuyId: 0,
+  stuffId: 0,
+  stuffName: "",
+  amount: 0,
+  shop: undefined,
+});
+
+
   const [newToBuy, setNewToBuy] = useState(EMPTY_TOBUY);
 
   const [stuffs, setStuffs] = useState<Stuff[]>([]);
@@ -86,6 +97,7 @@ const TaskListPage: React.FC = () => {
   const fetchTasks = async () => {
     try {
       const tobuys = await toBuyApi.getToBuys();
+      console.log(tobuys);
       setToBuys(tobuys);
     } catch (error) {
       console.error(`${TOBUY_ERRORS.FETCH_FAILED}:`, error);
@@ -160,6 +172,38 @@ const TaskListPage: React.FC = () => {
     }
   };
 
+  /**
+   * 買い物リストの数量を変更するハンドラー
+   * 入力されたタスク情報をAPIに送信して変更
+   * 作成後はダイアログを閉じ、入力内容をリセット
+   */
+   const handleUpdateTask = async () => {
+    try {
+      console.log(selectedEditingTask)
+      await toBuyApi.updateToBuy(selectedEditingTask);
+      setOpenAmountDialog(false); // ダイアログを閉じる
+      //setNewToBuy(EMPTY_TOBUY); // 入力内容をリセット
+      fetchTasks(); // 作成後のタスク一覧を再取得
+    } catch (error) {
+      console.error(`${TOBUY_ERRORS.CREATE_FAILED}:`, error);
+    }
+  };
+
+//   /**
+//    * クリックされたタスクの情報を取得するための関数
+//    * @param tobuyId 
+//    * @returns tobuyIdが一致するtoBuy
+//    */
+//   const getToBuyDetails = (tobuyId: number): ToBuy => {
+//     console.log(tobuyId)
+//     const result = tobuys.find((toBuy) => toBuy.tobuyId === tobuyId);
+//     if(result === undefined){
+//       throw new Error(`tobuyId: ${tobuyId} に対応するデータが見つかりません`);
+//     }
+//   return result;
+// };
+
+
   return (
     <Container>
       <Typography variant="h4" component="h1" gutterBottom>
@@ -202,9 +246,8 @@ const TaskListPage: React.FC = () => {
                     aria-label="数量変更"
                     sx={{ marginRight: 2 }}
                     onClick={() => {
-                      setOpenInfoDialog(true)
-                      //setSelectedTask(tobuy.tobuyId)
-                      // handleDeleteTask(tobuy.tobuyId)
+                      setOpenAmountDialog(true)
+                      setSelectedEditingTask(tobuy)
                     }}
                   >
                     <EditIcon />
@@ -355,7 +398,7 @@ const TaskListPage: React.FC = () => {
               onChange={(e) => {
                 const value = e.target.value;
                 const parsedValue = parseInt(value, 10); // 数値に変換
-                if (!isNaN(parsedValue)) {
+                if (!isNaN(parsedValue) && parsedValue >= 0) { //負数除外
                   setNewToBuy({ ...newToBuy, amount: parsedValue }); // number型で保存
                 }
               }}
@@ -422,6 +465,52 @@ const TaskListPage: React.FC = () => {
           </Button>
         </DialogActions>
       </Dialog>
+
+      {/* 数量変更ダイアログ */}
+      <Dialog open={openAmountDialog} onClose={() => setOpenAmountDialog(false)} disableScrollLock={true}>
+        <Box display="flex" alignItems="center">
+          <DialogTitle sx={{ flexGrow: 1 }}>数量の変更</DialogTitle>
+        </Box>
+        <DialogContent>
+          <Box sx={{ pt: 1 }}>
+       
+            {/* 材料名表示 */}
+            <TextField
+              autoFocus
+              margin="dense"
+              label="材料名"
+              fullWidth
+              value={selectedEditingTask.stuffName}
+              disabled
+              sx={{ marginBottom: 2 }}
+            />
+            {/* 数量入力フィールド */}
+            <TextField
+              margin="dense"
+              label="数量"
+              fullWidth
+              value={selectedEditingTask.amount}
+              onChange={(e) => {
+                const value = e.target.value;
+                const parsedValue = parseInt(value, 10); // 数値に変換
+                if (!isNaN(parsedValue) && parsedValue >= 0) { //負数除外
+                  setSelectedEditingTask({ ...selectedEditingTask, amount: parsedValue }); // number型で保存
+                }
+              }}
+              sx={{ width: "20%" }}
+              type="number"
+              inputProps={{ inputMode: "numeric", pattern: "[0-9]*" }} // ここで整数のみ許可
+
+            />
+          </Box>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setOpenAmountDialog(false)}>キャンセル</Button>
+          <Button onClick={handleUpdateTask} variant="contained">
+            確定
+          </Button>
+        </DialogActions>
+      </Dialog>
     </Container>
 
   );
diff --git a/frontend/src/services/api.ts b/frontend/src/services/api.ts
index 1477b83..43af21d 100644
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -109,7 +109,7 @@ export const toBuyApi = {
    * @param tobuy 作成する材料情報
    * @returns 作成された材料情報
    */
-  addToBuy: async (tobuy: Omit<ToBuy, 'stuffId' | 'tobuyId'> & { stuffId: number | null, category: string }): Promise<any> => {
+  addToBuy:async (tobuy: Omit<ToBuy, 'stuffId' | 'tobuyId'> & { stuffId: number | null, category: string }): Promise<any> => {
     const response = await fetch(`${API_BASE_URL}/api/tobuy/add`, {
       method: 'POST',
       headers: getHeaders(),
@@ -154,6 +154,25 @@ export const toBuyApi = {
     // }
   },
 
+  /**
+   * 買うものリストの変更
+   * @param tobuy 変更する材料情報
+   * @returns 変更された材料情報
+   */
+  updateToBuy: async (tobuy:ToBuy): Promise<any> => {
+    const response = await fetch(`${API_BASE_URL}/api/tobuy/update`, {
+      method: 'PUT',
+      headers: getHeaders(),
+      body: JSON.stringify(tobuy),
+    });
+
+    if (!response.ok) {
+      throw new Error(TOBUY_ERRORS.CREATE_FAILED);
+    }
+
+    return response.json();
+  },
+
   /**
    * 買うものリストの在庫登録（購入処理）
    */