fix profile

Author: nguyentramy1

src/app/features/profile/component/updateform/profile-popup/update-profile.html

@@ -97,8 +97,9 @@
       <div class="dropdown">
         <span class="dropdown-title">Trình độ học vấn</span>
         <app-dropdown-button
-          [label]="'Trình độ học vấn'"
+          [label]="selectedEducation ? selectedEducation.label : 'Chọn trình độ học vấn'"
           [options]="education"
+          [selected]="selectedEducation"
           [variant]="'secondary'"
           [size]="'small'"
           [customDropField]="'main-type'"
@@ -121,8 +122,9 @@
           <span class="dropdown-title">Giới tính</span>
           @if (selectedGender) {
           <app-dropdown-button
-            [label]="'Giới tính'"
+            [label]="selectedGender.label"
             [options]="gender"
+            [selected]="selectedGender"
             [variant]="'secondary'"
             [size]="'small'"
             [customDropField]="'main-type'"
@@ -151,7 +153,7 @@
       <div class="dropdown">
         <span class="dropdown-title">Thành phố</span>
         <app-dropdown-button
-          [label]="'Chọn thành phố'"
+          [label]="selectedCity ? selectedCity : 'Chọn thành phố'"
           [options]="cities"
           [variant]="'secondary'"
           [size]="'small'"

src/app/features/profile/component/updateform/profile-popup/update-profile.ts

@@ -44,8 +44,8 @@ import { TruncatePipe } from '../../../../../shared/pipes/format-view.pipe';
     FormsModule,
     ButtonComponent,
     LottieComponent,
-    TruncatePipe
-],
+    TruncatePipe,
+  ],
   providers: [provideLottieOptions({ player: () => import('lottie-web') })],
 
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -115,8 +115,8 @@ export class UpdateProfileComponent {
     ];
 
     this.gender = [
-      { value: 'true', label: 'Nam' },
-      { value: 'false', label: 'Nữ' },
+      { value: 'false', label: 'Nam' },
+      { value: 'true', label: 'Nữ' },
     ];
   }
 
@@ -147,21 +147,21 @@ export class UpdateProfileComponent {
       this.originalDob = this.user.dob;
       if (this.user.dob) {
         const [day, month, year] = this.user.dob.split('/');
-        this.dob = `${year}-${month.padStart(2, '0')}-${day.padStart(
-          2,
-          '0'
-        )}T00:00`;
+        this.dob = `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
       }
-      const genderStr = this.user.gender?.toString();
-      this.selectedGender =
-        this.gender.find((g) => g.value === genderStr) || null;
 
+      // Gán giới tính
+      this.selectedGender =
+        this.gender.find((g) => g.value === String(this.user.gender)) || null;
+      console.log('selectedGender on init:', this.selectedGender);
       this.links = [...(this.user.links || [])];
       this.selectedCity = this.user.city || '';
 
       const edu = this.user.education;
       this.selectedEducation =
-        this.education.find((g) => g.value === edu) || null;
+        this.education.find((e) => e.value === this.user.education) || null;
+
+      console.log('selectedEducation on init:', this.selectedEducation);
     } else {
       this.hasError = true;
     }
@@ -247,7 +247,9 @@ export class UpdateProfileComponent {
     const isBioChanged = (this.bio || '') !== (this.user.bio || '');
 
     const isGenderChanged =
-      (this.selectedGender === 'true') !== this.user.gender;
+      (this.selectedGender?.value === 'true') !== this.user.gender;
+    console.log('selectedGender:', this.selectedGender);
+    console.log('user.gender:', this.user.gender);
 
     const isDisplayNameChanged =
       (this.displayName || '') !== (this.user.displayName || '');
@@ -294,7 +296,7 @@ export class UpdateProfileComponent {
           this.lastName,
           formatDateToDDMMYYYY(this.dob),
           this.bio || '',
-          this.selectedGender === 'true',
+          this.selectedGender === 'false' ? false : true,
           this.displayName,
           Number(this.selectedEducation?.value ?? 0),
           this.links,

src/app/features/profile/page/personal-profile/personal-profile.html

@@ -8,7 +8,7 @@
       [following]="followingList"
     ></app-profile-popup>
   </div>
-  <div class="learning-process">
+  <!-- <div class="learning-process">
     <div class="academic-results">
       <div class="title-nav">
         <span class="title"> Thống kê kết quả học tập </span>
@@ -90,9 +90,9 @@
         </div>
       }
     </div>
-    <!-- <div class="post"></div> -->
-  </div>
-  <div class="short-cut">
+    <div class="post"></div>
+  </div> -->
+  <!-- <div class="short-cut">
     <div class="recent-notice">
       <div class="title-nav">
         <span class="title"> Thông báo gần đây </span>
@@ -111,25 +111,23 @@
           >
         </div>
       </div>
-    </div>
+  </div> -->
 
-    @if (openedUser) {
-      <div
-        [ngClass]="{'profile-popup-overlay': true, 'hide': isClosing}"
-        >
-        <div
-          class="profile-popup-backdrop"
-          [ngClass]="{'hide': isClosing}"
-          (click)="closeProfilePopup()"
-        ></div>
-        <div [ngClass]="{'profile-popup-container': true, 'hide': isClosing}">
-          <button class="close-btn" (click)="closeProfilePopup()">×</button>
-          <app-update-profile
-            [user]="openedUser"
-            [variant]="'popup'"
-            (refresh)="refetchUserData($event)"
-          ></app-update-profile>
-        </div>
-      </div>
-    }
+  @if (openedUser) {
+  <div [ngClass]="{'profile-popup-overlay': true, 'hide': isClosing}">
+    <div
+      class="profile-popup-backdrop"
+      [ngClass]="{'hide': isClosing}"
+      (click)="closeProfilePopup()"
+    ></div>
+    <div [ngClass]="{'profile-popup-container': true, 'hide': isClosing}">
+      <button class="close-btn" (click)="closeProfilePopup()">×</button>
+      <app-update-profile
+        [user]="openedUser"
+        [variant]="'popup'"
+        (refresh)="refetchUserData($event)"
+      ></app-update-profile>
+    </div>
   </div>
+  }
+</div>