From 4b5103684119eb00f0d2caa78e1321ed876eefd5 Mon Sep 17 00:00:00 2001 From: prabhatsuman Date: Fri, 3 May 2024 21:24:19 +0530 Subject: [PATCH 1/5] added ps-1 --- .../migrations/0002_auto_20240503_2114.py | 19 +++++++++++++++++++ .../0002_indentfile_item_subtype.py | 18 ++++++++++++++++++ .../migrations/0002_auto_20240503_2114.py | 19 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py create mode 100644 FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py create mode 100644 FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py diff --git a/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py b/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py new file mode 100644 index 000000000..45d5fb68b --- /dev/null +++ b/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2024-05-03 21:14 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('central_mess', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='payments', + name='payment_date', + field=models.DateField(default=datetime.date(2024, 5, 3)), + ), + ] diff --git a/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py b/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py new file mode 100644 index 000000000..781af527e --- /dev/null +++ b/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-05-03 21:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ps1', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='indentfile', + name='item_subtype', + field=models.CharField(default='computers', max_length=250), + ), + ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py b/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py new file mode 100644 index 000000000..2c21ee49c --- /dev/null +++ b/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2024-05-03 21:14 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('research_procedures', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='staff_allocations', + name='start_date', + field=models.DateField(default=datetime.date(2024, 5, 3)), + ), + ] From bf921e1ec19eca7dc6ef70232ced1ad0ba51cfa1 Mon Sep 17 00:00:00 2001 From: prabhatsuman Date: Sun, 5 May 2024 01:32:34 +0530 Subject: [PATCH 2/5] revert to db sync --- .../migrations/0003_auto_20240505_0125.py | 19 +++++++++++++++++++ .../migrations/0002_auto_20240505_0125.py | 18 ++++++++++++++++++ .../migrations/0003_auto_20240505_0125.py | 19 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py create mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py create mode 100644 FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py diff --git a/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py b/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py new file mode 100644 index 000000000..c3bb6e6a7 --- /dev/null +++ b/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2024-05-05 01:25 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('central_mess', '0002_auto_20240503_2114'), + ] + + operations = [ + migrations.AlterField( + model_name='payments', + name='payment_date', + field=models.DateField(default=datetime.date(2024, 5, 5)), + ), + ] diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py b/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py new file mode 100644 index 000000000..6c8ac3bad --- /dev/null +++ b/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-05-05 01:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('globals', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='extrainfo', + name='user_status', + field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), + ), + ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py b/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py new file mode 100644 index 000000000..f3df290d4 --- /dev/null +++ b/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py @@ -0,0 +1,19 @@ +# Generated by Django 3.1.5 on 2024-05-05 01:25 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('research_procedures', '0002_auto_20240503_2114'), + ] + + operations = [ + migrations.AlterField( + model_name='staff_allocations', + name='start_date', + field=models.DateField(default=datetime.date(2024, 5, 5)), + ), + ] From 609833983119fc388cc9d98b251bf12f2e8914fe Mon Sep 17 00:00:00 2001 From: prabhatsuman Date: Sun, 5 May 2024 01:41:31 +0530 Subject: [PATCH 3/5] added ac-6, rspc --- .../department/migrations/0001_initial.py | 16 ++++++++ .../migrations/0002_auto_20240505_0135.py | 28 ++++++++++++++ .../0004_co_pis_co_project_investigator.py | 38 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py create mode 100644 FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py diff --git a/FusionIIIT/applications/department/migrations/0001_initial.py b/FusionIIIT/applications/department/migrations/0001_initial.py index fc8a34834..d13fc66d3 100644 --- a/FusionIIIT/applications/department/migrations/0001_initial.py +++ b/FusionIIIT/applications/department/migrations/0001_initial.py @@ -41,4 +41,20 @@ class Migration(migrations.Migration): ('maker_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), ], ), + migrations.AlterField( + model_name='announcements', + name='ann_date', + field=models.DateTimeField(auto_now_add=True), + ), + migrations.CreateModel( + name='Information', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('phone_number', models.BigIntegerField()), + ('email', models.CharField(max_length=200)), + ('facilites', models.TextField()), + ('labs', models.TextField()), + ('department', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), + ], + ), ] diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py new file mode 100644 index 000000000..5830157c2 --- /dev/null +++ b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.5 on 2024-05-05 01:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('programme_curriculum', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='newproposalfile', + name='is_archive', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='proposal_tracking', + name='receiver_archive', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='proposal_tracking', + name='sender_archive', + field=models.BooleanField(default=False), + ), + ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py b/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py new file mode 100644 index 000000000..9f1d265ad --- /dev/null +++ b/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py @@ -0,0 +1,38 @@ +# Generated by Django 3.1.5 on 2024-05-05 01:35 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('research_procedures', '0003_auto_20240505_0125'), + ] + + operations = [ + migrations.CreateModel( + name='co_project_investigator', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-co_pi_id'], + }, + ), + migrations.CreateModel( + name='co_pis', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-project_id'], + }, + ), + ] From 088335f91320f3db4d3bf936e943bf934ec5c06d Mon Sep 17 00:00:00 2001 From: prabhatsuman Date: Tue, 16 Jul 2024 15:46:47 +0530 Subject: [PATCH 4/5] updated mig --- .../migrations/0001_initial.py | 4 +- .../migrations/0001_initial.py | 4 +- .../central_mess/migrations/0001_initial.py | 4 +- .../migrations/0002_auto_20240503_2114.py | 19 ---------- .../migrations/0003_auto_20240505_0125.py | 19 ---------- .../migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 2 +- .../department/migrations/0001_initial.py | 31 +++++++-------- .../eis/migrations/0001_initial.py | 2 +- .../establishment/migrations/0001_initial.py | 2 +- .../estate_module/migrations/0001_initial.py | 2 +- .../examination/migrations/0001_initial.py | 2 +- .../feeds/migrations/0001_initial.py | 2 +- .../filetracking/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 2 +- .../globals/migrations/0001_initial.py | 4 +- .../migrations/0002_auto_20240505_0125.py | 18 --------- .../gymkhana/migrations/0001_initial.py | 2 +- .../health_center/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 2 +- .../hr2/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 2 +- .../iwdModuleV2/migrations/0001_initial.py | 2 +- .../leave/migrations/0001_initial.py | 4 +- .../office_module/migrations/0001_initial.py | 4 +- .../online_cms/migrations/0001_initial.py | 4 +- .../otheracademic/migrations/0001_initial.py | 2 +- .../placement_cell/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 5 ++- .../migrations/0002_auto_20240505_0135.py | 28 -------------- .../ps1/migrations/0001_initial.py | 3 +- .../0002_indentfile_item_subtype.py | 18 --------- .../recruitment/migrations/0001_initial.py | 2 +- .../migrations/0001_initial.py | 26 ++++++++++++- .../migrations/0002_auto_20240503_2114.py | 19 ---------- .../migrations/0003_auto_20240505_0125.py | 19 ---------- .../0004_co_pis_co_project_investigator.py | 38 ------------------- .../scholarships/migrations/0001_initial.py | 2 +- .../visitor_hostel/migrations/0001_initial.py | 2 +- 39 files changed, 77 insertions(+), 234 deletions(-) delete mode 100644 FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py delete mode 100644 FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py delete mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py delete mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py delete mode 100644 FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py diff --git a/FusionIIIT/applications/academic_information/migrations/0001_initial.py b/FusionIIIT/applications/academic_information/migrations/0001_initial.py index 0335e5ac7..22fd38161 100644 --- a/FusionIIIT/applications/academic_information/migrations/0001_initial.py +++ b/FusionIIIT/applications/academic_information/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion @@ -9,8 +9,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('programme_curriculum', '0001_initial'), + ('globals', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py index 8288015ad..71f23d8c2 100644 --- a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py +++ b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('programme_curriculum', '0001_initial'), + ('globals', '0001_initial'), ('academic_information', '0001_initial'), ] diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py index 7f2ac6f35..bbac3081f 100644 --- a/FusionIIIT/applications/central_mess/migrations/0001_initial.py +++ b/FusionIIIT/applications/central_mess/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import applications.central_mess.models import datetime @@ -199,7 +199,7 @@ class Migration(migrations.Migration): ('amount_paid', models.IntegerField(default=0)), ('payment_month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), ('payment_year', models.IntegerField(default=applications.central_mess.models.current_year)), - ('payment_date', models.DateField(default=datetime.date(2024, 4, 27))), + ('payment_date', models.DateField(default=datetime.date(2024, 7, 16))), ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), ], options={ diff --git a/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py b/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py deleted file mode 100644 index 45d5fb68b..000000000 --- a/FusionIIIT/applications/central_mess/migrations/0002_auto_20240503_2114.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-03 21:14 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('central_mess', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='payments', - name='payment_date', - field=models.DateField(default=datetime.date(2024, 5, 3)), - ), - ] diff --git a/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py b/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py deleted file mode 100644 index c3bb6e6a7..000000000 --- a/FusionIIIT/applications/central_mess/migrations/0003_auto_20240505_0125.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-05 01:25 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('central_mess', '0002_auto_20240503_2114'), - ] - - operations = [ - migrations.AlterField( - model_name='payments', - name='payment_date', - field=models.DateField(default=datetime.date(2024, 5, 5)), - ), - ] diff --git a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py index 25e95f7f1..e40ba5606 100644 --- a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py +++ b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py b/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py index a20c97753..10f81e921 100644 --- a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py +++ b/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/department/migrations/0001_initial.py b/FusionIIIT/applications/department/migrations/0001_initial.py index d13fc66d3..21c891a8e 100644 --- a/FusionIIIT/applications/department/migrations/0001_initial.py +++ b/FusionIIIT/applications/department/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models @@ -28,11 +28,22 @@ class Migration(migrations.Migration): ('request_maker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), ], ), + migrations.CreateModel( + name='Information', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('phone_number', models.BigIntegerField()), + ('email', models.CharField(max_length=200)), + ('facilites', models.TextField()), + ('labs', models.TextField()), + ('department', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), + ], + ), migrations.CreateModel( name='Announcements', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ann_date', models.DateTimeField(default='04-04-2021')), + ('ann_date', models.DateTimeField(auto_now_add=True)), ('message', models.CharField(max_length=200)), ('batch', models.CharField(default='Year-1', max_length=40)), ('department', models.CharField(default='ALL', max_length=40)), @@ -41,20 +52,4 @@ class Migration(migrations.Migration): ('maker_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), ], ), - migrations.AlterField( - model_name='announcements', - name='ann_date', - field=models.DateTimeField(auto_now_add=True), - ), - migrations.CreateModel( - name='Information', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('phone_number', models.BigIntegerField()), - ('email', models.CharField(max_length=200)), - ('facilites', models.TextField()), - ('labs', models.TextField()), - ('department', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), - ], - ), ] diff --git a/FusionIIIT/applications/eis/migrations/0001_initial.py b/FusionIIIT/applications/eis/migrations/0001_initial.py index a7c38380e..265b34ac7 100644 --- a/FusionIIIT/applications/eis/migrations/0001_initial.py +++ b/FusionIIIT/applications/eis/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.conf import settings diff --git a/FusionIIIT/applications/establishment/migrations/0001_initial.py b/FusionIIIT/applications/establishment/migrations/0001_initial.py index 8da9173cf..a1f013e5f 100644 --- a/FusionIIIT/applications/establishment/migrations/0001_initial.py +++ b/FusionIIIT/applications/establishment/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/estate_module/migrations/0001_initial.py b/FusionIIIT/applications/estate_module/migrations/0001_initial.py index 366378cf0..7d80b342e 100644 --- a/FusionIIIT/applications/estate_module/migrations/0001_initial.py +++ b/FusionIIIT/applications/estate_module/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/examination/migrations/0001_initial.py b/FusionIIIT/applications/examination/migrations/0001_initial.py index 8f9bc8897..4bc165c9d 100644 --- a/FusionIIIT/applications/examination/migrations/0001_initial.py +++ b/FusionIIIT/applications/examination/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/feeds/migrations/0001_initial.py b/FusionIIIT/applications/feeds/migrations/0001_initial.py index 9a8691daa..7b794eac6 100644 --- a/FusionIIIT/applications/feeds/migrations/0001_initial.py +++ b/FusionIIIT/applications/feeds/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/filetracking/migrations/0001_initial.py b/FusionIIIT/applications/filetracking/migrations/0001_initial.py index 4fc89cffa..56a210012 100644 --- a/FusionIIIT/applications/filetracking/migrations/0001_initial.py +++ b/FusionIIIT/applications/filetracking/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py index 18a9f6c88..7bcb45aba 100644 --- a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py +++ b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models diff --git a/FusionIIIT/applications/globals/migrations/0001_initial.py b/FusionIIIT/applications/globals/migrations/0001_initial.py index a8450bb11..93cf4ba26 100644 --- a/FusionIIIT/applications/globals/migrations/0001_initial.py +++ b/FusionIIIT/applications/globals/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import applications.globals.models import datetime @@ -39,7 +39,7 @@ class Migration(migrations.Migration): ('title', models.CharField(choices=[('Mr.', 'Mr.'), ('Mrs.', 'Mrs.'), ('Ms.', 'Ms.'), ('Dr.', 'Dr.'), ('Professor', 'Prof.'), ('Shreemati', 'Shreemati'), ('Shree', 'Shree')], default='Dr.', max_length=20)), ('sex', models.CharField(choices=[('M', 'Male'), ('F', 'Female'), ('O', 'Other')], default='M', max_length=2)), ('date_of_birth', models.DateField(default=datetime.date(1970, 1, 1))), - ('user_status', models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50)), + ('user_status', models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50)), ('address', models.TextField(default='', max_length=1000)), ('phone_no', models.BigIntegerField(default=9999999999, null=True)), ('user_type', models.CharField(choices=[('student', 'student'), ('staff', 'staff'), ('compounder', 'compounder'), ('faculty', 'faculty')], max_length=20)), diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py b/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py deleted file mode 100644 index 6c8ac3bad..000000000 --- a/FusionIIIT/applications/globals/migrations/0002_auto_20240505_0125.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-05 01:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py index 16c4ceed1..0869064d5 100644 --- a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py +++ b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/health_center/migrations/0001_initial.py b/FusionIIIT/applications/health_center/migrations/0001_initial.py index 887666ff8..7dfe99418 100644 --- a/FusionIIIT/applications/health_center/migrations/0001_initial.py +++ b/FusionIIIT/applications/health_center/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py index 04306f3c2..cc7cb2598 100644 --- a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py +++ b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models diff --git a/FusionIIIT/applications/hr2/migrations/0001_initial.py b/FusionIIIT/applications/hr2/migrations/0001_initial.py index 08e79b9c1..78ce3a457 100644 --- a/FusionIIIT/applications/hr2/migrations/0001_initial.py +++ b/FusionIIIT/applications/hr2/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings import django.core.validators diff --git a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py index d5ef66c0d..953bfcf22 100644 --- a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py +++ b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py index c62bf6a0b..5e56f2f96 100644 --- a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py +++ b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/leave/migrations/0001_initial.py b/FusionIIIT/applications/leave/migrations/0001_initial.py index 536667a90..3ffab190b 100644 --- a/FusionIIIT/applications/leave/migrations/0001_initial.py +++ b/FusionIIIT/applications/leave/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('globals', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ diff --git a/FusionIIIT/applications/office_module/migrations/0001_initial.py b/FusionIIIT/applications/office_module/migrations/0001_initial.py index a61863d3d..2190b792d 100644 --- a/FusionIIIT/applications/office_module/migrations/0001_initial.py +++ b/FusionIIIT/applications/office_module/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): dependencies = [ ('globals', '0001_initial'), ('academic_information', '0001_initial'), - ('filetracking', '0001_initial'), ('leave', '0001_initial'), + ('filetracking', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/online_cms/migrations/0001_initial.py b/FusionIIIT/applications/online_cms/migrations/0001_initial.py index 94f9a00b0..23293a797 100644 --- a/FusionIIIT/applications/online_cms/migrations/0001_initial.py +++ b/FusionIIIT/applications/online_cms/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion @@ -9,8 +9,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('globals', '0001_initial'), ('programme_curriculum', '0001_initial'), + ('globals', '0001_initial'), ('academic_information', '0001_initial'), ] diff --git a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py index 0cbedae6b..1598f71a5 100644 --- a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py +++ b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion diff --git a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py index a9a945f1d..712c60a56 100644 --- a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py +++ b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py index b5bdb145e..0654934c9 100644 --- a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py +++ b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings import django.core.validators @@ -125,6 +125,8 @@ class Migration(migrations.Migration): ('is_added', models.BooleanField(default=False)), ('is_submitted', models.BooleanField(default=False)), ('is_rejected', models.BooleanField(default=False)), + ('sender_archive', models.BooleanField(default=False)), + ('receiver_archive', models.BooleanField(default=False)), ('disciplines', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.discipline')), ('receive_design', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.designation')), ('receive_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), @@ -162,6 +164,7 @@ class Migration(migrations.Migration): ('upload_date', models.DateTimeField(auto_now_add=True)), ('is_read', models.BooleanField(default=False)), ('is_update', models.BooleanField(default=False)), + ('is_archive', models.BooleanField(default=False)), ('pre_requisit_courses', models.ManyToManyField(blank=True, to='programme_curriculum.Course')), ], options={ diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py deleted file mode 100644 index 5830157c2..000000000 --- a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240505_0135.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-05 01:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('programme_curriculum', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='newproposalfile', - name='is_archive', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='proposal_tracking', - name='receiver_archive', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='proposal_tracking', - name='sender_archive', - field=models.BooleanField(default=False), - ), - ] diff --git a/FusionIIIT/applications/ps1/migrations/0001_initial.py b/FusionIIIT/applications/ps1/migrations/0001_initial.py index d3107b543..e2e1c48e4 100644 --- a/FusionIIIT/applications/ps1/migrations/0001_initial.py +++ b/FusionIIIT/applications/ps1/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion @@ -26,6 +26,7 @@ class Migration(migrations.Migration): ('purpose', models.CharField(max_length=250)), ('specification', models.CharField(max_length=250)), ('item_type', models.CharField(max_length=250)), + ('item_subtype', models.CharField(default='computers', max_length=250)), ('nature', models.BooleanField(default=False)), ('indigenous', models.BooleanField(default=False)), ('replaced', models.BooleanField(default=False)), diff --git a/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py b/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py deleted file mode 100644 index 781af527e..000000000 --- a/FusionIIIT/applications/ps1/migrations/0002_indentfile_item_subtype.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-03 21:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ps1', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='indentfile', - name='item_subtype', - field=models.CharField(default='computers', max_length=250), - ), - ] diff --git a/FusionIIIT/applications/recruitment/migrations/0001_initial.py b/FusionIIIT/applications/recruitment/migrations/0001_initial.py index 2acee0f5d..489d77996 100644 --- a/FusionIIIT/applications/recruitment/migrations/0001_initial.py +++ b/FusionIIIT/applications/recruitment/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.conf import settings diff --git a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py index 56711cfcd..592c0fd36 100644 --- a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py +++ b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.conf import settings @@ -56,7 +56,7 @@ class Migration(migrations.Migration): ('year', models.IntegerField()), ('stipend', models.IntegerField()), ('staff_type', models.CharField(default='research', max_length=100)), - ('start_date', models.DateField(default=datetime.date(2024, 4, 27))), + ('start_date', models.DateField(default=datetime.date(2024, 7, 16))), ('end_date', models.DateField(blank=True, null=True)), ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), ('staff_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), @@ -95,4 +95,26 @@ class Migration(migrations.Migration): 'ordering': ['-financial_outlay_id'], }, ), + migrations.CreateModel( + name='co_project_investigator', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-co_pi_id'], + }, + ), + migrations.CreateModel( + name='co_pis', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('co_pi', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), + ], + options={ + 'ordering': ['-project_id'], + }, + ), ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py b/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py deleted file mode 100644 index 2c21ee49c..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0002_auto_20240503_2114.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-03 21:14 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='staff_allocations', - name='start_date', - field=models.DateField(default=datetime.date(2024, 5, 3)), - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py b/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py deleted file mode 100644 index f3df290d4..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0003_auto_20240505_0125.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-05 01:25 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0002_auto_20240503_2114'), - ] - - operations = [ - migrations.AlterField( - model_name='staff_allocations', - name='start_date', - field=models.DateField(default=datetime.date(2024, 5, 5)), - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py b/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py deleted file mode 100644 index 9f1d265ad..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0004_co_pis_co_project_investigator.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.1.5 on 2024-05-05 01:35 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('research_procedures', '0003_auto_20240505_0125'), - ] - - operations = [ - migrations.CreateModel( - name='co_project_investigator', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('co_pi_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), - ], - options={ - 'ordering': ['-co_pi_id'], - }, - ), - migrations.CreateModel( - name='co_pis', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('co_pi', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')), - ], - options={ - 'ordering': ['-project_id'], - }, - ), - ] diff --git a/FusionIIIT/applications/scholarships/migrations/0001_initial.py b/FusionIIIT/applications/scholarships/migrations/0001_initial.py index 7f0130f6e..5af71a08d 100644 --- a/FusionIIIT/applications/scholarships/migrations/0001_initial.py +++ b/FusionIIIT/applications/scholarships/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models diff --git a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py b/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py index af48c39c4..fca0cab67 100644 --- a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py +++ b/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-04-27 23:48 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models From 8aa30b5479d78d9d1c93681c9f1f3fadd2186ed3 Mon Sep 17 00:00:00 2001 From: prabhatsuman Date: Tue, 16 Jul 2024 16:17:01 +0530 Subject: [PATCH 5/5] corrected globals mig --- .../globals/migrations/0001_initial.py | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/FusionIIIT/applications/globals/migrations/0001_initial.py b/FusionIIIT/applications/globals/migrations/0001_initial.py index 60adbc297..f67ff0834 100644 --- a/FusionIIIT/applications/globals/migrations/0001_initial.py +++ b/FusionIIIT/applications/globals/migrations/0001_initial.py @@ -50,32 +50,6 @@ class Migration(migrations.Migration): ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), - migrations.CreateModel( - name='ModuleAccess', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('designation', models.CharField(max_length=155)), - ('program_and_curriculum', models.BooleanField(default=False)), - ('course_registration', models.BooleanField(default=False)), - ('course_management', models.BooleanField(default=False)), - ('other_academics', models.BooleanField(default=False)), - ('spacs', models.BooleanField(default=False)), - ('department', models.BooleanField(default=False)), - ('examinations', models.BooleanField(default=False)), - ('hr', models.BooleanField(default=False)), - ('iwd', models.BooleanField(default=False)), - ('complaint_management', models.BooleanField(default=False)), - ('fts', models.BooleanField(default=False)), - ('purchase_and_store', models.BooleanField(default=False)), - ('rspc', models.BooleanField(default=False)), - ('hostel_management', models.BooleanField(default=False)), - ('mess_management', models.BooleanField(default=False)), - ('gymkhana', models.BooleanField(default=False)), - ('placement_cell', models.BooleanField(default=False)), - ('visitor_hostel', models.BooleanField(default=False)), - ('phc', models.BooleanField(default=False)), - ], - ), migrations.CreateModel( name='Faculty', fields=[ @@ -132,7 +106,7 @@ class Migration(migrations.Migration): ('working', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='current_designation', to=settings.AUTH_USER_MODEL)), ], options={ - 'unique_together': {('working', 'designation'), ('user', 'designation')}, + 'unique_together': {('user', 'designation'), ('working', 'designation')}, }, ), - ] + ] \ No newline at end of file