From 18de59cd0ea720753c4ed739849a42fe99e674d3 Mon Sep 17 00:00:00 2001 From: SharanKumar06 Date: Mon, 11 Mar 2024 05:04:42 +0530 Subject: [PATCH 1/8] added new usecases --- .../migrations/0002_auto_20240302_2013.py | 18 ----- .../migrations/0003_auto_20240303_1017.py | 18 ----- .../migrations/0004_auto_20240303_1153.py | 18 ----- .../migrations/0005_auto_20240303_1505.py | 18 ----- .../migrations/0006_auto_20240303_2124.py | 18 ----- .../migrations/0007_auto_20240306_1805.py | 18 ----- .../migrations/0008_auto_20240306_1851.py | 18 ----- .../migrations/0009_auto_20240310_2142.py | 18 ----- .../migrations/0001_initial.py | 26 +++---- ...cial_outlay_projects_staff_allocations.py} | 30 +++++-- .../migrations/0002_pr_test.py | 21 ----- .../migrations/0003_prudvi.py | 21 ----- .../migrations/0004_auto_20240303_1017.py | 45 ----------- .../migrations/0005_auto_20240303_1153.py | 78 ------------------- .../migrations/0006_auto_20240303_2124.py | 41 ---------- .../migrations/0007_auto_20240303_2348.py | 56 ------------- .../migrations/0008_auto_20240306_1749.py | 20 ----- .../migrations/0009_auto_20240306_1755.py | 38 --------- .../migrations/0010_projects.py | 37 --------- .../0012_projects_financial_outlay_status.py | 18 ----- .../rs/display_add_staff_details.html | 27 +------ .../rs/display_financial_outlay.html | 10 ++- 22 files changed, 47 insertions(+), 565 deletions(-) delete mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20240302_2013.py delete mode 100644 FusionIIIT/applications/globals/migrations/0003_auto_20240303_1017.py delete mode 100644 FusionIIIT/applications/globals/migrations/0004_auto_20240303_1153.py delete mode 100644 FusionIIIT/applications/globals/migrations/0005_auto_20240303_1505.py delete mode 100644 FusionIIIT/applications/globals/migrations/0006_auto_20240303_2124.py delete mode 100644 FusionIIIT/applications/globals/migrations/0007_auto_20240306_1805.py delete mode 100644 FusionIIIT/applications/globals/migrations/0008_auto_20240306_1851.py delete mode 100644 FusionIIIT/applications/globals/migrations/0009_auto_20240310_2142.py rename FusionIIIT/applications/research_procedures/migrations/{0011_auto_20240306_1851.py => 0002_category_financial_outlay_projects_staff_allocations.py} (62%) delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0002_pr_test.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0003_prudvi.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0004_auto_20240303_1017.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0005_auto_20240303_1153.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0006_auto_20240303_2124.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0007_auto_20240303_2348.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0008_auto_20240306_1749.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0009_auto_20240306_1755.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0010_projects.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0012_projects_financial_outlay_status.py diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20240302_2013.py b/FusionIIIT/applications/globals/migrations/0002_auto_20240302_2013.py deleted file mode 100644 index fe2cd112a..000000000 --- a/FusionIIIT/applications/globals/migrations/0002_auto_20240302_2013.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-02 20:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0003_auto_20240303_1017.py b/FusionIIIT/applications/globals/migrations/0003_auto_20240303_1017.py deleted file mode 100644 index ccd5863be..000000000 --- a/FusionIIIT/applications/globals/migrations/0003_auto_20240303_1017.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 10:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0002_auto_20240302_2013'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0004_auto_20240303_1153.py b/FusionIIIT/applications/globals/migrations/0004_auto_20240303_1153.py deleted file mode 100644 index 07d0717cd..000000000 --- a/FusionIIIT/applications/globals/migrations/0004_auto_20240303_1153.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 11:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0003_auto_20240303_1017'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0005_auto_20240303_1505.py b/FusionIIIT/applications/globals/migrations/0005_auto_20240303_1505.py deleted file mode 100644 index 56c1ecbbb..000000000 --- a/FusionIIIT/applications/globals/migrations/0005_auto_20240303_1505.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 15:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0004_auto_20240303_1153'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0006_auto_20240303_2124.py b/FusionIIIT/applications/globals/migrations/0006_auto_20240303_2124.py deleted file mode 100644 index fabd6c7f0..000000000 --- a/FusionIIIT/applications/globals/migrations/0006_auto_20240303_2124.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 21:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0005_auto_20240303_1505'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0007_auto_20240306_1805.py b/FusionIIIT/applications/globals/migrations/0007_auto_20240306_1805.py deleted file mode 100644 index 4eb5600fb..000000000 --- a/FusionIIIT/applications/globals/migrations/0007_auto_20240306_1805.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0006_auto_20240303_2124'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0008_auto_20240306_1851.py b/FusionIIIT/applications/globals/migrations/0008_auto_20240306_1851.py deleted file mode 100644 index c9699a1e1..000000000 --- a/FusionIIIT/applications/globals/migrations/0008_auto_20240306_1851.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0007_auto_20240306_1805'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0009_auto_20240310_2142.py b/FusionIIIT/applications/globals/migrations/0009_auto_20240310_2142.py deleted file mode 100644 index ea03ff90d..000000000 --- a/FusionIIIT/applications/globals/migrations/0009_auto_20240310_2142.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-10 21:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0008_auto_20240306_1851'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py index 33988748c..2b3ff3118 100644 --- a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py +++ b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py @@ -57,19 +57,19 @@ class Migration(migrations.Migration): # ('students_under_group', models.ManyToManyField(related_name='allstudents', to=settings.AUTH_USER_MODEL)), # ], # ), - migrations.CreateModel( - name='Patent', - 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')), - ], - ), + # migrations.CreateModel( + # name='Patent', + # 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')), + # ], + # ), # migrations.CreateModel( # name='ConsultancyProject', # fields=[ diff --git a/FusionIIIT/applications/research_procedures/migrations/0011_auto_20240306_1851.py b/FusionIIIT/applications/research_procedures/migrations/0002_category_financial_outlay_projects_staff_allocations.py similarity index 62% rename from FusionIIIT/applications/research_procedures/migrations/0011_auto_20240306_1851.py rename to FusionIIIT/applications/research_procedures/migrations/0002_category_financial_outlay_projects_staff_allocations.py index e08aba382..7d98dd9bb 100644 --- a/FusionIIIT/applications/research_procedures/migrations/0011_auto_20240306_1851.py +++ b/FusionIIIT/applications/research_procedures/migrations/0002_category_financial_outlay_projects_staff_allocations.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:51 +# Generated by Django 3.1.5 on 2024-03-11 05:02 from django.conf import settings from django.db import migrations, models @@ -7,9 +7,11 @@ class Migration(migrations.Migration): + initial = True + dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('research_procedures', '0010_projects'), + ('research_procedures', '0001_initial'), ] operations = [ @@ -24,10 +26,26 @@ class Migration(migrations.Migration): 'ordering': ['-category_id'], }, ), - migrations.AddField( - model_name='projects', - name='project_description', - field=models.CharField(default='description', max_length=500), + migrations.CreateModel( + name='projects', + fields=[ + ('project_id', models.IntegerField(primary_key=True, serialize=False)), + ('project_name', models.CharField(max_length=500)), + ('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_description', models.CharField(default='description', max_length=500)), + ('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='staff_allocations', diff --git a/FusionIIIT/applications/research_procedures/migrations/0002_pr_test.py b/FusionIIIT/applications/research_procedures/migrations/0002_pr_test.py deleted file mode 100644 index 577ed037a..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0002_pr_test.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 09:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='pr_test', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=120)), - ('age', models.IntegerField()), - ], - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0003_prudvi.py b/FusionIIIT/applications/research_procedures/migrations/0003_prudvi.py deleted file mode 100644 index bb6eed369..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0003_prudvi.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 09:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0002_pr_test'), - ] - - operations = [ - migrations.CreateModel( - name='prudvi', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=120)), - ('age', models.IntegerField()), - ], - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0004_auto_20240303_1017.py b/FusionIIIT/applications/research_procedures/migrations/0004_auto_20240303_1017.py deleted file mode 100644 index 3af44b6c1..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0004_auto_20240303_1017.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 10:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0003_prudvi'), - ] - - operations = [ - migrations.CreateModel( - name='projects', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('project_id', models.IntegerField()), - ('project_name', models.CharField(max_length=500)), - ('project_type', models.CharField(max_length=500)), - ('status', models.IntegerField()), - ('financial_outlay', models.IntegerField()), - ('project_investigator_id', models.CharField(max_length=500)), - ('rspc_admin_id', models.CharField(max_length=500)), - ('co_project_investigator_id', models.CharField(max_length=500)), - ('sponsored_agency', models.CharField(max_length=500)), - ('start_date', models.DateField()), - ('submission_date', models.DateField()), - ('finish_date', models.DateField()), - ], - ), - migrations.CreateModel( - name='requests', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('request_id', models.IntegerField()), - ('project_id', models.IntegerField()), - ('request_type', models.CharField(max_length=500)), - ('project_investigator_id', models.CharField(max_length=400)), - ('status', models.IntegerField()), - ], - ), - migrations.DeleteModel( - name='prudvi', - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0005_auto_20240303_1153.py b/FusionIIIT/applications/research_procedures/migrations/0005_auto_20240303_1153.py deleted file mode 100644 index d2314e976..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0005_auto_20240303_1153.py +++ /dev/null @@ -1,78 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 11:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0004_auto_20240303_1017'), - ] - - operations = [ - migrations.CreateModel( - name='project_staff_info', - fields=[ - ('staff_id', models.CharField(max_length=400, primary_key=True, serialize=False)), - ('project_investigator_id', models.CharField(max_length=500)), - ('project_id', models.IntegerField()), - ('staff_name', models.CharField(max_length=400)), - ('status', models.IntegerField()), - ('description', models.CharField(max_length=400)), - ], - ), - migrations.CreateModel( - name='rspc_inventory', - fields=[ - ('inventory_id', models.IntegerField(primary_key=True, serialize=False)), - ('project_id', models.IntegerField()), - ('project_investigator_id', models.CharField(max_length=500)), - ('status', models.IntegerField()), - ('description', models.CharField(max_length=400)), - ('amount', models.IntegerField(default=0)), - ], - ), - migrations.RemoveField( - model_name='patent', - name='faculty_id', - ), - migrations.DeleteModel( - name='pr_test', - ), - migrations.RemoveField( - model_name='projects', - name='id', - ), - migrations.RemoveField( - model_name='requests', - name='id', - ), - migrations.AddField( - model_name='requests', - name='amount', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='requests', - name='description', - field=models.CharField(default=None, max_length=400, null=True), - ), - migrations.AlterField( - model_name='projects', - name='project_id', - field=models.IntegerField(primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='requests', - name='project_investigator_id', - field=models.CharField(max_length=500), - ), - migrations.AlterField( - model_name='requests', - name='request_id', - field=models.IntegerField(primary_key=True, serialize=False), - ), - migrations.DeleteModel( - name='Patent', - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0006_auto_20240303_2124.py b/FusionIIIT/applications/research_procedures/migrations/0006_auto_20240303_2124.py deleted file mode 100644 index 2ec530c35..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0006_auto_20240303_2124.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 21:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0005_auto_20240303_1153'), - ] - - operations = [ - migrations.AlterModelOptions( - name='projects', - options={'ordering': ['-project_id']}, - ), - migrations.RemoveField( - model_name='projects', - name='rspc_admin_id', - ), - migrations.AlterField( - model_name='project_staff_info', - name='status', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='projects', - name='status', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='requests', - name='status', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='rspc_inventory', - name='status', - field=models.IntegerField(default=0), - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0007_auto_20240303_2348.py b/FusionIIIT/applications/research_procedures/migrations/0007_auto_20240303_2348.py deleted file mode 100644 index a55cfb0eb..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0007_auto_20240303_2348.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-03 23:48 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('research_procedures', '0006_auto_20240303_2124'), - ] - - operations = [ - migrations.AlterField( - model_name='project_staff_info', - name='project_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='p_pji', to='research_procedures.projects'), - ), - migrations.AlterField( - model_name='project_staff_info', - name='project_investigator_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='projects', - name='co_project_investigator_id', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jn_copi', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='projects', - name='project_investigator_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jn_pid', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='requests', - name='project_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects'), - ), - migrations.AlterField( - model_name='requests', - name='project_investigator_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rj_pi', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='rspc_inventory', - name='project_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='research_procedures.projects'), - ), - migrations.AlterField( - model_name='rspc_inventory', - name='project_investigator_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rin_pi', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0008_auto_20240306_1749.py b/FusionIIIT/applications/research_procedures/migrations/0008_auto_20240306_1749.py deleted file mode 100644 index 9e95a61f9..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0008_auto_20240306_1749.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 17:49 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0007_auto_20240303_2348'), - ] - - operations = [ - migrations.AlterModelOptions( - name='requests', - options={'ordering': ['-request_id']}, - ), - migrations.DeleteModel( - name='project_staff_info', - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0009_auto_20240306_1755.py b/FusionIIIT/applications/research_procedures/migrations/0009_auto_20240306_1755.py deleted file mode 100644 index 2775ac14b..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0009_auto_20240306_1755.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 17:55 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0008_auto_20240306_1749'), - ] - - operations = [ - migrations.RemoveField( - model_name='requests', - name='project_id', - ), - migrations.RemoveField( - model_name='requests', - name='project_investigator_id', - ), - migrations.RemoveField( - model_name='rspc_inventory', - name='project_id', - ), - migrations.RemoveField( - model_name='rspc_inventory', - name='project_investigator_id', - ), - migrations.DeleteModel( - name='projects', - ), - migrations.DeleteModel( - name='requests', - ), - migrations.DeleteModel( - name='rspc_inventory', - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0010_projects.py b/FusionIIIT/applications/research_procedures/migrations/0010_projects.py deleted file mode 100644 index 590562836..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0010_projects.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:05 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('research_procedures', '0009_auto_20240306_1755'), - ] - - operations = [ - migrations.CreateModel( - name='projects', - fields=[ - ('project_id', models.IntegerField(primary_key=True, serialize=False)), - ('project_name', models.CharField(max_length=500)), - ('project_type', models.CharField(max_length=500)), - ('status', models.IntegerField(default=0)), - ('sponsored_agency', models.CharField(max_length=500)), - ('start_date', models.DateField()), - ('submission_date', models.DateField()), - ('finish_date', models.DateField()), - ('years', models.IntegerField()), - ('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'], - }, - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/0012_projects_financial_outlay_status.py b/FusionIIIT/applications/research_procedures/migrations/0012_projects_financial_outlay_status.py deleted file mode 100644 index bf9ec143e..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0012_projects_financial_outlay_status.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-10 21:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('research_procedures', '0011_auto_20240306_1851'), - ] - - operations = [ - migrations.AddField( - model_name='projects', - name='financial_outlay_status', - field=models.IntegerField(default=0), - ), - ] diff --git a/FusionIIIT/templates/rs/display_add_staff_details.html b/FusionIIIT/templates/rs/display_add_staff_details.html index 5d1c19e22..d05d4ded9 100644 --- a/FusionIIIT/templates/rs/display_add_staff_details.html +++ b/FusionIIIT/templates/rs/display_add_staff_details.html @@ -11,31 +11,6 @@ $(this).closest(".message").transition("fade"); }); - function populate( categoriesId, category_subcategory_map,year) { - console.log(category_subcategory_map) - let id1 = "subcategory-select-"+year+ "-"; - let id2 = categoriesId; - id1 += id2.charAt(id2.length - 1); - subcategoriesId= id1; - var categoriesSelect = document.getElementById(categoriesId); - var subcategoriesSelect = document.getElementById(subcategoriesId); - - subcategoriesSelect.innerHTML = ""; - var optionArray = category_subcategory_map - var selectedSubcategories = []; - for (var key in optionArray) { - if (categoriesSelect.value == key) { - selectedSubcategories = optionArray[key]; - } - } - for (var j = 0; j < selectedSubcategories.length; j++) { - var newOption = document.createElement("option"); - newOption.value = selectedSubcategories[j]; - newOption.innerHTML = selectedSubcategories[j]; - subcategoriesSelect.options.add(newOption); - } - - } function addCategorySection(event,year,category_subcategory_map) { event.preventDefault(); @@ -167,6 +142,8 @@ + + diff --git a/FusionIIIT/templates/rs/display_financial_outlay.html b/FusionIIIT/templates/rs/display_financial_outlay.html index fee1aeadc..505ce52a2 100644 --- a/FusionIIIT/templates/rs/display_financial_outlay.html +++ b/FusionIIIT/templates/rs/display_financial_outlay.html @@ -38,12 +38,14 @@ {% for year in years %}

Year {{year}}

- +
- + + + @@ -54,6 +56,10 @@ + + + + {% endif %} {% endfor %} From 5ff28797581a008e99b590a96ca686f3b2575063 Mon Sep 17 00:00:00 2001 From: SharanKumar06 Date: Thu, 25 Apr 2024 15:33:28 +0530 Subject: [PATCH 2/8] multi copis --- .../research_procedures/models.py | 35 ++---- FusionIIIT/templates/rs/add_copis.html | 102 ++++++++++++++++++ .../templates/rs/display_add_copis.html | 96 +++++++++++++++++ .../templates/rs/display_add_projects.html | 62 ++++++++++- 4 files changed, 264 insertions(+), 31 deletions(-) create mode 100644 FusionIIIT/templates/rs/add_copis.html create mode 100644 FusionIIIT/templates/rs/display_add_copis.html diff --git a/FusionIIIT/applications/research_procedures/models.py b/FusionIIIT/applications/research_procedures/models.py index 9279939d2..b07205167 100644 --- a/FusionIIIT/applications/research_procedures/models.py +++ b/FusionIIIT/applications/research_procedures/models.py @@ -101,34 +101,15 @@ def __str__(self): class Meta: ordering = ['-request_id'] -# class requests(models.Model): -# request_id=models.IntegerField(primary_key=True) -# project_id= models.ForeignKey(projects, on_delete=models.CASCADE) -# request_type=models.CharField(max_length=500) -# project_investigator_id=models.ForeignKey(User, related_name='rj_pi' , on_delete= models.CASCADE) -# status= models.IntegerField(default=0) #value 0 means pending -# description=models.CharField(max_length=400,default=None, null= True) -# amount= models.IntegerField(default=0) #value 0 means pending - -# class Meta: -# ordering = ['-request_id'] - -# class rspc_inventory(models.Model): -# inventory_id=models.IntegerField(primary_key=True) -# project_id= models.ForeignKey(projects, on_delete=models.CASCADE) -# project_investigator_id=models.ForeignKey(User, related_name="rin_pi" , on_delete= models.CASCADE) -# status= models.IntegerField(default=0) #value 0 means pending -# description=models.CharField(max_length=400) -# amount= models.IntegerField(default=0) #value 0 means pending - -# class project_staff_info(models.Model): -# staff_id=models.CharField(primary_key=True,max_length=400) -# project_investigator_id= models.ForeignKey(User, on_delete=models.CASCADE) -# project_id=models.ForeignKey(projects, related_name='p_pji', on_delete=models.CASCADE) -# staff_name=models.CharField(max_length=400) -# status=models.IntegerField(default=0) -# description=models.CharField(max_length=400) +class co_project_investigator(models.Model): + co_pi_id= models.ForeignKey(User, on_delete=models.CASCADE) + project_id= models.ForeignKey(projects, on_delete=models.CASCADE) + def __str__(self): + return str(self.co_pi_id) + + class Meta: + ordering = ['-co_pi_id'] diff --git a/FusionIIIT/templates/rs/add_copis.html b/FusionIIIT/templates/rs/add_copis.html new file mode 100644 index 000000000..d1dabda1c --- /dev/null +++ b/FusionIIIT/templates/rs/add_copis.html @@ -0,0 +1,102 @@ +{% extends 'globals/base.html' %} +{% load static %} + + +{% block title %} +IPR +{% endblock %} + + +{% block body %} + {% block navBar %} + {% include 'dashboard/navbar.html' %} + {% endblock %} + + + + + +{% comment %}The grid starts here!{% endcomment %} +
+ + {% comment %}The left-margin segment!{% endcomment %} +
+ + {% comment %} + The left-rail segment starts here! + {% endcomment %} +
+ + {% comment %}The user image card starts here!{% endcomment %} + {% block usercard %} + {% include 'globals/usercard.html' %} + {% endblock %} + {% comment %}The user image card ends here!{% endcomment %} + +
+ + {% comment %}The Tab-Menu starts here!{% endcomment %} +
+ {% block menucard %} + {% include 'rs/menu_card.html' with user_extra_info=user_extra_info designations=user_designations %} + {% endblock %} + +
+ {% comment %}The Tab-Menu ends here!{% endcomment %} + +
+ + {% comment %} + The left-rail segment ends here! + {% endcomment %} + + {% comment %} + The central-rail segment starts here! + {% endcomment %} + +
+ + +
+ {% block add_copis %} + {% include 'rs/display_add_copis.html' %} + {% endblock %} +
+ + + + +
+ + {% comment %}The central-rail segment ends here!{% endcomment %} + + {% comment %}The right-rail segment starts here!{% endcomment %} +
+
+ {% comment %} + TODO: the right rail! + {% endcomment %} +
+
+ {% comment %}The right-rail segment ends here!{% endcomment %} + + {% comment %}The right-margin segment!{% endcomment %} +
+ +
+ +{% comment %}The grid ends here!{% endcomment %} + +{% endblock %} + +{% block javascript %} + + + + + + +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/rs/display_add_copis.html b/FusionIIIT/templates/rs/display_add_copis.html new file mode 100644 index 000000000..c44a4cb5d --- /dev/null +++ b/FusionIIIT/templates/rs/display_add_copis.html @@ -0,0 +1,96 @@ + +{% load static %} + +{% block title %} + +{% endblock %} + +{% block add_copis %} + +{% block body %} + + + + + + + +
+ +
+ +
+ + +
+ {% csrf_token %} + +
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ +
+ + +
+ +
+ + {% comment %}
+ + +
{% endcomment %} + {% comment %} {% endcomment %} +
+
+ + +
+{% endblock %} +{% endblock %} diff --git a/FusionIIIT/templates/rs/display_add_projects.html b/FusionIIIT/templates/rs/display_add_projects.html index 39e40db0e..e180c7706 100644 --- a/FusionIIIT/templates/rs/display_add_projects.html +++ b/FusionIIIT/templates/rs/display_add_projects.html @@ -50,6 +50,42 @@ } }); }); + + function add_copis(event){ + event.preventDefault(); + var co_project_investigator_id = document.getElementById('co_project_investigator_id'); + var clonedcopis = co_project_investigator_id.cloneNode(true); + var clonedcopis_id = 'co_project_investigator_id'; + var count = document.querySelectorAll('.co_project_investigator_id').length + 1; + var newcopis = 'co_project_investigator_id-' + count; + clonedcopis.setAttribute('id',newcopis); + clonedcopis.setAttribute('name',newcopis); + var co_pi_container = document.getElementById('co_pi_container'); + co_pi_container.appendChild(clonedcopis); + var remove_copis = document.getElementById('remove_copis'); + remove_copis.setAttribute('class','remove_copis'); + + } + + function remove_copis(event){ + event.preventDefault(); + var co_project_investigator_id = document.getElementById('co_project_investigator_id'); + var count = document.querySelectorAll('.co_project_investigator_id').length; + if(count > 1){ + var lastcopis = document.getElementById('co_project_investigator_id-' + count); + lastcopis.remove(); + if(count == 2){ + var remove_copis = document.getElementById('remove_copis'); + remove_copis.setAttribute('class','remove_copis invisible'); + } + } + if(count == 1){ + var remove_copis = document.getElementById('remove_copis'); + remove_copis.setAttribute('class','remove_copis invisible'); + } + + } +
Category SubcategoryAmountTotal AmountAmount UtilisedAmount Remaining
{{ item.category }} {{ item.sub_category }} {{ item.amount }}{{ item.amount }}{{ item.amount - item.amount }}