From 4234418e51b6b0888cacb359e9fec6b7f5ffd9a7 Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Tue, 11 Feb 2025 22:14:28 +0330
Subject: [PATCH] account gender and birth date field update fix and add

---
 backend/account/admin.py                       |  8 ++++----
 .../migrations/0009_alter_user_gender.py       | 18 ++++++++++++++++++
 backend/account/models.py                      |  4 ++--
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 backend/account/migrations/0009_alter_user_gender.py

diff --git a/backend/account/admin.py b/backend/account/admin.py
index 94cd217..07e62f7 100644
--- a/backend/account/admin.py
+++ b/backend/account/admin.py
@@ -19,18 +19,18 @@ class UserAddressInLine(TabularInline):
     
 @admin.register(User)
 class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin):
-    # form = UserChangeForm
-    # add_form = UserCreationForm
+    form = UserChangeForm
+    add_form = UserCreationForm
     change_password_form = AdminPasswordChangeForm
     filter_horizontal = []
     ordering = []
     inlines = [UserAddressInLine]
     list_filter = ['is_superuser']
     search_fields = ['phone', 'first_name', 'last_name', 'email']
-    list_display = ['full_name_display', 'phone', 'email', 'is_superuser', ]
+    list_display = ['full_name_display', 'phone', 'email', 'is_superuser', 'gender', 'birth_date']
     # readonly_fields = ['phone', 'email', 'otp_expiry', 'otp_hash', 'date_joined', 'profile_photo']
     
-    exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login', 'gender', 'birth_date')
+    exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login',)
     import_form_class = ImportForm
     export_form_class = ExportForm
     fieldsets = (
diff --git a/backend/account/migrations/0009_alter_user_gender.py b/backend/account/migrations/0009_alter_user_gender.py
new file mode 100644
index 0000000..ed7e2b0
--- /dev/null
+++ b/backend/account/migrations/0009_alter_user_gender.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.2 on 2025-02-11 18:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0008_rename_birth_day_user_birth_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='gender',
+            field=models.CharField(choices=[('مرد', 'مرد'), ('زن', 'زن')], max_length=20, verbose_name='جنسیت'),
+        ),
+    ]
diff --git a/backend/account/models.py b/backend/account/models.py
index 3b32635..9038461 100644
--- a/backend/account/models.py
+++ b/backend/account/models.py
@@ -42,8 +42,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     is_active = models.BooleanField(default=True, verbose_name='فعال بودن کاربر')
     is_staff = models.BooleanField(default=False, verbose_name='کارمند')
     gender_option = (
-        ('male', 'مرد'),
-        ('female', 'زن')
+        ('مرد', 'مرد'),
+        ('زن', 'زن')
     )
     gender = models.CharField(choices=gender_option, max_length=20, verbose_name='جنسیت')
     birth_date = models.DateField()