Institute works v1

FusionIIIT/applications/iwdModuleV2/api/urls.py

@@ -1,79 +1,49 @@
 from django.urls import path
+from rest_framework.routers import DefaultRouter
 from . import views
-urlpatterns = [
-
-    # fully implemented
 
-    path('fetch-designations/', views.fetch_designations, name='fetch_designations'),
-    path('fetch-designations/', views.fetch_designations, name='fetch_designations'),
-    path('create-request/', views.create_request, name='create_request'),
-    path('create-proposal/', views.create_proposal, name='create_proposal'),
-    path('created-requests/', views.created_requests, name='created_requests'),
-    path('view-file/', views.view_file, name='view_file'),
-    path('dean-processed-requests/', views.dean_processed_requests, name='dean_processed_requests'),
-    path('handle-director-approval/', views.handle_director_approval, name='handle_director_approval'),
-    path('forward-request/', views.forward_request, name='handle_engineer_process_requests'),
-    path('handle-dean-process-request/', views.handle_dean_process_request, name='handleDeanProcessRequests'),
-    path('rejected-requests-view/', views.rejected_requests, name='rejectedRequests'),
-    path('handle-update-requests/', views.handle_update_requests, name='handleUpdateRequests'),
-    path('director-approved-requests/', views.director_approved_requests, name='issueWorkOrder'),
-    path('issue-work-order/', views.issue_work_order, name='workOrder'),
-    path('requests-in-progress/', views.requests_in_progress, name='requestsInProgress'),
-    path('work-under-progress/', views.work_under_progress, name='workUnderProgress'),
-    path('work-completed/', views.work_completed, name='workCompleted'),
-    path('view-budget/', views.view_budget, name='viewBudget'),
-    path('add-budget/', views.add_budget, name='addBudget'),
-    path('edit-budget/', views.edit_budget, name='editBudget'),
-    path('requests-status/', views.requests_status, name='requestsStatus'),
-    path('audit-document-view/', views.audit_document_view, name='auditDocumentView'),
-    path('audit-document/', views.handle_audit_document, name='auditDocument'),
-    path('get-proposals/', views.get_proposals, name='getProposals'),
-    path('get-items/', views.get_items, name='getItems'),
-    path('handle-admin-approval/', views.handle_admin_approval, name='handleAdminApproval'),
+router = DefaultRouter()
 
-    path('issued-work/', views.get_issued_work, name='activeWork'),
-    path('add-vendor/', views.add_vendor, name="addVendor"),
-    path('get-work/', views.get_work, name="getWork"),
-    path('get-vendors/', views.get_vendors, name="getVendors"),
+# Main resources
+router.register("requests", views.RequestViewSet, basename="requests")
+router.register("budgets", views.BudgetViewSet, basename="budgets")
+router.register("vendors", views.VendorViewSet, basename="vendors")
+router.register("work", views.WorkViewSet, basename="work")
 
-    # partially integrated on frontend
-    path('handle-process-bills/', views.handle_process_bills, name='handleProcessedBills'),
+urlpatterns = router.urls + [
 
-    path('engineer-processed-requests/', views.engineer_processed_requests, name='engineerProcessedRequests'),
-    # path('generate-final-bill/', views.generateFinalBill, name='generateFinalBill'),
-    path('handle-bill-generated-requests/', views.handleBillGeneratedRequests, name='handleBillGeneratedRequests'),
-    path('generated-bills-view/', views.generatedBillsView, name='generatedBillsView'),
-    path('settle-bills-view/', views.settle_bills_view, name='settleBillsView'),
-    path('handle-settle-bill-request/', views.handle_settle_bill_requests, name='handleSettleBillRequest'),
+    # Request workflows
+    path("requests/<int:pk>/forward/", views.forward_request, name="forward-request"),
+    path("requests/<int:pk>/director-approval/", views.handle_director_approval, name="director-approval"),
+    path("requests/<int:pk>/admin-approval/", views.handle_admin_approval, name="admin-approval"),
+    path("requests/<int:pk>/dean-process/", views.handle_dean_process_request, name="dean-process"),
 
-    # Unsure about use or depricated
+    # Status endpoints
+    path("requests-status/", views.requests_status, name="requests-status"),
+    path("rejected-requests/", views.rejected_requests, name="rejected-requests"),
 
-    # path('page1-1/', views.page1_1, name='page1_1'),
-    # path('aes-form/', views.AESForm, name='AESForm'),
-    # path('page2-1/', views.page2_1, name='page2_1'),
-    # path('corrigendum-input/', views.corrigendumInput, name='corrigendumInput'),
-    # path('addendum-input/', views.addendumInput, name='addendumInput'),
-    # path('pre-bid-form/', views.PreBidForm, name='PreBidForm'),
-    # path('no-of-entries-technical-bid/', views.noOfEntriesTechnicalBid, name='noOfEntriesTechnicalBid'),
-    # path('technical-bid-form/', views.TechnicalBidForm, name='TechnicalBidForm'),
-    # path('no-of-entries-financial-bid/', views.noOfEntriesFinancialBid, name='noOfEntriesFinancialBid'),
-    # path('letter-of-intent/', views.letterOfIntent, name='letterOfIntent'),
-    # path('agreement-input/', views.AgreementInput, name='AgreementInput'),
-    # path('milestones-form/', views.milestonesForm, name='milestonesForm'),
-    # path('page3-1/', views.page3_1, name='page3_1'),
-    # path('extension-of-time-form/', views.ExtensionOfTimeForm, name='ExtensionOfTimeForm'),
-    # path('page1-view/', views.page1View, name='page1View'),
-    # path('page2-view/', views.page2View, name='page2View'),
-    # path('aes-view/', views.AESView, name='AESView'),
-    # path('financial-bid-view/', views.financialBidView, name='financialBidView'),
-    # path('technical-bid-view/', views.technicalBidView, name='technicalBidView'),
-    # path('pre-bid-details-view/', views.preBidDetailsView, name='preBidDetailsView'),
-    # path('corrigendum-view/', views.corrigendumView, name='corrigendumView'),
-    # path('addendum-view/', views.addendumView, name='addendumView'),
-    # path('letter-of-intent-view/', views.letterOfIntentView, name='letterOfIntentView'),
-    # path('agreement-view/', views.agreementView, name='agreementView'),
-    # path('milestone-view/', views.milestoneView, name='milestoneView'),
-    # path('page3-view/', views.page3View, name='page3View'),
-    # path('extension-form-view/', views.extensionFormView, name='extensionFormView'),
-]
+    # Work progress
+    path("work/issued/", views.get_issued_work, name="issued-work"),
+    path("work/progress/", views.work_under_progress, name="work-under-progress"),
+    path("work/completed/", views.work_completed, name="work-completed"),
 
+    # Vendor & proposal endpoints
+    path("proposals/", views.get_proposals, name="proposals"),
+    path("items/", views.get_items, name="items"),
+
+    # Budget APIs
+    path("budget/add/", views.add_budget, name="add-budget"),
+    path("budget/edit/", views.edit_budget, name="edit-budget"),
+    path("budget/view/", views.view_budget, name="view-budget"),
+
+    # Audit APIs
+    path("audit/", views.handle_audit_document, name="audit-document"),
+    path("audit/view/", views.audit_document_view, name="audit-document-view"),
+
+    # Billing APIs
+    path("bills/process/", views.handle_process_bills, name="process-bills"),
+    path("bills/generated/", views.generatedBillsView, name="generated-bills"),
+    path("bills/settle/", views.settle_bills_view, name="settle-bills"),
+    path("bills/settle-request/", views.handle_settle_bill_requests, name="settle-bills-request"),
+
+]

FusionIIIT/applications/iwdModuleV2/api/views.py

@@ -1173,4 +1173,8 @@ def handle_admin_approval(request):
         Requests.objects.filter(id=request_id).update(iwdAdminApproval=-1, status="Rejected", activeProposal=None)
         return Response({'message': 'Request rejected by IWD Admin'}, status=status.HTTP_200_OK)
     else:
+<<<<<<< HEAD
         return Response({'error': 'Invalid action'}, status=status.HTTP_400_BAD_REQUEST)
+=======
+        return Response({'error': 'Invalid action'}, status=status.HTTP_400_BAD_REQUEST)
+>>>>>>> upstream/institute-works-v1