mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-24 07:15:44 +00:00
Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into fix/adjustment-uniformity-ui
This commit is contained in:
@@ -86,6 +86,15 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ===== USE SELECT HOOKS =====
|
// ===== USE SELECT HOOKS =====
|
||||||
|
const {
|
||||||
|
setInputValue: setSourceWarehouseSelectInputValue,
|
||||||
|
isLoadingOptions: isLoadingSourceWarehouses,
|
||||||
|
loadMore: loadMoreSourceWarehouses,
|
||||||
|
rawData: sourceWarehouses,
|
||||||
|
} = useSelect<Warehouse>(WarehouseApi.basePath, 'id', 'name', 'search', {
|
||||||
|
transfer_context: 'inventory_transfer',
|
||||||
|
});
|
||||||
|
|
||||||
const {
|
const {
|
||||||
setInputValue: setWarehouseSelectInputValue,
|
setInputValue: setWarehouseSelectInputValue,
|
||||||
isLoadingOptions: isLoadingWarehouses,
|
isLoadingOptions: isLoadingWarehouses,
|
||||||
@@ -136,6 +145,25 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
|
|||||||
return stockMap;
|
return stockMap;
|
||||||
}, [allProductWarehouses]);
|
}, [allProductWarehouses]);
|
||||||
|
|
||||||
|
const sourceWarehouseOptions = useMemo(() => {
|
||||||
|
if (!isResponseSuccess(sourceWarehouses)) return [];
|
||||||
|
|
||||||
|
return (
|
||||||
|
sourceWarehouses?.data.map((w) => {
|
||||||
|
warehouseStockMap.get(w.id);
|
||||||
|
return {
|
||||||
|
value: w.id,
|
||||||
|
label: w.name,
|
||||||
|
area: w.area?.name,
|
||||||
|
location:
|
||||||
|
'type' in w && (w.type === 'LOKASI' || w.type === 'KANDANG')
|
||||||
|
? w.location?.name
|
||||||
|
: undefined,
|
||||||
|
};
|
||||||
|
}) || []
|
||||||
|
);
|
||||||
|
}, [sourceWarehouses, warehouseStockMap]);
|
||||||
|
|
||||||
const warehouseOptions = useMemo(() => {
|
const warehouseOptions = useMemo(() => {
|
||||||
if (!isResponseSuccess(warehouses)) return [];
|
if (!isResponseSuccess(warehouses)) return [];
|
||||||
|
|
||||||
@@ -1354,10 +1382,10 @@ const MovementForm = ({ type = 'add', initialValues }: MovementFormProps) => {
|
|||||||
placeholder='Pilih gudang asal...'
|
placeholder='Pilih gudang asal...'
|
||||||
value={formik.values.source_warehouse}
|
value={formik.values.source_warehouse}
|
||||||
onChange={handleSourceWarehouseChange}
|
onChange={handleSourceWarehouseChange}
|
||||||
options={warehouseOptions}
|
options={sourceWarehouseOptions}
|
||||||
onInputChange={setWarehouseSelectInputValue}
|
onInputChange={setSourceWarehouseSelectInputValue}
|
||||||
onMenuScrollToBottom={loadMoreWarehouses}
|
onMenuScrollToBottom={loadMoreSourceWarehouses}
|
||||||
isLoading={isLoadingWarehouses}
|
isLoading={isLoadingSourceWarehouses}
|
||||||
isError={
|
isError={
|
||||||
formik.touched.source_warehouse_id &&
|
formik.touched.source_warehouse_id &&
|
||||||
Boolean(formik.errors.source_warehouse_id)
|
Boolean(formik.errors.source_warehouse_id)
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ const TransferToLayingFormModal = () => {
|
|||||||
'search',
|
'search',
|
||||||
{
|
{
|
||||||
category: 'GROWING',
|
category: 'GROWING',
|
||||||
|
transfer_context: 'transfer_to_laying',
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,13 @@ import DebouncedTextInput from '@/components/input/DebouncedTextInput';
|
|||||||
import Card from '@/components/Card';
|
import Card from '@/components/Card';
|
||||||
import Collapse from '@/components/Collapse';
|
import Collapse from '@/components/Collapse';
|
||||||
|
|
||||||
import { cn, formatCurrency, formatDate, formatNumber } from '@/lib/helper';
|
import {
|
||||||
|
cn,
|
||||||
|
formatCurrency,
|
||||||
|
formatDate,
|
||||||
|
formatNumber,
|
||||||
|
formatVechicleNumber,
|
||||||
|
} from '@/lib/helper';
|
||||||
import { isResponseSuccess } from '@/lib/api-helper';
|
import { isResponseSuccess } from '@/lib/api-helper';
|
||||||
import { DailyMarketingRow } from '@/types/api/report/marketing';
|
import { DailyMarketingRow } from '@/types/api/report/marketing';
|
||||||
import { MarketingReportApi } from '@/services/api/report/marketing-report';
|
import { MarketingReportApi } from '@/services/api/report/marketing-report';
|
||||||
@@ -94,7 +100,9 @@ const DailyMarketingsTable = ({
|
|||||||
accessorKey: 'vehicle_number',
|
accessorKey: 'vehicle_number',
|
||||||
header: 'No. Polisi',
|
header: 'No. Polisi',
|
||||||
cell: (props) => (
|
cell: (props) => (
|
||||||
<span className='text-nowrap'>{props.row.original.vehicle_number}</span>
|
<span className='text-nowrap'>
|
||||||
|
{formatVechicleNumber(props.row.original.vehicle_number)}
|
||||||
|
</span>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user