fix(FE-41): Menambahkan kolom kapasitas di tabel kandang

This commit is contained in:
randy-ar
2025-10-31 14:57:15 +07:00
parent b6991652ac
commit 495e11c6fe
8 changed files with 62 additions and 2 deletions
@@ -27,6 +27,7 @@ const DUMMY_TRANSFER_TO_LAYING_EDIT: TransferToLaying = {
{
kandang: {
id: 1,
capacity: 1000,
name: 'Kandang test',
status: 'ACTIVE',
location: {
@@ -56,6 +57,7 @@ const DUMMY_TRANSFER_TO_LAYING_EDIT: TransferToLaying = {
kandang: {
id: 1,
name: 'Kandang test 2',
capacity: 3000,
status: 'ACTIVE',
location: {
id: 1,
@@ -27,6 +27,7 @@ const DUMMY_TRANSFER_TO_LAYING_DETAIL: TransferToLaying = {
{
kandang: {
id: 1,
capacity: 1000,
name: 'Kandang test',
status: 'ACTIVE',
location: {
@@ -55,6 +56,7 @@ const DUMMY_TRANSFER_TO_LAYING_DETAIL: TransferToLaying = {
{
kandang: {
id: 1,
capacity: 3000,
name: 'Kandang test 2',
status: 'ACTIVE',
location: {
@@ -22,7 +22,7 @@ import RowCollapseOptions from '@/components/table/RowCollapseOptions';
import { Kandang } from '@/types/api/master-data/kandang';
import { KandangApi } from '@/services/api/master-data';
import { cn } from '@/lib/helper';
import { cn, formatNumber } from '@/lib/helper';
import { isResponseSuccess } from '@/lib/api-helper';
import { useTableFilter } from '@/services/hooks/useTableFilter';
import { ROWS_OPTIONS } from '@/config/constant';
@@ -93,12 +93,19 @@ const KandangsTable = () => {
setPageSize,
toQueryString: getTableFilterQueryString,
} = useTableFilter({
initial: { search: '', nameSort: '', locationSort: '', picSort: '' },
initial: {
search: '',
nameSort: '',
locationSort: '',
capacitySort: '',
picSort: '',
},
paramMap: {
page: 'page',
pageSize: 'limit',
nameSort: 'sort_name',
locationSort: 'sort_location',
capacitySort: 'sort_capacity',
picSort: ' sort_pic',
},
});
@@ -138,6 +145,11 @@ const KandangsTable = () => {
header: 'Lokasi',
cell: (props) => props.row.original.location.name,
},
{
accessorKey: 'capacity',
header: 'Kapasitas',
cell: (props) => formatNumber(props.row.original.capacity ?? 0),
},
{
accessorKey: 'pic',
header: 'PIC',
@@ -11,6 +11,10 @@ export const KandangFormSchema = Yup.object({
label: Yup.string().required(),
}).nullable(),
capacity: Yup.number()
.min(1, 'Kapasitas wajib diisi!')
.required('Kapasitas wajib diisi!'),
picId: Yup.number().min(1, 'PIC wajib diisi!').required('PIC wajib diisi!'),
pic: Yup.object({
value: Yup.number().min(1).required(),
@@ -27,6 +27,7 @@ import {
import { LocationApi, KandangApi } from '@/services/api/master-data';
import { cn } from '@/lib/helper';
import { UserApi } from '@/services/api/user';
import NumberInput from '@/components/input/NumberInput';
interface KandangFormProps {
type?: 'add' | 'edit' | 'detail';
@@ -81,6 +82,7 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
label: initialValues.location.name,
}
: null,
capacity: initialValues?.capacity ?? 0,
picId: initialValues?.pic?.id ?? 0,
pic: initialValues?.pic
? {
@@ -101,6 +103,7 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
const kandangPayload: CreateKandangPayload = {
name: values.name,
location_id: values.locationId,
capacity: values.capacity,
pic_id: values.picId,
};
@@ -249,6 +252,20 @@ const KandangForm = ({ type = 'add', initialValues }: KandangFormProps) => {
isClearable
/>
<NumberInput
required
name='capacity'
label='Kapasitas'
value={formik.values.capacity ?? undefined}
onChange={formik.handleChange}
onBlur={formik.handleBlur}
isError={
formik.touched.capacity && Boolean(formik.errors.capacity)
}
errorMessage={formik.errors.capacity as string}
readOnly={type === 'detail'}
/>
<SelectInput
required
label='PIC'
@@ -52,6 +52,7 @@ const dummyRecordings: Recording[] = [
},
coop: {
id: 1,
capacity: 1000,
name: 'Coop 1',
status: 'ACTIVE',
location: {
@@ -33,6 +33,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 11,
capacity: 1000,
name: 'KDG-11',
status: 'ACTIVE',
location: {
@@ -61,6 +62,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 12,
capacity: 1000,
name: 'KDG-12',
status: 'ACTIVE',
location: {
@@ -107,6 +109,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 13,
capacity: 1000,
name: 'KDG-13',
status: 'ACTIVE',
location: {
@@ -135,6 +138,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 14,
capacity: 1000,
name: 'KDG-14',
status: 'MAINTENANCE',
location: {
@@ -181,6 +185,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 21,
capacity: 1000,
name: 'KDG-21',
status: 'ACTIVE',
location: {
@@ -209,6 +214,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 22,
capacity: 1000,
name: 'KDG-22',
status: 'ACTIVE',
location: {
@@ -255,6 +261,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 15,
capacity: 1000,
name: 'KDG-15',
status: 'ACTIVE',
location: {
@@ -301,6 +308,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 23,
capacity: 1000,
name: 'KDG-23',
status: 'ACTIVE',
location: {
@@ -329,6 +337,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 24,
capacity: 1000,
name: 'KDG-24',
status: 'ACTIVE',
location: {
@@ -375,6 +384,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 16,
capacity: 1000,
name: 'KDG-16',
status: 'ACTIVE',
location: {
@@ -403,6 +413,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 17,
capacity: 1000,
name: 'KDG-17',
status: 'ACTIVE',
location: {
@@ -449,6 +460,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 18,
capacity: 1000,
name: 'KDG-18',
status: 'ACTIVE',
location: {
@@ -477,6 +489,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 19,
capacity: 1000,
name: 'KDG-19',
status: 'ACTIVE',
location: {
@@ -523,6 +536,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 25,
capacity: 1000,
name: 'KDG-25',
status: 'ACTIVE',
location: {
@@ -551,6 +565,7 @@ const GET_ALL_TRANSFER_TO_LAYING_DUMMY_DATA: BaseApiResponse<
{
kandang: {
id: 26,
capacity: 1000,
name: 'KDG-26',
status: 'ACTIVE',
location: {
@@ -610,6 +625,7 @@ const FLOCK_SOURCE_DUMMY_DATA: BaseApiResponse<FlockWithKandangs[]> = {
{
kandang: {
id: 3,
capacity: 1000,
name: 'Cikaum 1',
status: 'ACTIVE',
location: {
@@ -633,6 +649,7 @@ const FLOCK_SOURCE_DUMMY_DATA: BaseApiResponse<FlockWithKandangs[]> = {
{
kandang: {
id: 4,
capacity: 1000,
name: 'Cikaum 2',
status: 'ACTIVE',
location: {
@@ -656,6 +673,7 @@ const FLOCK_SOURCE_DUMMY_DATA: BaseApiResponse<FlockWithKandangs[]> = {
{
kandang: {
id: 5,
capacity: 1000,
name: 'Cikaum 3',
status: 'ACTIVE',
location: {
@@ -687,6 +705,7 @@ const FLOCK_SOURCE_DUMMY_DATA: BaseApiResponse<FlockWithKandangs[]> = {
{
kandang: {
id: 3,
capacity: 1000,
name: 'Cikaum 1',
status: 'ACTIVE',
location: {
@@ -710,6 +729,7 @@ const FLOCK_SOURCE_DUMMY_DATA: BaseApiResponse<FlockWithKandangs[]> = {
{
kandang: {
id: 4,
capacity: 1000,
name: 'Cikaum 2',
status: 'ACTIVE',
location: {
+2
View File
@@ -7,6 +7,7 @@ export type BaseKandang = {
name: string;
status: string;
location: BaseLocation;
capacity: number;
pic: BaseUser;
};
@@ -15,6 +16,7 @@ export type Kandang = BaseMetadata & BaseKandang;
export type CreateKandangPayload = {
name: string;
location_id: number;
capacity: number;
pic_id: number;
};