Merged

frontend/src/app/pages/account/company/subsidiary/subsidiary.component.ts

@@ -1,31 +1,38 @@
+import { SearchDTO } from './../../../../models/masters/masters';
 import { SubsidiaryDTO } from './../../../../models/account.model';
 import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { ConfirmationService, MessageService } from 'primeng/api';
-import { TableModule, Table } from 'primeng/table';
-import { DialogModule } from 'primeng/dialog';
-import { RippleModule } from 'primeng/ripple';
-import { ButtonModule } from 'primeng/button';
+import { TableModule } from 'primeng/table';
+import { Dialog } from 'primeng/dialog';
+import { Ripple } from 'primeng/ripple';
+import { ButtonModule, Button } from 'primeng/button';
 import { ToastModule } from 'primeng/toast';
 import { ToolbarModule } from 'primeng/toolbar';
-import { ConfirmDialogModule } from 'primeng/confirmdialog';
+import { ConfirmDialog } from 'primeng/confirmdialog';
 import { InputTextModule } from 'primeng/inputtext';
 import { TextareaModule } from 'primeng/textarea';
 import { CommonModule } from '@angular/common';
+import { FileUpload } from 'primeng/fileupload';
 import { SelectModule } from 'primeng/select';
-import { TagModule } from 'primeng/tag';
-import { SkeletonModule } from 'primeng/skeleton';
-import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { Tag } from 'primeng/tag';
+import { RadioButton } from 'primeng/radiobutton';
+import { Rating } from 'primeng/rating';
+import { Skeleton } from 'primeng/skeleton';
+import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
+import { InputNumber } from 'primeng/inputnumber';
 import { IconFieldModule } from 'primeng/iconfield';
 import { InputIconModule } from 'primeng/inputicon';
+import { Table } from 'primeng/table';
+import { DropdownModule } from 'primeng/dropdown';
 import { CompanyService } from '../../../../services/account/company/company.service';
+import { FloatLabelModule } from "primeng/floatlabel";
 import { ValidationService } from '../../../../services/utilities/validation.service';
 import { TooltipModule } from 'primeng/tooltip';
 import { AutoCompleteModule } from 'primeng/autocomplete';
 import { MasterService } from '../../../../services/masters/master.service';
-import { CityDTO, SearchDTO } from '../../../../models/masters/masters';
+import { CityDTO } from '../../../../models/masters/masters';
 import { debounceTime, Subject } from 'rxjs';
 import { Request } from '../../../../models/request.model';
-import { FloatLabelModule } from 'primeng/floatlabel';
 
 interface Column {
     field: string;
@@ -38,19 +45,11 @@ interface ExportColumn {
     dataKey: string;
 }
 
-import { FormsModule } from '@angular/forms';
-
 @Component({
   selector: 'app-subsidiary',
     templateUrl: './subsidiary.component.html',
     standalone: true,
-    imports: [
-      CommonModule, FormsModule, ReactiveFormsModule,
-      TableModule, DialogModule, ButtonModule, ToastModule, ToolbarModule, ConfirmDialogModule,
-      InputTextModule, TextareaModule, SelectModule, TagModule,
-      SkeletonModule, IconFieldModule,
-      InputIconModule, TooltipModule, AutoCompleteModule, RippleModule, FloatLabelModule
-    ],
+    imports: [TableModule, Dialog, Ripple, SelectModule, ToastModule, ToolbarModule, ConfirmDialog, InputTextModule, TextareaModule, CommonModule, FileUpload, DropdownModule, Tag, RadioButton, Rating, InputTextModule, InputNumber, IconFieldModule, InputIconModule, Button, FloatLabelModule, FormsModule, ReactiveFormsModule, TooltipModule, Skeleton, AutoCompleteModule],
     providers: [MessageService, ConfirmationService],
     styleUrl: './subsidiary.component.css'
 })
@@ -117,11 +116,6 @@ export class SubsidiaryComponent implements OnInit{
         this.dt.exportCSV();
     }
 
-    onSearch(event: Event) {
-        const input = event.target as HTMLInputElement;
-        this.dt.filterGlobal(input.value, 'contains');
-    }
-
     searchCities(event: any) {
         const query = event.query;
         this.searchSubject.next(query);
@@ -237,8 +231,15 @@ export class SubsidiaryComponent implements OnInit{
             message: `Are you sure you want to ${isActivating ? 'activate' : 'deactivate'} ` + subsidiary.name + '?',
             header: 'Confirm',
             icon: 'pi pi-exclamation-triangle',
-            rejectButtonStyleClass: 'p-button-text p-button-secondary',
-            acceptButtonStyleClass: isActivating ? 'p-button-success' : 'p-button-danger',
+            rejectButtonProps: {
+                label: 'No',
+                severity: 'secondary',
+                variant: 'text'
+            },
+            acceptButtonProps: {
+                severity: isActivating ? 'success' : 'danger',
+                label: 'Yes'
+            },
             accept: () => {
                 this.subsidiaryService.activateDeactivateSubsidiary(subsidiary.id?? '', isActivating).subscribe({
                     next: (updatedSubsidiary) => {