Gad 2 : Pushing for latest_staging

FusionIIIT/applications/iwdModuleV2/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-
+from datetime import date
 
 # Create your models here.
 
@@ -160,3 +160,51 @@ class NoOfTechnicalBidTimes(models.Model):
     key = models.ForeignKey(Projects, on_delete=models.CASCADE, unique=True)
     number = models.IntegerField()
 
+class Requests(models.Model):
+    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)
+
+class WorkOrder(models.Model):
+    # 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(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(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):
+    # 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)
+    budgetIssued = models.IntegerField(default=0)

FusionIIIT/applications/iwdModuleV2/urls.py

@@ -36,5 +36,46 @@
     url(r'milestoneView/$', views.milestoneView, name='Milestones'),
     url(r'addendumView/$', views.addendumView, name='Addendum View'),
     url('agreementView/$', views.agreementView, name='Agreement VIew'),
-    url(r'corrigendumView/$', views.corrigendumView, name='Corrigendum View')
+    url(r'corrigendumView/$', views.corrigendumView, name='Corrigendum View'),
+    url('requestsView/',views.requestsView, name='Requests view'),
+    url('createdRequestsView/',views.createdRequests, name='Created Requests view'),
+    url('handleEngineerProcessRequests/', views.handleEngineerProcessRequests, name='Engineer-Process-Requests'),
+    url('engineerProcessedRequestsView/',views.engineerProcessedRequests, name='Engineer-Processed-Requests view'),
+    url('handleDeanProcessRequests/', views.handleDeanProcessRequests, name='Dean-Process-Requests'),
+    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'),
+    url('issueWorkOrder/', views.issueWorkOrder, name='Issue Work Order'),
+    url('workOrder/', views.workOrder, name='Work Order'),
+    url('inventory/', views.inventory, name='Inventory'),
+    url('addItemsView/', views.addItemsView, name='Add Items View'),
+    url('addItems/', views.addItems, name='Add Items'),
+    url('editInventoryView/', views.editInventoryView, name='Edit Inventory View'),
+    url('editInventory/', views.editInventory, name='Edit Inventory'),
+    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'),
+
 ]