diff --git a/accounting-ng-nuttakit/src/app/app-routing.module.ts b/accounting-ng-nuttakit/src/app/app-routing.module.ts
index d42211b..61ac5f6 100644
--- a/accounting-ng-nuttakit/src/app/app-routing.module.ts
+++ b/accounting-ng-nuttakit/src/app/app-routing.module.ts
@@ -22,13 +22,13 @@ const routes: Routes = [
(m) => m.MainControlModule
),
},
- {
- path: 'report',
- loadChildren: () =>
- import('./controls/report-control/report-control.module').then(
- (m) => m.ReportControlModule
- ),
- },
+ // {
+ // path: 'report',
+ // loadChildren: () =>
+ // import('./controls/report-control/report-control.module').then(
+ // (m) => m.ReportControlModule
+ // ),
+ // },
],
},
diff --git a/accounting-ng-nuttakit/src/app/component/main-dashboard/main-dashboard.component.html b/accounting-ng-nuttakit/src/app/component/main-dashboard/main-dashboard.component.html
index 061614f..0044269 100644
--- a/accounting-ng-nuttakit/src/app/component/main-dashboard/main-dashboard.component.html
+++ b/accounting-ng-nuttakit/src/app/component/main-dashboard/main-dashboard.component.html
@@ -203,7 +203,7 @@
รวมเดือนนี้
-
฿732K
+
{{myActSumData.summary.totalExpense}}
diff --git a/accounting-ng-nuttakit/src/app/controls/main-control/main-control-routing.module.ts b/accounting-ng-nuttakit/src/app/controls/main-control/main-control-routing.module.ts
index 632626a..285e146 100644
--- a/accounting-ng-nuttakit/src/app/controls/main-control/main-control-routing.module.ts
+++ b/accounting-ng-nuttakit/src/app/controls/main-control/main-control-routing.module.ts
@@ -1,12 +1,14 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { MainDashboardContentComponent } from '../../content/main-dashboard-content/main-dashboard-content.component';
+import { MainReportComponent } from '../../component/main-report/main-report.component';
// import { MainReportComponent } from '../../component/main-report/main-report.component';
const routes: Routes = [
{ path: 'dashboard', component: MainDashboardContentComponent },
+ { path: 'report', component: MainReportComponent },
// children: [
// {
// path: 'dashboard',
diff --git a/accounting-ng-nuttakit/src/app/controls/main-control/main-control.module.ts b/accounting-ng-nuttakit/src/app/controls/main-control/main-control.module.ts
index 6bf2214..ce71e45 100644
--- a/accounting-ng-nuttakit/src/app/controls/main-control/main-control.module.ts
+++ b/accounting-ng-nuttakit/src/app/controls/main-control/main-control.module.ts
@@ -9,6 +9,7 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MainDashboardComponent } from '../../component/main-dashboard/main-dashboard.component';
import { MainDashboardContentComponent } from '../../content/main-dashboard-content/main-dashboard-content.component';
import { AccDateFormatPipe } from '../../pipe/dtmtodatetime.pipe';
+import { MainReportComponent } from '../../component/main-report/main-report.component';
// import { MainReportComponent } from '../../component/main-report/main-report.component';
@@ -18,6 +19,7 @@ import { AccDateFormatPipe } from '../../pipe/dtmtodatetime.pipe';
declarations: [
MainDashboardComponent,
MainDashboardContentComponent,
+ MainReportComponent,
AccDateFormatPipe
// MainReportComponent
],
diff --git a/accounting-ng-nuttakit/src/app/controls/report-control/report-control-routing.module.ts b/accounting-ng-nuttakit/src/app/controls/report-control/report-control-routing.module.ts
deleted file mode 100644
index 20967f4..0000000
--- a/accounting-ng-nuttakit/src/app/controls/report-control/report-control-routing.module.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { MainReportComponent } from '../../component/main-report/main-report.component';
-
-const routes: Routes = [
- {
- path: '',
- component: MainReportComponent
- }
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule]
-})
-export class ReportControlRoutingModule { }
diff --git a/accounting-ng-nuttakit/src/app/controls/report-control/report-control.module.ts b/accounting-ng-nuttakit/src/app/controls/report-control/report-control.module.ts
deleted file mode 100644
index 89c6491..0000000
--- a/accounting-ng-nuttakit/src/app/controls/report-control/report-control.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MainReportComponent } from '../../component/main-report/main-report.component';
-import { ReportControlRoutingModule } from './report-control-routing.module';
-import { ReactiveFormsModule } from '@angular/forms';
-
-
-@NgModule({
- declarations: [
- MainReportComponent
- ],
- imports: [
- CommonModule,
- ReportControlRoutingModule,
- ReactiveFormsModule
- ]
-})
-export class ReportControlModule { }