cập nhật api thêm/sửa mẻ
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
import Select from "@/components/Select";
|
||||
import { IconSymbol } from "@/components/ui/icon-symbol";
|
||||
import { queryGpsData } from "@/controller/DeviceController";
|
||||
import { queryUpdateFishingLogs } from "@/controller/TripController";
|
||||
import { showErrorToast, showSuccessToast } from "@/services/toast_service";
|
||||
import { useFishes } from "@/state/use-fish";
|
||||
import { useTrip } from "@/state/use-trip";
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import React from "react";
|
||||
import { Controller, useFieldArray, useForm } from "react-hook-form";
|
||||
@@ -24,7 +28,6 @@ interface CreateOrUpdateHaulModalProps {
|
||||
fishingLog?: Model.FishingLog | null;
|
||||
fishingLogIndex?: number;
|
||||
}
|
||||
|
||||
const UNITS = ["con", "kg", "tấn"] as const;
|
||||
type Unit = (typeof UNITS)[number];
|
||||
|
||||
@@ -70,6 +73,7 @@ const CreateOrUpdateHaulModal: React.FC<CreateOrUpdateHaulModalProps> = ({
|
||||
const [expandedFishIndices, setExpandedFishIndices] = React.useState<
|
||||
number[]
|
||||
>([]);
|
||||
const { trip, getTrip } = useTrip();
|
||||
const { control, handleSubmit, formState, watch, reset } =
|
||||
useForm<FormValues>({
|
||||
resolver: zodResolver(formSchema),
|
||||
@@ -95,26 +99,90 @@ const CreateOrUpdateHaulModal: React.FC<CreateOrUpdateHaulModalProps> = ({
|
||||
);
|
||||
};
|
||||
|
||||
const onSubmit = (values: FormValues) => {
|
||||
// Map form values to the FishingLogInfo-like shape the user requested
|
||||
const mapped = values.fish.map((f) => {
|
||||
const meta = fishSpecies!.find((x) => x.id === f.id);
|
||||
return {
|
||||
fish_species_id: f.id,
|
||||
fish_name: meta?.name,
|
||||
catch_number: f.quantity,
|
||||
catch_unit: f.unit,
|
||||
fish_size: f.size,
|
||||
fish_rarity: meta?.rarity_level,
|
||||
fish_condition: "",
|
||||
gear_usage: "",
|
||||
} as unknown; // inferred shape — keep as unknown to avoid relying on global types here
|
||||
});
|
||||
const onSubmit = async (values: FormValues) => {
|
||||
// Ensure species list is available so we can populate name/rarity
|
||||
if (!fishSpecies || fishSpecies.length === 0) {
|
||||
showErrorToast("Danh sách loài cá chưa sẵn sàng");
|
||||
return;
|
||||
}
|
||||
// Helper to map form rows -> API info entries (single place)
|
||||
const buildInfo = (rows: FormValues["fish"]) =>
|
||||
rows.map((item) => {
|
||||
const meta = fishSpecies.find((f) => f.id === item.id);
|
||||
return {
|
||||
fish_species_id: item.id,
|
||||
fish_name: meta?.name ?? "",
|
||||
catch_number: item.quantity,
|
||||
catch_unit: item.unit,
|
||||
fish_size: item.size,
|
||||
fish_rarity: meta?.rarity_level ?? null,
|
||||
fish_condition: "",
|
||||
gear_usage: "",
|
||||
} as unknown;
|
||||
});
|
||||
|
||||
console.log("SUBMIT (FishingLogInfo[]): ", JSON.stringify(mapped, null, 2));
|
||||
try {
|
||||
const gpsResp = await queryGpsData();
|
||||
if (!gpsResp.data) {
|
||||
showErrorToast("Không thể lấy dữ liệu GPS hiện tại");
|
||||
return;
|
||||
}
|
||||
const gpsData = gpsResp.data;
|
||||
|
||||
// close modal after submit (you can change this to pass the payload to a parent via prop)
|
||||
onClose();
|
||||
const info = buildInfo(values.fish) as any;
|
||||
|
||||
// Base payload fields shared between create and update
|
||||
const base: Partial<Model.FishingLog> = {
|
||||
fishing_log_id: fishingLog?.fishing_log_id || "",
|
||||
trip_id: trip?.id || "",
|
||||
start_at: fishingLog?.start_at!,
|
||||
start_lat: fishingLog?.start_lat!,
|
||||
start_lon: fishingLog?.start_lon!,
|
||||
weather_description:
|
||||
fishingLog?.weather_description || "Nắng đẹp, Trời nhiều mây",
|
||||
info,
|
||||
sync: true,
|
||||
};
|
||||
|
||||
// Build final payload depending on create vs update
|
||||
const body: Model.FishingLog =
|
||||
fishingLog?.status == 0
|
||||
? ({
|
||||
...base,
|
||||
haul_lat: gpsData.lat,
|
||||
haul_lon: gpsData.lon,
|
||||
end_at: new Date(),
|
||||
status: 1,
|
||||
} as Model.FishingLog)
|
||||
: ({
|
||||
...base,
|
||||
haul_lat: fishingLog?.haul_lat,
|
||||
haul_lon: fishingLog?.haul_lon,
|
||||
end_at: fishingLog?.end_at,
|
||||
status: fishingLog?.status,
|
||||
} as Model.FishingLog);
|
||||
// console.log("Body: ", body);
|
||||
|
||||
const resp = await queryUpdateFishingLogs(body);
|
||||
if (resp?.status === 200) {
|
||||
showSuccessToast(
|
||||
fishingLog?.fishing_log_id == null
|
||||
? "Thêm mẻ cá thành công"
|
||||
: "Cập nhật mẻ cá thành công"
|
||||
);
|
||||
getTrip();
|
||||
onClose();
|
||||
} else {
|
||||
showErrorToast(
|
||||
fishingLog?.fishing_log_id == null
|
||||
? "Thêm mẻ cá thất bại"
|
||||
: "Cập nhật mẻ cá thất bại"
|
||||
);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("onSubmit error:", err);
|
||||
showErrorToast("Có lỗi xảy ra khi lưu mẻ cá");
|
||||
}
|
||||
};
|
||||
|
||||
// Initialize / reset form when modal visibility or haulData changes
|
||||
|
||||
Reference in New Issue
Block a user