Skip to content

make mess card viewable #131

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
mittal-ishaan merged 1 commit into from
Apr 4, 2025
Merged

make mess card viewable #131

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
9 changes: 6 additions & 3 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
{% url 'cafeteria' as cafe_url %}
{% url 'contact' as contact_url %}
{% url 'SDC' as SDC_url %}
{% url 'qrscan' as qrscan_url %}
<div class="logo bg-white py-2 px-0 mx-md-3 mx-0 container-md">
<a href="https://www.iiti.ac.in/" target="_blank" class="row text-decoration-none header mx-0 flex justify-content-center">
<img src="{% static '../static/images/Indian_Institute_of_Technology,_Indore_Logo.png' %}" alt="" height="80px" width="100px" class="col-lg-1 col-2">
Expand Down Expand Up @@ -68,9 +69,9 @@
<li class="nav-item">
<a class="nav-link {% if request.path == contact_url %} active {%endif%}" href="/contact">Contact</a>
</li>
<li class="nav-item">
<!-- <li class="nav-item">
<a class="nav-link {% if request.path == SDC_url %} active {%endif%}" href="/sdc">SDC</a>
</li>
</li> -->
{% if user.is_authenticated %}
{% if user.is_staff%}
<li class="nav-item dropdown">
Expand All @@ -85,14 +86,16 @@
</ul>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link {% if request.path == SDC_url %} active {%endif%}" href="/qrscan/">Mess Card</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown"
aria-expanded="false">
hello, {{user.first_name}}
</a>
<ul class="dropdown-menu me-5" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="/profile/" style="color:rgb(18, 37, 106) ; font-weight: bold; ">Profile</a></li>
<!-- <li><a class="dropdown-item" href="/qrscan/" style="color:rgb(18, 37, 106) ; font-weight: bold; ">Mess Card</a></li> -->
<li><a class="dropdown-item" href="/accounts/logout/" style="color:rgb(18, 37, 106) ; font-weight: bold; ">Logout</a></li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ <h6 class="card-subtitle mt-2">{{ student.name }}</h6>
<span class="card-text">Roll Number: {{ student.roll_no }}</span><br>
<span class="card-text">Email: {{ user.email }}</span><br>
<span class="card-text">Department: {{ student.department }}</span><br>
<a href="/qrscan/"><button class="btn btn-primary">View Mess Card</button></a>
<hr>
{% if allocation_info|length > 0 %}
<h5>Your Allocation Details:</h5>
Expand All @@ -40,7 +41,6 @@ <h6>{{ key }}</h6>
</div>
</div>
{% endfor %}
<!-- <a href="/qrscan/"><button class="btn btn-primary">View Mess Card</button></a> -->
{% else %}
<h6>You will be able to see your allocated caterer after the allocation process is completed </h6>
{% endif %}
Expand Down