ทะเบียนประเทศ, ทะเบียนประเภท

src/app/DPU/common/common.module.ts

@@ -42,6 +42,16 @@ export const admin: Routes = [
         import('./company-department/company-department.component').then((m) => m.CompanyDepartmentComponent),
     },
     {
+      path: 'country-registration',
+      loadComponent: () =>
+        import('./company-department/country-registration/country-registration.component').then((m) => m.CountryRegistrationComponent),
+    },
+    {
+      path: 'category-company',
+      loadComponent: () =>
+        import('./company-department/category-company/category-company.component').then((m) => m.CategoryCompanyComponent),
+    },
+    {
       path: 'admin-manage',
       loadComponent: () =>
         import('./admin-manage/admin-manage.component').then((m) => m.AdminManageComponent),

src/app/DPU/common/company-department/category-company/category-company.component.spec.ts

+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { CategoryCompanyComponent } from './category-company.component';
+
+describe('CategoryCompanyComponent', () => {
+  let component: CategoryCompanyComponent;
+  let fixture: ComponentFixture<CategoryCompanyComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CategoryCompanyComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CategoryCompanyComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/DPU/common/company-department/category-company/category-company.component.ts

+import { Component, ElementRef, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { MatDialog } from '@angular/material/dialog';
+import swal from 'sweetalert';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../../../../shared/shared.module';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { FormsModule } from '@angular/forms';
+import { MatPaginator } from '@angular/material/paginator';
+import { FileUploadModule } from 'ng2-file-upload';
+import { PdpaConfigComponent } from '../../pdpa-manage/pdpa-config/pdpa-config.component';
+import { QuillModule } from 'ngx-quill';
+import { CategoryModel } from '../../../models/category.model';
+import { CategoryCompanyService } from '../../../services/category-company.service';
+
+@Component({
+  standalone: true,
+  imports: [
+    CommonModule,
+    SharedModule,
+    TranslateModule,
+    NgSelectModule,
+    FormsModule,
+    MatPaginator,
+    FileUploadModule,
+    PdpaConfigComponent,
+    QuillModule
+  ],
+  selector: 'app-category-company',
+  templateUrl: './category-company.component.html',
+  styleUrls: ['./category-company.component.css']
+})
+export class CategoryCompanyComponent implements OnInit {
+
+  quillConfig = {
+    toolbar: [
+      ['link'],
+      ['bold', 'italic', 'underline', 'strike'],
+      ['blockquote', 'code-block'],
+      [{ 'header': 1 }, { 'header': 2 }],
+      [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+      [{ 'script': 'sub' }, { 'script': 'super' }],
+      [{ 'indent': '-1' }, { 'indent': '+1' }],
+      [{ 'direction': 'rtl' }],
+      [{ 'size': ['small', false, 'large', 'huge'] }],
+      [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+      [{ 'color': [] }, { 'background': [] }],
+      [{ 'align': [] }],
+      ['clean'],
+    ]
+  };
+  @ViewChild('closeModal') public childModal?: ElementRef;
+  @ViewChild('modalDetail') modalDetail!: TemplateRef<any>;
+
+  currentTab = 1
+
+  allSelected = false;
+  someSelected = false;
+  itemsList: CategoryModel[] = []
+  filterList: CategoryModel[] = []
+  category: CategoryModel = new CategoryModel()
+  selectedItems = new Map<string, boolean>();
+  pageIndex = 0;
+
+  modalStatus: "add" | "edit" = "add"
+  isSaving = false;
+
+  get searchTerm(): string {
+    return this._searchTerm;
+  }
+  set searchTerm(val: string) {
+    this.pageIndex = 0;
+    this.allSelected = false
+    this._searchTerm = val;
+    if (val != '') {
+      this.filterList = this.filter(val);
+    } else {
+      this.updatePagedItems()
+    }
+  }
+
+  _searchTerm = "";
+  constructor(private categoryCompanyService: CategoryCompanyService, public translate: TranslateService, private modal: MatDialog) {
+
+  }
+
+  ngOnInit(): void {
+    this.categoryCompanyService.list().subscribe(res => {
+      this.itemsList = res.map(item => new CategoryModel(item, this.translate));
+      this.filterList = [...this.itemsList];
+    });
+  }
+
+  filter(v: string) {
+    return this.itemsList?.filter(
+      (x) =>
+        x.categoryId?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
+        x.thName?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
+        x.engName?.toLowerCase().indexOf(v.toLowerCase()) !== -1
+    );
+  }
+
+
+  new() {
+    this.modalStatus = 'add'
+    this.category = new CategoryModel();
+  }
+
+  view(item: CategoryModel) {
+    this.modalStatus = 'edit';
+    this.category = new CategoryModel(item, this.translate);
+  }
+
+  save() {
+    swal({
+      title: "Are you sure?",
+      text: "คุณต้องการบันทึกหรือไม่",
+      icon: "warning",
+      dangerMode: false,
+      buttons: ["Cancel", "Confirm"],
+    })
+      .then((willDelete: any) => {
+        if (willDelete) {
+
+          if (this.modalStatus == 'add') {
+            console.log(this.category);
+            this.categoryCompanyService.post(this.category).subscribe(result => {
+              swal("Save Success!!", "บันทึกเวอร์ชั่นสำเร็จ", "success");
+              this.ngOnInit()
+              this.childModal?.nativeElement.click()
+            })
+          } else if (this.modalStatus == 'edit') {
+            const respone = new CategoryModel(this.category);
+            this.categoryCompanyService.post(respone).subscribe(result => {
+              console.log(result)
+              swal("Update Success!!", "บันทึกเวอร์ชั่นสำเร็จ", "success");
+              this.ngOnInit()
+              this.childModal?.nativeElement.click()
+            })
+          }
+        }
+      });
+  }
+
+  deletecategory(item: CategoryModel) {
+    const versionText = `${this.translate.instant('category')}: ${item.thName}`;
+    swal({
+      title: "Are you sure?",
+      text: `Confirm to delete :\n${versionText}\!`,
+      icon: "warning",
+      dangerMode: true,
+      buttons: ["Cancel", "Yes,Delete it!"],
+    }).then((willDelete: any) => {
+      if (willDelete) {
+        const res = new CategoryModel(item)
+        this.categoryCompanyService.delete(res).subscribe(result => {
+          swal("Delete Success!!", "ลบข้อมูลสำเร็จ", "success");
+          this.ngOnInit();
+        });
+      }
+    });
+  }
+
+  deleteSelect() {
+    let categoryConfig = '';
+    this.selectedItems.forEach((isSelected, res) => {
+      if (isSelected) {
+        const category = this.itemsList.find(category => category.categoryId === res) as CategoryModel;
+        if (category) {
+          categoryConfig += `${this.translate.instant('category')}: ${category.thName}\n`;
+        }
+      }
+    });
+
+    swal({
+      title: "Are you sure?",
+      text: categoryConfig,
+      icon: "warning",
+      dangerMode: true,
+      buttons: ["Cancel", "Yes, Delete it!"],
+    })
+      .then((willDelete: any) => {
+        if (willDelete) {
+          this.selectedItems.forEach((isSelected, res) => {
+            if (isSelected) {
+              const category = this.itemsList.find(category => category.categoryId === res);
+              if (category) {
+
+                const newcategory = new CategoryModel(category)
+                this.categoryCompanyService.delete(newcategory).subscribe(result => {
+                  swal("Delete Success!!", "ลบข้อมูลที่เลือกสำเร็จ", "success");
+                  this.ngOnInit();
+                });
+              }
+            }
+          });
+        }
+      });
+  }
+
+
+  updatePagedItems() {
+    const startIndex = this.pageIndex * 10;
+    const endIndex = startIndex + 10;
+    this.filterList = this.itemsList.slice(startIndex, endIndex);
+  }
+
+  toggleAll(event: any) {
+    this.allSelected = event.target.checked;
+    this.selectedItems.clear();
+    this.itemsList.forEach(item => {
+      this.selectedItems.set(item.categoryId, this.allSelected);
+    });
+    this.someSelected = this.itemsList.some(item => this.selectedItems.get(item.categoryId));
+  }
+
+  onCheckboxChange(categoryId: string) {
+    const isSelected = this.selectedItems.get(categoryId) || false;
+    this.selectedItems.set(categoryId, !isSelected);
+    this.allSelected = this.itemsList.every(item => this.selectedItems.get(item.categoryId));
+    this.someSelected = this.itemsList.some(item => this.selectedItems.get(item.categoryId));
+  }
+
+  filterEmp(empId: string) {
+    this.category = this.itemsList.filter(e => e.categoryId == empId)[0]
+  }
+
+}

src/app/DPU/common/company-department/country-registration/country-registration.component.spec.ts

+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { CountryRegistrationComponent } from './country-registration.component';
+
+describe('CountryRegistrationComponent', () => {
+  let component: CountryRegistrationComponent;
+  let fixture: ComponentFixture<CountryRegistrationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CountryRegistrationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CountryRegistrationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/DPU/common/company-department/country-registration/country-registration.component.ts

+import { CommonModule } from "@angular/common";
+import { ChangeDetectionStrategy, Component, ElementRef, TemplateRef, ViewChild } from '@angular/core';
+import { NgSelectModule } from "@ng-select/ng-select";
+import { TranslateModule, TranslateService } from "@ngx-translate/core";
+import { FormsModule } from "@angular/forms";
+import swal from 'sweetalert';
+import { MatPaginator, PageEvent } from "@angular/material/paginator";
+import { FileUploadModule } from 'ng2-file-upload';
+import { FileItem, FileUploader, ParsedResponseHeaders } from "ng2-file-upload";
+import { Router } from "@angular/router";
+import { QuillModule } from "ngx-quill";
+import { MatDialog } from "@angular/material/dialog";
+import { SharedModule } from "../../../../shared/shared.module";
+import { PdpaConfigComponent } from "../../pdpa-manage/pdpa-config/pdpa-config.component";
+import { MyPdpaModel, PdpaModel } from "../../../models/pdpa.model";
+import { CountryService } from "../../../services/country.service";
+import { CountryModel } from "../../../models/country.model";
+
+@Component({
+  selector: 'app-country-registration',
+  standalone: true,
+  imports: [
+    CommonModule,
+    SharedModule,
+    TranslateModule,
+    NgSelectModule,
+    FormsModule,
+    MatPaginator,
+    FileUploadModule,
+    PdpaConfigComponent,
+    QuillModule
+  ],
+  templateUrl: './country-registration.component.html',
+  styleUrl: './country-registration.component.css'
+})
+export class CountryRegistrationComponent {
+  quillConfig = {
+    toolbar: [
+      ['link'],
+      ['bold', 'italic', 'underline', 'strike'],
+      ['blockquote', 'code-block'],
+      [{ 'header': 1 }, { 'header': 2 }],
+      [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+      [{ 'script': 'sub' }, { 'script': 'super' }],
+      [{ 'indent': '-1' }, { 'indent': '+1' }],
+      [{ 'direction': 'rtl' }],
+      [{ 'size': ['small', false, 'large', 'huge'] }],
+      [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+      [{ 'color': [] }, { 'background': [] }],
+      [{ 'align': [] }],
+      ['clean'],
+    ]
+  };
+  @ViewChild('closeModal') public childModal?: ElementRef;
+  @ViewChild('modalDetail') modalDetail!: TemplateRef<any>;
+
+  currentTab = 1
+
+  allSelected = false;
+  someSelected = false;
+  itemsList: CountryModel[] = []
+  filterList: CountryModel[] = []
+  country: CountryModel = new CountryModel()
+  selectedItems = new Map<string, boolean>();
+  pageIndex = 0;
+
+  modalStatus: "add" | "edit" = "add"
+  isSaving = false;
+
+  get searchTerm(): string {
+    return this._searchTerm;
+  }
+  set searchTerm(val: string) {
+    this.pageIndex = 0;
+    this.allSelected = false
+    this._searchTerm = val;
+    if (val != '') {
+      this.filterList = this.filter(val);
+    } else {
+      this.updatePagedItems()
+    }
+  }
+
+  _searchTerm = "";
+  constructor(private countryService: CountryService, public translate: TranslateService, private modal: MatDialog) {
+
+  }
+
+  ngOnInit(): void {
+    this.countryService.list().subscribe(res => {
+      this.itemsList = res.map(item => new CountryModel(item, this.translate));
+      this.filterList = [...this.itemsList];
+    });
+  }
+
+  filter(v: string) {
+    return this.itemsList?.filter(
+      (x) =>
+        x.countryId?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
+        x.thName?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
+        x.engName?.toLowerCase().indexOf(v.toLowerCase()) !== -1
+    );
+  }
+
+
+  new() {
+    this.modalStatus = 'add'
+    this.country = new CountryModel();
+  }
+
+  view(item: CountryModel) {
+    this.modalStatus = 'edit';
+    this.country = new CountryModel(item, this.translate);
+  }
+
+  save() {
+    swal({
+      title: "Are you sure?",
+      text: "คุณต้องการบันทึกหรือไม่",
+      icon: "warning",
+      dangerMode: false,
+      buttons: ["Cancel", "Confirm"],
+    })
+      .then((willDelete: any) => {
+        if (willDelete) {
+
+          if (this.modalStatus == 'add') {
+            console.log(this.country);
+            this.countryService.post(this.country).subscribe(result => {
+              swal("Save Success!!", "บันทึกเวอร์ชั่นสำเร็จ", "success");
+              this.ngOnInit()
+              this.childModal?.nativeElement.click()
+            })
+          } else if (this.modalStatus == 'edit') {
+            const respone = new CountryModel(this.country);
+            this.countryService.post(respone).subscribe(result => {
+              console.log(result)
+              swal("Update Success!!", "บันทึกเวอร์ชั่นสำเร็จ", "success");
+              this.ngOnInit()
+              this.childModal?.nativeElement.click()
+            })
+          }
+        }
+      });
+  }
+
+  deleteCountry(item: CountryModel) {
+    const versionText = `${this.translate.instant('Country')}: ${item.thName}`;
+    swal({
+      title: "Are you sure?",
+      text: `Confirm to delete :\n${versionText}\!`,
+      icon: "warning",
+      dangerMode: true,
+      buttons: ["Cancel", "Yes,Delete it!"],
+    }).then((willDelete: any) => {
+      if (willDelete) {
+        const res = new CountryModel(item)
+        console.log(res);
+        this.countryService.delete(res).subscribe(result => {
+          swal("Delete Success!!", "ลบข้อมูลสำเร็จ", "success");
+          this.ngOnInit();
+        });
+      }
+    });
+  }
+
+  deleteSelect() {
+    let countryConfig = '';
+    this.selectedItems.forEach((isSelected, res) => {
+      if (isSelected) {
+        const country = this.itemsList.find(country => country.countryId === res) as CountryModel;
+        if (country) {
+          countryConfig += `${this.translate.instant('Country')}: ${country.thName}\n`;
+        }
+      }
+    });
+
+    swal({
+      title: "Are you sure?",
+      text: countryConfig,
+      icon: "warning",
+      dangerMode: true,
+      buttons: ["Cancel", "Yes, Delete it!"],
+    })
+      .then((willDelete: any) => {
+        if (willDelete) {
+          this.selectedItems.forEach((isSelected, res) => {
+            if (isSelected) {
+              const country = this.itemsList.find(country => country.countryId === res);
+              if (country) {
+
+                const newCountry = new CountryModel(country)
+                console.log(newCountry);
+                
+                this.countryService.delete(newCountry).subscribe(result => {
+                  swal("Delete Success!!", "ลบข้อมูลที่เลือกสำเร็จ", "success");
+                  this.ngOnInit();
+                });
+              }
+            }
+          });
+        }
+      });
+  }
+
+
+  updatePagedItems() {
+    const startIndex = this.pageIndex * 10;
+    const endIndex = startIndex + 10;
+    this.filterList = this.itemsList.slice(startIndex, endIndex);
+  }
+
+  toggleAll(event: any) {
+    this.allSelected = event.target.checked;
+    this.selectedItems.clear();
+    this.itemsList.forEach(item => {
+      this.selectedItems.set(item.countryId, this.allSelected);
+    });
+    this.someSelected = this.itemsList.some(item => this.selectedItems.get(item.countryId));
+  }
+
+  onCheckboxChange(countryId: string) {
+    const isSelected = this.selectedItems.get(countryId) || false;
+    this.selectedItems.set(countryId, !isSelected);
+    this.allSelected = this.itemsList.every(item => this.selectedItems.get(item.countryId));
+    this.someSelected = this.itemsList.some(item => this.selectedItems.get(item.countryId));
+  }
+
+  filterEmp(empId: string) {
+    this.country = this.itemsList.filter(e => e.countryId == empId)[0]
+  }
+
+}
\ No newline at end of file

src/app/DPU/services/category-company.service.ts

+import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { environment } from "../../../environments/environment";
+import { Observable } from "rxjs";
+import { CategoryModel } from "../models/category.model";
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CategoryCompanyService {
+
+  constructor(private http: HttpClient) { }
+
+  list(): Observable<CategoryModel[]> {
+    return this.http.get<CategoryModel[]>(`${environment.baseUrl}/company-category/list`);
+  }
+
+  post(body: any): Observable<any> {
+    return this.http.post(`${environment.baseUrl}/company-category`, body, { observe: 'response' });
+  }
+
+  delete(body: any): Observable<any> {
+    const option = {
+      headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
+      body: body
+    };
+    return this.http.delete<any>(`${environment.baseUrl}/company-category`, option);
+  }
+}

src/app/DPU/services/country.service.ts

+import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { environment } from "../../../environments/environment";
+import { Observable } from "rxjs";
+import { CountryModel } from "../models/country.model";
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CountryService {
+
+  constructor(private http: HttpClient) { }
+
+  list(): Observable<CountryModel[]> {
+    return this.http.get<CountryModel[]>(`${environment.baseUrl}/country/list`);
+  }
+
+  post(body: any): Observable<any> {
+    return this.http.post(`${environment.baseUrl}/country`, body, { observe: 'response' });
+  }
+
+  delete(body: any): Observable<any> {
+    const option = {
+      headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
+      body: body
+    };
+    return this.http.delete<any>(`${environment.baseUrl}/country`, option);
+  }
+}

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

@@ -129,6 +129,8 @@ export class NavService implements OnDestroy {
         type: 'sub',
         children: [
           { path: '/company-departments/company-info', title: 'ข้อมูลบริษัท', type: 'link' },
+          { path: '/admin/country-registration', title: 'ทะเบียนประเทศ', type: 'link' },
+          { path: '/admin/category-company', title: 'ทะเบียนประเภทบริษัท', type: 'link' },
         ],
       },
 

src/assets/i18n/en.json

@@ -90,5 +90,9 @@
   "Surname(Eng)":"Surname(Eng)",
   "Name-Surname(Thai)":"Name-Surname(Thai)",
   "Name-Surname(Eng)":"Name-Surname(Eng)",
-  "Add Version":"Add Version"
+  "Add Version":"Add Version",
+  "Category ID":"Category ID",
+  "Category":"Category",
+  "Country ID":"Country ID",
+  "Country":"Country"
 }

src/assets/i18n/th.json

@@ -90,5 +90,9 @@
   "Surname(Eng)":"นามสกุล(อังกฤษ)",
   "Name-Surname(Thai)":"ชื่อ-นามสกุล(ไทย)",
   "Name-Surname(Eng)":"ชื่อ-นามสกุล(อังกฤษ)",
-  "Add Version":"สร้างเวอร์ชั่น"
+  "Add Version":"สร้างเวอร์ชั่น",
+  "Category ID":"รหัสประเภทบริษัท",
+  "Category":"ประเภท",
+  "Country ID":"รหัสประเทศ",
+  "Country":"ประเทศ"
 }