Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
2 changes: 2 additions & 0 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
url(r'^__debug__/', include(debug_toolbar.urls)),
url(r'^research_procedures/', include('applications.research_procedures.urls')),
url(r'^accounts/', include('allauth.urls')),

# url(r'^api/iwdModuleV2/', include('applications.iwdModuleV2.api.urls')),


url(r'^eis/', include('applications.eis.urls')),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.1.5 on 2024-10-10 18:36

import datetime
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('central_mess', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='payments',
name='payment_date',
field=models.DateField(default=datetime.date(2024, 10, 10)),
),
migrations.AlterUniqueTogether(
name='payments',
unique_together=set(),
),
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.1.5 on 2024-10-12 14:59
# Generated by Django 3.1.5 on 2024-10-15 14:51

import datetime
from django.db import migrations, models
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.1.5 on 2024-10-21 20:42

import datetime
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('central_mess', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='payments',
name='payment_date',
field=models.DateField(default=datetime.date(2024, 10, 21)),
),
migrations.AlterUniqueTogether(
name='payments',
unique_together=set(),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by Django 3.1.5 on 2024-10-23 05:45

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('central_mess', '0002_auto_20241010_1836'),
('central_mess', '0002_auto_20241021_2042'),
('central_mess', '0002_auto_20241015_1451'),
]

operations = [
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.1.5 on 2024-10-07 23:02
# Generated by Django 3.1.5 on 2024-10-15 14:51

from django.db import migrations, models

Expand Down
140 changes: 140 additions & 0 deletions FusionIIIT/applications/iwdModuleV2/api/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
from rest_framework import serializers
from applications.globals.models import *
from applications.iwdModuleV2.models import *
from applications.ps1.models import *

class WorkOrderFormSerializer(serializers.ModelSerializer):
class Meta:
model = WorkOrder
fields = '__all__'

class AgreementSerializer(serializers.ModelSerializer):
class Meta:
model = Agreement
fields = '__all__'

class MilestonesSerializer(serializers.ModelSerializer):
class Meta:
model = Milestones
fields = '__all__'

class ExtensionOfTimeDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = ExtensionOfTimeDetails
fields = '__all__'

class ProjectsSerializer(serializers.ModelSerializer):
class Meta:
model = Projects
fields = '__all__'

class DesignationSerializer(serializers.ModelSerializer):
class Meta:
model = Designation
fields = ['id', 'name']

class HoldsDesignationSerializer(serializers.ModelSerializer):
designation = DesignationSerializer()
username = serializers.CharField(source='user.username')

class Meta:
model = HoldsDesignation
fields = ['id', 'designation', 'username']

class CreateRequestsSerializer(serializers.ModelSerializer):
class Meta:
model = Requests
fields = ['id', 'name', 'area', 'description', 'requestCreatedBy']

def create(self, validated_data):
validated_data['engineerProcessed'] = 0
validated_data['directorApproval'] = 0
validated_data['deanProcessed'] = 0
validated_data['status'] = "Pending"
validated_data['issuedWorkOrder'] = 0
validated_data['workCompleted'] = 0
validated_data['billGenerated'] = 0
validated_data['billProcessed'] = 0
validated_data['billSettled'] = 0
return super().create(validated_data)

class DirectorApprovedRequestsSerializer(serializers.ModelSerializer):
class Meta:
model = Requests
fields = ['id', 'name', 'area', 'description', 'requestCreatedBy']

class WorkUnderProgressSerializer(serializers.ModelSerializer):
class Meta:
model = Requests
fields = ['id', 'name', 'area', 'description', 'requestCreatedBy', 'issuedWorkOrder', 'workCompleted']


class RequestsInProgressSerializer(serializers.ModelSerializer):
class Meta:
model = Requests
fields = ['id', 'name', 'area', 'description', 'requestCreatedBy', 'issuedWorkOrder', 'workCompleted']

class PageOneDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = PageOneDetails
fields = '__all__'

class PageTwoDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = PageTwoDetails
fields = '__all__'

class PageThreeDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = PageThreeDetails
fields = '__all__'

class AESDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = AESDetails
fields = '__all__'

class CorrigendumTableSerializer(serializers.ModelSerializer):
class Meta:
model = CorrigendumTable
fields = '__all__'

class AddendumSerializer(serializers.ModelSerializer):
class Meta:
model = Addendum
fields = '__all__'

class PreBidDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = PreBidDetails
fields = '__all__'

class NoOfTechnicalBidTimesSerializer(serializers.ModelSerializer):
class Meta:
model = NoOfTechnicalBidTimes
fields = '__all__'

class TechnicalBidDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = TechnicalBidDetails
fields = '__all__'

class TechnicalBidContractorDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = TechnicalBidContractorDetails
fields = '__all__'

class FinancialBidDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = FinancialBidDetails
fields = '__all__'

class FinancialContractorDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = FinancialContractorDetails
fields = '__all__'

class LetterOfIntentDetailsSerializer(serializers.ModelSerializer):
class Meta:
model = LetterOfIntentDetails
fields = '__all__'
70 changes: 70 additions & 0 deletions FusionIIIT/applications/iwdModuleV2/api/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
from django.urls import path
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('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('handle-engineer-process/', views.handle_engineer_process_requests, 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'),

# partially integrated on frontend
path('handle-process-bills/', views.handle_process_bills, name='handleProcessedBills'),

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'),

# Unsure about use or depricated

# 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'),
]

Loading