Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .DS_Store
Binary file not shown.
Binary file modified FusionIIIT/.DS_Store
Binary file not shown.
Binary file modified FusionIIIT/applications/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Generated by Django 3.1.5 on 2024-03-16 21:21

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('globals', '0018_auto_20240315_2157'),
('globals', '0020_auto_20240315_2158'),
]

operations = [
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.5 on 2024-03-15 20:53

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('hostel_management', '0018_hostelhistory'),
]

operations = [
migrations.AddField(
model_name='hostelleave',
name='remark',
field=models.TextField(blank=True, null=True),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Generated by Django 3.1.5 on 2024-03-16 21:21

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('hostel_management', '0019_hostelleave_remark'),
('hostel_management', '0019_merge_20240315_2153'),
]

operations = [
]
2 changes: 1 addition & 1 deletion FusionIIIT/templates/dashboard/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
{% comment %}A single modules row ends here!{% endcomment %}


{% if request.user.extrainfo.user_type == "student" or user in hall_caretaker or user in hall_warden %}
{% if request.user.extrainfo.user_type == "student" or user in hall_caretaker or user in hall_warden or request.user.is_superuser %}

<div style="width: calc(50% - 10px);
margin: 5px;
Expand Down
12 changes: 6 additions & 6 deletions FusionIIIT/templates/hostelmanagement/hostel.html
Original file line number Diff line number Diff line change
Expand Up @@ -193,20 +193,20 @@
<!-- Ends here -->


{% if user in hall_caretaker or user in hall_warden %}
<!-- {% if user in hall_caretaker or user in hall_warden %}
<a class="item" data-tab="nineth" >
Complaints
<i class="right floated chevron right icon"></i>
</a>
{% endif %}
{% endif %} -->

<!-- This should be only in hall_caretaker -->
{% if user in hall_caretaker %}
<!-- {% if user in hall_caretaker %}
<a class="item" data-tab="tenth" >
Inventory Form
<i class="right floated chevron right icon"></i>
</a>
{% endif %}
{% endif %} -->



Expand Down Expand Up @@ -261,12 +261,12 @@
{% endif %}


{% if user in hall_caretaker%}
<!-- {% if user in hall_caretaker%}
<a class="item" data-tab="inventory1">
Inventory list
<i class="right floated chevron right icon"></i>
</a>
{% endif %}
{% endif %} -->

</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% block My_fine %}
<h1>My Fine</h1>
<h2 align="center">My Fine</h2>
<div class="textLoader" style="max-height: 64vh; overflow-y: auto; overflow-x: hidden;">
<table class="ui table " border="1">
<thead>
<tr>
Expand All @@ -20,4 +21,5 @@ <h1>My Fine</h1>
{% endfor %}
</tbody>
</table>
</div>
{% endblock %}
Binary file added Test/.DS_Store
Binary file not shown.
Binary file added Test/Fusion Automation Testing/.DS_Store
Binary file not shown.