ทะเบียนแผนก

src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.html

@@ -94,9 +94,10 @@
                     <td>{{item.edesc}}</td>
                     <td class="flex justify-center">
                         <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
-                            (click)="selectBu2(item);currentModal='edit'"
+                            (click)="currentModal='edit';selectBu2(item)"
                             data-hs-overlay="#department-list-modal-edit"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="selectBu2(item)"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
+                            (click)="currentModal='delete';selectBu2(item)"
                             data-hs-overlay="#department-list-alert-delete-modal"></i>
                     </td>
                 </tr>
@@ -225,7 +226,7 @@
                 </div> -->
                 <label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดแผนก (ไทย)*</label>
                 <input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="bu2.tdesc">
-                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดแผนก (อังกฤษ)*</label>
+                <label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดแผนก (อังกฤษ)</label>
                 <input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="bu2.edesc">
                 <div class="flex justify-end mt-2rem mb-1rem space-x-4">
                     <button type="button"
@@ -579,7 +580,7 @@
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#department-list-alert-modal">
+                        data-hs-overlay="#department-list-modal-add">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
@@ -591,16 +592,11 @@
                 </p>
 
                 <div class="flex justify-end mt-2rem mb-1rem">
-                    <button type="button" *ngIf="currentModal=='add'"
+                    <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
                         data-hs-overlay="#department-list-modal-add">
                         ย้อนกลับ
                     </button>
-                    <button type="button" *ngIf="currentModal=='edit'"
-                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#department-list-modal-edit">
-                        ย้อนกลับ
-                    </button>
                     <a class="ti-btn ti-btn-success" href="javascript:void(0);"
                         data-hs-overlay="#department-list-alert-modal" (click)="addBu2()">
                         บันทึกข้อมูล
@@ -620,7 +616,7 @@
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#department-list-alert-modal">
+                        data-hs-overlay="#department-list-modal-edit">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
@@ -632,12 +628,7 @@
                 </p>
 
                 <div class="flex justify-end mt-2rem mb-1rem">
-                    <button type="button" *ngIf="currentModal=='add'"
-                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#department-list-modal-add">
-                        ย้อนกลับ
-                    </button>
-                    <button type="button" *ngIf="currentModal=='edit'"
+                    <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
                         data-hs-overlay="#department-list-modal-edit">
                         ย้อนกลับ
@@ -672,14 +663,9 @@
                 </p>
 
                 <div class="flex justify-end mt-2rem mb-1rem">
-                    <button type="button" *ngIf="currentModal=='add'"
-                        class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#department-list-modal-add">
-                        ย้อนกลับ
-                    </button>
-                    <button type="button" *ngIf="currentModal=='edit'"
+                    <button
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#department-list-modal-edit">
+                        data-hs-overlay="#department-list-alert-delete-modal">
                         ย้อนกลับ
                     </button>
                     <a class="ti-btn ti-btn-success" href="javascript:void(0);"
@@ -712,7 +698,8 @@
                     </button>
                 </div>
                 <div class="flex justify-center mt-2rem mb-1rem space-x-4">
-                    <button type="submit" class="ti-btn ti-btn-secondary" (click)="uploadFile()"
+                    <button type="submit" class="ti-btn ti-btn-secondary"
+                        data-hs-overlay="#department-list-upload-modal" (click)="uploadFile()"
                         [disabled]="!selectedFile">
                         อัปโหลด
                     </button>

src/app/components/company-components/company-registration/branch-business-unit/department-list/department-list.component.ts

@@ -34,13 +34,13 @@ export class DepartmentListComponent implements OnInit {
     search: ""
   }
   bu1List: Bu1Model[] = []
-  bu1: Bu1Model = new MyBu1Model({})
+  bu1: Bu1Model = new MyBu1Model()
   bu1Modal: table = {
     currentPage: 1,
     page: Array.from({ length: 1 }, (_, i) => i + 1),
     search: ""
   }
-  currentModal = ""
+  currentModal: 'add' | 'edit' | 'delete' = "add"
   constructor(private bu2Service: Bu2Service,
     private bu1Service: Bu1Service,
     private toastr: ToastrService,
@@ -117,8 +117,8 @@ export class DepartmentListComponent implements OnInit {
   }
   filterBu2Table() {
     return this.bu2List.filter(x => x.bu2id.toLowerCase().includes(this.bu2Table.search.toLowerCase()) ||
-    x.tdesc.toLowerCase().includes(this.bu2Table.search.toLowerCase()) ||
-    x.edesc.toLowerCase().includes(this.bu2Table.search.toLowerCase()))
+      x.tdesc.toLowerCase().includes(this.bu2Table.search.toLowerCase()) ||
+      x.edesc.toLowerCase().includes(this.bu2Table.search.toLowerCase()))
   }
   selectBu2(bu2?: Bu2Model) {
     this.bu2 = new MyBu2Model(bu2 || {})
@@ -140,8 +140,8 @@ export class DepartmentListComponent implements OnInit {
   }
   filterBu2Modal() {
     return this.bu2List.filter(x => x.bu2id.toLowerCase().includes(this.bu2Modal.search.toLowerCase()) ||
-    x.tdesc.toLowerCase().includes(this.bu2Modal.search.toLowerCase()) ||
-    x.edesc.toLowerCase().includes(this.bu2Modal.search.toLowerCase()))
+      x.tdesc.toLowerCase().includes(this.bu2Modal.search.toLowerCase()) ||
+      x.edesc.toLowerCase().includes(this.bu2Modal.search.toLowerCase()))
   }
 
 
@@ -161,8 +161,8 @@ export class DepartmentListComponent implements OnInit {
   }
   filterBu1Modal() {
     return this.bu1List.filter(x => x.bu1id.toLowerCase().includes(this.bu1Modal.search.toLowerCase()) ||
-    x.tdesc.toLowerCase().includes(this.bu1Modal.search.toLowerCase()) ||
-    x.edesc.toLowerCase().includes(this.bu1Modal.search.toLowerCase()))
+      x.tdesc.toLowerCase().includes(this.bu1Modal.search.toLowerCase()) ||
+      x.edesc.toLowerCase().includes(this.bu1Modal.search.toLowerCase()))
   }
   selectBu1(bu1?: Bu1Model) {
     this.bu1 = new MyBu1Model(bu1 || {})

src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.html

@@ -27,7 +27,7 @@
             </div>
             <div class="px-1">
                 <button type="button" class="ti-btn ti-btn-soft-secondary h-45px m-0 shadow-md"
-                    data-hs-overlay="#department-register-modal-add" (click)="selectBu1()">
+                    data-hs-overlay="#department-register-modal-add" (click)="currentModel='add';selectBu1()">
                     <i class="ri-add-line"></i>
                     Add
                 </button>
@@ -89,9 +89,11 @@
                     <td>{{item.tdesc}}</td>
                     <td>{{item.edesc}}</td>
                     <td class="flex justify-center">
-                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="selectBu1(item)"
+                        <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
+                            (click)="currentModel='edit';selectBu1(item)"
                             data-hs-overlay="#department-register-modal-edit"></i>
-                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="selectBu1(item)"
+                        <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
+                            (click)="currentModel='delete';selectBu1(item)"
                             data-hs-overlay="#department-register-delete-alert-modal"></i>
                     </td>
                 </tr>
@@ -277,7 +279,7 @@
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#department-register-alert-modal">
+                        [attr.data-hs-overlay]="currentModel=='add'?'#department-register-modal-add':'#department-register-modal-edit'">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>
@@ -291,7 +293,7 @@
                 <div class="flex justify-end mt-2rem mb-1rem">
                     <button type="button"
                         class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
-                        data-hs-overlay="#department-register-alert-modal">
+                        [attr.data-hs-overlay]="currentModel=='add'?'#department-register-modal-add':'#department-register-modal-edit'">
                         ย้อนกลับ
                     </button>
                     <button type="button" class="ti-btn ti-btn-success" (click)="addBu1()"
@@ -360,8 +362,9 @@
                     </button>
                 </div>
                 <div class="flex justify-center mt-2rem mb-1rem space-x-4">
-                    <button type="submit" class="ti-btn ti-btn-secondary" [class.ti-btn-disabled]="!selectedFile"
-                        (click)="uploadFile()" [disabled]="!selectedFile">
+                    <button type="submit" data-hs-overlay="#department-register-upload-modal"
+                        class="ti-btn ti-btn-secondary" [class.ti-btn-disabled]="!selectedFile" (click)="uploadFile()"
+                        [disabled]="!selectedFile">
                         อัปโหลด
                     </button>
                 </div>

src/app/components/company-components/company-registration/branch-business-unit/department-register/department-register.component.ts

@@ -14,11 +14,13 @@ export class DepartmentRegisterComponent implements OnInit {
   page = Array.from({ length: 1 }, (_, i) => i + 1);
   bu1List: Bu1Model[] = []
   bu1ListLoading = false
-  bu1: Bu1Model = new MyBu1Model({})
+  bu1: Bu1Model = new MyBu1Model()
   search = ""
 
   selectedFile: File | null = null;
   selectedFileName: string = 'กรุณาเลือกไฟล์';
+
+  currentModel: 'add' | 'edit' | 'delete' = "add"
   constructor(private bu1Service: Bu1Service,
     private toastr: ToastrService,
     private cdr: ChangeDetectorRef,

src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts

@@ -221,7 +221,7 @@ export class SubEmployeeRegistrationComponent {
 
   getEmployeeList() {
     this.employee.loading = true
-    this.employeeService.getPageListAll().subscribe({
+    this.employeeService.getList().subscribe({
       next: response => {
         this.employee.dataList = response.map((x: any) => ({ check: false, data: new MyEmployeeModel(x) }))
         this.employee.loading = false
@@ -234,7 +234,11 @@ export class SubEmployeeRegistrationComponent {
     })
   }
   updateEmployeeList(type: 'add' | 'update' | 'delete') {
-    this.employeeService[type](this.employee.select).subscribe({
+    let body = this.employee.select
+    if (type == 'delete') {
+      body = [this.employee.select]
+    }
+    this.employeeService[type](body).subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')

src/app/shared/model/bu1.model.ts

@@ -10,11 +10,11 @@ export class MyBu1Model implements Bu1Model {
     tdesc: string;
     edesc: string;
     companyId: string
-    constructor(data: Partial<Bu1Model>) {
-        this.bu1id = data.bu1id || ""
-        this.tdesc = data.tdesc || ""
-        this.edesc = data.edesc || ""
-        this.companyId = data.companyId || ""
+    constructor(data?: Partial<Bu1Model>) {
+        this.bu1id = data?.bu1id || ""
+        this.tdesc = data?.tdesc || ""
+        this.edesc = data?.edesc || ""
+        this.companyId = data?.companyId || ""
     }
 }
 

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

@@ -14,13 +14,13 @@ export class EmployeeService {
   constructor(private http: HttpClient) {
   }
   getPageList(page: string, size: string): Observable<PageModel> {
-    return this.http.get<PageModel>(this.urlApi + "/lists?page=" + page + "&size=" + size)
+    return this.http.get<PageModel>(this.urlApi + "/profile/create-short?page=" + page + "&size=" + size)
   }
   getPageListAll(): Observable<EmployeeModel[]> {
-    return this.http.get<PageModel>(`${this.urlApi}/lists?page=0&size=100`).pipe(
+    return this.http.get<PageModel>(`${this.urlApi}/profile/create-short?page=0&size=100`).pipe(
       expand(response =>
         !response.last
-          ? this.http.get<PageModel>(`${this.urlApi}/lists?page=${response.pageable.pageNumber + 1}&size=100`)
+          ? this.http.get<PageModel>(`${this.urlApi}/profile/create-short?page=${response.pageable.pageNumber + 1}&size=100`)
           : []
       ),
       map(response => response.content),
@@ -28,6 +28,9 @@ export class EmployeeService {
     );
   }
 
+  getList(): Observable<EmployeeModel[]> {
+    return this.http.get<EmployeeModel[]>(this.urlApi + "/profile/create-short/lists")
+  }
   getById(employeeId: string): Observable<EmployeeModel> {
     return this.http.get<EmployeeModel>(this.urlApi + "/profile?employeeId=" + employeeId)
   }
@@ -37,13 +40,13 @@ export class EmployeeService {
   update(body: EmployeeModel): Observable<AlertModel> {
     return this.http.post<AlertModel>(this.urlApi + '/profile-update', body)
   }
-  delete(body: EmployeeModel): Observable<AlertModel> {
+  delete(body: EmployeeModel[]): Observable<AlertModel> {
     const options = {
       headers: new HttpHeaders({
         "Content-Type": "application/json",
       }),
       body: body
     };
-    return this.http.delete<AlertModel>(this.urlApi, options)
+    return this.http.delete<AlertModel>(this.urlApi + "/profile-delete", options)
   }
 }