260228:1446 20260228:14:30 workflow update #2
All checks were successful
Build and Deploy / deploy (push) Successful in 2m29s

This commit is contained in:
admin
2026-02-28 14:46:57 +07:00
parent 3a41b84367
commit 4bdf163c93
14 changed files with 337 additions and 20 deletions

View File

@@ -10,6 +10,7 @@ import {
drawingMasterDataService,
ContractCategory,
ContractSubCategory,
CreateContractCategoryDto,
} from '@/lib/services/drawing-master-data.service';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
@@ -107,7 +108,7 @@ export default function ContractCategoriesPage() {
console.log('Contract Categories Data:', data);
return data;
}}
createFn={(data) => drawingMasterDataService.createContractCategory({ ...data, projectId: selectedProjectId })}
createFn={(data: Record<string, unknown>) => drawingMasterDataService.createContractCategory({ ...(data as unknown as CreateContractCategoryDto), projectId: selectedProjectId })}
updateFn={(id, data) => drawingMasterDataService.updateContractCategory(id, data)}
deleteFn={(id) => drawingMasterDataService.deleteContractCategory(id)}
columns={columns}

View File

@@ -6,7 +6,7 @@ import { ColumnDef } from '@tanstack/react-table';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Loader2 } from 'lucide-react';
import { useProjects } from '@/hooks/use-master-data';
import { drawingMasterDataService } from '@/lib/services/drawing-master-data.service';
import { drawingMasterDataService, CreateContractSubCategoryDto } from '@/lib/services/drawing-master-data.service';
import { Badge } from '@/components/ui/badge';
interface SubCategory {
@@ -100,8 +100,8 @@ export default function ContractSubCategoriesPage() {
console.log('Contract Sub-Categories Data:', data);
return data;
}}
createFn={(data) =>
drawingMasterDataService.createContractSubCategory({ ...data, projectId: selectedProjectId })
createFn={(data: Record<string, unknown>) =>
drawingMasterDataService.createContractSubCategory({ ...(data as unknown as CreateContractSubCategoryDto), projectId: selectedProjectId })
}
updateFn={(id, data) => drawingMasterDataService.updateContractSubCategory(id, data)}
deleteFn={(id) => drawingMasterDataService.deleteContractSubCategory(id)}

View File

@@ -109,7 +109,7 @@ export default function ContractVolumesPage() {
description="Manage drawing volumes (เล่ม) for contract drawings"
queryKey={["contract-drawing-volumes", String(selectedProjectId)]}
fetchFn={() => drawingMasterDataService.getContractVolumes(selectedProjectId)}
createFn={(data) => drawingMasterDataService.createContractVolume({ ...data, projectId: selectedProjectId })}
createFn={(data: Record<string, unknown>) => drawingMasterDataService.createContractVolume({ ...(data as unknown as Parameters<typeof drawingMasterDataService.createContractVolume>[0]), projectId: selectedProjectId })}
updateFn={(id, data) => drawingMasterDataService.updateContractVolume(id, data)}
deleteFn={(id) => drawingMasterDataService.deleteContractVolume(id)}
columns={columns}

View File

@@ -6,7 +6,7 @@ import { ColumnDef } from '@tanstack/react-table';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Loader2, CheckCircle, XCircle } from 'lucide-react';
import { useProjects } from '@/hooks/use-master-data';
import { drawingMasterDataService } from '@/lib/services/drawing-master-data.service';
import { drawingMasterDataService, CreateShopMainCategoryDto } from '@/lib/services/drawing-master-data.service';
import { Badge } from '@/components/ui/badge';
interface MainCategory {
@@ -111,9 +111,9 @@ export default function ShopMainCategoriesPage() {
console.log('Shop Main Categories Data:', data);
return data;
}}
createFn={(data) =>
createFn={(data: Record<string, unknown>) =>
drawingMasterDataService.createShopMainCategory({
...data,
...(data as unknown as CreateShopMainCategoryDto),
projectId: selectedProjectId,
isActive: data.isActive === 'true' || data.isActive === true,
})

View File

@@ -6,7 +6,7 @@ import { ColumnDef } from '@tanstack/react-table';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Loader2, CheckCircle, XCircle } from 'lucide-react';
import { useProjects } from '@/hooks/use-master-data';
import { drawingMasterDataService } from '@/lib/services/drawing-master-data.service';
import { drawingMasterDataService, CreateShopSubCategoryDto } from '@/lib/services/drawing-master-data.service';
import { Badge } from '@/components/ui/badge';
interface SubCategory {
@@ -113,9 +113,9 @@ export default function ShopSubCategoriesPage() {
console.log('Shop Sub-Categories Data:', data);
return data;
}}
createFn={(data) =>
createFn={(data: Record<string, unknown>) =>
drawingMasterDataService.createShopSubCategory({
...data,
...(data as unknown as CreateShopSubCategoryDto),
projectId: selectedProjectId,
isActive: data.isActive === 'true' || data.isActive === true,
})