Gad 2(latest) (FusionIIIT#1735)

* Added API folder in iwdModuleV2

* Added endpoints in API folder in iwdModuleV2

* Added additional endpoints in API folder in iwdModuleV2

* fix[api] : fetchdesignation, requestview

* fix : view file endpoint

* minor updates while updating the issue-work-order table (#4)

* minor changes (#5)

* minor changes

* minor changes

* approve/reject  and view file

* fix: work order

* Minor changes in addBudget and editBudget endpoints (#6)

* fix : serializer

* modified views related to audit document view (#7)

* Added API folder in iwdModuleV2

* modified views related to audit document view

* fixed apis

* fix: serializer overriding requestCreatedBdBy value

* fix: serializer overriding requestCreatedBdBy value

* fix api

* chore: made handlers consistent

* major fixes

* fix: handle dean process request file attachment upload

* fix : forward file

* Basic proposal system implemented (#8)

* Basic proposal system implemented

* Added a separate Items model and updated ProposalSerializer

* Updated BE

* Removed migrations

* Minor changes

* Update models.py

* Update models.py

---------

Co-authored-by: Divyansh Bisht <[email protected]>

* fix : migrations

* chore : aded proposal endpoint

* get_proposal

* fixed create_proposal function

* Updated handle_update_requests and create_proposal endpoints

* Minor cleanup

* Updated handle_update_requests and create_proposal endpoints (#11)

* Updated handle_update_requests and create_proposal endpoints

* Minor cleanup

* fix: request_id fetch (#12)

* Added get_items endpoint

* fixed all proposal related apis

* fix: migrations

* fix: DB cleaning

* fix: request status api

* fix : migrations mismatch

* fix: migrations issue

---------

Co-authored-by: Bhargavzz <[email protected]>
Co-authored-by: Abhijeet <[email protected]>
Co-authored-by: dotniiko <[email protected]>
Co-authored-by: Dhruv Ratmele <[email protected]>
Co-authored-by: Abhijeet Patil <[email protected]>
Co-authored-by: Bhargavzz <[email protected]>
Co-authored-by: Himanshu <[email protected]>
Co-authored-by: Somgester <[email protected]>

Author: 5 people

FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.1.5 on 2025-02-20 04:42
+# Generated by Django 3.1.5 on 2025-03-25 05:26
 
 import datetime
 from django.db import migrations, models
@@ -21,20 +21,6 @@ class Migration(migrations.Migration):
                 ('budgetIssued', models.IntegerField(default=0)),
             ],
         ),
-        migrations.CreateModel(
-            name='FinancialBidDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=200)),
-                ('description', models.CharField(max_length=200)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Projects',
-            fields=[
-                ('id', models.CharField(max_length=200, primary_key=True, serialize=False)),
-            ],
-        ),
         migrations.CreateModel(
             name='Requests',
             fields=[
@@ -55,24 +41,6 @@ class Migration(migrations.Migration):
                 ('activeProposal', models.IntegerField(null=True)),
             ],
         ),
-        migrations.CreateModel(
-            name='WorkOrderForm',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('issueDate', models.DateField()),
-                ('nitNiqNo', models.IntegerField()),
-                ('agency', models.CharField(max_length=200)),
-                ('name', models.CharField(max_length=200)),
-                ('amount', models.IntegerField()),
-                ('time', models.IntegerField()),
-                ('monthDay', models.IntegerField()),
-                ('startDate', models.DateField()),
-                ('completionDate', models.DateField()),
-                ('deposit', models.IntegerField()),
-                ('contractDay', models.IntegerField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
         migrations.CreateModel(
             name='WorkOrder',
             fields=[
@@ -88,24 +56,6 @@ class Migration(migrations.Migration):
                 ('request_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.requests')),
             ],
         ),
-        migrations.CreateModel(
-            name='TechnicalBidDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=200)),
-                ('requirements', models.CharField(max_length=200)),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='TechnicalBidContractorDetails',
-            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)),
-                ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.technicalbiddetails')),
-            ],
-        ),
         migrations.CreateModel(
             name='Proposal',
             fields=[
@@ -119,148 +69,20 @@ class Migration(migrations.Migration):
                 ('request', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='proposals', to='iwdModuleV2.requests')),
             ],
         ),
-        migrations.CreateModel(
-            name='PreBidDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=200)),
-                ('nameOfParticipants', models.CharField(max_length=200)),
-                ('issuesRaised', models.CharField(max_length=200)),
-                ('responseDecision', models.CharField(max_length=200)),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='PageTwoDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('corrigendum', models.FileField(null=True, upload_to='')),
-                ('addendum', models.FileField(null=True, upload_to='')),
-                ('preBidMeetingDetails', models.FileField(null=True, upload_to='')),
-                ('technicalBidMeetingDetails', models.FileField(null=True, upload_to='')),
-                ('technicallyQualifiedAgencies', models.CharField(max_length=200, null=True)),
-                ('financialBidMeetingDetails', models.FileField(null=True, upload_to='')),
-                ('nameOfLowestAgency', models.CharField(max_length=200, null=True)),
-                ('letterOfIntent', models.FileField(null=True, upload_to='')),
-                ('workOrder', models.FileField(null=True, upload_to='')),
-                ('agreementLetter', models.FileField(null=True, upload_to='')),
-                ('milestones', models.FileField(null=True, upload_to='')),
-                ('page_id', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='PageThreeDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('extensionOfTime', models.FileField(upload_to='')),
-                ('actualCostOfBuilding', models.IntegerField()),
-                ('page_id', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='PageOneDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('aESFile', models.FileField(null=True, upload_to='')),
-                ('dASA', models.DateField(null=True)),
-                ('nitNiqNo', models.IntegerField(null=True)),
-                ('proTh', models.CharField(max_length=200, null=True)),
-                ('emdDetails', models.CharField(max_length=200, null=True)),
-                ('preBidDate', models.DateField(max_length=200, null=True)),
-                ('technicalBidDate', models.DateField(null=True)),
-                ('financialBidDate', models.DateField(null=True)),
-                ('page_id', models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='NoOfTechnicalBidTimes',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('number', models.IntegerField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Milestones',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=200)),
-                ('description', models.CharField(max_length=200)),
-                ('timeAllowed', models.IntegerField()),
-                ('amountWithheld', models.IntegerField()),
-                ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='LetterOfIntentDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('nitNiqNo', models.IntegerField()),
-                ('dateOfOpening', models.DateField()),
-                ('agency', models.CharField(max_length=200)),
-                ('name', models.CharField(max_length=200)),
-                ('tenderValue', models.IntegerField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
         migrations.CreateModel(
             name='Item',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('description', models.TextField()),
-                ('unit', models.CharField(max_length=50)),
-                ('price_per_unit', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('name', models.CharField(default=' ', max_length=255)),
+                ('description', models.TextField(default=' ')),
+                ('unit', models.CharField(default=' ', max_length=50)),
+                ('price_per_unit', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
                 ('quantity', models.IntegerField(default=0)),
-                ('total_price', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('total_price', models.DecimalField(decimal_places=2, default=0, max_digits=10)),
                 ('docs', models.FileField(blank=True, null=True, upload_to='items/')),
                 ('proposal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='iwdModuleV2.proposal')),
             ],
         ),
-        migrations.CreateModel(
-            name='FinancialContractorDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=200)),
-                ('estimatedCost', models.IntegerField()),
-                ('percentageRelCost', models.IntegerField()),
-                ('perFigures', models.IntegerField()),
-                ('totalCost', models.IntegerField()),
-                ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.financialbiddetails')),
-            ],
-        ),
-        migrations.AddField(
-            model_name='financialbiddetails',
-            name='key',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects'),
-        ),
-        migrations.CreateModel(
-            name='ExtensionOfTimeDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=200)),
-                ('hindrance', models.CharField(max_length=200)),
-                ('periodOfHindrance', models.IntegerField()),
-                ('periodOfExtension', models.IntegerField()),
-                ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='CorrigendumTable',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('issueDate', models.DateField()),
-                ('nitNo', models.IntegerField()),
-                ('name', models.CharField(max_length=200)),
-                ('lastDate', models.DateField(null=True)),
-                ('lastTime', models.TimeField()),
-                ('env1BidOpeningDate', models.DateField()),
-                ('env1BidOpeningTime', models.TimeField()),
-                ('env2BidOpeningDate', models.DateField()),
-                ('env2BidOpeningTime', models.TimeField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
         migrations.CreateModel(
             name='Bills',
             fields=[
@@ -269,40 +91,4 @@ class Migration(migrations.Migration):
                 ('request_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.requests')),
             ],
         ),
-        migrations.CreateModel(
-            name='Agreement',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date', models.DateField()),
-                ('agencyName', models.CharField(max_length=200)),
-                ('workName', models.CharField(max_length=200)),
-                ('fdrSum', models.IntegerField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AESDetails',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('sNo', models.CharField(max_length=100)),
-                ('descOfItems', models.CharField(max_length=200)),
-                ('unit', models.CharField(max_length=200)),
-                ('quantity', models.IntegerField()),
-                ('rate', models.IntegerField()),
-                ('amount', models.IntegerField()),
-                ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Addendum',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('issueDate', models.DateField()),
-                ('nitNiqNo', models.IntegerField()),
-                ('name', models.CharField(max_length=200)),
-                ('openDate', models.DateField()),
-                ('openTime', models.TimeField()),
-                ('key', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')),
-            ],
-        ),
     ]