diff --git a/FusionIIIT/applications/academic_information/migrations/0001_initial.py b/FusionIIIT/applications/academic_information/migrations/0001_initial.py
index 4b0f359c3..0335e5ac7 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.db import migrations, models
import django.db.models.deletion
diff --git a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py
index 42142593d..8288015ad 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import datetime
from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
dependencies = [
('globals', '0001_initial'),
- ('academic_information', '0001_initial'),
('programme_curriculum', '0001_initial'),
+ ('academic_information', '0001_initial'),
]
operations = [
@@ -368,6 +368,16 @@ class Migration(migrations.Migration):
'db_table': 'Bonafide',
},
),
+ migrations.CreateModel(
+ name='backlog_course',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('is_summer_course', models.BooleanField(default=False)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')),
+ ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
+ ],
+ ),
migrations.CreateModel(
name='AssistantshipClaim',
fields=[
@@ -402,4 +412,4 @@ class Migration(migrations.Migration):
'unique_together': {('curr_id', 'student_id')},
},
),
- ]
\ No newline at end of file
+ ]
diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py
index c197e0231..7f2ac6f35 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import applications.central_mess.models
import datetime
@@ -63,6 +63,19 @@ class Migration(migrations.Migration):
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
+ migrations.CreateModel(
+ name='Update_Payment',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('Txn_no', models.CharField(max_length=20)),
+ ('img', models.ImageField(default=None, upload_to='images/')),
+ ('amount', models.IntegerField(default=0)),
+ ('status', models.CharField(default='pending', max_length=10)),
+ ('update_remark', models.CharField(default='NA', max_length=50)),
+ ('payment_date', models.DateField(default=None, null=True)),
+ ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
+ ],
+ ),
migrations.CreateModel(
name='Special_request',
fields=[
@@ -186,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, 15))),
+ ('payment_date', models.DateField(default=datetime.date(2024, 4, 27))),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
options={
diff --git a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py
index 44df90d3c..25e95f7f1 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 f0214910c..a20c97753 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 cb016ad8b..0d36c4ef9 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-04-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 f3dbd4bf3..a7c38380e 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import datetime
from django.conf import settings
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('auth', '0012_alter_user_first_name_max_length'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
diff --git a/FusionIIIT/applications/establishment/migrations/0001_initial.py b/FusionIIIT/applications/establishment/migrations/0001_initial.py
index d85fe198d..8da9173cf 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.conf import settings
from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('globals', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
+ ('globals', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
diff --git a/FusionIIIT/applications/estate_module/migrations/0001_initial.py b/FusionIIIT/applications/estate_module/migrations/0001_initial.py
index 899dbfccc..366378cf0 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 9cbd0f6ac..8f9bc8897 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-18 13:13
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.db import migrations, models
import django.db.models.deletion
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('academic_information', '0001_initial'),
+ ('programme_curriculum', '0001_initial'),
]
operations = [
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
('authenticator_3', models.BooleanField(default=False)),
('year', models.DateField(auto_now_add=True)),
('course_year', models.IntegerField(default=2024)),
- ('course_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
]
diff --git a/FusionIIIT/applications/feeds/migrations/0001_initial.py b/FusionIIIT/applications/feeds/migrations/0001_initial.py
index e989d0101..9a8691daa 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 3375630f7..4fc89cffa 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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/finance_accounts/migrations/0001_initial.py b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py
index 8d45f1fc1..18a9f6c88 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 7fc43ccef..a8450bb11 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50)),
+ ('user_status', models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], 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)),
@@ -106,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')},
},
),
]
diff --git a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py
index 546d7fb81..16c4ceed1 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.conf import settings
from django.db import migrations, models
@@ -11,9 +11,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('globals', '0001_initial'),
('academic_information', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -30,6 +30,8 @@ class Migration(migrations.Migration):
('spent_budget', models.IntegerField(default=0, null=True)),
('avail_budget', models.IntegerField(default=0, null=True)),
('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)),
+ ('head_changed_on', models.DateField(default=django.utils.timezone.now, null=True)),
+ ('created_on', models.DateField(default=django.utils.timezone.now, null=True)),
('co_coordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='coco_of', to='academic_information.student')),
('co_ordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='co_of', to='academic_information.student')),
('faculty_incharge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='faculty_incharge_of', to='globals.faculty')),
@@ -68,7 +70,7 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Registration_form',
fields=[
- ('roll', models.CharField(default='2016001', max_length=7, primary_key=True, serialize=False)),
+ ('roll', models.CharField(default='20160017', max_length=8, primary_key=True, serialize=False)),
('user_name', models.CharField(default='Student', max_length=40)),
('branch', models.CharField(default='open', max_length=20)),
('cpi', models.FloatField(default=6.0, max_length=3)),
@@ -93,6 +95,16 @@ class Migration(migrations.Migration):
'ordering': ['-pub_date'],
},
),
+ migrations.CreateModel(
+ name='Inventory',
+ fields=[
+ ('club_name', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='club_inventory', serialize=False, to='gymkhana.club_info')),
+ ('inventory', models.FileField(upload_to='gymkhana/inventory')),
+ ],
+ options={
+ 'db_table': 'Inventory',
+ },
+ ),
migrations.CreateModel(
name='Voting_voters',
fields=[
@@ -121,7 +133,7 @@ class Migration(migrations.Migration):
('venue', models.CharField(choices=[('Classroom', (('CR101', 'CR101'), ('CR102', 'CR102'))), ('Lecturehall', (('L101', 'L101'), ('L102', 'L102')))], max_length=50)),
('date', models.DateField(default=None)),
('start_time', models.TimeField(default=None)),
- ('end_time', models.TimeField(default=None, null=True)),
+ ('end_time', models.TimeField(default=None)),
('session_poster', models.ImageField(null=True, upload_to='gymkhana/session_poster')),
('details', models.TextField(max_length=256, null=True)),
('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)),
diff --git a/FusionIIIT/applications/health_center/migrations/0001_initial.py b/FusionIIIT/applications/health_center/migrations/0001_initial.py
index 072d80def..887666ff8 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import datetime
from django.db import migrations, models
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
name='Doctor',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('doctor_name', models.CharField(choices=[(0, 'Dr.Sharma'), (1, 'Dr.Vinay')], max_length=50)),
+ ('doctor_name', models.CharField(max_length=50)),
('doctor_phone', models.CharField(max_length=15)),
('specialization', models.CharField(max_length=100)),
('active', models.BooleanField(default=True)),
@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
name='Pathologist',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('pathologist_name', models.CharField(choices=[(0, 'Dr.Ajay'), (1, 'Dr.Rahul')], max_length=50)),
+ ('pathologist_name', models.CharField(max_length=50)),
('pathologist_phone', models.CharField(max_length=15)),
('specialization', models.CharField(max_length=100)),
('active', models.BooleanField(default=True)),
@@ -132,6 +132,18 @@ class Migration(migrations.Migration):
('patient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
),
+ migrations.CreateModel(
+ name='MedicalProfile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('date_of_birth', models.DateField()),
+ ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female'), ('O', 'Other')], max_length=1)),
+ ('blood_type', models.CharField(choices=[('A+', 'A+'), ('A-', 'A-'), ('B+', 'B+'), ('B-', 'B-'), ('AB+', 'AB+'), ('AB-', 'AB-'), ('O+', 'O+'), ('O-', 'O-')], max_length=3)),
+ ('height', models.DecimalField(decimal_places=2, max_digits=5)),
+ ('weight', models.DecimalField(decimal_places=2, max_digits=5)),
+ ('user_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
+ ],
+ ),
migrations.CreateModel(
name='Hospital_admit',
fields=[
@@ -197,9 +209,6 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('ann_date', models.DateTimeField(default='04-04-2021')),
('message', models.CharField(max_length=200)),
- ('batch', models.CharField(default='Year-1', max_length=40)),
- ('department', models.CharField(default='ALL', max_length=40)),
- ('programme', models.CharField(max_length=10)),
('upload_announcement', models.FileField(default=' ', null=True, upload_to='health_center/upload_announcement')),
('anno_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='announcements_made', to='globals.extrainfo')),
],
diff --git a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py
index 8659d1649..04306f3c2 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.conf import settings
from django.db import migrations, models
@@ -12,9 +12,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('globals', '0001_initial'),
('academic_information', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -26,6 +26,50 @@ class Migration(migrations.Migration):
('hall_name', models.CharField(max_length=50)),
('max_accomodation', models.IntegerField(default=0)),
('number_students', models.PositiveIntegerField(default=0)),
+ ('assigned_batch', models.CharField(blank=True, max_length=50, null=True)),
+ ('type_of_seater', models.CharField(choices=[('single', 'Single Seater'), ('double', 'Double Seater'), ('triple', 'Triple Seater')], default='single', max_length=50)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelComplaint',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('hall_name', models.CharField(max_length=100)),
+ ('student_name', models.CharField(max_length=100)),
+ ('roll_number', models.CharField(max_length=20)),
+ ('description', models.TextField()),
+ ('contact_number', models.CharField(max_length=15)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelLeave',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('student_name', models.CharField(max_length=100)),
+ ('roll_num', models.CharField(max_length=20)),
+ ('reason', models.TextField()),
+ ('phone_number', models.CharField(blank=True, max_length=20, null=True)),
+ ('start_date', models.DateField(default=django.utils.timezone.now)),
+ ('end_date', models.DateField()),
+ ('status', models.CharField(default='pending', max_length=20)),
+ ('remark', models.TextField(blank=True, null=True)),
+ ('file_upload', models.FileField(blank=True, null=True, upload_to='hostel_management/')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='StudentDetails',
+ fields=[
+ ('id', models.CharField(max_length=20, primary_key=True, serialize=False)),
+ ('first_name', models.CharField(blank=True, max_length=100, null=True)),
+ ('last_name', models.CharField(blank=True, max_length=100, null=True)),
+ ('programme', models.CharField(blank=True, max_length=100, null=True)),
+ ('batch', models.CharField(blank=True, max_length=100, null=True)),
+ ('room_num', models.CharField(blank=True, max_length=20, null=True)),
+ ('hall_no', models.CharField(blank=True, max_length=20, null=True)),
+ ('hall_id', models.CharField(blank=True, max_length=20, null=True)),
+ ('specialization', models.CharField(blank=True, max_length=100, null=True)),
+ ('parent_contact', models.CharField(blank=True, max_length=20, null=True)),
+ ('address', models.CharField(blank=True, max_length=255, null=True)),
],
),
migrations.CreateModel(
@@ -51,7 +95,18 @@ class Migration(migrations.Migration):
('start_time', models.TimeField(blank=True, null=True)),
('end_time', models.TimeField(blank=True, null=True)),
('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
- ('staff_id', models.ForeignKey(on_delete=django.db.models.fields.related.ForeignKey, to='globals.staff')),
+ ('staff_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.staff')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelTransactionHistory',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('change_type', models.CharField(max_length=100)),
+ ('previous_value', models.CharField(max_length=255)),
+ ('new_value', models.CharField(max_length=255)),
+ ('timestamp', models.DateTimeField(auto_now_add=True)),
+ ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
],
),
migrations.CreateModel(
@@ -75,6 +130,49 @@ class Migration(migrations.Migration):
('posted_by', models.ForeignKey(on_delete=django.db.models.fields.related.ForeignKey, to='globals.extrainfo')),
],
),
+ migrations.CreateModel(
+ name='HostelInventory',
+ fields=[
+ ('inventory_id', models.AutoField(primary_key=True, serialize=False)),
+ ('inventory_name', models.CharField(max_length=100)),
+ ('cost', models.DecimalField(decimal_places=2, max_digits=10)),
+ ('quantity', models.PositiveIntegerField(default=0)),
+ ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelHistory',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('timestamp', models.DateTimeField(default=django.utils.timezone.now)),
+ ('batch', models.CharField(max_length=50, null=True)),
+ ('caretaker', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='caretaker_history', to='globals.staff')),
+ ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
+ ('warden', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='warden_history', to='globals.faculty')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelFine',
+ fields=[
+ ('fine_id', models.AutoField(primary_key=True, serialize=False)),
+ ('student_name', models.CharField(max_length=100)),
+ ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+ ('status', models.CharField(choices=[('Pending', 'Pending'), ('Paid', 'Paid')], default='Pending', max_length=50)),
+ ('reason', models.TextField()),
+ ('hall', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
+ ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='HostelAllotment',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('assignedBatch', models.CharField(max_length=50)),
+ ('assignedCaretaker', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.staff')),
+ ('assignedWarden', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.faculty')),
+ ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
+ ],
+ ),
migrations.CreateModel(
name='HallWarden',
fields=[
@@ -102,36 +200,39 @@ class Migration(migrations.Migration):
('staff', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.staff')),
],
),
- migrations.CreateModel(
- name='GuestRoomDetail',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('room_no', models.CharField(max_length=4, unique=True)),
- ('room_status', models.CharField(choices=[('Booked', 'Booked'), ('CheckedIn', 'Checked In'), ('Available', 'Available'), ('UnderMaintenance', 'Under Maintenance')], default='Available', max_length=20)),
- ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
- ],
- ),
migrations.CreateModel(
name='GuestRoomBooking',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('guest_name', models.CharField(max_length=100)),
- ('guest_phone', models.CharField(max_length=15)),
- ('guest_email', models.CharField(blank=True, max_length=40)),
+ ('guest_name', models.CharField(max_length=255)),
+ ('guest_phone', models.CharField(max_length=255)),
+ ('guest_email', models.CharField(blank=True, max_length=255)),
('guest_address', models.TextField(blank=True)),
('rooms_required', models.IntegerField(blank=True, default=1, null=True)),
+ ('guest_room_id', models.CharField(blank=True, max_length=255)),
('total_guest', models.IntegerField(default=1)),
('purpose', models.TextField()),
('arrival_date', models.DateField()),
('arrival_time', models.TimeField()),
('departure_date', models.DateField()),
('departure_time', models.TimeField()),
- ('status', models.CharField(choices=[('Confirmed', 'Confirmed'), ('Pending', 'Pending'), ('Rejected', 'Rejected'), ('Canceled', 'Canceled'), ('CancelRequested', 'Cancel Requested'), ('CheckedIn', 'Checked In'), ('Complete', 'Complete'), ('Forward', 'Forward')], default='Pending', max_length=15)),
+ ('status', models.CharField(choices=[('Confirmed', 'Confirmed'), ('Pending', 'Pending'), ('Rejected', 'Rejected'), ('Canceled', 'Canceled'), ('CancelRequested', 'Cancel Requested'), ('CheckedIn', 'Checked In'), ('Complete', 'Complete'), ('Forward', 'Forward')], default='Pending', max_length=255)),
('booking_date', models.DateField(default=django.utils.timezone.now)),
- ('nationality', models.CharField(blank=True, max_length=20)),
- ('guest_room_id', models.ManyToManyField(to='hostel_management.GuestRoomDetail')),
+ ('nationality', models.CharField(blank=True, max_length=255)),
+ ('room_type', models.CharField(choices=[('single', 'Single'), ('double', 'Double'), ('triple', 'Triple')], default='single', max_length=10)),
('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
('intender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
+ migrations.CreateModel(
+ name='GuestRoom',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('room', models.CharField(max_length=255)),
+ ('occupied_till', models.DateField(blank=True, null=True)),
+ ('vacant', models.BooleanField(default=True)),
+ ('room_type', models.CharField(choices=[('single', 'Single'), ('double', 'Double'), ('triple', 'Triple')], default='single', max_length=10)),
+ ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')),
+ ],
+ ),
]
diff --git a/FusionIIIT/applications/hr2/migrations/0001_initial.py b/FusionIIIT/applications/hr2/migrations/0001_initial.py
index 733f5b0bb..08e79b9c1 100644
--- a/FusionIIIT/applications/hr2/migrations/0001_initial.py
+++ b/FusionIIIT/applications/hr2/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 3.1.5 on 2024-04-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
+from django.conf import settings
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
dependencies = [
('globals', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -25,6 +27,79 @@ class Migration(migrations.Migration):
('extra_info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
),
+ migrations.CreateModel(
+ name='LTCform',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('employeeId', models.IntegerField()),
+ ('name', models.CharField(max_length=100, null=True)),
+ ('blockYear', models.TextField()),
+ ('pfNo', models.IntegerField(max_length=50)),
+ ('basicPaySalary', models.IntegerField(null=True)),
+ ('designation', models.CharField(max_length=50)),
+ ('departmentInfo', models.CharField(max_length=50)),
+ ('leaveRequired', models.BooleanField(default=False, null=True)),
+ ('leaveStartDate', models.DateField(blank=True, null=True)),
+ ('leaveEndDate', models.DateField(blank=True, null=True)),
+ ('dateOfDepartureForFamily', models.DateField(blank=True, null=True)),
+ ('natureOfLeave', models.TextField(blank=True, null=True)),
+ ('purposeOfLeave', models.TextField(blank=True, null=True)),
+ ('hometownOrNot', models.BooleanField(default=False)),
+ ('placeOfVisit', models.TextField(blank=True, max_length=100, null=True)),
+ ('addressDuringLeave', models.TextField(null=True)),
+ ('modeofTravel', models.TextField(blank=True, max_length=10, null=True)),
+ ('detailsOfFamilyMembersAlreadyDone', models.JSONField(blank=True, null=True)),
+ ('detailsOfFamilyMembersAboutToAvail', models.JSONField(blank=True, max_length=100, null=True)),
+ ('detailsOfDependents', models.JSONField(blank=True, null=True)),
+ ('amountOfAdvanceRequired', models.IntegerField(blank=True, null=True)),
+ ('certifiedThatFamilyDependents', models.BooleanField(blank=True, null=True)),
+ ('certifiedThatAdvanceTakenOn', models.DateField(blank=True, null=True)),
+ ('adjustedMonth', models.TextField(blank=True, max_length=50, null=True)),
+ ('submissionDate', models.DateField(null=True)),
+ ('phoneNumberForContact', models.BigIntegerField()),
+ ('approved', models.BooleanField(null=True)),
+ ('approvedDate', models.DateField(auto_now_add=True, null=True)),
+ ('approved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='LTC_approved_by', to=settings.AUTH_USER_MODEL)),
+ ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='LTC_created_by', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='LeaveForm',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('employeeId', models.IntegerField(max_length=22, null=True)),
+ ('name', models.CharField(max_length=40, null=True)),
+ ('designation', models.CharField(max_length=40, null=True)),
+ ('submissionDate', models.DateField(blank=True, null=True)),
+ ('pfNo', models.IntegerField(max_length=30, null=True)),
+ ('departmentInfo', models.CharField(max_length=40, null=True)),
+ ('natureOfLeave', models.TextField(max_length=40, null=True)),
+ ('leaveStartDate', models.DateField(blank=True, null=True)),
+ ('leaveEndDate', models.DateField(blank=True, null=True)),
+ ('purposeOfLeave', models.TextField(max_length=40, null=True)),
+ ('addressDuringLeave', models.TextField(blank=True, max_length=40, null=True)),
+ ('academicResponsibility', models.TextField(blank=True, max_length=40, null=True)),
+ ('addministrativeResponsibiltyAssigned', models.TextField(max_length=40, null=True)),
+ ('approved', models.BooleanField(null=True)),
+ ('approvedDate', models.DateField(auto_now_add=True, null=True)),
+ ('approved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Leave_approved_by', to=settings.AUTH_USER_MODEL)),
+ ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Leave_created_by', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='LeaveBalance',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('casualLeave', models.IntegerField(default=0)),
+ ('specialCasualLeave', models.IntegerField(default=0)),
+ ('earnedLeave', models.IntegerField(default=0)),
+ ('commutedLeave', models.IntegerField(default=0)),
+ ('restrictedHoliday', models.IntegerField(default=0)),
+ ('stationLeave', models.IntegerField(default=0)),
+ ('vacationLeave', models.IntegerField(default=0)),
+ ('employeeId', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
+ ],
+ ),
migrations.CreateModel(
name='ForeignService',
fields=[
@@ -88,4 +163,84 @@ class Migration(migrations.Migration):
('extra_info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
),
+ migrations.CreateModel(
+ name='CPDAReimbursementform',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('employeeId', models.IntegerField(max_length=22, null=True)),
+ ('name', models.CharField(max_length=50)),
+ ('designation', models.CharField(max_length=50)),
+ ('pfNo', models.IntegerField(max_length=20)),
+ ('advanceTaken', models.IntegerField()),
+ ('purpose', models.TextField()),
+ ('adjustmentSubmitted', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('balanceAvailable', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('advanceDueAdjustment', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('advanceAmountPDA', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('amountCheckedInPDA', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('submissionDate', models.DateField(auto_now_add=True)),
+ ('approved', models.BooleanField(null=True)),
+ ('approvedDate', models.DateField(auto_now_add=True, null=True)),
+ ('approved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='CPDAR_approved_by', to=settings.AUTH_USER_MODEL)),
+ ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='CPDAR_created_by', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='CPDAAdvanceform',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('employeeId', models.IntegerField(max_length=22, null=True)),
+ ('name', models.CharField(max_length=40, null=True)),
+ ('designation', models.CharField(max_length=40, null=True)),
+ ('pfNo', models.IntegerField(max_length=30, null=True)),
+ ('purpose', models.TextField(max_length=40, null=True)),
+ ('amountRequired', models.IntegerField(max_length=30, null=True)),
+ ('advanceDueAdjustment', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('submissionDate', models.DateField(blank=True, null=True)),
+ ('balanceAvailable', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('advanceAmountPDA', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('amountCheckedInPDA', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+ ('approved', models.BooleanField(null=True)),
+ ('approvedDate', models.DateField(auto_now_add=True, null=True)),
+ ('approved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='CPDA_approved_by', to=settings.AUTH_USER_MODEL)),
+ ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='CPDA_created_by', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Appraisalform',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('employeeId', models.IntegerField(max_length=22, null=True)),
+ ('name', models.CharField(max_length=22)),
+ ('designation', models.CharField(max_length=50)),
+ ('disciplineInfo', models.CharField(max_length=22, null=True)),
+ ('specificFieldOfKnowledge', models.TextField(max_length=40, null=True)),
+ ('currentResearchInterests', models.TextField(max_length=40, null=True)),
+ ('coursesTaught', models.JSONField(max_length=100, null=True)),
+ ('newCoursesIntroduced', models.JSONField(max_length=100, null=True)),
+ ('newCoursesDeveloped', models.JSONField(max_length=100, null=True)),
+ ('otherInstructionalTasks', models.TextField(max_length=100, null=True)),
+ ('thesisSupervision', models.JSONField(max_length=100, null=True)),
+ ('sponsoredReseachProjects', models.JSONField(max_length=100, null=True)),
+ ('otherResearchElement', models.TextField(max_length=40, null=True)),
+ ('publication', models.TextField(max_length=40, null=True)),
+ ('referredConference', models.TextField(max_length=40, null=True)),
+ ('conferenceOrganised', models.TextField(max_length=40, null=True)),
+ ('membership', models.TextField(max_length=40, null=True)),
+ ('honours', models.TextField(max_length=40, null=True)),
+ ('editorOfPublications', models.TextField(max_length=40, null=True)),
+ ('expertLectureDelivered', models.TextField(max_length=40, null=True)),
+ ('membershipOfBOS', models.TextField(max_length=40, null=True)),
+ ('otherExtensionTasks', models.TextField(max_length=40, null=True)),
+ ('administrativeAssignment', models.TextField(max_length=40, null=True)),
+ ('serviceToInstitute', models.TextField(max_length=40, null=True)),
+ ('otherContribution', models.TextField(max_length=40, null=True)),
+ ('performanceComments', models.TextField(max_length=100, null=True)),
+ ('submissionDate', models.DateField(max_length=6, null=True)),
+ ('approved', models.BooleanField(null=True)),
+ ('approvedDate', models.DateField(auto_now_add=True, null=True)),
+ ('approved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Appraisal_approved_by', to=settings.AUTH_USER_MODEL)),
+ ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Appraisal_created_by', to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
]
diff --git a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py
index e772edafa..d5ef66c0d 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 b86a5c530..c62bf6a0b 100644
--- a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py
+++ b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 3.1.5 on 2024-04-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
+import datetime
from django.db import migrations, models
import django.db.models.deletion
@@ -12,6 +13,14 @@ class Migration(migrations.Migration):
]
operations = [
+ migrations.CreateModel(
+ name='Budget',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('budgetIssued', models.IntegerField(default=0)),
+ ],
+ ),
migrations.CreateModel(
name='FinancialBidDetails',
fields=[
@@ -26,6 +35,25 @@ class Migration(migrations.Migration):
('id', models.CharField(max_length=200, primary_key=True, serialize=False)),
],
),
+ migrations.CreateModel(
+ name='Requests',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('description', models.CharField(max_length=200)),
+ ('area', models.CharField(max_length=200)),
+ ('requestCreatedBy', models.CharField(max_length=200)),
+ ('engineerProcessed', models.IntegerField(default=0)),
+ ('directorApproval', models.IntegerField(default=0)),
+ ('deanProcessed', models.IntegerField(default=0)),
+ ('status', models.CharField(max_length=200)),
+ ('issuedWorkOrder', models.IntegerField(default=0)),
+ ('workCompleted', models.IntegerField(default=0)),
+ ('billGenerated', models.IntegerField(default=0)),
+ ('billProcessed', models.IntegerField(default=0)),
+ ('billSettled', models.IntegerField(default=0)),
+ ],
+ ),
migrations.CreateModel(
name='PageOneDetails',
fields=[
@@ -83,6 +111,21 @@ class Migration(migrations.Migration):
('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)),
],
),
+ migrations.CreateModel(
+ name='WorkOrder',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('date', models.DateField(default=datetime.date.today)),
+ ('agency', models.CharField(max_length=200)),
+ ('amount', models.IntegerField(default=0)),
+ ('deposit', models.IntegerField(default=0)),
+ ('alloted_time', models.CharField(max_length=200)),
+ ('start_date', models.DateField()),
+ ('completion_date', models.DateField()),
+ ('request_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.requests')),
+ ],
+ ),
migrations.CreateModel(
name='TechnicalBidDetails',
fields=[
@@ -187,6 +230,14 @@ class Migration(migrations.Migration):
('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)),
],
),
+ migrations.CreateModel(
+ name='Bills',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('file', models.FileField(upload_to='')),
+ ('request_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.requests')),
+ ],
+ ),
migrations.CreateModel(
name='Agreement',
fields=[
diff --git a/FusionIIIT/applications/leave/migrations/0001_initial.py b/FusionIIIT/applications/leave/migrations/0001_initial.py
index b6fa10f0c..536667a90 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 c488a504c..a61863d3d 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import datetime
from django.db import migrations, models
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('filetracking', '0001_initial'),
('globals', '0001_initial'),
('academic_information', '0001_initial'),
+ ('filetracking', '0001_initial'),
('leave', '0001_initial'),
]
diff --git a/FusionIIIT/applications/online_cms/migrations/0001_initial.py b/FusionIIIT/applications/online_cms/migrations/0001_initial.py
index 9f3c47375..94f9a00b0 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.db import migrations, models
import django.db.models.deletion
@@ -10,6 +10,7 @@ class Migration(migrations.Migration):
dependencies = [
('globals', '0001_initial'),
+ ('programme_curriculum', '0001_initial'),
('academic_information', '0001_initial'),
]
@@ -22,7 +23,7 @@ class Migration(migrations.Migration):
('submit_date', models.DateTimeField()),
('assignment_name', models.CharField(max_length=100)),
('assignment_url', models.CharField(max_length=100, null=True)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -32,7 +33,7 @@ class Migration(migrations.Migration):
('comment_time', models.DateTimeField(auto_now=True)),
('comment', models.TextField(max_length=2000)),
('commenter_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -44,7 +45,7 @@ class Migration(migrations.Migration):
('number_of_question', models.IntegerField(default=0)),
('description', models.TextField(max_length=1000)),
('total_score', models.IntegerField(default=0)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -77,7 +78,7 @@ class Migration(migrations.Migration):
('description', models.TextField(max_length=1000)),
('rules', models.TextField(max_length=2000)),
('total_score', models.IntegerField(default=0)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -93,7 +94,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('topic_name', models.TextField(max_length=200)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -119,6 +120,19 @@ class Migration(migrations.Migration):
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
+ migrations.CreateModel(
+ name='Student_grades',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('semester', models.IntegerField(default=1)),
+ ('year', models.IntegerField(default=2016)),
+ ('roll_no', models.TextField(max_length=2000)),
+ ('total_marks', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('grade', models.TextField(max_length=2000)),
+ ('batch', models.IntegerField(default=2021)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ],
+ ),
migrations.CreateModel(
name='QuizResult',
fields=[
@@ -134,7 +148,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
),
@@ -163,6 +177,50 @@ class Migration(migrations.Migration):
('prac_quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.practice')),
],
),
+ migrations.CreateModel(
+ name='Modules',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('module_name', models.CharField(max_length=50)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='GradingScheme_grades',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('O_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('O_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('A_plus_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('A_plus_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('A_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('A_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('B_plus_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('B_plus_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('B_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('B_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('C_plus_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('C_plus_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('C_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('C_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('D_plus_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('D_plus_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('D_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('D_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('F_Lower', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('F_Upper', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='GradingScheme',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('type_of_evaluation', models.TextField(default=None, max_length=255)),
+ ('weightage', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ],
+ ),
migrations.CreateModel(
name='ForumReply',
fields=[
@@ -179,7 +237,7 @@ class Migration(migrations.Migration):
('description', models.CharField(max_length=100)),
('video_name', models.CharField(max_length=40)),
('video_url', models.CharField(max_length=100, null=True)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
],
),
migrations.CreateModel(
@@ -190,7 +248,28 @@ class Migration(migrations.Migration):
('description', models.CharField(max_length=100)),
('document_name', models.CharField(max_length=40)),
('document_url', models.CharField(max_length=100, null=True)),
- ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ('module_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='online_cms.modules')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='AttendanceFiles',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('upload_time', models.DateTimeField(auto_now=True)),
+ ('file_name', models.CharField(max_length=40)),
+ ('file_url', models.CharField(max_length=100, null=True)),
+ ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Attendance',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('date', models.DateField()),
+ ('present', models.BooleanField(default=False)),
+ ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.courseinstructor')),
+ ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
],
),
- ]
\ No newline at end of file
+ ]
diff --git a/FusionIIIT/applications/otheracademic/migrations/0001_initial.py b/FusionIIIT/applications/otheracademic/migrations/0001_initial.py
index 3a2317c25..0cbedae6b 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-16 20:30
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.db import migrations, models
import django.db.models.deletion
@@ -9,7 +9,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('globals', '__first__'),
+ ('globals', '0001_initial'),
]
operations = [
@@ -70,8 +70,6 @@ class Migration(migrations.Migration):
('alumni_notclear', models.BooleanField(default=False)),
('placement_cell_clear', models.BooleanField(default=False)),
('placement_cell_notclear', models.BooleanField(default=False)),
- ('discipline_office_dsa_clear', models.BooleanField(default=False)),
- ('discipline_office_dsa_notclear', models.BooleanField(default=False)),
('hostel_credential', models.CharField(max_length=100)),
('bank_credential', models.CharField(max_length=100)),
('btp_credential', models.CharField(max_length=100)),
@@ -132,7 +130,7 @@ class Migration(migrations.Migration):
('date_from', models.DateField()),
('date_to', models.DateField()),
('date_of_application', models.DateField()),
- ('upload_file', models.FileField(upload_to='leave_doc')),
+ ('upload_file', models.FileField(blank=True, upload_to='')),
('address', models.CharField(max_length=100)),
('purpose', models.TextField()),
('leave_type', models.CharField(choices=[('Casual', 'Casual'), ('Medical', 'Medical'), ('Vacation', 'Vacation'), ('Duty', 'Duty')], max_length=20)),
@@ -141,9 +139,12 @@ class Migration(migrations.Migration):
('alt_mobile_no', models.CharField(max_length=100)),
('ta_approved', models.BooleanField()),
('ta_rejected', models.BooleanField()),
+ ('thesis_approved', models.BooleanField()),
+ ('thesis_rejected', models.BooleanField()),
('hod_approved', models.BooleanField()),
('hod_rejected', models.BooleanField()),
('ta_supervisor', models.CharField(max_length=100)),
+ ('thesis_supervisor', models.CharField(max_length=100)),
('hod', models.CharField(max_length=100)),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
@@ -217,6 +218,7 @@ class Migration(migrations.Migration):
('rate', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
('half_day_leave', models.IntegerField(default=0)),
('full_day_leave', models.IntegerField(default=0)),
+ ('remark', models.TextField(default='')),
('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
diff --git a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py
index 95f070aef..a9a945f1d 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 ea11ebc7c..b5bdb145e 100644
--- a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py
+++ b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py
@@ -1,5 +1,6 @@
-# Generated by Django 3.1.5 on 2024-04-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
+from django.conf import settings
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
dependencies = [
('globals', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
@@ -19,10 +21,11 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=100)),
- ('version', models.DecimalField(decimal_places=1, default=1.0, max_digits=2, validators=[django.core.validators.MinValueValidator(1.0), django.core.validators.DecimalValidator(decimal_places=1, max_digits=2)])),
+ ('version', models.DecimalField(decimal_places=1, default=1.0, max_digits=5, validators=[django.core.validators.MinValueValidator(1.0), django.core.validators.DecimalValidator(decimal_places=1, max_digits=5)])),
('working_curriculum', models.BooleanField(default=True)),
('no_of_semester', models.PositiveIntegerField(default=1)),
('min_credit', models.PositiveIntegerField(default=0)),
+ ('latest_version', models.BooleanField(default=True)),
],
),
migrations.CreateModel(
@@ -110,19 +113,40 @@ class Migration(migrations.Migration):
},
),
migrations.CreateModel(
- name='UpdateCourseProposal',
+ name='Proposal_Tracking',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('faculty_name', models.CharField(max_length=100)),
- ('faculty_code', models.CharField(max_length=10)),
+ ('file_id', models.CharField(max_length=100)),
+ ('current_id', models.CharField(max_length=100)),
+ ('current_design', models.CharField(max_length=100)),
+ ('receive_date', models.DateTimeField(auto_now_add=True)),
+ ('forward_date', models.DateTimeField(auto_now_add=True)),
+ ('remarks', models.CharField(blank=True, max_length=250, null=True)),
+ ('is_added', models.BooleanField(default=False)),
+ ('is_submitted', models.BooleanField(default=False)),
+ ('is_rejected', 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)),
+ ],
+ options={
+ 'unique_together': {('file_id', 'current_id', 'current_design', 'disciplines')},
+ },
+ ),
+ migrations.CreateModel(
+ name='NewProposalFile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('uploader', models.CharField(max_length=100)),
+ ('designation', models.CharField(max_length=100)),
('code', models.CharField(max_length=10)),
('name', models.CharField(max_length=100)),
- ('credit', models.PositiveIntegerField(default=0)),
- ('lecture_hours', models.PositiveIntegerField(null=True)),
- ('tutorial_hours', models.PositiveIntegerField(null=True)),
- ('pratical_hours', models.PositiveIntegerField(null=True)),
- ('discussion_hours', models.PositiveIntegerField(null=True)),
- ('project_hours', models.PositiveIntegerField(null=True)),
+ ('credit', models.PositiveIntegerField(default=3)),
+ ('lecture_hours', models.PositiveIntegerField(default=3, null=True)),
+ ('tutorial_hours', models.PositiveIntegerField(default=0, null=True)),
+ ('pratical_hours', models.PositiveIntegerField(default=0, null=True)),
+ ('discussion_hours', models.PositiveIntegerField(default=0, null=True)),
+ ('project_hours', models.PositiveIntegerField(default=0, null=True)),
('pre_requisits', models.TextField(blank=True, null=True)),
('syllabus', models.TextField()),
('percent_quiz_1', models.PositiveIntegerField(default=10)),
@@ -133,13 +157,15 @@ class Migration(migrations.Migration):
('percent_lab_evaluation', models.PositiveIntegerField(default=10)),
('percent_course_attendance', models.PositiveIntegerField(default=5)),
('ref_books', models.TextField()),
- ('working_course', models.BooleanField(default=True)),
- ('status', models.PositiveIntegerField(default=0)),
- ('disciplines', models.ManyToManyField(blank=True, to='programme_curriculum.Discipline')),
+ ('subject', models.CharField(max_length=100, null=True)),
+ ('description', models.CharField(max_length=400, null=True)),
+ ('upload_date', models.DateTimeField(auto_now_add=True)),
+ ('is_read', models.BooleanField(default=False)),
+ ('is_update', models.BooleanField(default=False)),
('pre_requisit_courses', models.ManyToManyField(blank=True, to='programme_curriculum.Course')),
],
options={
- 'unique_together': {('code', 'faculty_code')},
+ 'unique_together': {('code', 'uploader', 'name')},
},
),
migrations.AlterUniqueTogether(
@@ -163,38 +189,6 @@ class Migration(migrations.Migration):
'unique_together': {('semester', 'name', 'type')},
},
),
- migrations.CreateModel(
- name='CourseProposal',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('faculty_name', models.CharField(max_length=100)),
- ('faculty_code', models.CharField(max_length=10)),
- ('code', models.CharField(max_length=10)),
- ('name', models.CharField(max_length=100)),
- ('credit', models.PositiveIntegerField(default=3)),
- ('lecture_hours', models.PositiveIntegerField(default=3, null=True)),
- ('tutorial_hours', models.PositiveIntegerField(default=0, null=True)),
- ('pratical_hours', models.PositiveIntegerField(default=0, null=True)),
- ('discussion_hours', models.PositiveIntegerField(default=0, null=True)),
- ('project_hours', models.PositiveIntegerField(default=0, null=True)),
- ('pre_requisits', models.TextField(blank=True, null=True)),
- ('syllabus', models.TextField()),
- ('percent_quiz_1', models.PositiveIntegerField(default=10)),
- ('percent_midsem', models.PositiveIntegerField(default=20)),
- ('percent_quiz_2', models.PositiveIntegerField(default=10)),
- ('percent_endsem', models.PositiveIntegerField(default=30)),
- ('percent_project', models.PositiveIntegerField(default=15)),
- ('percent_lab_evaluation', models.PositiveIntegerField(default=10)),
- ('percent_course_attendance', models.PositiveIntegerField(default=5)),
- ('ref_books', models.TextField()),
- ('status', models.PositiveIntegerField(default=0)),
- ('disciplines', models.ManyToManyField(blank=True, to='programme_curriculum.Discipline')),
- ('pre_requisit_courses', models.ManyToManyField(blank=True, to='programme_curriculum.Course')),
- ],
- options={
- 'unique_together': {('code', 'faculty_code')},
- },
- ),
migrations.CreateModel(
name='CourseInstructor',
fields=[
@@ -207,4 +201,4 @@ class Migration(migrations.Migration):
'unique_together': {('course_id', 'instructor_id', 'batch_id')},
},
),
- ]
\ No newline at end of file
+ ]
diff --git a/FusionIIIT/applications/ps1/migrations/0001_initial.py b/FusionIIIT/applications/ps1/migrations/0001_initial.py
index 4d5674c39..d3107b543 100644
--- a/FusionIIIT/applications/ps1/migrations/0001_initial.py
+++ b/FusionIIIT/applications/ps1/migrations/0001_initial.py
@@ -1,7 +1,8 @@
-# Generated by Django 3.1.5 on 2024-04-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.db import migrations, models
import django.db.models.deletion
+import django.utils.timezone
class Migration(migrations.Migration):
@@ -9,8 +10,8 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('filetracking', '0001_initial'),
('globals', '0001_initial'),
+ ('filetracking', '0001_initial'),
]
operations = [
@@ -24,7 +25,7 @@ class Migration(migrations.Migration):
('estimated_cost', models.IntegerField(null=True)),
('purpose', models.CharField(max_length=250)),
('specification', models.CharField(max_length=250)),
- ('indent_type', models.CharField(max_length=250)),
+ ('item_type', models.CharField(max_length=250)),
('nature', models.BooleanField(default=False)),
('indigenous', models.BooleanField(default=False)),
('replaced', models.BooleanField(default=False)),
@@ -40,19 +41,54 @@ class Migration(migrations.Migration):
'db_table': 'IndentFile',
},
),
+ migrations.CreateModel(
+ name='StockItem',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('nomenclature', models.CharField(max_length=100, unique=True)),
+ ('inUse', models.BooleanField(default=True)),
+ ('location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100)),
+ ('isTransferred', models.BooleanField(default=False)),
+ ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')),
+ ],
+ options={
+ 'db_table': 'StockItem',
+ },
+ ),
migrations.CreateModel(
name='StockEntry',
fields=[
('item_id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='ps1.indentfile')),
('vendor', models.CharField(max_length=250)),
- ('item_name', models.CharField(max_length=250)),
('current_stock', models.IntegerField()),
('recieved_date', models.DateField()),
('bill', models.FileField(upload_to='')),
+ ('location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100)),
('dealing_assistant_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
],
options={
'db_table': 'StockEntry',
},
),
- ]
\ No newline at end of file
+ migrations.CreateModel(
+ name='StockTransfer',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('src_location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100)),
+ ('dest_location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR2', max_length=100)),
+ ('dateTime', models.DateTimeField(default=django.utils.timezone.now)),
+ ('dest_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='dept_dest_transfers', to='globals.departmentinfo')),
+ ('indent_file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.indentfile')),
+ ('src_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='dept_src_transfers', to='globals.departmentinfo')),
+ ('stockItem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.stockitem')),
+ ],
+ options={
+ 'db_table': 'StockTransfer',
+ },
+ ),
+ migrations.AddField(
+ model_name='stockitem',
+ name='StockEntryId',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.stockentry'),
+ ),
+ ]
diff --git a/FusionIIIT/applications/recruitment/migrations/0001_initial.py b/FusionIIIT/applications/recruitment/migrations/0001_initial.py
index 386d6d6fb..2acee0f5d 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 4de9b80a1..56711cfcd 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-14 19:17
+# Generated by Django 3.1.5 on 2024-04-27 23:48
import datetime
from django.conf import settings
@@ -12,80 +12,87 @@ class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('globals', '0001_initial'),
]
operations = [
migrations.CreateModel(
- name='TechTransfer',
+ name='category',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('pf_no', models.IntegerField()),
- ('details', models.CharField(default=' ', max_length=500)),
- ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)),
- ('start_date', models.DateField(blank=True, null=True)),
- ('end_date', models.DateField(blank=True, null=True)),
- ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ('category_id', models.IntegerField(primary_key=True, serialize=False)),
+ ('category_name', models.CharField(max_length=500)),
+ ('sub_category_name', models.CharField(max_length=500)),
],
+ options={
+ 'ordering': ['-category_id'],
+ },
),
migrations.CreateModel(
- name='ResearchProject',
+ name='projects',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('pf_no', models.IntegerField()),
- ('ptype', models.CharField(default='Research', max_length=100)),
- ('pi', models.CharField(default=' ', max_length=1000)),
- ('co_pi', models.CharField(default=' ', max_length=1500)),
- ('title', models.TextField(default=' ', max_length=5000)),
- ('funding_agency', models.CharField(default=' ', max_length=250, null=True)),
- ('financial_outlay', models.CharField(default=' ', max_length=150, null=True)),
- ('status', models.CharField(choices=[('Awarded', 'Awarded'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=10)),
- ('start_date', models.DateField(blank=True, null=True)),
- ('finish_date', models.DateField(blank=True, null=True)),
- ('date_submission', models.DateField(blank=True, null=True)),
- ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)),
- ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ('project_id', models.IntegerField(primary_key=True, serialize=False)),
+ ('project_name', models.CharField(max_length=600)),
+ ('project_type', models.CharField(max_length=500)),
+ ('sponsored_agency', models.CharField(max_length=500)),
+ ('start_date', models.DateField()),
+ ('submission_date', models.DateField()),
+ ('finish_date', models.DateField()),
+ ('years', models.IntegerField()),
+ ('status', models.IntegerField(default=0)),
+ ('project_info_file', models.FileField(blank=True, null=True, upload_to='')),
+ ('financial_outlay_status', models.IntegerField(default=0)),
+ ('co_project_investigator_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='copi_id', to=settings.AUTH_USER_MODEL)),
+ ('project_investigator_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pi_id', to=settings.AUTH_USER_MODEL)),
],
+ options={
+ 'ordering': ['-project_id'],
+ },
),
migrations.CreateModel(
- name='ResearchGroup',
+ name='staff_allocations',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('name', models.CharField(max_length=120)),
- ('description', models.TextField()),
- ('faculty_under_group', models.ManyToManyField(related_name='allfaculty', to=settings.AUTH_USER_MODEL)),
- ('students_under_group', models.ManyToManyField(related_name='allstudents', to=settings.AUTH_USER_MODEL)),
+ ('staff_allocation_id', models.IntegerField(primary_key=True, serialize=False)),
+ ('staff_name', models.CharField(max_length=500)),
+ ('qualification', models.CharField(max_length=500)),
+ ('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))),
+ ('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)),
],
+ options={
+ 'ordering': ['-staff_allocation_id'],
+ },
),
migrations.CreateModel(
- name='Patent',
+ name='requests',
fields=[
- ('application_id', models.AutoField(primary_key=True, serialize=False)),
- ('title', models.CharField(max_length=120)),
- ('ipd_form', models.FileField(blank=True, null=True, upload_to='')),
- ('project_details', models.FileField(blank=True, null=True, upload_to='')),
- ('ipd_form_file', models.TextField(blank=True, null=True)),
- ('project_details_file', models.TextField(blank=True, null=True)),
- ('status', models.CharField(choices=[('Approved', 'Approved'), ('Disapproved', 'Disapproved'), ('Pending', 'Pending')], default='Pending', max_length=20)),
- ('faculty_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')),
+ ('request_id', models.IntegerField(primary_key=True, serialize=False)),
+ ('request_type', models.CharField(max_length=500)),
+ ('approval_status', models.IntegerField(default=0)),
+ ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')),
+ ('project_investigator_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rj_pi', to=settings.AUTH_USER_MODEL)),
],
+ options={
+ 'ordering': ['-request_id'],
+ },
),
migrations.CreateModel(
- name='ConsultancyProject',
+ name='financial_outlay',
fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('pf_no', models.IntegerField()),
- ('consultants', models.CharField(max_length=150)),
- ('title', models.CharField(max_length=1000)),
- ('client', models.CharField(max_length=1000)),
- ('financial_outlay', models.IntegerField()),
- ('start_date', models.DateField(blank=True, null=True)),
- ('end_date', models.DateField(blank=True, null=True)),
- ('duration', models.CharField(blank=True, max_length=500, null=True)),
- ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)),
- ('status', models.CharField(blank=True, choices=[('Completed', 'Completed'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing')], default='Ongoing', max_length=10, null=True)),
- ('remarks', models.CharField(blank=True, max_length=1000, null=True)),
- ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ('financial_outlay_id', models.IntegerField(primary_key=True, serialize=False)),
+ ('category', models.CharField(max_length=500)),
+ ('sub_category', models.CharField(max_length=500)),
+ ('amount', models.IntegerField()),
+ ('year', models.IntegerField()),
+ ('status', models.IntegerField(default=0)),
+ ('staff_limit', models.IntegerField(default=0)),
+ ('utilized_amount', models.IntegerField(default=0, null=True)),
+ ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects')),
],
+ options={
+ 'ordering': ['-financial_outlay_id'],
+ },
),
]
diff --git a/FusionIIIT/applications/scholarships/migrations/0001_initial.py b/FusionIIIT/applications/scholarships/migrations/0001_initial.py
index 13627011e..7f0130f6e 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
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 96df7d704..af48c39c4 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-15 23:58
+# Generated by Django 3.1.5 on 2024-04-27 23:48
from django.conf import settings
from django.db import migrations, models