Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

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

 <div class="auth">
   <div class="flex h-full !py-0 bg-white dark:bg-bgdark">
     <div class="grid grid-cols-12 gap-6 w-full h-full">
-      <div class="lg:col-span-6 col-span-12 hidden lg:block relative">
+      <div class="lg:col-span-8 col-span-12 hidden lg:block relative">
         <div class="cover relative w-full h-full z-[1] p-10">
-          <a routerLink="/dashboard/sales" class="header- logo">
+          <!-- <a routerLink="/dashboard/sales" class="header- logo">
             <img style="height: 36px; width: 93px;" src="./assets/img/brand-logos/logo-login-light.png" alt="logo"
               class="ltr:ml-auto rtl:mr-auto block" />
-          </a>
-          <div class="authentication-page justify-center w-full max-w-7xl mx-auto p-0">
+          </a> -->
+          <!-- <div class="authentication-page justify-center w-full max-w-7xl mx-auto p-0">
             <img src="./assets/img/loginform/Computer login-bro.png" alt="logo" class="mx-auto h-[500px]" />
-          </div>
+          </div> -->
         </div>
       </div>
-      <div class="lg:col-span-6 col-span-12">
+      <div class="lg:col-span-4 col-span-12">
         <div class="authentication-page w-full">
           <!-- ========== MAIN CONTENT ========== -->
-          <main id="content" class="w-full max-w-md 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" />
-            </a>
+          <main id="content" class="w-full max-w-lg mx-auto p-6">
+            <div class="header-logo">
+              <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" />
+            </div>
             <div class="mt-2">
               <div class="p-4 sm:p-7">
                 <div class="text-center">
                   <h1 class="block text-2xl font-bold text-gray-800 dark:text-white">
-                    Sign in
+                    ลงชื่อเข้าใช้งานระบบ
                   </h1>
-                  <h1 class="block text-1xl font-bold text-gray-800 dark:text-white">
+                  <!-- <h1 class="block text-1xl font-bold text-gray-800 dark:text-white">
                     (ลงชื่อเข้าใช้งานระบบ)
-                  </h1>
+                  </h1> -->
                 </div>
 
                 <div class="mt-5">
@@ -39,7 +39,7 @@
                       <div class="grid gap-y-4">
                         <!-- Form Group -->
                         <div>
-                          <label for="email" class="block text-sm mb-2 dark:text-white">Email address (อีเมล์)</label>
+                          <label for="email" class="block text-sm mb-2 dark:text-white">ชื่อสมาชิก</label>
                           <div class="relative">
                             <input type="email" id="email" name="email"
                               class="py-2 px-3 block w-full border-gray-200 rounded-sm text-sm focus:border-primary focus:ring-primary dark:bg-bgdark dark:border-white/10 dark:text-white/70"
@@ -51,9 +51,9 @@
                         <!-- Form Group -->
                         <div>
                           <div class="flex justify-between items-center">
-                            <label for="password" class="block text-sm mb-2 dark:text-white">Password (รหัสผ่าน)</label>
+                            <label for="password" class="block text-sm mb-2 dark:text-white">รหัสผ่าน</label>
                             <a class="text-sm text-primary decoration-2 hover:underline font-medium"
-                              routerLink="/forgotpassword/basic">Forgot password?</a>
+                              routerLink="/forgotpassword/basic">ลืมรหัสผ่าน?</a>
                           </div>
                           <div class="relative">
                             <input [type]="showPassword ? 'text' : 'password'" id="password" name="password"
@@ -64,7 +64,7 @@
                         <!-- End Form Group -->
 
                         <!-- Checkbox -->
-                        <div class="flex items-center">
+                        <!-- <div class="flex items-center">
                           <div class="flex">
                             <input id="remember-me" name="remember-me" type="checkbox"
                               class="shrink-0 mt-0.5 border-gray-200 rounded text-primary  focus:ring-primary dark:bg-bgdark dark:border-white/10 dark:checked:bg-primary dark:checked:border-primary dark:focus:ring-offset-white/10" />
@@ -72,19 +72,16 @@
                           <div class="ltr:ml-3 rtl:mr-3">
                             <label for="remember-me" class="text-sm dark:text-white">Remember me</label>
                           </div>
-                        </div>
+                        </div> -->
                         <!-- End Checkbox -->
                         <button type="submit" (click)="Submit()"
-                          class="py-2 px-3 inline-flex justify-center items-center gap-2 rounded-sm border border-transparent font-semibold bg-primary text-white hover:bg-primary focus:outline-none focus:ring-0 focus:ring-primary focus:ring-offset-0 transition-all text-sm dark:focus:ring-offset-white/10">Sign
-                          in</button>
+                          class="py-2 px-3 inline-flex justify-center items-center gap-2 rounded-sm border border-transparent font-semibold bg-primary text-white hover:bg-primary focus:outline-none focus:ring-0 focus:ring-primary focus:ring-offset-0 transition-all text-sm dark:focus:ring-offset-white/10">เข้าสู่ระบบ</button>
                         <div class="text-center">
                           <p class="mt-3 text-sm text-gray-600 dark:text-white/70">
-                            Don't have an account yet?
-                            (คุณมีบัญชีเเล้วหรือยัง?)
+                            คุณมีบัญชีเเล้วหรือยัง?
                             <a class="text-primary decoration-2 hover:underline font-medium"
                               routerLink="/auth/register">
-                              Sign up here
-                              (กรุณาลงทะเบียนที่นี่ หากคุณยังไม่มีบัญชีเข้าใช้)
+                              กรุณาลงทะเบียนที่นี่ หากคุณยังไม่มีบัญชีเข้าใช้
                             </a>
                           </p>
                         </div>

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

@@ -7,10 +7,10 @@
     height: 100%;
     width: 100%;
     content: var(--tw-content);
-    background-image: url('/assets/img/loginform/bg_signup.jpg');
+    background-image: url('/assets/img/loginform/bg_signup.png');
     background-size: cover;
     background-repeat: no-repeat;
-    background-position: center;
+    // background-position: center;
   }
   @media (min-width: 480px){
     .authentication-page{

src/app/authentication/register-page/register-page.component.scss

@@ -14,7 +14,7 @@
     height: 100%;
     width: 100%;
     content: var(--tw-content);
-    background-image: url('/assets/img/register_images/bg_signup.jpg');
+    background-image: url('/assets/img/register_images/bg_signup.png');
     background-size: cover;
     background-position: center;
-  }
+  }
\ No newline at end of file

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 || ""
     }
 }