gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-20 13:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(FE-316): Update uniformity payload/fields and file handling

Browse Source
This commit is contained in:
rstubryan
2025-12-28 11:50:14 +07:00
parent f37eea687a
commit b24fb54856
8 changed files with 132 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/uniformity/UniformityTable.tsx
+6 -6
View File
@@ -269,23 +269,23 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
{
accessorKey: 'location.name',
header: 'Lokasi',
cell: (props) => props.row.original.location.name || '-',
cell: (props) => props.row.original.location_name || '-',
},
{
accessorKey: 'project_flock_kandang_id',
accessorKey: 'flock_name',
header: 'Flock',
cell: (props) => `Flock ${props.row.original.project_flock_kandang_id}`,
cell: (props) => props.row.original.flock_name || '-',
},
{
accessorKey: 'kandang.name',
accessorKey: 'kandang_name',
header: 'Kandang',
cell: (props) => props.row.original.kandang.name || '-',
cell: (props) => props.row.original.kandang_name || '-',
},
{
accessorKey: 'week',
header: 'Tanggal (Week)',
cell: (props) =>
`${formatDate(props.row.original.date, 'DD MMM YYYY')} (${props.row.original.week})`,
`${formatDate(props.row.original.applied_at, 'DD MMM YYYY')} (${props.row.original.week})`,
},
{
accessorKey: 'status',
src/components/pages/uniformity/form/UniformityForm.schema.ts
+9 -3
View File
@@ -3,6 +3,7 @@ import { Uniformity } from '@/types/api/uniformity/uniformity';
type UniformityFormSchemaType = {
date: string;
week: number;
location?: {
value: number;
label: string;
@@ -19,7 +20,7 @@ type UniformityFormSchemaType = {
label: string;
} | null;
kandang_id: number;
files: File | undefined;
file: File | undefined;
};
const FileSchema = Yup.mixed<File>()
@@ -44,6 +45,10 @@ const FileSchema = Yup.mixed<File>()
export const UniformityFormSchema: Yup.ObjectSchema<UniformityFormSchemaType> =
Yup.object({
date: Yup.string().required('Tanggal wajib diisi!'),
week: Yup.number()
.min(1, 'Minggu ke wajib diisi!')
.required('Minggu ke wajib diisi!')
.typeError('Minggu ke wajib diisi!'),
location: Yup.object({
value: Yup.number().min(1).required(),
label: Yup.string().required(),
@@ -69,7 +74,7 @@ export const UniformityFormSchema: Yup.ObjectSchema<UniformityFormSchemaType> =
.min(1, 'Kandang wajib diisi!')
.required('Kandang wajib diisi!')
.typeError('Kandang wajib diisi!'),
files: FileSchema.required('File wajib diisi!'),
file: FileSchema.required('File wajib diisi!'),
});
export type UniformityFormValues = Yup.InferType<typeof UniformityFormSchema>;
@@ -79,6 +84,7 @@ export const getUniformityFormInitialValues = (
): UniformityFormValues => {
return {
date: initialValues?.week ? '' : '',
week: initialValues?.week ?? 0,
location: initialValues?.location
? {
value: initialValues.location.id,
@@ -101,6 +107,6 @@ export const getUniformityFormInitialValues = (
}
: null,
kandang_id: initialValues?.kandang?.id ?? 0,
files: undefined,
file: undefined,
};
};
src/components/pages/uniformity/form/UniformityForm.tsx
+30 -13
View File
@@ -5,6 +5,7 @@ import { useFormik } from 'formik';
import { useRouter } from 'next/navigation';
import { Icon } from '@iconify/react';
import { toast } from 'react-hot-toast';
import moment from 'moment';
import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
import { useUiStore } from '@/stores/ui/ui.store';
import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
@@ -240,14 +241,17 @@ const UniformityForm = ({
setUniformityFormData({
date: values.date,
week: values.week,
project_flock_kandang_id: projectFlockKandangId,
files: values.files as File,
fileName: (values.files as File).name,
file: values.file as File,
fileName: (values.file as File).name,
});
const payload: VerifyUniformityPayload = {
date: values.date,
week: values.week,
project_flock_kandang_id: projectFlockKandangId,
files: values.files as File,
file: values.file as File,
};
const res = await UniformityApi.verifyUniformity(payload);
@@ -323,10 +327,10 @@ const UniformityForm = ({
(e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0];
formik.setFieldTouched('files', true);
formik.setFieldTouched('file', true);
if (!file) {
formik.setFieldValue('files', undefined);
formik.setFieldValue('file', undefined);
return;
}
@@ -346,7 +350,7 @@ const UniformityForm = ({
return;
}
formik.setFieldValue('files', file);
formik.setFieldValue('file', file);
},
[formik]
);
@@ -363,6 +367,19 @@ const UniformityForm = ({
}, [formik]);
// ===== SIDE EFFECTS =====
useEffect(() => {
// Calculate week from date whenever date changes (week of the month)
if (formik.values.date) {
const date = moment(formik.values.date);
const weekNumber = date.week() - moment(date).startOf('month').week() + 1;
// Handle edge case for end of year
const adjustedWeekNumber = weekNumber <= 0 ? weekNumber + 52 : weekNumber;
formik.setFieldValue('week', adjustedWeekNumber);
}
}, [formik.values.date]);
useEffect(() => {
const unsub = subscribeValidate(() => {
setIsValid(true);
@@ -486,7 +503,7 @@ const UniformityForm = ({
htmlFor='file-upload-input'
className={cn(
"w-full text-sm font-normal leading-5 after:content-['*'] after:ml-0.5 after:text-red-500",
formik.touched.files && formik.errors.files && 'text-red-500'
formik.touched.file && formik.errors.file && 'text-red-500'
)}
>
Upload File
@@ -495,7 +512,7 @@ const UniformityForm = ({
<section
className={cn(
'h-full w-full border rounded-2xl border-dashed cursor-pointer mt-2',
formik.touched.files && formik.errors.files
formik.touched.file && formik.errors.file
? 'border-red-500'
: 'border-gray-300'
)}
@@ -503,7 +520,7 @@ const UniformityForm = ({
document.getElementById('file-upload-input')?.click()
}
>
{formik.values.files ? (
{formik.values.file ? (
<div className='flex flex-col items-center justify-center gap-2 my-10'>
<div className='border border-[#18181B]/25 rounded-2xl p-1 flex items-center justify-center'>
<Button
@@ -521,7 +538,7 @@ const UniformityForm = ({
</Button>
</div>
<span className='text-md font-semibold text-black line-clamp-2 text-center max-w-xs break-all'>
{formik.values.files.name}
{formik.values.file.name}
</span>
</div>
) : (
@@ -585,15 +602,15 @@ const UniformityForm = ({
ref={fileInputRef}
type='file'
id='file-upload-input'
name='files'
name='file'
accept='application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,text/csv'
onChange={handleFileChange}
className='hidden'
/>
{formik.touched.files && formik.errors.files && (
{formik.touched.file && formik.errors.file && (
<p className='w-full text-sm text-red-500 mt-2'>
{formik.errors.files as string}
{formik.errors.file as string}
</p>
)}
</div>
src/components/pages/uniformity/form/UniformityPreviewForm.tsx
+2 -2
View File
@@ -39,10 +39,10 @@ const UniformityPreviewForm = () => {
const tableData = useMemo(() => {
if (!verifyUniformityResult) return [];
return verifyUniformityResult.body_weights.map((weight, index) => ({
return verifyUniformityResult.uniformity_details.map((detail, index) => ({
id: `weight-${index}`,
number: index + 1,
weight: weight,
weight: detail.weight,
}));
}, [verifyUniformityResult]);
src/components/pages/uniformity/form/UniformityResultForm.tsx
+7 -5
View File
@@ -90,7 +90,7 @@ const UniformityResultForm = () => {
};
const handleSubmit = async () => {
if (!uniformityFormData || !uniformityFormData.files) {
if (!uniformityFormData || !uniformityFormData.file) {
toast.error('Form data is missing. Please try again.');
return;
}
@@ -100,8 +100,9 @@ const UniformityResultForm = () => {
try {
const payload = {
date: uniformityFormData.date,
week: uniformityFormData.week,
project_flock_kandang_id: uniformityFormData.project_flock_kandang_id,
files: uniformityFormData.files,
file: uniformityFormData.file,
};
const res = await UniformityApi.createUniformity(payload);
@@ -206,10 +207,11 @@ const UniformityResultForm = () => {
const tableData = useMemo(() => {
if (!verifyUniformityResult) return [];
return verifyUniformityResult.body_weights.map((weight, index) => ({
id: `weight-${index}`,
return verifyUniformityResult.uniformity_details.map((detail, index) => ({
id: `body-weight-${index + 1}`,
number: index + 1,
weight: weight,
weight: detail.weight,
status: detail.range.toLowerCase() as 'ideal' | 'outside',
}));
}, [verifyUniformityResult]);
src/services/api/uniformity.ts
+8 -5
View File
@@ -25,13 +25,14 @@ export class UniformityApiService extends BaseApiService<
): Promise<BaseApiResponse<Uniformity> | undefined> {
const formData = new FormData();
formData.append('date', payload.date);
formData.append('week', payload.week.toString());
formData.append(
'project_flock_kandang_id',
payload.project_flock_kandang_id.toString()
);
if (payload.files) {
formData.append('file', payload.files);
if (payload.file) {
formData.append('file', payload.file);
}
return await this.create(formData as unknown as CreateUniformityPayload);
@@ -41,13 +42,15 @@ export class UniformityApiService extends BaseApiService<
payload: VerifyUniformityPayload
): Promise<BaseApiResponse<VerifyUniformityResponse> | undefined> {
const formData = new FormData();
formData.append('date', payload.date);
formData.append('week', payload.week.toString());
formData.append(
'project_flock_kandang_id',
payload.project_flock_kandang_id.toString()
);
if (payload.files) {
formData.append('file', payload.files);
if (payload.file) {
formData.append('file', payload.file);
}
return await this.customRequest<BaseApiResponse<VerifyUniformityResponse>>(
@@ -61,5 +64,5 @@ export class UniformityApiService extends BaseApiService<
}
export const UniformityApi = new UniformityApiService(
'http://localhost:4010/api/uniformity'
'http://localhost:4010/api/production/uniformities'
);
src/stores/uniformity/uniformity.store.ts
+2 -1
View File
@@ -6,8 +6,9 @@ export type UniformityStep = 'preview' | 'result';
export type UniformityFormData = {
date: string;
week: number;
project_flock_kandang_id: number;
files: File | null;
file: File | null;
fileName: string;
};
src/types/api/uniformity/uniformity.d.ts
Vendored
+68 -9
View File
@@ -1,29 +1,88 @@
import { BaseMetadata } from '@/types/api/api-general';
import { Location } from '@/types/api/location/location';
import { ProjectFlock } from '@/types/api/project-flock/project-flock';
import { Kandang } from '@/types/api/kandang/kandang';
import { BaseMetadata } from '@/types/common/base-metadata';
import { BaseApproval } from '@/types/api/approval/approval';
// ==================== GET ALL RESPONSE ====================
export type Uniformity = BaseMetadata & {
id: number;
location: Location;
project_flock_kandang_id: number;
location: Location;
project_flock: ProjectFlock;
location_name: string;
flock_name: string;
kandang: Kandang;
kandang_name: string;
applied_at: string;
week: number;
status: 'CREATED' | 'APPROVED' | 'REJECTED';
uniformity: number;
date?: string;
cv: number;
chick_qty_of_weight: number;
uniform_qty: number;
mean_up: number;
mean_down: number;
created_at: string;
created_by: number;
latest_approval?: BaseApproval;
};
// ==================== GET ONE RESPONSE ====================
export type UniformityInfoUmum = {
tanggal: string;
lokasi_farm: string;
project_flock: string;
kandang: string;
file_name: string;
};
export type UniformitySampling = {
chick_qty_of_weight: number;
mean_weight: number;
mean_down: number;
mean_up: number;
};
export type UniformityResult = {
uniform_qty: number;
outside_qty: number;
uniformity: number;
cv: number;
};
export type UniformityDetailItem = {
id: number;
weight: number;
range: 'Ideal' | 'Outside';
};
export type UniformityDetail = BaseMetadata & {
id: number;
info_umum: UniformityInfoUmum;
sampling: UniformitySampling;
result: UniformityResult;
uniformity_details: UniformityDetailItem[];
};
// ==================== VERIFY RESPONSE ====================
export type VerifyUniformityResponse = {
sampling: UniformitySampling;
result: UniformityResult;
uniformity_details: UniformityDetailItem[];
};
// ==================== PAYLOADS ====================
export type CreateUniformityPayload = {
date: string;
project_flock_kandang_id: number;
files: File;
file: File;
week: number;
};
export type VerifyUniformityPayload = {
date: string;
project_flock_kandang_id: number;
files: File;
};
export type VerifyUniformityResponse = {
body_weights: number[];
file: File;
week: number;
};