Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gad 2 added notifications and tracking for each file. #1553

Merged
merged 2 commits into from
Apr 25, 2024
Merged

Gad 2 added notifications and tracking for each file. #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18944dd
Added notifications and tracking for each file
Srivatsa19 Apr 23, 2024
2b28b61
Removed unwanted files
Srivatsa19 Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions FusionIIIT/applications/iwdModuleV2/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,6 @@ class WorkOrder(models.Model):
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()
Expand Down
74 changes: 33 additions & 41 deletions FusionIIIT/applications/iwdModuleV2/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf.urls import url

from django.conf.urls import url, include
from django.urls import path
from . import views

app_name = 'iwdModuleV2'
Expand Down Expand Up @@ -37,45 +37,37 @@
url(r'addendumView/$', views.addendumView, name='Addendum View'),
url('agreementView/$', views.agreementView, name='Agreement 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(r'^requestsView/',views.requestsView, name='Requests view'),
url(r'^createdRequestsView/',views.createdRequests, name='Created Requests view'),
url(r'^handleEngineerProcessRequests/', views.handleEngineerProcessRequests, name='Engineer-Process-Requests'),
url(r'^engineerProcessedRequestsView/',views.engineerProcessedRequests, name='Engineer-Processed-Requests view'),
url(r'^handleDeanProcessRequests/', views.handleDeanProcessRequests, name='Dean-Process-Requests'),
url(r'^deanProcessedRequestsView/',views.deanProcessedRequests, name='Dean-Processed-Requests view'),
url(r'^handleDirectorApprovalRequests/', views.handleDirectorApprovalRequests, name='Director-Approval-Requests'),
url(r'^updateRejectedRequests/', views.updateRejectedRequests, name='Update-Rejected-Requests'),
url(r'^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'),
url(r'^rejectedRequestsView/',views.rejectedRequests, name='Rejected Requests view'),
url(r'^requestsStatus/', views.requestsStatus, name='Requests-Status'),
url(r'^fetchDesignations/', views.fetchDesignations, name='Fetch-Designations'),
url(r'^fetchRequest/', views.fetchRequest, name='Fetch-Request'),
url(r'^issueWorkOrder/', views.issueWorkOrder, name='Issue Work Order'),
url(r'^workOrder/', views.workOrder, name='Work Order'),
url(r'^requestsInProgess/', views.requestsInProgess, name='Requests In Progress'),
url(r'^workCompleted/', views.workCompleted, name='Work Completed'),
url(r'^generateFinalBill/', views.generateFinalBill, name='Generate-Final-Bill'),
url(r'^handleBillGeneratedRequests/', views.handleBillGeneratedRequests, name='Handle-Bill-Generated-Requests'),
url(r'^generatedBillsView/', views.generatedBillsView, name='Generated-Bills-View'),
url(r'^handleProcessedBills/', views.handleProcessedBills, name='Handle-Processed-Bills'),
url(r'^auditDocumentView/', views.auditDocumentView, name='Audit-Document-View'),
url(r'^auditDocument/', views.auditDocument, name='Audit-Document'),
url(r'^settleBillsView/', views.settleBillsView, name='Settle-Bills-View'),
url(r'^handleSettleBillRequests/', views.handleSettleBillRequests, name='Handle-Settle-Bill-Requests'),
url(r'^viewBudget/', views.viewBudget, name='View-Budget'),
url(r'^budget/', views.budget, name='Budget'),
url(r'^addBudget/', views.addBudget, name='Add-Budget'),
url(r'^editBudgetView/', views.editBudgetView, name='Edit-Budget-View'),
url(r'^editBudget/', views.editBudget, name='Edit-Budget'),
path('view_file/<id>/<url>',views.view_file,name="view_file"),

]
Loading