Skip to content

os-1: changes after 1st testing #1243

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 14 commits into from
Apr 15, 2023
Merged

os-1: changes after 1st testing #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
14e32e6
responsiveness added
harsh-k-singh Apr 1, 2023
1ef274a
Merge branch 'test' of https://github.com/FusionIIIT/Fusion
harsh-k-singh Apr 4, 2023
3d86fda
Bill generation completed
harsh-k-singh Apr 4, 2023
c955e50
some random files
harsh-k-singh Apr 6, 2023
15da19a
conflict resolved
harsh-k-singh Apr 6, 2023
789377b
Merge branch 'test' into main
harsh-k-singh Apr 6, 2023
735262e
Revert "Bill generation completed"
harsh-k-singh Apr 6, 2023
cb572fb
Merge branch 'test' of https://github.com/FusionIIIT/Fusion
harsh-k-singh Apr 10, 2023
0fda896
changes after first test run
harsh-k-singh Apr 13, 2023
b10cea3
Merge branch 'test' of https://github.com/FusionIIIT/Fusion
harsh-k-singh Apr 13, 2023
5d53ea0
Merge branch 'main' of https://github.com/harsh-k-singh/Fusion
harsh-k-singh Apr 13, 2023
a2ea18d
Delete room-availability.html
harsh-k-singh Apr 13, 2023
b0c6e74
updated room-availability.html
harsh-k-singh Apr 13, 2023
ebe301c
merged main of remote
harsh-k-singh Apr 13, 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
4 changes: 2 additions & 2 deletions FusionIIIT/templates/vhModule/add-item-modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ <h5 class="ui dividing header">Add Item</h5>
<div class="field">
<label>Quantity</label>
<div class="ui input large">
<input placeholder="Quantity" name="quantity_add" type="number">
<input placeholder="Quantity" name="quantity_add" type="number" min="0" oninput="validity.valid||(value='');">
</div>
</div>

<div class="field">
<label>Cost</label>
<div class="ui input large">
<input placeholder="Amount" name="cost" type="number">
<input placeholder="Amount" name="cost" type="number" min="0" oninput="validity.valid||(value='');">
</div>
</div>

Expand Down
74 changes: 51 additions & 23 deletions FusionIIIT/templates/vhModule/bookings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,38 @@
{% load static %}

{% block css %}
<style>

button.tooltip {
padding: 0px 5px;
position: relative;
background: #FFBB99;
cursor: pointer;
}

.tooltip-info {
position: absolute;
top: 0px;
left: 0px;
}

button.tooltip::before {
content: attr(data-tooltip);
position: absolute;
top: 2.75em;
font-size: 0.9em;
padding: 1px 5px;
display: none;
color: white;
background: rgba(0, 0, 0, 0.75);
border-radius: 4px;
transition: opacity 0.1s ease-out;
z-index: 99;
text-align: left;
}

button.tooltip:hover::before {
display: inline-block;
}
</style>
{% endblock %}

{% block bookings %}
<button style="border: none; float: right; display: block;" class="ui inverted right floated small red button" onclick="requestModal()">
Expand Down Expand Up @@ -164,22 +192,22 @@ <h4 class="ui image header">
{% if user_designation == 'Intender'%}
<td>
{% if booking.status == "Pending" %}
<button class="tiny ui inverted basic button" data-tooltip="Pending"><i class="yellow exclamation icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Pending"><i class="yellow exclamation icon"></i><span class="tooltip-info">Pending</span></button>

{% elif booking.status == "Confirmed" %}
<button class="tiny ui inverted basic button" data-tooltip="Confirmed"><i class="green check icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Confirmed"><i class="green check icon"></i><span class="tooltip-info">Confirmed</span></button>

{% elif booking.status == "Forward" %}
<button class="tiny ui inverted basic button" data-tooltip="pending"><i class="yellow exclamation icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Pending"><i class="yellow exclamation icon"></i><span class="tooltip-info">Pending</span></button>

{% elif booking.status == "Rejected" %}
<button class="tiny ui inverted basic button" data-tooltip="Rejected"><i class="red trash icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Rejected"><i class="red trash icon"></i><span class="tooltip-info">Rejected</span></button>

{% elif booking.status == "Canceled" %}
<button class="tiny ui inverted basic button" data-tooltip="Canceled"><i class="red close icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Canceled"><i class="red close icon"></i><span class="tooltip-info">Canceled</span></button>

{% elif booking.status == "Complete" %}
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Complete"><i class="green calender check icon"></i><span class="tooltip-info">Complete</span></button>
{% else %}

{{ booking.status }}
Expand Down Expand Up @@ -298,25 +326,25 @@ <h4 class="ui image header">
<td>{{ booking.visitor_category }}</td>
<td>
{% if booking.status == "Pending" %}
<button class="tiny ui inverted basic button" data-tooltip="Pending"><i class="yellow exclamation icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Pending"><i class="yellow exclamation icon"></i><span class="tooltip-info">Pending</span></button>

{% elif booking.status == "Confirmed" %}
<button class="tiny ui inverted basic button" data-tooltip="Confirmed"><i class="green check icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Confirmed"><i class="green check icon"></i><span class="tooltip-info">Confirmed</span></button>

{% elif booking.status == "Forward" %}
<button class="tiny ui inverted basic button" data-tooltip="Forward"><i class="green arrow right icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Forward"><i class="green arrow right icon"></i><span class="tooltip-info">Forward</span></button>

{% elif booking.status == "Rejected" %}
<button class="tiny ui inverted basic button" data-tooltip="Rejected"><i class="red trash icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Rejected"><i class="red trash icon"></i><span class="tooltip-info">Rejected</span></button>

{% elif booking.status == "Canceled" %}
<button class="tiny ui inverted basic button" data-tooltip="Canceled"><i class="red close icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Canceled"><i class="red close icon"></i><span class="tooltip-info">Canceled</span></button>

{% elif booking.status == "Complete" %}
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Complete"><i class="green calender check icon"></i><span class="tooltip-info">Complete</span></button>
{% else %}

<button class="tiny ui inverted basic button" data-tooltip="Pending"><i class="yellow exclamation icon"></i></button>
<button class="tiny ui inverted basic button tooltip" data-tooltip="Pending"><i class="yellow exclamation icon"><span class="tooltip-info">Pending</span></i></button>
{% endif %}

</td>
Expand Down Expand Up @@ -500,24 +528,24 @@ <h4 class="ui image header">
<td onclick="bookingDetailsModal('{{ booking.id }}')">{{ booking.visitor_category }}</td>
<td>
{% if booking.status == "Pending" %}
<button class="tiny ui inverted basic button" data-tooltip="Pending"><i class="yellow exclamation icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Pending"><i class="yellow exclamation icon"></i><span class="tooltip-info">Pending</span></button>

{% elif booking.status == "Confirmed" %}
<button class="tiny ui inverted basic button" data-tooltip="Confirmed"><i class="green check icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Confirmed"><i class="green check icon"></i><span class="tooltip-info">Confirmed</span></button>

{% elif booking.status == "Forward" %}
<button class="tiny ui inverted basic button" data-tooltip="Forward"><i class="green arrow right icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Forward"><i class="green arrow right icon"></i><span class="tooltip-info">Forward</span></button>

{% elif booking.status == "Rejected" %}
<button class="tiny ui inverted basic button" data-tooltip="Rejected"><i class="red trash icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Rejected"><i class="red trash icon"></i><span class="tooltip-info">Rejected</span></button>

{% elif booking.status == "Canceled" %}
<button class="tiny ui inverted basic button" data-tooltip="Canceled"><i class="red close icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Canceled"><i class="red close icon"></i><span class="tooltip-info">Canceled</span></button>

{% elif booking.status == "Complete" %}
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i><span class="tooltip-info">Complete</span></button>
{% else %}
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i></button>
<button class="tiny ui inverted basic button" data-tooltip="Complete"><i class="green calender check icon"></i><span class="tooltip-info">Commplete</span></button>

<!-- {{ booking.status }} -->
{% endif %}
Expand Down
10 changes: 5 additions & 5 deletions FusionIIIT/templates/vhModule/record-meal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,36 +44,36 @@ <h4 class="ui image header">

<td>
<div class="ui">
<input type="number" min=0 value=0 name="m_tea{{key}}" style="width: 100%;">
<input type="number" min=0 value=0 oninput="validity.valid||(value='');" name="m_tea{{key}}" style="width: 100%;">

<label></label>
</div>
</td>

<td>
<div class="ui">
<input type="number" min=0 value=0 name="breakfast{{key}}" style="width: 100%;">
<input type="number" min=0 value=0 oninput="validity.valid||(value='');" name="breakfast{{key}}" style="width: 100%;">
<label></label>
</div>
</td>

<td>
<div class="ui">
<input type="number" min=0 value=0 name="lunch{{key}}" style="width: 100%;">
<input type="number" min=0 value=0 oninput="validity.valid||(value='');" name="lunch{{key}}" style="width: 100%;">
<label></label>
</div>
</td>

<td>
<div class="ui">
<input type="number" min=0 value=0 name="eve_tea{{key}}" style="width: 100%;">
<input type="number" min=0 value=0 oninput="validity.valid||(value='');" name="eve_tea{{key}}" style="width: 100%;">
<label></label>
</div>
</td>

<td>
<div class="ui">
<input type="number" min=0 value=0 name="dinner{{key}}" style="width: 100%;">
<input type="number" min=0 value=0 oninput="validity.valid||(value='');" name="dinner{{key}}" style="width: 100%;">
<label></label>
</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/templates/vhModule/view-inventory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<td>
<div class="field" style="display: none" id=select-{{item.id}}>
<div class="ui input">
<input name="quantity" type="number" min="0" placeholder={{item.quantity}}
<input name="quantity" type="number" min="0" placeholder={{item.quantity}} oninput="validity.valid||(value='0');"
onchange='submit_inventory_form("{{ item.id}}")' id="input-{{item.id}}">
</div>
</div>
Expand Down