ทะเบียนบริษัท

src/app/authentication/login-page/login-page2.component.html

@@ -17,8 +17,8 @@
           <!-- ========== MAIN CONTENT ========== -->
           <main id="content" class="w-full max-w-lg mx-auto p-6">
             <a routerLink="/dashboard/sales" class="header-logo">
-              <img src="./assets/img/brand-logos/logo.png" alt="logo" class="mx-auto block dark:hidden" />
-              <img src="./assets/img/brand-logos/desktop-dark.png" alt="logo" class="mx-auto hidden dark:block" />
+              <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="mx-auto block dark:hidden" />
+              <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="mx-auto hidden dark:block" />
             </a>
             <div class="mt-2">
               <div class="p-4 sm:p-7">

src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.ts

@@ -42,7 +42,7 @@ export class CompanyRegistrationPageComponent {
     this.dataLoading = true
     this.companyService.getList().subscribe({
       next: response => {
-        this.dataList = response.map(x => ({ check: false, data: { code: x.companyId, tdesc: x.tdesc, edesc: x.edesc, address: x.addressText, contact: x.descOther } }))
+        this.dataList = response.map(x => ({ check: false, data: { code: x.companyId, tdesc: x.tdesc, edesc: x.edesc, address: x.addressText, contact: x.contactText } }))
         this.dataLoading = false
         this.isDataListCheckedAll = false
         this.dataListCheckAll()
@@ -63,7 +63,7 @@ export class CompanyRegistrationPageComponent {
   dataListFilter() {
     return this.dataList.filter(x => {
       const data = x.data
-      const match = data.code.includes(this.search) || data.tdesc.includes(this.search) || data.edesc.includes(this.search);
+      const match = data.code.toLowerCase().includes(this.search.toLowerCase()) || data.tdesc.toLowerCase().includes(this.search.toLowerCase()) || data.edesc.toLowerCase().includes(this.search.toLowerCase());
       return match;
     });
   }
@@ -72,7 +72,7 @@ export class CompanyRegistrationPageComponent {
   }
 
   addCompany() {
-    const body = new MyCompanyModel({ companyId: this.dataSelect.code, tdesc: this.dataSelect.tdesc, edesc: this.dataSelect.edesc, addressText: this.dataSelect.address, descOther: this.dataSelect.contact })
+    const body = new MyCompanyModel({ companyId: this.dataSelect.code, tdesc: this.dataSelect.tdesc, edesc: this.dataSelect.edesc, addressText: this.dataSelect.address, contactText: this.dataSelect.contact })
     this.companyService.post(body).subscribe({
       next: response => {
         if (response.success) {
@@ -89,9 +89,9 @@ export class CompanyRegistrationPageComponent {
   deleteCompany() {
     let body: CompanyModel | CompanyModel[] = []
     if (this.dataSelect.code) {
-      body = new MyCompanyModel({ companyId: this.dataSelect.code, tdesc: this.dataSelect.tdesc, edesc: this.dataSelect.edesc, addressText: this.dataSelect.address, descOther: this.dataSelect.contact })
+      body = new MyCompanyModel({ companyId: this.dataSelect.code, tdesc: this.dataSelect.tdesc, edesc: this.dataSelect.edesc, addressText: this.dataSelect.address, contactText: this.dataSelect.contact })
     } else {
-      body = this.dataList.filter(x => x.check && x.data.code != '100').map(x => new MyCompanyModel({ companyId: x.data.code, tdesc: x.data.tdesc, edesc: x.data.edesc, addressText: x.data.address, descOther: x.data.contact }))
+      body = this.dataList.filter(x => x.check && x.data.code != '100').map(x => new MyCompanyModel({ companyId: x.data.code, tdesc: x.data.tdesc, edesc: x.data.edesc, addressText: x.data.address, contactText: x.data.contact }))
     }
     this.companyService.delete(body).subscribe({
       next: response => {
@@ -118,7 +118,7 @@ export class CompanyRegistrationPageComponent {
     const selectAll = this.isDataListCheckedAll;
     this.dataList.filter(x => {
       const data = x.data
-      const match = data.code.includes(this.search) || data.tdesc.includes(this.search) || data.edesc.includes(this.search);
+      const match = data.code.toLowerCase().includes(this.search.toLowerCase()) || data.tdesc.toLowerCase().includes(this.search.toLowerCase()) || data.edesc.toLowerCase().includes(this.search.toLowerCase());
       return match;
     }).forEach(x => x.check = selectAll);
     this.dataListCheck();
@@ -142,7 +142,7 @@ export class CompanyRegistrationPageComponent {
     const formData = new FormData();
     formData.append('file', this.selectedFile);
     this.dataLoading = true
-    this.fileService.uploadExcel(formData, '').subscribe({
+    this.fileService.uploadExcel(formData, 'mcompany').subscribe({
       next: response => {
         if (response.success) {
           this.showAlert(response.message, 'success')
@@ -160,7 +160,7 @@ export class CompanyRegistrationPageComponent {
     })
   }
   downloadFile() {
-    const fileName = '.xlsx'
+    const fileName = 'IMPORT_COMPANY.xlsx'
     this.fileService.downloadTemplate(fileName).subscribe({
       next: response => {
         const url = window.URL.createObjectURL(response);

src/app/shared/components/sidebar/sidebar.component.html

@@ -3,13 +3,13 @@
   <!-- Start::main-sidebar-header -->
   <div class="main-sidebar-header" style="background-color: white;padding-top: 0px;padding-bottom: 0px;">
     <a routerLink="/dashboard/sales" class="header-logo">
-      <img src="./assets/img/brand-logos/logo.png" alt="logo" class="main-logo desktop-logo"
+      <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="main-logo desktop-logo"
         style="height: 100%;object-fit: contain;" />
-      <img src="./assets/img/brand-logos/logo.png" alt="logo" class="main-logo toggle-logo"
+      <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="main-logo toggle-logo"
         style="height: 100%;object-fit: contain;" />
-      <img src="./assets/img/brand-logos/logo.png" alt="logo" class="main-logo desktop-dark"
+      <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="main-logo desktop-dark"
         style="height: 100%;object-fit: contain;" />
-      <img src="./assets/img/brand-logos/logo.png" alt="logo" class="main-logo toggle-dark"
+      <img src="./assets/img/brand-logos/mySkill-x.png" alt="logo" class="main-logo toggle-dark"
         style="height: 100%;object-fit: contain;" />
     </a>
   </div>

src/app/shared/model/company.model.ts

@@ -47,6 +47,7 @@ export interface CompanyModel {
     brandEdesc: string
     logo: string
     addressText: string
+    contactText: string
 }
 
 
@@ -99,6 +100,7 @@ export class MyCompanyModel implements CompanyModel {
     brandEdesc: string
     logo: string
     addressText: string
+    contactText: string
     constructor(data: Partial<CompanyModel>) {
         this.companyId = data.companyId || ""
         this.tdesc = data.tdesc || ""
@@ -148,6 +150,7 @@ export class MyCompanyModel implements CompanyModel {
         this.brandEdesc = data.brandEdesc || ""
         this.logo = data.logo || ""
         this.addressText = data.addressText || ""
+        this.contactText = data.contactText || ""
     }
 }