menu

Web-Manage/src/app/DPU/company-management/admin-borrow-manage/admin-borrow-manage.component.html

+<p>admin-borrow-manage works!</p>

Web-Manage/src/app/DPU/company-management/admin-borrow-manage/admin-borrow-manage.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-admin-borrow-manage',
+  standalone: true,
+  imports: [],
+  templateUrl: './admin-borrow-manage.component.html',
+  styleUrl: './admin-borrow-manage.component.scss'
+})
+export class AdminBorrowManageComponent {
+
+}

Web-Manage/src/app/DPU/company-management/admin-project-emp-manage/admin-project-emp-manage.component.html

+<p>admin-project-emp-manage works!</p>

Web-Manage/src/app/DPU/company-management/admin-project-emp-manage/admin-project-emp-manage.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-admin-project-emp-manage',
+  standalone: true,
+  imports: [],
+  templateUrl: './admin-project-emp-manage.component.html',
+  styleUrl: './admin-project-emp-manage.component.scss'
+})
+export class AdminProjectEmpManageComponent {
+
+}

Web-Manage/src/app/DPU/company-management/admin-project-equirement/admin-project-equirement.component.html

+<p>admin-project-equirement works!</p>

Web-Manage/src/app/DPU/company-management/admin-project-equirement/admin-project-equirement.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-admin-project-equirement',
+  standalone: true,
+  imports: [],
+  templateUrl: './admin-project-equirement.component.html',
+  styleUrl: './admin-project-equirement.component.scss'
+})
+export class AdminProjectEquirementComponent {
+
+}

Web-Manage/src/app/DPU/company-management/admin-project-home/admin-project-home.component.html

+<p>admin-project-home works!</p>

Web-Manage/src/app/DPU/company-management/admin-project-home/admin-project-home.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-admin-project-home',
+  standalone: true,
+  imports: [],
+  templateUrl: './admin-project-home.component.html',
+  styleUrl: './admin-project-home.component.scss'
+})
+export class AdminProjectHomeComponent {
+
+}

Web-Manage/src/app/DPU/company-management/company-management.module.ts

@@ -10,53 +10,74 @@ export const companyRoutes: Routes = [
     loadComponent: () =>
       import('./home-installer/home-installer.component').then((m) => m.HomeInstallerComponent),
   },
+  // {
+  //   path: 'company/company-info',
+  //   loadComponent: () =>
+  //     import('./company-info/company-info.component').then((m) => m.CompanyInfoComponent),
+  // },
+  // {
+  //   path: 'company/company-location',
+  //   loadComponent: () =>
+  //     import('./company-location/company-location.component').then((m) => m.CompanyLocationComponent),
+  // },
+  // {
+  //   path: 'company/company-department',
+  //   loadComponent: () =>
+  //     import('../common/employee/department/department.component').then((m) => m.DepartmentComponent),
+  // },
+  // {
+  //   path: 'company/company-position',
+  //   loadComponent: () =>
+  //     import('../common/employee/position/position.component').then((m) => m.PositionComponent),
+  // },
+  // {
+  //   path: 'company/company-emp',
+  //   loadComponent: () =>
+  //     import('./company-emp/company-emp.component').then((m) => m.CompanyEmpComponent),
+  // },
+  // {
+  //   path: 'company/timestamp-log',
+  //   loadComponent: () =>
+  //     import('./timestamp-log/timestamp-log.component').then((m) => m.TimestampLogComponent),
+  // },
+  // {
+  //   path: 'company/timestamp-log/:company_employeeId',
+  //   loadComponent: () =>
+  //     import('./timestamp-log/timestamp-log.component').then((m) => m.TimestampLogComponent),
+  // },
+  // {
+  //   path: 'company/timestamp-face',
+  //   loadComponent: () =>
+  //     import('./enroll-face/enroll-face.component').then((m) => m.EnrollFaceComponent),
+  // },
+  // {
+  //   path: 'company/warning-timestamp-log',
+  //   loadComponent: () =>
+  //     import('./warning-timetamp/warning-timetamp.component').then((m) => m.WarningTimetampComponent),
+  // },
   {
-      path: 'company/company-info',
+    path: 'company/admin-home',
     loadComponent: () =>
-        import('./company-info/company-info.component').then((m) => m.CompanyInfoComponent),
+      import('./admin-project-home/admin-project-home.component').then((m) => m.AdminProjectHomeComponent),
   },
   {
-      path: 'company/company-location',
+    path: 'company/project-emp',
     loadComponent: () =>
-        import('./company-location/company-location.component').then((m) => m.CompanyLocationComponent),
+      import('./admin-project-emp-manage/admin-project-emp-manage.component').then((m) => m.AdminProjectEmpManageComponent),
   },
   {
-      path: 'company/company-department',
+    path: 'company/equirement-emp',
     loadComponent: () =>
-        import('../common/employee/department/department.component').then((m) => m.DepartmentComponent),
+      import('./admin-project-equirement/admin-project-equirement.component').then((m) => m.AdminProjectEquirementComponent),
   },
   {
-      path: 'company/company-position',
+    path: 'company/admin-borrow',
     loadComponent: () =>
-        import('../common/employee/position/position.component').then((m) => m.PositionComponent),
-    },
-    {
-      path: 'company/company-emp',
-      loadComponent: () =>
-        import('./company-emp/company-emp.component').then((m) => m.CompanyEmpComponent),
-    },
-    {
-      path: 'company/timestamp-log',
-      loadComponent: () =>
-        import('./timestamp-log/timestamp-log.component').then((m) => m.TimestampLogComponent),
-    },
-    {
-      path: 'company/timestamp-log/:company_employeeId',
-      loadComponent: () =>
-        import('./timestamp-log/timestamp-log.component').then((m) => m.TimestampLogComponent),
-    },
-    {
-      path: 'company/timestamp-face',
-      loadComponent: () =>
-        import('./enroll-face/enroll-face.component').then((m) => m.EnrollFaceComponent),
-    },
-    {
-      path: 'company/warning-timestamp-log',
-      loadComponent: () =>
-        import('./warning-timetamp/warning-timetamp.component').then((m) => m.WarningTimetampComponent),
+      import('./admin-borrow-manage/admin-borrow-manage.component').then((m) => m.AdminBorrowManageComponent),
   },
 
 
+
 ];
 
 

Web-Manage/src/app/DPU/company-management/emp-borrow-manage/emp-borrow-manage.component.html

+<p>emp-borrow-manage works!</p>

Web-Manage/src/app/DPU/company-management/emp-borrow-manage/emp-borrow-manage.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-emp-borrow-manage',
+  standalone: true,
+  imports: [],
+  templateUrl: './emp-borrow-manage.component.html',
+  styleUrl: './emp-borrow-manage.component.scss'
+})
+export class EmpBorrowManageComponent {
+
+}

Web-Manage/src/app/DPU/company-management/emp-project-home/emp-project-home.component.html

+<p>emp-project-home works!</p>

Web-Manage/src/app/DPU/company-management/emp-project-home/emp-project-home.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-emp-project-home',
+  standalone: true,
+  imports: [],
+  templateUrl: './emp-project-home.component.html',
+  styleUrl: './emp-project-home.component.scss'
+})
+export class EmpProjectHomeComponent {
+
+}

Web-Manage/src/app/authentication/login/login.component.ts

@@ -124,13 +124,15 @@ export class LoginComponent {
       this.tokenService.saveToken(result.access_token);
       // this.tokenService.saveRefreshToken(result.refreshToken);
       this.tokenService.saveUser(result);
-
-      if (result.member.role == 99 || result.member.role == 1) {
+      if (result.member.status == 1) {
+        if (result.member.role == 99) {
           this.routes.navigate(['/admin/member-manage'])
         } else {
           this.adminCompanyList(result.member.memberId)
         }
-
+      } else {
+        this.error = 'ไม่สามารถใช้งานได้กรุณาติดต่อผู้ให้บริการ'
+      }
       // this.routes.navigate(['/admin/member-manage'])
     }, (error) => {
       this.showLoader = false;

Web-Manage/src/app/shared/components/sidebar/sidebar.component.ts

@@ -170,9 +170,16 @@ export class SidebarComponent {
 
   changeMenu() {
     if (this.isInstallerRoute) {
+      if(this.tokenService.getUser().member.role==1){
         this.menuitemsSubscribe$ = this.navServices.items.subscribe((items) => {
-        this.menuItems = this.navServices.getCompanyMenu();
+          this.menuItems = this.navServices.getProjectAdminMenu();
         });
+      }else{
+        this.menuitemsSubscribe$ = this.navServices.items.subscribe((items) => {
+          this.menuItems = this.navServices.getProjectEmpMenu();
+        });
+      }
+
     } else {
       this.menuitemsSubscribe$ = this.navServices.items.subscribe((items) => {
         this.menuItems = this.navServices.getCommonMenu();

Web-Manage/src/app/shared/services/nav.service.ts

@@ -146,27 +146,50 @@ export class NavService implements OnDestroy {
     ]
   }
 
-  getCompanyMenu() {
+  getProjectAdminMenu() {
     return [
       // Dashboard
-      { headTitle: 'จัดการบริษัท' },
+      { headTitle: 'จัดการโครงการ' },
+      {
+        icon: 'home',
+        path: '/company/admin-home',
+        title: 'หน้าแรก',
+        type: 'link',
+        selected: false,
+        Menusub: true,
+        active: false,
+      },
       // { headTitle: 'User Management' },
       {
-        title: 'จัดการข้อมูลบริษัท',
+        title: 'จัดการข้อมูลโครงการ',
         icon: 'buildings',
         type: 'sub',
         badgeClass: 'warning',
         badgeText: 'warning',
         active: false,
         children: [
-          { path: '/company/company-info', title: 'ข้อมูลบริษัท', type: 'link' },
-          { path: '/company/company-department', title: 'จัดการแผนก', type: 'link' },
-          { path: '/company/company-position', title: 'จัดการตำแหน่ง', type: 'link' },
-          // { path: '/company/company-hr', title: 'จัดการผู้ดูแลบริษัท', type: 'link' },
-          { path: '/company/company-emp', title: 'พนักงาน', type: 'link' },
+          { path: '/company/equirement-emp', title: 'สินทรัพย์', type: 'link' },
+          { path: '/company/project-emp', title: 'พนักงาน', type: 'link' }
         ],
       },
       {
+        icon: 'store',
+        path: '/company/admin-borrow',
+        title: 'จัดการการเบิก-คืน',
+        type: 'link',
+        selected: false,
+        Menusub: true,
+        active: false,
+      },
+    ];
+  }
+
+  getProjectEmpMenu() {
+    return [
+      // Dashboard
+      { headTitle: 'จัดการบริษัท' },
+      // { headTitle: 'User Management' }
+      {
         title: 'จัดการข้อมูลการลงเวลา',
         icon: 'time',
         type: 'sub',