Skip to content

Remove js popup and replace ajax by normal POST req. issue #97 #120

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

Open
pnshiralkar wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Remove js popup and replace ajax by normal POST req. issue #97 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63f0aff
Removed JS Popup, Removed AJAX for ACCEPT function
pnshiralkar Apr 22, 2020
f4dd287
Removed AJAX for REJECT function
pnshiralkar Apr 22, 2020
815e02e
Removed AJAX for APPROVE function, handled page form resubmission case
pnshiralkar Apr 23, 2020
bd8d0a1
Removed AJAX for change date and delete function
pnshiralkar Apr 23, 2020
0ba0af3
Approve workshop bug fixed
pnshiralkar Apr 23, 2020
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
24 changes: 6 additions & 18 deletions workshop_app/templates/workshop_app/manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@
trigger : 'hover'
});
});

function sendData(d){
var URL = "{{ URL_ROOT }}/my_workshops/"
console.log(d);
$.ajax({
url: URL,
type: "POST",
dataType: 'json',
data: {
d,
csrfmiddlewaretoken: $("input[name=csrfmiddlewaretoken]").val()
},
});

window.location.reload();
alert("Refreshing Page please wait, if you don't see your changes, please refresh this page again.");
}
</script>


Expand Down Expand Up @@ -65,7 +48,12 @@ <h4 align="center">This is the list of workshops you have created, you can delet
<td>{{ w.user }}</td>
<td>{{ w.workshop }}</td>
<td>{{ w.date | date}}</td>
<td><button class="btn btn-danger btn-sm" id="delete-btn" onClick="sendData('{{ w.user}},{{w.date | safe}},{{ w.workshop.id }},DELETED')" data-toggle="popover" title="Please Note" data-content="Once Deleted you cannot revoke this action." > Delete Workshop </button></td>
<form method="post">
<input type="hidden" name="d" value="{{ w.user}},{{w.date | safe}},{{ w.workshop.id }},DELETED">
{% csrf_token %}
<td><button class="btn btn-danger btn-sm" id="delete-btn" data-toggle="popover" title="Please Note" data-content="Once Deleted you cannot revoke this action." > Delete Workshop </button></td>
</form>

</tr>
</tbody>
{% endfor %}
Expand Down
42 changes: 34 additions & 8 deletions workshop_app/templates/workshop_app/my_workshops.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
},
});

window.location.reload();
alert("Refreshing Page please wait, if you don't see your changes, please refresh this page again.");
{#window.location.reload();#}
console.log(d);
}
</script>

Expand Down Expand Up @@ -111,7 +111,7 @@
alert(response);
}
});

console.log(data_c)
};

</script>
Expand Down Expand Up @@ -191,8 +191,18 @@ <h3 align="center" style="color: #04a9cf;"><strong><u>My Requests</u></strong></
<td><span class = "label label-warning">{{ workshop.status }}</span></td>
{% endif %}
{% if request.user.profile.position == 'instructor' and workshop.status == 'Pending' and workshop.requested_workshop_instructor %}
<td><button class="btn btn-primary btn-sm" id="book-btn" onClick="sendData('{{workshop.requested_workshop_coordinator}},{{workshop.requested_workshop_date| safe}},{{ workshop.requested_workshop_title_id }},ACCEPTED')" data-toggle="popover" title="Please Note" data-content="Once Accepted you can't Reject, you have to personally contact the Coordinator if the workshop is to be cancelled"> Accept</button></td>
<td><button class="btn btn-danger btn-sm" id="book-btn" onClick="sendData('{{workshop.requested_workshop_coordinator}},{{workshop.requested_workshop_date| safe}},{{ workshop.requested_workshop_title_id }},REJECTED')" data-toggle="popover" title="Please Note" data-content="Once Rejected you cannot revoke this action."> Reject </button></td>
<td><form method="post">
<input type="hidden" name="action" value="accept">
<input type="hidden" name="workshop_id" value="{{ workshop.id }}">
{% csrf_token %}
<button class="btn btn-primary btn-sm" id="book-btn" data-toggle="popover" title="Please Note" data-content="Once Accepted you can't Reject, you have to personally contact the Coordinator if the workshop is to be cancelled"> Accept</button>
</form></td>
<td><form method="post">
<input type="hidden" name="action" value="reject">
<input type="hidden" name="workshop_id" value="{{ workshop.id }}">
{% csrf_token %}
<button class="btn btn-danger btn-sm" id="book-btn" data-toggle="popover" title="Please Note" data-content="Once Rejected you cannot revoke this action."> Reject </button>
</form></td>
{% endif %}
</tr>
</tbody>
Expand Down Expand Up @@ -236,9 +246,20 @@ <h3 align="center" style="color: #04a9cf;"><strong><u>Workshops Accepted</u></st
class="datepicker" onclick="changeDate('R,{{ workshop.requested_workshop_date| safe}}, {{forloop.counter}}')">
</span>
<div class="myDialogR{{forloop.counter}}" style="display: none;" title="Select New Date">
<form method="post">
<input type="text" name="new_date" class="rDate{{forloop.counter}}" /><br>
{% if workshop.requested_workshop_date %}
<input type="hidden" name="workshop_type" value="requested">
{% else %}
<input type="hidden" name="workshop_type" value="proposed">
{% endif %}
<input type="hidden" name="action" value="change_date">
<input type="hidden" name="workshop_id" value="{{ workshop.id }}">
<input type="hidden" name="cid" value="{{ workshop.requested_workshop_coordinator_id }}">
{% csrf_token %}
<button class="btn btn-primary btn-xs" type="submit" >Save</button>
</form>

<input type="text" class="rDate{{forloop.counter}}" /><br>
<button class="btn btn-primary btn-xs" type="submit" onclick="submitNewDate('{{forloop.counter}},R,{{workshop.requested_workshop_instructor_id}},{{workshop.requested_workshop_coordinator_id}},{{ workshop.requested_workshop_title_id }},{{ workshop.requested_workshop_date | safe}}')">Save</button>
</div>
</td>
{% else %}
Expand Down Expand Up @@ -318,7 +339,12 @@ <h3 align="center" style="color: #04a9cf;"><strong><u>Workshops Proposed By Me</

<td><span class = "label label-warning">{{ workshop.status }}</span></td>
{% if request.user.profile.position == 'instructor' and workshop.status == 'Pending' %}
<td><button class="btn btn-primary btn-sm" id="book-btn" onClick="sendData('{{workshop.proposed_workshop_coordinator}},{{workshop.proposed_workshop_date| safe}},{{ workshop.proposed_workshop_title_id }},APPROVED')" data-toggle="popover" title="Please Note" data-content="Once Accepted you can't Reject, you have to personally contact the Coordinator if the workshop is to be cancelled"> Accept</button></td>
<td><form method="post">
<input type="hidden" name="action" value="approve">
<input type="hidden" name="workshop_id" value="{{ workshop.id }}">
{% csrf_token %}
<button class="btn btn-primary btn-sm" id="book-btn" data-toggle="popover" title="Please Note" data-content="Once Accepted you can't Reject, you have to personally contact the Coordinator if the workshop is to be cancelled"> Accept</button>
</form></td>
{% endif %}
{% endif %}
</tr>
Expand Down
Loading