diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8ff1770..ddb8237 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,33 +5,12 @@ - - - - - - - - - + + + - - - - - - - - - - - - - - - - + diff --git a/apps/cuser/cuser_model.py b/apps/cuser/cuser_model.py index 19a4bf6..0c576d2 100644 --- a/apps/cuser/cuser_model.py +++ b/apps/cuser/cuser_model.py @@ -24,7 +24,7 @@ class CUserManager(BaseUserManager): class CUser(BaseModel, AbstractBaseUser, PermissionsMixin): username = models.CharField(max_length=50, null=False, blank=False, unique=True) mobile = models.PositiveBigIntegerField(null=False, blank=False, unique=True) - name_family = models.CharField(max_length=50, null=True, blank=True) + name_family = models.CharField(max_length=100, null=True, blank=True) is_active = models.BooleanField(default=False) is_staff = models.BooleanField(default=False) is_superuser = models.BooleanField(default=False) diff --git a/apps/cuser/migrations/0013_alter_cuser_name_family.py b/apps/cuser/migrations/0013_alter_cuser_name_family.py new file mode 100644 index 0000000..c32d951 --- /dev/null +++ b/apps/cuser/migrations/0013_alter_cuser_name_family.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('cuser', '0012_cuserrole_is_admin'), + ] + + operations = [ + migrations.AlterField( + model_name='cuser', + name='name_family', + field=models.CharField(blank=True, max_length=100, null=True), + ), + ] diff --git a/apps/customer/migrations/0007_alter_customer_name_family.py b/apps/customer/migrations/0007_alter_customer_name_family.py new file mode 100644 index 0000000..dbf356f --- /dev/null +++ b/apps/customer/migrations/0007_alter_customer_name_family.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('customer', '0006_alter_customernote_options'), + ] + + operations = [ + migrations.AlterField( + model_name='customer', + name='name_family', + field=models.CharField(max_length=100), + ), + ] diff --git a/apps/customer/models.py b/apps/customer/models.py index e1d6d93..5838568 100644 --- a/apps/customer/models.py +++ b/apps/customer/models.py @@ -49,7 +49,7 @@ class CustomerGroup(BaseModel): class Customer(BaseModel): - name_family = models.CharField(max_length=25, null=False, blank=False) + name_family = models.CharField(max_length=100, null=False, blank=False) mobile = models.PositiveBigIntegerField(null=True, blank=True) phone = models.PositiveBigIntegerField(null=True, blank=True) address = models.CharField(max_length=100, null=True, blank=True) diff --git a/apps/jwt_auth/migrations/0087_alter_cuserroleloginopt_uuid.py b/apps/jwt_auth/migrations/0087_alter_cuserroleloginopt_uuid.py new file mode 100644 index 0000000..e1ecedb --- /dev/null +++ b/apps/jwt_auth/migrations/0087_alter_cuserroleloginopt_uuid.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:38 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('jwt_auth', '0086_alter_cuserroleloginopt_uuid'), + ] + + operations = [ + migrations.AlterField( + model_name='cuserroleloginopt', + name='uuid', + field=models.UUIDField(default=uuid.UUID('0fc1ec70-e817-495e-91c9-e98666cbc2c1'), unique=True), + ), + ] diff --git a/apps/jwt_auth/migrations/0088_alter_cuserroleloginopt_uuid.py b/apps/jwt_auth/migrations/0088_alter_cuserroleloginopt_uuid.py new file mode 100644 index 0000000..202f604 --- /dev/null +++ b/apps/jwt_auth/migrations/0088_alter_cuserroleloginopt_uuid.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:42 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + dependencies = [ + ('jwt_auth', '0087_alter_cuserroleloginopt_uuid'), + ] + + operations = [ + migrations.AlterField( + model_name='cuserroleloginopt', + name='uuid', + field=models.UUIDField(default=uuid.UUID('35e24d20-a3c0-4e33-9307-aff890cfd593'), unique=True), + ), + ] diff --git a/apps/lead/migrations/0041_alter_lead_status.py b/apps/lead/migrations/0041_alter_lead_status.py new file mode 100644 index 0000000..bbf1fb0 --- /dev/null +++ b/apps/lead/migrations/0041_alter_lead_status.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lead', '0040_alter_lead_status'), + ] + + operations = [ + migrations.AlterField( + model_name='lead', + name='status', + field=models.CharField(blank=True, choices=[('UN', 'unknown'), ('FA', 'FAIL'), ('SU', 'OK')], default='UN', max_length=2, null=True), + ), + ] diff --git a/apps/lead/migrations/0042_alter_lead_desc_alter_lead_status_alter_lead_title_and_more.py b/apps/lead/migrations/0042_alter_lead_desc_alter_lead_status_alter_lead_title_and_more.py new file mode 100644 index 0000000..9856442 --- /dev/null +++ b/apps/lead/migrations/0042_alter_lead_desc_alter_lead_status_alter_lead_title_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lead', '0041_alter_lead_status'), + ] + + operations = [ + migrations.AlterField( + model_name='lead', + name='desc', + field=models.TextField(), + ), + migrations.AlterField( + model_name='lead', + name='status', + field=models.CharField(blank=True, choices=[('SU', 'OK'), ('FA', 'FAIL'), ('UN', 'unknown')], default='UN', max_length=2, null=True), + ), + migrations.AlterField( + model_name='lead', + name='title', + field=models.CharField(max_length=300), + ), + migrations.AlterField( + model_name='leadcomment', + name='desc', + field=models.TextField(), + ), + ] diff --git a/apps/lead/models.py b/apps/lead/models.py index 11d28d6..ce438b7 100644 --- a/apps/lead/models.py +++ b/apps/lead/models.py @@ -48,8 +48,8 @@ class Lead(BaseModel): ("UN", "unknown"), } - title = models.CharField(max_length=100) - desc = models.CharField(max_length=300) + title = models.CharField(max_length=300) + desc = models.TextField() customer = models.ForeignKey(CustomerModel, on_delete=models.CASCADE, null=False, blank=False) product_type = models.ForeignKey(ProductTypeModel, on_delete=models.SET_NULL, null=True, blank=True) type = models.ForeignKey(LeadType, on_delete=models.SET_NULL, null=True, blank=True) @@ -68,7 +68,7 @@ class Lead(BaseModel): class LeadComment(BaseModel): lead = models.ForeignKey(Lead, on_delete=models.CASCADE, null=False, blank=False, related_name='lead_comment') - desc = models.CharField(max_length=300) + desc = models.TextField() cuser_role = models.ForeignKey(CuserRoleModel, on_delete=models.SET_NULL, null=True, blank=True) sys_ws = models.ForeignKey(WorkspaceModel, on_delete=models.CASCADE, null=False, blank=False) diff --git a/apps/lead/views.py b/apps/lead/views.py index 0cb27ed..6e8e231 100644 --- a/apps/lead/views.py +++ b/apps/lead/views.py @@ -228,7 +228,7 @@ class LeadRetrieveApi(APIView): class LeadCommentCreateApi(APIView): class InputSerializer(serializers.Serializer): - desc = serializers.CharField(max_length=200, required=True) + desc = serializers.CharField(required=True) class OutputSerializer(serializers.Serializer): id = serializers.IntegerField(required=True) diff --git a/apps/reminder/migrations/0035_alter_reminder_type.py b/apps/reminder/migrations/0035_alter_reminder_type.py new file mode 100644 index 0000000..640771e --- /dev/null +++ b/apps/reminder/migrations/0035_alter_reminder_type.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reminder', '0034_alter_reminder_type'), + ] + + operations = [ + migrations.AlterField( + model_name='reminder', + name='type', + field=models.CharField(choices=[('UN', 'UNKNOWN'), ('CU', 'CUSTOMER'), ('LE', 'LEAD'), ('NO', 'NOTE')], default='UN', max_length=2), + ), + ] diff --git a/apps/reminder/migrations/0036_alter_reminder_type.py b/apps/reminder/migrations/0036_alter_reminder_type.py new file mode 100644 index 0000000..7faa0b2 --- /dev/null +++ b/apps/reminder/migrations/0036_alter_reminder_type.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('reminder', '0035_alter_reminder_type'), + ] + + operations = [ + migrations.AlterField( + model_name='reminder', + name='type', + field=models.CharField(choices=[('NO', 'NOTE'), ('LE', 'LEAD'), ('CU', 'CUSTOMER'), ('UN', 'UNKNOWN')], default='UN', max_length=2), + ), + ] diff --git a/apps/ticket/migrations/0009_alter_ticketcomment_desc.py b/apps/ticket/migrations/0009_alter_ticketcomment_desc.py new file mode 100644 index 0000000..a527821 --- /dev/null +++ b/apps/ticket/migrations/0009_alter_ticketcomment_desc.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.1 on 2024-07-25 05:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ticket', '0008_alter_ticketcommentfile_ticket_comment'), + ] + + operations = [ + migrations.AlterField( + model_name='ticketcomment', + name='desc', + field=models.TextField(), + ), + ] diff --git a/apps/ticket/models.py b/apps/ticket/models.py index 56ea21c..480c526 100644 --- a/apps/ticket/models.py +++ b/apps/ticket/models.py @@ -25,7 +25,7 @@ class Ticket(BaseModel): class TicketComment(BaseModel): ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE, null=False, blank=False) - desc = models.CharField(max_length=500) + desc = models.TextField() cuser_role = models.ForeignKey(CuserRole, on_delete=models.CASCADE, null=False, blank=False) sys_ws = models.ForeignKey(Workspace, on_delete=models.CASCADE, null=False, blank=False)