Dev

README.md

@@ -1,37 +1,39 @@
 
 
 <h1>Fixed Asset Management System</h1>
-<p><strong>Nest.js & Angular | Cloud-based Web Application for Asset Management</strong></p>
-<p>Current version: V1.0 Branch </p>
+<p><strong>Nest.js & Angular SSR | Cloud-based Web Application for Asset Management</strong></p>
+<p>Current version: V1.5 Branch </p>
+<p>Next version function: Unit test and Excel Data Export </p>
+<p>If you find this project helpful, please click ⭐ Star! This helps more people discover it.</p>
 
 <h2>🌟 Project Overview</h2>
-<p>This is a full-stack <strong>Fixed Asset Management System</strong> built with <strong>Spring Boot</strong> and <strong>Vue.js</strong>, designed for managing fixed assets within facilities. The system includes:</p>
+<p>This is a full-stack <strong>Fixed Asset Management System</strong> built with <strong>Nest.js</strong> and <strong>Angular SSR</strong>, designed for managing fixed assets within facilities. The system includes:</p>
 <ul>
   <li>Purchase and maintenance record management</li>
   <li>Asset write-off tracking</li>
   <li>Status monitoring and reporting</li>
 </ul>
 <p>The system is <strong>cloud-based</strong>, significantly reducing IT infrastructure costs and improving usability, with no installation required.</p>
-<!--
-<p>🔗 <strong><a href="https://felix-fixedasset.web.app/login" target="_blank">Online Demo</a></strong></p>
+
+<p>🔗 <strong><a href="https://pos.felix9611.com/login" target="_blank">Online Demo Front from Cloudflare DNS Tunnel and my Raspberry Pi5 server</a></strong></p>
 <p><strong>Username:</strong> <code>Demo</code><br>
 <strong>Password:</strong> <code>888888</code></p>
-<p><em>Note: Backend & Database hosted on Koyeb, Frontend on Firebase. Initial data load may take a few seconds. If cannot load the verification code, please click the "Reset" button.</em></p>
---><!--
+<p><em>Note: Backend and Frontend both hosted on self-hosted Raspberry Pi5 with Cloudflare</em></p>
+
 <h2>📸 Example Screenshots</h2>
---><!--
-<h3>Dashboard Overview</h3>
-<img src="https://github.com/felix9611/springboot-fixedasset-vue-2/blob/main/image/fixedasset-1.png" alt="Dashboard Overview">
---><!--
-<h3>Asset List View</h3>
-<img src="https://github.com/felix9611/springboot-fixedasset-vue-2/blob/main/image/fixedasset-2.png" alt="Asset List View">
---><!--
-<h3>Asset Maintenance Records</h3>
-<img src="https://github.com/felix9611/springboot-fixedasset-vue-2/blob/main/image/fixedasset-3.png" alt="Maintenance Records">
---><!--
-<h3>Asset Write-Off Management</h3>
-<img src="https://github.com/felix9611/springboot-fixedasset-vue-2/blob/main/image/fixedasset-4.png" alt="Write-Off Management">
--->
+
+<h3>Tax Information</h3>
+<img src="https://github.com/felix9611/nest-fixedasset-mongo-angular/blob/dev/image/fixedasset-1.png" alt="Dashboard Overview">
+
+<h3>Asset Form View</h3>
+<img src="https://github.com/felix9611/nest-fixedasset-mongo-angular/blob/dev/image/fixedasset-2.png" alt="Asset List View">
+
+<h3>User Info</h3>
+<img src="https://github.com/felix9611/nest-fixedasset-mongo-angular/blob/dev/image/fixedasset-3.png" alt="Maintenance Records">
+
+<h3>Dashboard</h3>
+<img src="https://github.com/felix9611/nest-fixedasset-mongo-angular/blob/dev/image/fixedasset-4.png" alt="Write-Off Management">
+
 <h2>🚀 Key Features</h2>
 <ul>
   <li><strong>Comprehensive Asset Management:</strong> Manage asset status, purchase records, maintenance schedules, and write-offs.</li>
@@ -62,7 +64,9 @@
 <ul>
   <li><strong>Asset Registration & Tracking:</strong> Record and track fixed assets with detailed status and information.</li>
   <li><strong>Expenditure & Maintenance Management:</strong> Log asset purchase, maintenance, and write-off records for better financial control.</li>
-  <li><strong>Dynamic Reporting:</strong> Showing chart graphs and generate PDF and Excel reports for easy analysis and sharing.</li>
+  <li><strong>Dynamic Reporting:</strong> Showing chart graphs for easy analysis and sharing.</li>
+  <li><strong>Role Permission:</strong> Unit by per role with menu page permission, customization user group(s) to actionable functions</li>
+  <li><strong>Excel Data Import:</strong> Batch upload data increases efficiency</li>
 </ul>
 
 <h2>📋 How to Run the Project</h2>
@@ -109,13 +113,17 @@ yarn start
 npm run build:uat or build:prod
 // or
 yarn build:uat or build:prod
+
+// Preview URL
+http://localhost:4200
 </code></pre>
-<!---
+
 <h2>🌐 Deployment</h2>
 <ul>
-  <li><strong>Backend:</strong> Koyeb (Spring Boot)</li>
-  <li><strong>Frontend:</strong> Firebase Hosting</li>
-</ul>-->
+  <li><strong>Database:</strong><strong>New experiment!</strong> Self-hosted in My Raspberry Pi5 server</li>
+  <li><strong>Backend:</strong><strong>New experiment!</strong> Fullset self-hosted server power by my Raspberry Pi5 server</li>
+  <li><strong>Frontend:</strong>Cloudflare Tunnel DNS + Raspberry Pi5 runing in Angualr SSR</li>
+</ul>
 
 <h2>📈 Business Impact</h2>
 <ul>

backend/src/app.controller.ts

@@ -5,8 +5,8 @@ import { AppService } from './app.service';
 export class AppController {
   constructor(private readonly appService: AppService) {}
 
-  @Get()
+ /* @Get()
   getHello(): string {
     return this.appService.getHello();
-  }
+  } */
 }

backend/src/app.module.ts

@@ -24,6 +24,8 @@ import { WriteOffModule } from './module/write-off/write-off.module'
 import { SysMenuMoudule } from './module/sys-menu/sys-menu.module'
 import { RepairRecordMoudule } from './module/repair-record/repair-record.module'
 import { StockTakeMoudule } from './module/stock-take/stcok-take.module'
+import { ExcelFieldMatchModule } from './module/excelFieldMatch/excelFieldMatch.module'
+import { SysUserSchema } from './module/sys-user/sysUser.schame'
 
 @Module({
   imports: [
@@ -44,10 +46,12 @@ import { StockTakeMoudule } from './module/stock-take/stcok-take.module'
     SysRoleMoudule,
     SysUserMoudule,
     SysMenuMoudule,
+    ExcelFieldMatchModule,
     MongooseModule.forRoot('mongodb://localhost/fixedasset'),
     MongooseModule.forFeature([
       { name: 'SysRoles', schema: SysRoleSchema },
-      { name: 'Department', schema: DepartmentSchema }
+      { name: 'Department', schema: DepartmentSchema },
+      { name: 'SysUser', schema: SysUserSchema }
     ])
   ],
   controllers: [AppController],

backend/src/module/InvRecord/InvRecord.controller.ts

@@ -1,11 +1,15 @@
 import { Body, Controller, Post } from '@nestjs/common'
 import { InvRecordService } from './InvRecord.service'
-import { ListRecordReqDto } from './InvRecord.dto'
+import { ListInvRecordResponse, ListRecordReqBody, ListRecordReqDto } from './InvRecord.dto'
+import { ApiBody, ApiOperation, ApiResponse } from '@nestjs/swagger'
 
 @Controller('sys/inv-record')
 export class InvRecordController {
     constructor(private invReocrdService: InvRecordService) {}
 
+    @ApiOperation({ summary: 'Page and list'})
+    @ApiBody({ type: ListRecordReqBody })
+    @ApiResponse({ description: 'If successful', status: 201, type: ListInvRecordResponse })
     @Post('list')
     async list(@Body() query: ListRecordReqDto) {
         return await this.invReocrdService.listRecord(query)

backend/src/module/InvRecord/InvRecord.dto.ts

@@ -1,3 +1,9 @@
+import { ApiProperty } from "@nestjs/swagger"
+import { AssetListBody } from "../asset-list/asset-list.dto"
+import { LocationBody } from "../location/location.dto"
+import { CommonPageAndList, CommonPageAndListResponse } from "src/tool/open-api-body"
+import { IsOptional } from "@nestjs/class-validator"
+
 export interface CreateInvRecordDto {
     assetCode: string
     placeFrom: string
@@ -9,4 +15,45 @@ export interface ListRecordReqDto {
     limit: number
     assetCode?: string
     dateRange?: string[]
+}
+
+export class InvRecordBody {
+    @ApiProperty({ description: 'Data Id' })
+    _id: string
+
+    @ApiProperty({ description: 'Asset Code' })
+    assetCode: string
+
+    @ApiProperty({ description: 'Place From Id' })
+    placeFrom: string    
+
+    @ApiProperty({ description: 'Place To Id' })
+    placeTo: string
+
+    @ApiProperty({ description: 'Created At' })
+    createdAt: string
+
+    @ApiProperty({ description: 'Asset List Data', type: AssetListBody })
+    assetList: AssetListBody
+
+    @ApiProperty({ description: 'Place From Date', type: LocationBody })
+    placeFromData: LocationBody   
+
+    @ApiProperty({ description: 'Place To Date', type: LocationBody })
+    placeToData: LocationBody  
+}
+
+export class ListRecordReqBody extends CommonPageAndList {
+    @ApiProperty({ description: 'Asset Code' })
+    @IsOptional()
+    assetCode: string
+
+    @ApiProperty({ description: 'Date Range', isArray: true })
+    @IsOptional()
+    dateRange: string[]
+}
+
+export class ListInvRecordResponse extends CommonPageAndListResponse {
+    @ApiProperty({ description: 'Data List', type: InvRecordBody, isArray: true })
+    data: InvRecordBody[]
 }

backend/src/module/InvRecord/InvRecord.service.ts

@@ -79,7 +79,7 @@ export class InvRecordService {
             { $limit: limit },
         ]).exec()
 
-        const total = await this.invRecordModel.find(finalFilter).countDocuments()
+        const total = await this.invRecordModel.find(finalFilter).countDocuments().exec()
 
         return {
             total,