np-dms/lcbp3
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

260220:1143 20260220 TASK-BEFE-001 Fix Drawing Master Data Pages
All checks were successful
Build and Deploy / deploy (push) Successful in 4m50s
Details

Browse Source
This commit is contained in:
admin
2026-02-20 11:43:23 +07:00
parent d455598dc2
commit 21b48f7d32
3 changed files with 74 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/modules/drawing/drawing-master-data.controller.ts
View File

@@ -9,6 +9,7 @@ import {
Query,
UseGuards,
ParseIntPipe,
Logger,
} from '@nestjs/common';
import {
ApiTags,
@@ -27,6 +28,8 @@ import { RequirePermission } from '../../common/decorators/require-permission.de
@UseGuards(JwtAuthGuard, RbacGuard)
@Controller('drawings/master-data')
export class DrawingMasterDataController {
private readonly logger = new Logger(DrawingMasterDataController.name);
constructor(private readonly masterDataService: DrawingMasterDataService) {}
// =====================================================
@@ -38,9 +41,12 @@ export class DrawingMasterDataController {
@ApiQuery({ name: 'projectId', required: true, type: Number })
@RequirePermission('document.view')
getVolumes(@Query('projectId', ParseIntPipe) projectId: number) {
this.logger.log(`Fetching Contract Volumes for Project ID: ${projectId}`);
return this.masterDataService.findAllVolumes(projectId);
}
// ... (Create/Update/Delete methods remain unchanged) ...
@Post('contract/volumes')
@ApiOperation({ summary: 'Create Volume' })
@RequirePermission('master_data.drawing_category.manage')
@@ -89,9 +95,14 @@ export class DrawingMasterDataController {
@ApiQuery({ name: 'projectId', required: true, type: Number })
@RequirePermission('document.view')
getCategories(@Query('projectId', ParseIntPipe) projectId: number) {
this.logger.log(
`Fetching Contract Categories for Project ID: ${projectId}`
);
return this.masterDataService.findAllCategories(projectId);
}
// ... (Create/Update/Delete methods remain unchanged) ...
@Post('contract/categories')
@ApiOperation({ summary: 'Create Category' })
@RequirePermission('master_data.drawing_category.manage')
@@ -140,9 +151,14 @@ export class DrawingMasterDataController {
@ApiQuery({ name: 'projectId', required: true, type: Number })
@RequirePermission('document.view')
getContractSubCats(@Query('projectId', ParseIntPipe) projectId: number) {
this.logger.log(
`Fetching Contract Sub-Categories for Project ID: ${projectId}`
);
return this.masterDataService.findAllContractSubCats(projectId);
}
// ... (Create/Update/Delete methods remain unchanged) ...
@Post('contract/sub-categories')
@ApiOperation({ summary: 'Create Contract Sub-Category' })
@RequirePermission('master_data.drawing_category.manage')
@@ -228,9 +244,14 @@ export class DrawingMasterDataController {
@ApiQuery({ name: 'projectId', required: true, type: Number })
@RequirePermission('document.view')
getShopMainCats(@Query('projectId', ParseIntPipe) projectId: number) {
this.logger.log(
`Fetching Shop Main Categories for Project ID: ${projectId}`
);
return this.masterDataService.findAllShopMainCats(projectId);
}
// ... (Create/Update/Delete methods remain unchanged) ...
@Post('shop/main-categories')
@ApiOperation({ summary: 'Create Shop Main Category' })
@RequirePermission('master_data.drawing_category.manage')
@@ -285,6 +306,9 @@ export class DrawingMasterDataController {
@Query('projectId', ParseIntPipe) projectId: number,
@Query('mainCategoryId') mainCategoryId?: number
) {
this.logger.log(
`Fetching Shop Sub-Categories for Project ID: ${projectId}, MainCategory: ${mainCategoryId}`
);
return this.masterDataService.findAllShopSubCats(
projectId,
mainCategoryId ? Number(mainCategoryId) : undefined