เพิ่มเมนู portal ให้ myhr-plus mylearn myjob myskill-x

src/app/portal-manage/my-portal/approved-list/approved-list.component.html

@@ -26,11 +26,12 @@
     </div>
   </div> -->
 
-@if(companySelect.companyId){
+  <ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
+<!-- @if(companySelect.companyId){
 <ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
 } @else {
 <ng-container *ngTemplateOutlet="companyTemplate"></ng-container>
-}
+} -->
 
 
 <ng-template #companyTemplate>

src/app/portal-manage/my-portal/approved-list/approved-list.component.ts

@@ -101,8 +101,8 @@ export class ApprovedListComponent implements OnInit {
         document: "0"
       },
     ];
-    // this.getListCount();
-    this.getCompany()
+    this.getListCount();
+    // this.getCompany()
   }
 
   getCompany() {

src/app/portal-manage/my-portal/category-list-approve/category-list-approve.component.html

@@ -28,11 +28,12 @@
 </div> -->
 
 
-@if(companySelect.companyId){
+<ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
+<!-- @if(companySelect.companyId){
 <ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
 } @else {
 <ng-container *ngTemplateOutlet="companyTemplate"></ng-container>
-}
+} -->
 
 
 <ng-template #companyTemplate>

src/app/portal-manage/my-portal/category-list-approve/category-list-approve.component.ts

@@ -104,8 +104,8 @@ export class CategoryListApproveComponent implements OnInit {
         document: "0"
       },
     ];
-    // this.getListCount();
-    this.getCompany()
+    this.getListCount();
+    // this.getCompany()
   }
 
   getCompany() {

src/app/portal-manage/my-portal/category-list/category-list.component.html

@@ -25,11 +25,12 @@
   </div>
 </div> -->
 
-@if(companySelect.companyId){
+<ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
+<!-- @if(companySelect.companyId){
 <ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
 } @else {
 <ng-container *ngTemplateOutlet="companyTemplate"></ng-container>
-}
+} -->
 
 
 <ng-template #companyTemplate>

src/app/portal-manage/my-portal/category-list/category-list.component.ts

@@ -115,8 +115,8 @@ export class CategorylistComponent implements OnInit {
       // },
 
     ];
-    // this.getListCount();
-    this.getCompany()
+    this.getListCount();
+    // this.getCompany()
   }
 
   getCompany() {

src/app/portal-manage/my-portal/create-category/create-category.component.html

@@ -27,11 +27,12 @@
 </div> -->
 
 
-@if(companySelect.companyId){
+<ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
+<!-- @if(companySelect.companyId){
 <ng-container *ngTemplateOutlet="documentTemplate"></ng-container>
 } @else {
 <ng-container *ngTemplateOutlet="companyTemplate"></ng-container>
-}
+} -->
 
 
 <ng-template #companyTemplate>

src/app/portal-manage/my-portal/create-category/create-category.component.ts

@@ -121,8 +121,8 @@ export class CreateCategoryComponent implements OnInit {
       //   document: "0"
       // }
     ];
-    // this.getListCount();
-    this.getCompany()
+    this.getListCount();
+    // this.getCompany()
   }
 
   getCompany() {

src/app/portal-manage/my-portal/excel-list/excel-list.component.html

@@ -150,15 +150,14 @@
 
 
 <ng-template #documentTemplate>
-
-
-
     <div class="grid grid-cols-12 gap-6">
         <div class="xl:col-span-12 col-span-12">
             <div class="box">
                 <div class="box-header justify-between">
                     <div class="box-title">
-                        รายการเอกสาร
+                        รายการเอกสาร ({{companySelect.companyName}})
+                        <span class="cursor-pointer text-info" style="text-decoration: underline;"
+                            (click)="removeCompany()">เปลี่ยนบริษัท</span>
                     </div>
                     <div class="flex flex-wrap gap-4">
                         <!-- Search By -->

src/app/portal-manage/my-portal/excel-list/excel-list.component.ts

@@ -218,6 +218,10 @@ export class ExcelListComponent implements OnInit {
         this.companySelect = this.tokenService.getSelectCompany()
         this.getData()
     }
+    removeCompany() {
+        this.tokenService.removeCompany()
+        this.companySelect = this.tokenService.getSelectCompany()
+    }
     get totalItems(): number {
         return this.searchText == ''
             ? this.template.data.length

src/app/portal-manage/my-portal/excel-report-toggle/excel-report-toggle.component.html

@@ -156,7 +156,9 @@
             <div class="box">
                 <div class="box-header justify-between">
                     <div class="box-title">
-                        รายการเอกสาร
+                        รายการเอกสาร ({{companySelect.companyName}})
+                        <span class="cursor-pointer text-info" style="text-decoration: underline;"
+                            (click)="removeCompany()">เปลี่ยนบริษัท</span>
                     </div>
                     <div class="flex flex-wrap gap-4">
                         <!-- Search By -->

src/app/portal-manage/my-portal/excel-report-toggle/excel-report-toggle.component.ts

@@ -186,6 +186,10 @@ export class ExcelReportToggleComponent implements OnInit {
         this.getExcelList()
 
     }
+    removeCompany() {
+        this.tokenService.removeCompany()
+        this.companySelect = this.tokenService.getSelectCompany()
+    }
     get totalItems(): number {
         return this.searchText == ''
             ? this.template.data.length

src/app/portal-manage/my-portal/excel-report/excel-report.component.html

@@ -146,6 +146,13 @@
 
 <ng-template #documentTemplate>
   <div class="box">
+    <div class="box-header justify-between">
+      <div class="box-title">
+        รายงาน Excel ({{companySelect.companyName}})
+        <span class="cursor-pointer text-info" style="text-decoration: underline;"
+          (click)="removeCompany();isDropdownOpen=false">เปลี่ยนบริษัท</span>
+      </div>
+    </div>
     <div class="relative w-full max-w-4xl mx-auto my-8 font-sans">
       <button (click)="toggleDropdown()"
         class="w-full bg-white bg-gradient-to-r from-blue-600 to-blue-800 text-white font-semibold py-4 px-6 rounded-xl shadow-lg hover:from-blue-700 hover:to-blue-900 focus:outline-none focus:ring-4 focus:ring-blue-300 transition-all duration-300 ease-in-out flex items-center justify-between">

src/app/portal-manage/my-portal/excel-report/excel-report.component.ts

@@ -157,6 +157,10 @@ export class ExcelReportComponent implements OnInit {
 
 
   }
+  removeCompany() {
+    this.tokenService.removeCompany()
+    this.companySelect = this.tokenService.getSelectCompany()
+  }
 
   openModal(data: any, modal: any) {
     this.searchModal = ''; // รีเซ็ต search

src/app/portal-manage/myhr-plus/myhr-plus.module.ts

@@ -3,6 +3,109 @@ import { CommonModule } from '@angular/common';
 import { MyhrPlusComponent } from './myhr-plus.component';
 import { RouterModule, Routes } from '@angular/router';
 
+const portalRoutes: Routes = [
+  {
+    path: 'category-list',
+    loadComponent: () =>
+      import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
+  },
+  {
+    path: 'view-list-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'create-category',
+    loadComponent: () =>
+      import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
+  },
+  {
+    path: 'list-excel',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
+  },
+  {
+    path: 'list-doc',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
+  },
+  {
+    path: 'list-course',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
+  },
+  {
+    path: 'category-list-approve',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
+  },
+  {
+    path: 'approve-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
+  },
+  {
+    path: 'approve-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
+  },
+  {
+    path: 'approve-course',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
+  },
+  {
+    path: 'approved-list',
+    loadComponent: () =>
+      import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
+  },
+  {
+    path: 'view-list-excel/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'excel-list',
+    loadComponent: () =>
+      import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
+  },
+  {
+    path: 'excel-report-toggle',
+    loadComponent: () =>
+      import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
+  },
+  {
+    path: 'datasource-table',
+    loadComponent: () =>
+      import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
+  },
+  {
+    path: 'excel-report',
+    loadComponent: () =>
+      import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
+  }
+]
+
 export const myhrplus: Routes = [
   {
     path: "myhr-plus", children: [
@@ -11,110 +114,13 @@ export const myhrplus: Routes = [
         loadComponent: () =>
           import('./dashboard/dashboard.component').then((m) => m.DashboardComponent),
       },
-      {
-        path: 'category-list',
-        loadComponent: () =>
-          import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
-      },
-      {
-        path: 'view-list-excel',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
-      },
-      {
-        path: 'view-list-doc',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
-      },
-      {
-        path: 'view-list-course',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
-      },
-      {
-        path: 'create-category',
-        loadComponent: () =>
-          import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
-      },
-      {
-        path: 'list-excel',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
-      },
-      {
-        path: 'list-doc',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
-      },
-      {
-        path: 'list-course',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
-      },
-      {
-        path: 'category-list-approve',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
-      },
-      {
-        path: 'approve-excel',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
-      },
-      {
-        path: 'approve-doc',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
-      },
-      {
-        path: 'approve-course',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
-      },
-      {
-        path: 'approved-list',
-        loadComponent: () =>
-          import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
-      },
-      {
-        path: 'view-list-excel/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
-      },
-      {
-        path: 'view-list-doc/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
-      },
-      {
-        path: 'view-list-course/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
-      },
-      {
-        path: 'excel-list',
-        loadComponent: () =>
-          import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
-      },
-      {
-        path: 'excel-report-toggle',
-        loadComponent: () =>
-          import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
-      },
-      {
-        path: 'datasource-table',
-        loadComponent: () =>
-          import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
-      },
-      {
-        path: 'excel-report',
-        loadComponent: () =>
-          import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
-      },
+      ...portalRoutes
     ]
   }
 ]
 
+
+
 @NgModule({
   imports: [
     CommonModule,

src/app/portal-manage/myjob/myjob.module.ts

@@ -4,6 +4,108 @@ import { MyjobComponent } from './myjob.component';
 import { RouterModule, Routes } from '@angular/router';
 import { QuillModule } from 'ngx-quill';
 
+const portalRoutes: Routes = [
+  {
+    path: 'category-list',
+    loadComponent: () =>
+      import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
+  },
+  {
+    path: 'view-list-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'create-category',
+    loadComponent: () =>
+      import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
+  },
+  {
+    path: 'list-excel',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
+  },
+  {
+    path: 'list-doc',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
+  },
+  {
+    path: 'list-course',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
+  },
+  {
+    path: 'category-list-approve',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
+  },
+  {
+    path: 'approve-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
+  },
+  {
+    path: 'approve-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
+  },
+  {
+    path: 'approve-course',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
+  },
+  {
+    path: 'approved-list',
+    loadComponent: () =>
+      import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
+  },
+  {
+    path: 'view-list-excel/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'excel-list',
+    loadComponent: () =>
+      import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
+  },
+  {
+    path: 'excel-report-toggle',
+    loadComponent: () =>
+      import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
+  },
+  {
+    path: 'datasource-table',
+    loadComponent: () =>
+      import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
+  },
+  {
+    path: 'excel-report',
+    loadComponent: () =>
+      import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
+  }
+]
 export const myjob: Routes = [
   {
     path: "myjob", children: [
@@ -83,7 +185,8 @@ export const myjob: Routes = [
         loadComponent: () =>
           import('./company-department/career-cluster/career-cluster.component').then((m) => m.CareerClusterComponent),
       },
-    ]
+      ...portalRoutes
+    ],
   }
 ]
 

src/app/portal-manage/mylearn/mylearn.module.ts

@@ -3,20 +3,122 @@ import { CommonModule } from '@angular/common';
 import { MylearnComponent } from './mylearn.component';
 import { RouterModule, Routes } from '@angular/router';
 
-
+const portalRoutes: Routes = [
+  {
+    path: 'category-list',
+    loadComponent: () =>
+      import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
+  },
+  {
+    path: 'view-list-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'create-category',
+    loadComponent: () =>
+      import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
+  },
+  {
+    path: 'list-excel',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
+  },
+  {
+    path: 'list-doc',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
+  },
+  {
+    path: 'list-course',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
+  },
+  {
+    path: 'category-list-approve',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
+  },
+  {
+    path: 'approve-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
+  },
+  {
+    path: 'approve-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
+  },
+  {
+    path: 'approve-course',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
+  },
+  {
+    path: 'approved-list',
+    loadComponent: () =>
+      import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
+  },
+  {
+    path: 'view-list-excel/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'excel-list',
+    loadComponent: () =>
+      import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
+  },
+  {
+    path: 'excel-report-toggle',
+    loadComponent: () =>
+      import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
+  },
+  {
+    path: 'datasource-table',
+    loadComponent: () =>
+      import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
+  },
+  {
+    path: 'excel-report',
+    loadComponent: () =>
+      import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
+  }
+]
 export const mylearn: Routes = [
   {
-    path: "mylearn", children:[
+    path: "mylearn", children: [
       {
         path: 'dashboard',
-      loadComponent: () =>
-        import('./dashboard/dashboard.component').then((m) => m.DashboardComponent),
+        loadComponent: () =>
+          import('./dashboard/dashboard.component').then((m) => m.DashboardComponent),
       },
       {
-      path: 'mylearn-pdpa-manage',
-      loadComponent: () =>
-        import('./pdpa-manage/pdpa-manage.component').then((m) => m.PdpaManageComponent),
+        path: 'mylearn-pdpa-manage',
+        loadComponent: () =>
+          import('./pdpa-manage/pdpa-manage.component').then((m) => m.PdpaManageComponent),
       },
+      ...portalRoutes
     ]
   }
 ]

src/app/portal-manage/myskill-x/myskill-x.module.ts

@@ -5,110 +5,114 @@ import { RouterModule, Routes } from '@angular/router';
 import { SharedModule } from '../../shared/shared.module';
 import { QuillModule } from 'ngx-quill';
 
+
+const portalRoutes: Routes = [
+  {
+    path: 'category-list',
+    loadComponent: () =>
+      import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
+  },
+  {
+    path: 'view-list-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course',
+    loadComponent: () =>
+      import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'create-category',
+    loadComponent: () =>
+      import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
+  },
+  {
+    path: 'list-excel',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
+  },
+  {
+    path: 'list-doc',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
+  },
+  {
+    path: 'list-course',
+    loadComponent: () =>
+      import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
+  },
+  {
+    path: 'category-list-approve',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
+  },
+  {
+    path: 'approve-excel',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
+  },
+  {
+    path: 'approve-doc',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
+  },
+  {
+    path: 'approve-course',
+    loadComponent: () =>
+      import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
+  },
+  {
+    path: 'approved-list',
+    loadComponent: () =>
+      import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
+  },
+  {
+    path: 'view-list-excel/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
+  },
+  {
+    path: 'view-list-doc/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
+  },
+  {
+    path: 'view-list-course/:type',
+    loadComponent: () =>
+      import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
+  },
+  {
+    path: 'excel-list',
+    loadComponent: () =>
+      import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
+  },
+  {
+    path: 'excel-report-toggle',
+    loadComponent: () =>
+      import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
+  },
+  {
+    path: 'datasource-table',
+    loadComponent: () =>
+      import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
+  },
+  {
+    path: 'excel-report',
+    loadComponent: () =>
+      import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
+  }
+]
 export const myportal: Routes = [
   {
     path: 'myskill-x', children: [
       //////////////MyPortal/////////////////
-      {
-        path: 'category-list',
-        loadComponent: () =>
-          import('../my-portal/category-list/category-list.component').then((m) => m.CategorylistComponent),
-      },
-      {
-        path: 'view-list-excel',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
-      },
-      {
-        path: 'view-list-doc',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
-      },
-      {
-        path: 'view-list-course',
-        loadComponent: () =>
-          import('../my-portal/category-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
-      },
-      {
-        path: 'create-category',
-        loadComponent: () =>
-          import('../my-portal/create-category/create-category.component').then((m) => m.CreateCategoryComponent),
-      },
-      {
-        path: 'list-excel',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-excel/list-excel.component').then((m) => m.ListExcelComponent),
-      },
-      {
-        path: 'list-doc',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-doc/list-doc.component').then((m) => m.ListDocComponent),
-      },
-      {
-        path: 'list-course',
-        loadComponent: () =>
-          import('../my-portal/create-category/list-course/list-course.component').then((m) => m.ListCourseComponent),
-      },
-      {
-        path: 'category-list-approve',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/category-list-approve.component').then((m) => m.CategoryListApproveComponent),
-      },
-      {
-        path: 'approve-excel',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-excel/approve-excel.component').then((m) => m.ApproveExcelComponent),
-      },
-      {
-        path: 'approve-doc',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-doc/approve-doc.component').then((m) => m.ApproveDocComponent),
-      },
-      {
-        path: 'approve-course',
-        loadComponent: () =>
-          import('../my-portal/category-list-approve/approve-course/approve-course.component').then((m) => m.ApproveCourseComponent),
-      },
-      {
-        path: 'approved-list',
-        loadComponent: () =>
-          import('../my-portal/approved-list/approved-list.component').then((m) => m.ApprovedListComponent),
-      },
-      {
-        path: 'view-list-excel/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-excel/view-list-excel.component').then((m) => m.ViewListExcelComponent),
-      },
-      {
-        path: 'view-list-doc/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-doc/view-list-doc.component').then((m) => m.ViewListDocComponent),
-      },
-      {
-        path: 'view-list-course/:type',
-        loadComponent: () =>
-          import('../my-portal/approved-list/view-list-course/view-list-course.component').then((m) => m.ViewListCourseComponent),
-      },
-      {
-        path: 'excel-list',
-        loadComponent: () =>
-          import('../my-portal/excel-list/excel-list.component').then((m) => m.ExcelListComponent),
-      },
-      {
-        path: 'excel-report-toggle',
-        loadComponent: () =>
-          import('../my-portal/excel-report-toggle/excel-report-toggle.component').then((m) => m.ExcelReportToggleComponent),
-      },
-      {
-        path: 'datasource-table',
-        loadComponent: () =>
-          import('../my-portal/datasource-table/datasource-table.component').then((m) => m.DatasourceTableComponent),
-      },
-      {
-        path: 'excel-report',
-        loadComponent: () =>
-          import('../my-portal/excel-report/excel-report.component').then((m) => m.ExcelReportComponent),
-      },
+      ...portalRoutes
     ]
   }
 ];

src/app/shared/services/nav.service.ts

@@ -227,7 +227,7 @@ export class NavService implements OnDestroy {
         title: 'dashboard',
         type: 'link',
       },
-
+      ...this.createPortalMenu('mylearn')
     ];
   }
 
@@ -272,7 +272,8 @@ export class NavService implements OnDestroy {
           { path: '/myjob/country-registration', title: 'จัดการประเทศ', type: 'link' },
           { path: '/myjob/provinces', title: 'จัดการจังหวัด', type: 'link' },
         ],
-      }
+      },
+      ...this.createPortalMenu('myjob')
     ];
   }