|
|
|
|
@ -34,7 +34,7 @@ import { |
|
|
|
|
Add as AddIcon, Delete as DeleteIcon, ShoppingBasket as ShoppingBasketIcon, |
|
|
|
|
SoupKitchen as SoupKitchenIcon |
|
|
|
|
} from '@mui/icons-material'; |
|
|
|
|
import { ToBuy, Stuff, Stock } from '../types/types'; |
|
|
|
|
import { ToBuy, Stuff, /*Stock*/ } from '../types/types'; |
|
|
|
|
import { TOBUY_ERRORS } from '../constants/errorMessages'; |
|
|
|
|
//import { FaCarrot } from "react-icons/fa6"; //エラー起きる いったん保留
|
|
|
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
@ -73,6 +73,8 @@ const TaskListPage: React.FC = () => { |
|
|
|
|
|
|
|
|
|
const [newStock, setNewStock] = useState(EMPTY_STOCK); |
|
|
|
|
|
|
|
|
|
const [newPrice, setNewPrice] = useState("");//入力用の価格(文字列)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// コンポーネントマウント時にタスク一覧を取得
|
|
|
|
|
useEffect(() => { |
|
|
|
|
@ -126,14 +128,21 @@ 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}); |
|
|
|
|
const parsedPrice = parseInt(newPrice, 10);
|
|
|
|
|
if (!isNaN(parsedPrice)) { |
|
|
|
|
setNewStock({ ...newStock, price: parsedPrice }); |
|
|
|
|
}else{ |
|
|
|
|
alert('入力が無効です') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
await toBuyApi.buy({ tobuyId, ...newStock, lastUpdate: today }); //データベースに送信
|
|
|
|
|
fetchTasks(); // 削除後の買うもの一覧を再取得
|
|
|
|
|
} catch (error) { |
|
|
|
|
console.error(`${TOBUY_ERRORS.BUY_FAILED}:`, error); |
|
|
|
|
@ -253,12 +262,13 @@ const TaskListPage: React.FC = () => { |
|
|
|
|
<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> |
|
|
|
|
@ -286,7 +296,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> |
|
|
|
|
@ -360,26 +370,37 @@ const TaskListPage: React.FC = () => { |
|
|
|
|
margin="dense" |
|
|
|
|
label="価格" |
|
|
|
|
fullWidth |
|
|
|
|
value={newStock.price} |
|
|
|
|
onChange={(e) => setNewStock({...newStock, price: parseInt(e.target.value)})} |
|
|
|
|
value={newPrice} |
|
|
|
|
onChange={(e) => { |
|
|
|
|
const value = e.target.value; |
|
|
|
|
if (/^\d*$/.test(value)) { |
|
|
|
|
setNewPrice(value) |
|
|
|
|
} ; |
|
|
|
|
}} |
|
|
|
|
/> |
|
|
|
|
{/* 購入日入力フィールド */} |
|
|
|
|
<TextField |
|
|
|
|
margin="dense" |
|
|
|
|
label="購入日(yyyy/MM/dd)" |
|
|
|
|
fullWidth |
|
|
|
|
value={newStock.buyDate} |
|
|
|
|
onChange={(e) => setNewStock({ ...newStock, buyDate: e.target.value })} |
|
|
|
|
/> |
|
|
|
|
{/* 消費・賞味期限入力フィールド */} |
|
|
|
|
<TextField |
|
|
|
|
margin="dense" |
|
|
|
|
label="消費・賞味期限(yyyy/MM/dd)" |
|
|
|
|
fullWidth |
|
|
|
|
multiline |
|
|
|
|
value={newStock.expDate} |
|
|
|
|
onChange={(e) => setNewStock({...newStock, expDate: e.target.value})} |
|
|
|
|
onChange={(e) => setNewStock({ ...newStock, expDate: e.target.value })} |
|
|
|
|
/> |
|
|
|
|
{/* 購入日入力フィールド */} |
|
|
|
|
{/* 購入店舗入力フィールド */} |
|
|
|
|
<TextField |
|
|
|
|
margin="dense" |
|
|
|
|
label="購入日(yyyy/MM/dd)" |
|
|
|
|
label="店舗" |
|
|
|
|
fullWidth |
|
|
|
|
multiline |
|
|
|
|
value={newStock.buyDate} |
|
|
|
|
onChange={(e) => setNewStock({...newStock, buyDate: e.target.value})} |
|
|
|
|
value={newToBuy.shop} |
|
|
|
|
onChange={(e) => setNewToBuy({ ...newToBuy, shop: e.target.value })} |
|
|
|
|
/> |
|
|
|
|
</Box> |
|
|
|
|
</DialogContent> |
|
|
|
|
|
akito.nishiwaki
4 months ago