Gad 2 New Commits

FusionIIIT/applications/globals/api/views.py

@@ -103,6 +103,12 @@ def profile(request, username=None):
         return Response(data=resp, status=status.HTTP_200_OK)
     elif profile['user_type'] == 'faculty':
         return redirect('/eis/api/profile/' + (username+'/' if username else ''))
+    elif profile['user_type'] == 'staff':
+        resp = {
+            'user' : user_detail,
+            'profile' : profile,
+        }
+        return Response(data=resp, status=status.HTTP_200_OK)
 
 @api_view(['PUT'])
 def profile_update(request):

FusionIIIT/applications/globals/migrations/0004_auto_20240412_1408.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-04-12 14:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('globals', '0003_auto_20240308_1025'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extrainfo',
+            name='user_status',
+            field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50),
+        ),
+    ]

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

@@ -223,4 +223,18 @@ class Migration(migrations.Migration):
                 ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)),
             ],
         ),
+        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()),
+                ('directorApproval', models.IntegerField()),
+                ('deanProcessed', models.IntegerField()),
+                ('status', models.CharField(max_length=200)),
+            ],
+        ),
     ]

FusionIIIT/applications/iwdModuleV2/migrations/0002_auto_20240412_1408.py

@@ -0,0 +1,106 @@
+# Generated by Django 3.1.5 on 2024-04-12 14:08
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('iwdModuleV2', '0001_initial'),
+    ]
+
+    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='Inventory',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('quantity', models.IntegerField(default=0)),
+                ('cost', models.IntegerField(default=0)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='requests',
+            name='billGenerated',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='requests',
+            name='billProcessed',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='requests',
+            name='billSettled',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='requests',
+            name='issuedWorkOrder',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='requests',
+            name='workCompleted',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='requests',
+            name='deanProcessed',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='requests',
+            name='directorApproval',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='requests',
+            name='engineerProcessed',
+            field=models.IntegerField(default=0),
+        ),
+        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='UsedItems',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('itemName', models.CharField(max_length=200)),
+                ('cost', models.IntegerField(default=0)),
+                ('quantity', models.IntegerField(default=0)),
+                ('date', models.DateField(default=datetime.date.today)),
+                ('request_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.requests')),
+            ],
+        ),
+        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')),
+            ],
+        ),
+    ]

FusionIIIT/applications/iwdModuleV2/models.py

@@ -161,39 +161,50 @@ class NoOfTechnicalBidTimes(models.Model):
     number = models.IntegerField()
 
 class Requests(models.Model):
-    # id = models.IntegerField(primary_key=True, max_length=200)
     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()
-    directorApproval = models.IntegerField()
-    deanProcessed = models.IntegerField()
+    engineerProcessed = models.IntegerField(default=0)
+    directorApproval = models.IntegerField(default=0)
+    deanProcessed = models.IntegerField(default=0)
     status = models.CharField(max_length=200)
-    issuedWorkOrder = models.IntegerField()
-    workCompleted = models.IntegerField()
+    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)
 
 class WorkOrder(models.Model):
-    request_id = models.IntegerField()
+    # request_id = models.IntegerField()
+    request_id = models.ForeignKey(Requests, on_delete=models.CASCADE)
     name = models.CharField(max_length=200)
     date = models.DateField(default=date.today)
     agency = models.CharField(max_length=200)
-    amount = models.IntegerField()
-    deposit = models.IntegerField()
+    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()
 
 class Inventory(models.Model):
     name = models.CharField(max_length=200)
-    quantity = models.IntegerField()
-    cost = models.IntegerField()
+    quantity = models.IntegerField(default=0)
+    cost = models.IntegerField(default=0)
+
+class UsedItems(models.Model):
+    # requestId = models.IntegerField()
+    request_id = models.ForeignKey(Requests, on_delete=models.CASCADE)
+    itemName = models.CharField(max_length=200)
+    cost = models.IntegerField(default=0)
+    quantity = models.IntegerField(default=0)
+    date = models.DateField(default=date.today)
 
 class Bills(models.Model):
-    key = models.ForeignKey(Projects, on_delete=models.CASCADE, unique=True)
+    # requestId = models.IntegerField()
+    request_id = models.ForeignKey(Requests, on_delete=models.CASCADE)
+    file = models.FileField()
+
+class Budget(models.Model):
     name = models.CharField(max_length=200)
-    work = models.CharField(max_length=200)
-    description = models.CharField(max_length=200)
-    agency = models.CharField(max_length=200)
-    bill_processed = models.IntegerField()
-    bill_settled = models.IntegerField()
+    budgetIssued = models.IntegerField(default=0)

FusionIIIT/applications/iwdModuleV2/urls.py

@@ -45,6 +45,10 @@
     url('deanProcessedRequestsView/',views.deanProcessedRequests, name='Dean-Processed-Requests view'),
     url('handleDirectorApprovalRequests/', views.handleDirectorApprovalRequests, name='Director-Approval-Requests'),
     url('handleDirectorRejectionRequests/', views.handleDirectorRejectionRequests, name='Director-Rejection-Requests'),
+    url('updateRejectedRequests/', views.updateRejectedRequests, name='Update-Rejected-Requests'),
+    url('handleUpdateRequests/', views.handleUpdateRequests, name='Handle-Update-Requests'),
+    # url('rejectedRequests/', views.rejectedRequests, name='Rejected-Requests'),
+    url('rejectedRequestsView/',views.rejectedRequests, name='Rejected Requests view'),
     url('requestsStatus/', views.requestsStatus, name='Requests-Status'),
     url('fetchDesignations/', views.fetchDesignations, name='Fetch-Designations'),
     url('fetchRequest/', views.fetchRequest, name='Fetch-Request'),
@@ -58,6 +62,20 @@
     url('requestsInProgess/', views.requestsInProgess, name='Requests In Progress'),
     url('workCompleted/', views.workCompleted, name='Work Completed'),
     url('requestFromInventory/', views.requestFromInventory, name='Request From Inventory'),
+    url('editInventoryAfterRequest/', views.editInventoryAfterRequest, name='Edit-Inventory-After-Request'),
+    url('generateFinalBill/', views.generateFinalBill, name='Generate-Final-Bill'),
+    url('handleBillGeneratedRequests/', views.handleBillGeneratedRequests, name='Handle-Bill-Generated-Requests'),
+    url('generatedBillsView/', views.generatedBillsView, name='Generated-Bills-View'),
+    url('handleProcessedBills/', views.handleProcessedBills, name='Handle-Processed-Bills'),
+    url('auditDocumentView/', views.auditDocumentView, name='Audit-Document-View'),
+    url('auditDocument/', views.auditDocument, name='Audit-Document'),
+    url('settleBillsView/', views.settleBillsView, name='Settle-Bills-View'),
+    url('handleSettleBillRequests/', views.handleSettleBillRequests, name='Handle-Settle-Bill-Requests'),
+    url('viewBudget/', views.viewBudget, name='View-Budget'),
+    url('budget/', views.budget, name='Budget'),
+    url('addBudget/', views.addBudget, name='Add-Budget'),
+    url('editBudgetView/', views.editBudgetView, name='Edit-Budget-View'),
+    url('editBudget/', views.editBudget, name='Edit-Budget'),
     # url('billsView/',views.billsView, name='Bills View'),
 
 ]