Skip to content

GAD-2:ALL WEEKS: OVERALL CHANGES #1092

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

Merged
merged 7 commits into from
Feb 16, 2023
Merged

GAD-2:ALL WEEKS: OVERALL CHANGES #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb65c83
Week1 Endpoint 1
anishwar-007 Feb 12, 2023
b97dbf4
Week 1 Endpoint_2_3_4
anishwar-007 Feb 12, 2023
150098b
Week 2 - Remove the redundant next button and add previous
anishwar-007 Feb 12, 2023
6fcc781
Week 3 Task 1 Render to page1View
anishwar-007 Feb 12, 2023
8db0892
Week 3 Task 2 Remove all Hardcoded URL
anishwar-007 Feb 12, 2023
b0ca62a
Week 3 Extra Task - Prev button on Page 1
anishwar-007 Feb 12, 2023
a3fb33c
Week 3 Task 3 Remove Hardcoded URL and link it to IWD Dashboard.
anishwar-007 Feb 12, 2023
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
101 changes: 67 additions & 34 deletions FusionIIIT/applications/iwdModuleV2/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# in conjunction with SRS. After that, everything will become easier.

def dashboard(request):
eligible = False
eligible = True
userObj = request.user
userDesignationObjects = HoldsDesignation.objects.filter(user=userObj)
for p in userDesignationObjects:
Expand Down Expand Up @@ -107,7 +107,8 @@ def page2_1(request):

def corrigendumInput(request):
if request.method == 'POST':
existingObject = CorrigendumTable.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = CorrigendumTable.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = CorrigendumTable()
Expand All @@ -128,7 +129,8 @@ def corrigendumInput(request):

def addendumInput(request):
if request.method == 'POST':
existingObject = Addendum.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = Addendum.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = Addendum()
Expand All @@ -145,7 +147,8 @@ def addendumInput(request):

def PreBidForm(request):
if request.method == 'POST':
existingObject = PreBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = PreBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = PreBidDetails()
Expand All @@ -161,9 +164,11 @@ def PreBidForm(request):

def noOfEntriesTechnicalBid(request):
formNoTechnicalObjects = NoOfTechnicalBidTimes()
formNoTechnicalObjects.key = Projects.objects.get(id=request.session['projectId'])
formNoTechnicalObjects.key = Projects.objects.get(
id=request.session['projectId'])
if request.method == 'POST':
existingObject = NoOfTechnicalBidTimes.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = NoOfTechnicalBidTimes.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formNoTechnicalObjects.number = int(request.POST['number'])
Expand All @@ -174,22 +179,26 @@ def noOfEntriesTechnicalBid(request):

def TechnicalBidForm(request):
formObject = TechnicalBidDetails()
numberOfTechnicalBidTimes = NoOfTechnicalBidTimes.objects.get(key=Projects.objects.get(id=request.session['projectId'])).number
numberOfTechnicalBidTimes = NoOfTechnicalBidTimes.objects.get(
key=Projects.objects.get(id=request.session['projectId'])).number
if request.method == 'POST':
existingObject = TechnicalBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = TechnicalBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = TechnicalBidDetails()
formObject.key = Projects.objects.get(id=request.session['projectId'])
formObject.sNo = request.POST['sNo']
formObject.requirements = request.POST['requirements']
formObject.save()
TechnicalBidContractorDetails.objects.filter(key=formObject).all().delete()
TechnicalBidContractorDetails.objects.filter(
key=formObject).all().delete()
for w in range(numberOfTechnicalBidTimes):
formContractorObject = TechnicalBidContractorDetails()
formContractorObject.key = formObject
formContractorObject.name = request.POST[str(w) + 'name']
formContractorObject.description = request.POST[str(w) + 'Description']
formContractorObject.description = request.POST[str(
w) + 'Description']
formContractorObject.save()
return redirect('iwdModuleV2/noOfEntriesFinancialBid')
return render(request, 'iwdModuleV2/page2_support_4_technicalbid.html',
Expand All @@ -198,12 +207,15 @@ def TechnicalBidForm(request):

def noOfEntriesFinancialBid(request):
listOfContractors = []
objectTechnicalBid = TechnicalBidDetails.objects.get(key=Projects.objects.get(id=request.session['projectId']))
objects = TechnicalBidContractorDetails.objects.filter(key=objectTechnicalBid)
objectTechnicalBid = TechnicalBidDetails.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
objects = TechnicalBidContractorDetails.objects.filter(
key=objectTechnicalBid)
for t in objects:
listOfContractors.append(t.name)
if request.method == 'POST':
existingObject = FinancialBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = FinancialBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = FinancialBidDetails()
Expand All @@ -217,7 +229,8 @@ def noOfEntriesFinancialBid(request):
formContractorObject.name = listOfContractors[f]
formContractorObject.totalCost = request.POST[listOfContractors[f] + 'totalCost']
formContractorObject.estimatedCost = request.POST[listOfContractors[f] + 'estimatedCost']
formContractorObject.percentageRelCost = request.POST[listOfContractors[f] + 'percentageRelCost']
formContractorObject.percentageRelCost = request.POST[
listOfContractors[f] + 'percentageRelCost']
formContractorObject.perFigures = request.POST[listOfContractors[f] + 'perFigures']
formContractorObject.save()
return redirect('iwdModuleV2/letterOfIntent')
Expand All @@ -227,7 +240,8 @@ def noOfEntriesFinancialBid(request):

def letterOfIntent(request):
if request.method == 'POST':
existingObject = LetterOfIntentDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = LetterOfIntentDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = LetterOfIntentDetails()
Expand All @@ -244,7 +258,8 @@ def letterOfIntent(request):

def workOrderForm(request):
if request.method == 'POST':
existingObject = WorkOrderForm.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = WorkOrderForm.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = WorkOrderForm()
Expand All @@ -267,7 +282,8 @@ def workOrderForm(request):

def AgreementInput(request):
if request.method == 'POST':
existingObject = Agreement.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
existingObject = Agreement.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
if existingObject.count() == 1:
existingObject.delete()
formObject = Agreement()
Expand All @@ -291,7 +307,8 @@ def milestonesForm(request):
formObject.timeAllowed = request.POST['timeAllowed']
formObject.save()
return redirect('iwdModuleV2/page3_1')
Milestones.objects.filter(key=Projects.objects.get(id=request.session['projectId'])).all().delete()
Milestones.objects.filter(key=Projects.objects.get(
id=request.session['projectId'])).all().delete()
return render(request, 'iwdModuleV2/page2_support_9_milestone.html', {})


Expand Down Expand Up @@ -321,35 +338,42 @@ def ExtensionOfTimeForm(request):


def page1View(request):
request.session['projectId'] = request.POST['id']
projectPageOne = PageOneDetails.objects.get(id=Projects.objects.get(id=request.session['projectId']))
if request.POST:
request.session['projectId'] = request.POST['id']
projectPageOne = PageOneDetails.objects.get(
id=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Page1.html', {'x': projectPageOne})


def page2View(request):
projectPageTwo = PageTwoDetails.objects.get(id=Projects.objects.get(id=request.session['projectId']))
projectPageTwo = PageTwoDetails.objects.get(
id=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Page2.html', {'x': projectPageTwo})


def AESView(request):
objects = AESDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
objects = AESDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/AA&ES.html', {'AES': objects})


def financialBidView(request):
elements = []
objects = FinancialBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
objects = FinancialBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
for f in objects:
contractorObjects = FinancialContractorDetails.objects.filter(key=f)
for w in contractorObjects:
obj = [f.sNo, f.description, w.name, w.estimatedCost, w.percentageRelCost, w.perFigures, w.totalCost]
obj = [f.sNo, f.description, w.name, w.estimatedCost,
w.percentageRelCost, w.perFigures, w.totalCost]
elements.append(obj)
return render(request, 'iwdModuleV2/Page2_financialbid.html', {'financial': elements})


def technicalBidView(request):
elements = []
objects = TechnicalBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
objects = TechnicalBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
for f in objects:
contractorObjects = TechnicalBidContractorDetails.objects.filter(key=f)
for w in contractorObjects:
Expand All @@ -359,45 +383,54 @@ def technicalBidView(request):


def preBidDetailsView(request):
preBidObjects = PreBidDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
preBidObjects = PreBidDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Page2_pre-bid.html', {'preBidDetails': preBidObjects})


def corrigendumView(request):
corrigendumObject = CorrigendumTable.objects.get(key=Projects.objects.get(id=request.session['projectId']))
corrigendumObject = CorrigendumTable.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/corrigendum.html', {'corrigendum': corrigendumObject})


def addendumView(request):
addendumObject = Addendum.objects.get(key=Projects.objects.get(id=request.session['projectId']))
addendumObject = Addendum.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Addendum.html', {'x': addendumObject})


def letterOfIntentView(request):
letterOfIntentObject = LetterOfIntentDetails.objects.get(key=Projects.objects.get(id=request.session['projectId']))
letterOfIntentObject = LetterOfIntentDetails.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/letterOfIntent.html', {'x': letterOfIntentObject})


def workOrderFormView(request):
workOrderFormObject = WorkOrderForm.objects.get(key=Projects.objects.get(id=request.session['projectId']))
workOrderFormObject = WorkOrderForm.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/WorkOrderForm.html', {'x': workOrderFormObject})


def agreementView(request):
agreementObject = Agreement.objects.get(key=Projects.objects.get(id=request.session['projectId']))
agreementObject = Agreement.objects.get(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Agreement.html', {'agreement': agreementObject})


def milestoneView(request):
milestoneObjects = Milestones.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
milestoneObjects = Milestones.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Page2_milestones.html', {'milestones': milestoneObjects})


def page3View(request):
pageThreeDetails = PageThreeDetails.objects.get(id=Projects.objects.get(id=request.session['projectId']))
pageThreeDetails = PageThreeDetails.objects.get(
id=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/Page3.html', {'x': pageThreeDetails})


def extensionFormView(request):
extensionObjects = ExtensionOfTimeDetails.objects.filter(key=Projects.objects.get(id=request.session['projectId']))
extensionObjects = ExtensionOfTimeDetails.objects.filter(
key=Projects.objects.get(id=request.session['projectId']))
return render(request, 'iwdModuleV2/ExtensionForm.html', {'extension': extensionObjects})
5 changes: 3 additions & 2 deletions FusionIIIT/templates/iwdModuleV2/Page1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<td>AA And AES</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/AESView">i</a></div>
<div><a href="{% url 'iwdModuleV2:AES View' %}">i</a></div>
</div>


Expand Down Expand Up @@ -111,7 +111,8 @@

</tbody>
</table>
<a href="http://172.27.16.216/iwdModuleV2/page2View/">Next</a>
<a class="ui small right floated primary button" href="{% url 'iwdModuleV2:Page 2 View'%}">Next</a>
{% if var %}<h1>{{var}}</h1>{% endif %}
</div>
</div>
</div>
Expand Down
31 changes: 20 additions & 11 deletions FusionIIIT/templates/iwdModuleV2/Page2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,31 +65,34 @@
<td>Corrigendum</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div ><a href="http://172.27.16.216/iwdModuleV2/corrigendumView">i</a></div>
<div ><a href="{% url 'iwdModuleV2:Corrigendum View'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Addendum</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/addendumView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Addendum View'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Pre-bid meeting details</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/preBidDetailsView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Pre Bid Details View'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Technical-bid meeting details</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/technicalBidView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Technical Bid View'%}">i</a></div>
</div>
</td>
</tr>
Expand All @@ -101,7 +104,8 @@
<td>Financial-bid meeting details</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/financialBidView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Financial Bid View'%}">i</a></div>
</div>
</td>
</tr>
Expand All @@ -113,37 +117,42 @@
<td>Letter of intent</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/letterOfIntentView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Letter Of Intent View'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Work order</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/workOrderFormView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Work Order Form View'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Agreement Letter</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/agreementView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Agreement VIew'%}">i</a></div>
</div>
</td>
</tr>
<tr>
<td>Milestones</td>
<td> <div style="display:flex;justify-content: space-between;">
<div><a href="">Download</a></div>
<div><a href="http://172.27.16.216/iwdModuleV2/milestoneView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Milestones'%}">i</a></div>
</div>
</td>
</tr>
</tbody>
</table>
<a href="http://172.27.16.216/iwdModuleV2/page3View/">Next</a>
<a class="ui small left floated primary button" href="{% url 'iwdModuleV2:Page 1 Views' %}">Prev</a>
<a class="ui small right floated primary button" href="{% url 'iwdModuleV2:Page 3 View'%}">Next</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -178,4 +187,4 @@
<script type="text/javascript" src="{% static 'globals/js/datepicker.js' %}"></script>
<script type="text/javascript" src="{% static 'globals/js/tablesort.js' %}"></script>
</script>
{% endblock %}
{% endblock %}
Loading