Skip to content

Removed the redundant 'next' button - #1037 #1038

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

Closed
wants to merge 6 commits into from
Closed

Removed the redundant 'next' button - #1037 #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ab6830
add previous button
Mihir-solanki-13 Feb 3, 2023
fb08c9c
Submit button takes us to the page1Viwe
Mihir-solanki-13 Feb 10, 2023
882b830
remove hardcoded url of page1view
Mihir-solanki-13 Feb 10, 2023
2038437
remove hardcoded url of page2view and add next and prev button
Mihir-solanki-13 Feb 10, 2023
dd25126
remove hardcoded url of page3view and add next and button to home
Mihir-solanki-13 Feb 10, 2023
02ddc99
for previous button in page2view
Mihir-solanki-13 Feb 10, 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
10 changes: 6 additions & 4 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 @@ -320,10 +320,12 @@ def ExtensionOfTimeForm(request):
return render(request, 'iwdModuleV2/page3_support_1_extension_of_time.html', {})


def page1View(request):
request.session['projectId'] = request.POST['id']
def page1View(request ):
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})

return render(request, 'iwdModuleV2/Page1.html', {'x': projectPageOne })


def page2View(request):
Expand Down
7 changes: 5 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,8 @@
<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 +112,9 @@

</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
29 changes: 19 additions & 10 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
6 changes: 4 additions & 2 deletions FusionIIIT/templates/iwdModuleV2/Page3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@
<td>Extension of time</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/extensionFormView">i</a></div>

<div ><a href="{% url 'iwdModuleV2:Extension Form'%}">i</a></div>
</div>
</td>
</tr>
Expand All @@ -76,7 +77,8 @@
</tr>
</tbody>
</table>
<a href="http://172.27.16.216/iwdModuleV2/">Next</a>
<a class="ui small left floated primary button" href="{% url 'iwdModuleV2:Page 2 View'%}">Prev</a>
<a class="ui small right floated primary button" href="../">Back To Home</a>
</div>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion FusionIIIT/templates/iwdModuleV2/page1_support_1_aes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@
<form action="http://172.27.16.216/iwdModuleV2" style="margin-right:3%;">
<br><br>
<input class="ui small right floated primary button" type="Submit" value="Next" style="background-color:#2ECC71 ;" />
<a class="ui small left floated primary button" href="../../">Prev</a>
</form>


<br>
<br>
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/templates/iwdModuleV2/page2_support_1_corrigendum.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<div >
<input type="submit" name="Submit" value="Next" class="ui small right floated primary button" />
</div>
<a href="http://172.27.16.216/iwdModuleV2/addendumInput/">Next</a>
<a class="ui small left floated primary button" href="../../">Prev</a>
</div>

</form>
Expand Down
3 changes: 2 additions & 1 deletion FusionIIIT/templates/iwdModuleV2/viewWork.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="fields">
<div class="eight wide field">
<form class="ui form" style="padding: 8px; padding-left: 24px; padding-right: 24px;", method="post" action="http://172.27.16.216/iwdModuleV2/page1View/">{% csrf_token %}
<form class="ui form" style="padding: 8px; padding-left: 24px; padding-right: 24px;", method="post" action="{% url 'iwdModuleV2:Page 1 Views' %}">
{% csrf_token %}
<label>Project ID<sup><i class="small red asterisk icon"></i></sup></label><p id="id"></p>
<div class="ui fluid input">
<textarea id="project_id" class="ui textarea" rows="1" name="id" required="true"></textarea>
Expand Down