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

os-1-final #1613

Open
wants to merge 1 commit into
base: os-1-final
Choose a base branch
from
+31 −8
Open

os-1-final #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions FusionIIIT/templates/phcModule/phc_student.html
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is change in code of other module, verify it @prajjwalkapoor

Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,17 @@
<div class="row">
{% comment %}The Tab-Menu starts here!{% endcomment %}
<div class="ui large fluid vertical pointing menu">
<<<<<<< HEAD
{% comment %} <a class="active item" data-tab="first">
Appointments/Requests
<i class="right floated chevron right icon"></i>
</a> {% endcomment %}
=======
<a class="active item" data-tab="first">
Appointments/Requests
<i class="right floated chevron right icon"></i>
</a>
>>>>>>> staging

<a class="item" data-tab="first">
History
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/templates/vhModule/booking-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<div class="field">
<div class="three fields">

{% if user_designation == 'Intender' %}
{% if user_designationz == 'Intender' %}
<div class="field">
<label>Category</label>

Expand Down
10 changes: 7 additions & 3 deletions FusionIIIT/templates/vhModule/booking-request-action-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,15 @@



{% if user_designation == 'VhIncharge' %}
{% if user_designation == 'VhIncharge' or user_designation == 'VhCaretaker' %}
<div class="field">
<label>Remarks (required*)</label>
<div class="ui fluid input">
<<<<<<< HEAD
<input type="text" value="{{booking.remark}}" name="cancellation-remarks-{{ booking.id }}" required="">
=======
<input type="text" value="{{booking.remark}}" name="cancellation-remarks-{{ booking.id }}" required="" >
>>>>>>> staging
</div>
</div>
{% endif %}
Expand All @@ -232,9 +236,9 @@
Forward
</div>

<!-- <div class="ui large green button right floated" id="confirm-booking" onclick="confirm_booking('{{ booking.id }}')">
<div class="ui large green button right floated" id="confirm-booking" onclick="confirm_booking('{{ booking.id }}')">
Confirm
</div> -->
</div>

</div>
{% endif %}
Expand Down
8 changes: 8 additions & 0 deletions FusionIIIT/templates/vhModule/bookings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ <h4 class="ui image header">
<th class="three wide column">CheckOut</th>
<th class="three wide column">Category</th>
<th class="three wide column">Status</th>
<!-- <th class="three wide column">View Bill</th> -->
</tr>
</thead>

Expand Down Expand Up @@ -518,6 +519,11 @@ <h4 class="ui image header">
{% endif %}

</td>
<!-- <td>
<div onclick="hostelBillModal('{{ booking.id }}')" class="ui large grey right floated button" >
Print Bill
</div>
</td> -->
</tr>
{% endfor %}
</tbody>
Expand Down Expand Up @@ -579,6 +585,8 @@ <h4 class="ui image header">

{% include 'vhModule/check-out-modal.html' %}

{% include 'vhModule/hostel-bill.html' %}

{% include 'vhModule/request-booking.html' %}

{% include 'vhModule/update-booking.html' %}
Expand Down
4 changes: 4 additions & 0 deletions FusionIIIT/templates/vhModule/check-out-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,13 @@ <h2>Room Details</h2>
<div class="ten wide field"></div>
<div class="six wide field">
<label><br></label>

<div class="ui large green right floated button" onclick="check_out('{{ booking.id }}', '{{ value.mess_bill }}' , '{{ value.room_bill }}')">
Settle
</div>
<div class="ui large grey right floated button" onclick="window.print()">
Print Bill
</div>
</div>
<!-- <div class="two wide field">
<label><br></label>
Expand Down
8 changes: 4 additions & 4 deletions FusionIIIT/templates/vhModule/visitorhostel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<i class="right floated chevron right icon"></i>
</a>

{% if user_designation == 'VhIncharge' or user_designation == 'VhCaretaker' %}
{% if global_var == 'VhIncharge' or global_var == 'VhCaretaker' %}
<a class="item" data-tab="third" id="roomstatus">
Room Availability
<i class="right floated chevron right icon"></i>
Expand Down Expand Up @@ -129,9 +129,9 @@

<div class="three wide column">
<div class="row">
{% comment %}
TODO: the right rail!
{% endcomment %}
{% block sidepanel%}
{% include 'notifications/visitorhostel_sidepanel.html' %}
{% endblock %}
</div>
</div>

Expand Down
Loading