diff --git a/FusionIIIT/applications/academic_information/migrations/0001_initial.py b/FusionIIIT/applications/academic_information/migrations/0001_initial.py index 68d090ad7..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-06-19 22:14 +# 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 3f3d51b8b..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-06-19 22:14 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import datetime from django.db import migrations, models @@ -11,9 +11,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('programme_curriculum', '0001_initial'), ('globals', '0001_initial'), ('academic_information', '0001_initial'), - ('programme_curriculum', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py index 9c9114cdd..7e80bedf5 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-06-19 22:14 +# Generated by Django 3.1.5 on 2024-07-16 15:44 import applications.central_mess.models import datetime @@ -203,6 +203,20 @@ class Migration(migrations.Migration): ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), ], ), + migrations.CreateModel( + name='Payments', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('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, 7, 16))), + ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), + ], + options={ + 'unique_together': {('student_id', 'payment_date')}, + }, + ), migrations.CreateModel( name='Monthly_bill', fields=[ diff --git a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py index d8a5e84b9..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-06-19 22:14 +# 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 6c541bfd1..7cd42f1b2 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-06-19 22:14 +# 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 b89a27ce2..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 2024-06-19 22:14 +# 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/eis/migrations/0001_initial.py b/FusionIIIT/applications/eis/migrations/0001_initial.py index b5beffb14..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-06-19 22:14 +# 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 e8ef4435c..51caaf80b 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-06-19 22:14 +# 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 5aef74dbc..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-06-19 22:14 +# 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 348f941c0..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-06-19 22:14 +# 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 314f41f7b..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-06-19 22:14 +# 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 320a93dfb..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-06-19 22:14 +# 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 09ff2fb32..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-06-19 22:14 +# 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 ac0c416bd..f67ff0834 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-06-19 22:14 +# 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)), @@ -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 diff --git a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py index 19690ba85..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-06-19 22:14 +# 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 fb9d546ba..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-06-19 22:14 +# 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 fe00be088..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-06-19 22:14 +# 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 10a474d11..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-06-19 22:14 +# 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 c7a14180b..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-06-19 22:14 +# 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 1285e9b78..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-06-19 22:14 +# 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 1049e0d3c..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-06-19 22:14 +# 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/office_module/migrations/0001_initial.py b/FusionIIIT/applications/office_module/migrations/0001_initial.py index 5e021add1..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-06-19 22:14 +# 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/online_cms/migrations/0001_initial.py b/FusionIIIT/applications/online_cms/migrations/0001_initial.py index 51b1f514d..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-06-19 22:14 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.db import migrations, models import django.db.models.deletion @@ -9,9 +9,9 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('academic_information', '0001_initial'), - ('globals', '0001_initial'), ('programme_curriculum', '0001_initial'), + ('globals', '0001_initial'), + ('academic_information', '0001_initial'), ] operations = [ diff --git a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py index 6b31bc9d8..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-06-19 22:14 +# 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 89a40cb84..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-06-19 22:14 +# 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 429bfbad7..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-06-19 22:14 +# 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/ps1/migrations/0001_initial.py b/FusionIIIT/applications/ps1/migrations/0001_initial.py index 5e1b2fce1..5b3086e09 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-06-19 22:14 +# 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/recruitment/migrations/0001_initial.py b/FusionIIIT/applications/recruitment/migrations/0001_initial.py index c9960bbd1..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-06-19 22:14 +# 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 f723b02c9..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-06-19 22:14 +# 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, 6, 19))), + ('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)), diff --git a/FusionIIIT/applications/scholarships/migrations/0001_initial.py b/FusionIIIT/applications/scholarships/migrations/0001_initial.py index 19428800c..7e1962c88 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-06-19 22:14 +# 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 841bcaf40..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-06-19 22:14 +# Generated by Django 3.1.5 on 2024-07-16 15:44 from django.conf import settings from django.db import migrations, models