Skip to content

Gad-3 : fixed minor issues #1389

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
ChaudharyRaman merged 24 commits into from
Mar 26, 2024
Merged

Gad-3 : fixed minor issues #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5c61a54
GAD-5: Fix responsiveness (#1125)
Lawful2002 Feb 23, 2023
9a4fc4d
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
b295d7f
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
72e34e7
Merge branch 'main' into gad-5
akshatnema Mar 18, 2023
721ee82
Merge branch 'main' into gad-5
akshatnema Mar 19, 2023
91ef4e9
Merge branch 'main' into gad-5
akshatnema Mar 23, 2023
da49572
Merge branch 'main' into gad-5
akshatnema Mar 26, 2023
daab40e
Minor changes
nidhibarapatre Mar 4, 2024
92faf40
Implementation of FTS and completion of the redirect functionality
nidhibarapatre Mar 4, 2024
3f43b27
Change in model of supervisor
nidhibarapatre Mar 6, 2024
d50d0e6
Complition of redirect functionality and pagination
nidhibarapatre Mar 8, 2024
bf8f36c
Fixation of a error
nidhibarapatre Mar 8, 2024
e6afdd7
Completion of module
nidhibarapatre Mar 11, 2024
47af12c
GAD -5 Dashboard Changes (#1325)
BlackHAWK2001 Mar 11, 2024
ed642ee
dashboard and usercard updated (#1329)
Arpittak Mar 12, 2024
d40e94d
Fixing ui bugs (#1335)
SukulSarve Mar 17, 2024
59d8868
Merge remote-tracking branch 'upstream2/gad-5' into gad-3
nidhibarapatre Mar 18, 2024
9ea22d7
Integrated dashborad
nidhibarapatre Mar 20, 2024
7a16993
creating new branch
nidhibarapatre Mar 20, 2024
feebe01
Merge remote-tracking branch 'upstream3/gad-3' into new-gad3
nidhibarapatre Mar 20, 2024
a54deb1
disallowing migrations
nidhibarapatre Mar 20, 2024
61a875a
removing migration files
nidhibarapatre Mar 21, 2024
56918b4
resolved errors
nidhibarapatre Mar 26, 2024
725edc9
Merge remote-tracking branch 'upstream3/gad-3' into gad_-3
nidhibarapatre Mar 26, 2024
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
6 changes: 3 additions & 3 deletions FusionIIIT/applications/complaint_system/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
url(r'^caretaker/$', views.caretaker, name='caretaker'),
url(r'^caretaker/feedback/(?P<feedcomp_id>[0-9]+)/$', views.feedback_care),
url(r'^caretaker/pending/(?P<cid>[0-9]+)/$', views.resolvepending),
url(r'^caretaker/detail/(?P<detailcomp_id1>[0-9]+)/$', views.detail),
url(r'^caretaker/detail2/(?P<detailcomp_id1>[0-9]+)/$', views.detail),
url(r'^caretaker/search_complaint$', views.search_complaint),
url(r'^caretaker/(?P<complaint_id>[0-9]+)/feedback/$', views.submitfeedbackcaretaker),

Expand All @@ -29,8 +29,8 @@
url(r'^supervisor/$', views.supervisor),
url(r'^supervisor/feedback/(?P<feedcomp_id>[0-9]+)/$', views.feedback_super),
url(r'^supervisor/caretaker_id_know_more/(?P<caretaker_id>[0-9]+)/$', views.caretaker_id_know_more),
url(r'^supervisor/caretaker_id_know_more/(?P<caretaker_id>[0-9]+)/complaint_reassign_super/(?P<iid>[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'),
url(r'^supervisor/detail3/(?P<detailcomp_id1>[0-9]+)/$', views.detail3, name = 'detail3'),
# url(r'^supervisor/caretaker_id_know_more/(?P<caretaker_id>[0-9]+)/complaint_reassign_super/(?P<iid>[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'),
url(r'^supervisor/detail/(?P<detailcomp_id1>[0-9]+)/$', views.detail3, name = 'detail3'),
url(r'^supervisor/pending/(?P<cid>[0-9]+)/$', views.resolvependingsuper),
url(r'^supervisor/(?P<complaint_id>[0-9]+)/$', views.submitfeedbacksuper),

Expand Down
619 changes: 279 additions & 340 deletions FusionIIIT/applications/complaint_system/views.py
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 11 additions & 119 deletions FusionIIIT/templates/complaintModule/assignworker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,104 +60,7 @@
</a>
</div>

<!-- <div class="ui active tab large" data-tab="feedback">
<div class="ui vertical segment">
<form method="post" action=".">
{% csrf_token %}
<div class="ui header">
Assign Worker to complaint
<div>Complaint ID :{{ detail.complainer }}</div>
<div>Complainer :{{ detail.complainer.user.first_name }}
{{detail.complainer.user.last_name}}
</div>
</div>
<br>


<table>
<div class="fields">
<div class="eight wide field">
<tr>
<td>Complaint Date</td>
<td> : {{ detail.complaint_date }}</td>
</tr>
</div>
<div class="eight wide field">
<tr>
<td>Deadline</td>
<td><span style="color:red;"> : {{ detail.complaint_finish }}</span></td>
</tr>
</div>
</div>
<div class="fields">
<div class="eight wide field">
<tr>
<td>Complaint Type</td>
<td> : {{ detail.complaint_type }}</td>
</tr>
</div>
<div class="eight wide field">
<tr>
<td>Location</td>
<td> : {{ detail.location }}</td>
</tr>
</div>
<div class="eight wide field">
<tr>
<td>Specific Location</td>
<td> : {{ detail.specific_location }}</td>
</tr>
</div>

<div class="eight wide field">
<tr>
<td>Status</td>
<td> : {% if detail.status == 0 %}
<i class="large orange warning icon"></i>Yet to assign Worker
{% elif detail.status == 1 %}
<i class="large orange add user icon"></i>Worker Assigned
{% elif detail.status == 2 %}
<i class="large green checkmark icon"></i>Completed
{% elif detail.status == 3 %}
<i class="large red x icon"></i>Complaint Rejected
{% endif %}
</td>
</tr>
</div>
</div>
</table>
<div class="field">
<div class="eight wide field">
<h4><label>Assign Worker :</label>
{% if flag == 'no_worker' %}
<B>NO WORKER PRESENT AT THE PLACE</B>
{% else %}
<select name="assign_worker">
{% for i in worker %}
<option value="{{ i.id }}">{{ i.name }} ({{ i.worker_type }})</option>
{% endfor %}
</select>
<a href="javascript:history.go(-1)">
<button class="ui large primary button right floated" type="button" name="back">
Back
</button>
</a>
<button class="ui large primary button right floated" type="submit" name="submit"
value="assign" onclick="assignworkersubmit()">
Submit
</button>
<br>
{% endif %}
</h4>
</div>
</div>
</form>
</div>

<br>


</div> -->


<!-- redirect complaint -->
<div class="ui active tab large" data-tab="redirect">
Expand Down Expand Up @@ -196,38 +99,27 @@ <h4>If you want to redirect this complaint ,</br>
</table>
<div class="eight wide field">

{% if detail.status != 0 %}
<!-- {% if detail.status != 0 %}

<H3>You have assigned a worker. First, remove the worker from this complaint then
<span style="color: red;">declined</span> this complaint.
.
</H3>
{% else %}
<!-- <p>Incharge:{{ detail.complaint_type }} incharge</p> -->

<!-- <select name="assign_caretaker">
{% if total_caretakers_in_area %}
{% for i in total_caretakers_in_area %}
<option value="{{ i.id }}">{{ i.area }}-incharge</option>
{% endfor %}
{% else %}
<option></option>
{% endif %}
</select> -->
<!-- <br><br> -->
{% else %} -->
<button class="ui large primary button right floated" type="submit" name="submit"
value="redirect" onclick="redirectsubmit()">
Submit
</button>
<a href="javascript:history.go(-1)">
<button class="ui large primary button right floated" type="button" name="back">
Back
</button>
</a>

{% if total_caretakers_in_area %}
<button class="ui large primary button right floated" type="submit" name="submit"
value="redirect" onclick="redirectsubmit()">
Submit
</button>
{% endif %}
{% endif %}
<!-- {% if total_caretakers_in_area %} -->

<!-- {% endif %} -->
<!-- {% endif %} -->
</div>
</div>
</form>
Expand Down
4 changes: 2 additions & 2 deletions FusionIIIT/templates/complaintModule/carefeedback.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</td>

<td>
<a href="./detail/{{ a.id }}/feedback"> <button class="ui inverted basic button" data-tooltip="Click here to view details" ><i class="large green info icon"></i></button></a>
<a href="./detail2/{{ a.id }}/"> <button class="ui inverted basic button" data-tooltip="Click here to view details" ><i class="large green info icon"></i></button></a>
</td>

<td>
Expand Down Expand Up @@ -127,7 +127,7 @@
</div>
<script>
document.addEventListener("DOMContentLoaded", function () {
paginate('feedback_care', 3, 'paginationfeedback_care'); // Call the pagination function with table ID and rows per page
paginate('feedback_care', 10, 'paginationfeedback_care'); // Call the pagination function with table ID and rows per page
});
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion FusionIIIT/templates/complaintModule/complaint_caretaker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
{% comment %}The ... end here!{% endcomment %}

{% comment %}The ... starts here!{% endcomment %}
<div class="ui active tab segment" data-tab="first">
<div class="ui tab segment" data-tab="second">
{% block complainthistory %}
{% include 'complaintModule/complainthistory_care_final.html' %}
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions FusionIIIT/templates/complaintModule/complainthistory_care_final.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@ <h4 class="ui image header">
</div>
<script>
document.addEventListener("DOMContentLoaded", function () {
paginate('pending_care', 3, 'paginationpending_care'); // Call the pagination function with table ID and rows per page
paginate('pending_care', 10, 'paginationpending_care'); // Call the pagination function with table ID and rows per page
});
document.addEventListener("DOMContentLoaded", function () {
paginate('resolve_care', 3, 'paginationresolve_care'); // Call the pagination function with table ID and rows per page
paginate('resolve_care', 10, 'paginationresolve_care'); // Call the pagination function with table ID and rows per page
});
document.addEventListener("DOMContentLoaded", function () {
paginate('decline_care', 3, 'paginationdecline_care'); // Call the pagination function with table ID and rows per page
paginate('decline_care', 10, 'paginationdecline_care'); // Call the pagination function with table ID and rows per page
});
</script>
{% endblock%}
12 changes: 6 additions & 6 deletions FusionIIIT/templates/complaintModule/complainthistory_user_final.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</tr>
</thead>

{% for a in history %}
{% for a in outbox %}
{% if a.status == 0 %}


Expand Down Expand Up @@ -196,7 +196,7 @@ <h4 class="ui image header">

</tr>
</thead>
{% for a in history %}
{% for a in outbox %}
{% if a.status == 2 %}
<tbody>
<tr>
Expand Down Expand Up @@ -310,7 +310,7 @@ <h4 class="ui image header">

</tr>
</thead>
{% for a in history %}
{% for a in outbox %}
{% if a.status == 3 %}
<tbody>
<tr>
Expand Down Expand Up @@ -360,13 +360,13 @@ <h4 class="ui image header">
</div>
<script>
document.addEventListener("DOMContentLoaded", function () {
paginate('pending_user', 3, 'paginationpending_user'); // Call the pagination function with table ID and rows per page
paginate('pending_user', 10, 'paginationpending_user'); // Call the pagination function with table ID and rows per page
});
document.addEventListener("DOMContentLoaded", function () {
paginate('resolve_user', 3, 'paginationresolve_user'); // Call the pagination function with table ID and rows per page
paginate('resolve_user', 10, 'paginationresolve_user'); // Call the pagination function with table ID and rows per page
});
document.addEventListener("DOMContentLoaded", function () {
paginate('decline_user', 3, 'paginationdecline_user'); // Call the pagination function with table ID and rows per page
paginate('decline_user', 10, 'paginationdecline_user'); // Call the pagination function with table ID and rows per page
});
</script>
{% endblock%}
2 changes: 1 addition & 1 deletion FusionIIIT/templates/complaintModule/feedback.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</tr>
</thead>

{% for a in history %}
{% for a in outbox %}
{% if a.status == 2 %}

<tbody>
Expand Down
14 changes: 8 additions & 6 deletions FusionIIIT/templates/dashboard/modules.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,25 +133,27 @@

{% comment %}A single modules row starts here!{% endcomment %}

{% if request.user.extrainfo.user_type == "student" or request.user.extrainfo.user_type == "staff" or request.user.extrainfo.user_type == "faculty" or "spacsconvenor" == global_var or "spacsassistant" == global_var or "hall1caretaker" == global_var or "hall4caretaker" == global_var or "shyams" == global_var or "ccsupervisor" == global_var%}
<div style="width: calc(50% - 10px);
<div style="width: calc(50% - 10px);
margin: 5px;
box-sizing: border-box;">
<a class="ui large label" style="height: 120px; width:100%" href="/spacs">
<div class="ui centered grid">
<div class="row">
<i class="ui student icon big"></i>
</div>

<div class="row">
<span class="ui sub header centered">Scholarship Portal</span>
</div>
</div>
</a>
</div>

<div class="column">
<a class="ui large label" href="/complaint">

{% if request.user.extrainfo.user_type == "student" or request.user.extrainfo.user_type == "staff" or request.user.extrainfo.user_type == "faculty" or "spacsconvenor" == global_var or "spacsassistant" == global_var or "hall1caretaker" == global_var or "hall4caretaker" == global_var or "shyams" == global_var or "ccsupervisor" == global_var%}
<div style="width: calc(50% - 10px);
margin: 5px;
box-sizing: border-box;" >
<a class="ui large label" style="height: 120px; width:100%" href="/complaint">
<div class="ui centered grid">
<div class="row">
<i class="ui line chart icon big"></i>
Expand Down