Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add finalize and submit for review buttons

Browse source
This commit is contained in:
Preston Doman 2019-03-06 21:10:51 -08:00
parent 05f29b3584
commit 0c1e1c6359
2 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
front/static/edit_report.html
View file

@ -86,7 +86,8 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-danger delete-report">Delete Report</button> <button type="button" class="btn btn-danger delete-report">Delete Report</button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary submit-report-button">Submit Report</button> <button type="button" class="btn btn-primary finalize-report">Finalize Report</button>
<button type="button" class="btn btn-primary review-report">Submit for Review</button>
</div> </div>
</div> </div>
</div> </div>

38
front/static/js/viewHistory.js
View file

@ -86,7 +86,7 @@ function updateSection(parsedData, saveButton) {
saveButton.innerHTML = "Save"; saveButton.innerHTML = "Save";
saveButton.disabled = false; saveButton.disabled = false;
} }
// Wraps a Bootstrap form group around a field // Wraps a Bootstrap form group around a field
@ -214,7 +214,7 @@ function createCollapsibleCard(sectionIdStr, sectionTitle, sectionCompleted, rul
sectionState.classList.add("fas", "fa-exclamation-triangle"); sectionState.classList.add("fas", "fa-exclamation-triangle");
} }
} }
// Create h2, button. Append button to h2, h2 to header, and header to card // Create h2, button. Append button to h2, h2 to header, and header to card
const h2 = document.createElement("h2"); const h2 = document.createElement("h2");
h2.classList.add("mb-0"); h2.classList.add("mb-0");
@ -284,7 +284,7 @@ function createCardFooter(ruleViolations) {
violation.appendChild(ruleBreakText); violation.appendChild(ruleBreakText);
violationMessage.appendChild(violation); violationMessage.appendChild(violation);
} }
cardFooter.appendChild(violationMessage); cardFooter.appendChild(violationMessage);
return cardFooter; return cardFooter;
} }
@ -295,12 +295,6 @@ function createReportForm(parsedData, type) {
const accordion = document.createElement("div"); const accordion = document.createElement("div");
accordion.classList.add("accordion"); accordion.classList.add("accordion");
//submit button
const submitButton = document.querySelector(".submit-report-button");
if (submitButton) {
submitButton.setAttribute("data-rid", parsedData.report_pk);
}
if (type === reportType.EDIT) { if (type === reportType.EDIT) {
modalBody = document.querySelector("#editReportModalBody"); modalBody = document.querySelector("#editReportModalBody");
modalLabel = document.querySelector("#editReportModalLabel"); modalLabel = document.querySelector("#editReportModalLabel");
@ -317,6 +311,15 @@ function createReportForm(parsedData, type) {
return; return;
} }
const reviewButton = document.querySelector(".review-report");
if (reviewButton) {
reviewButton.setAttribute("data-rid", parsedData.report_pk);
}
const finalizeButton = document.querySelector(".finalize-report");
if (finalizeButton) {
finalizeButton.setAttribute("data-rid", parsedData.report_pk);
}
while (modalBody.firstChild) { while (modalBody.firstChild) {
modalBody.removeChild(modalBody.firstChild); modalBody.removeChild(modalBody.firstChild);
} }
@ -529,10 +532,10 @@ document.addEventListener("click", function(event) {
console.log("View button clicked"); console.log("View button clicked");
const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid; const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid;
makeAjaxRequest("GET", url, displayReport); makeAjaxRequest("GET", url, displayReport);
} else if (event.target.classList.contains("submit-report-button")) { } else if (event.target.classList.contains("review-report")) {
event.preventDefault(); event.preventDefault();
//const title = document.querySelector("#editReportModalLabel").textContent; console.log("review-report");
const result = confirm("Are you sure you want to submit the report ?"); const result = confirm("Are you sure you want to submit this report for review?");
if (result) { if (result) {
const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid; const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid;
makeAjaxRequest("PUT", url, function(parsedData) { makeAjaxRequest("PUT", url, function(parsedData) {
@ -540,6 +543,17 @@ document.addEventListener("click", function(event) {
location.reload(true); location.reload(true);
}); });
} }
} else if (event.target.classList.contains("finalize-report")) {
event.preventDefault();
console.log("finalize-report");
const result = confirm("Are you sure you want to finalize this report? This means you will no longer be able to modify it.");
if (result) {
const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid + "/final";
makeAjaxRequest("PUT", url, function(parsedData) {
alert(parsedData.message);
location.reload(true);
});
}
} else if (event.target.classList.contains("delete-report")) { } else if (event.target.classList.contains("delete-report")) {
event.preventDefault(); event.preventDefault();
const title = document.querySelector("#editReportModalLabel").textContent; const title = document.querySelector("#editReportModalLabel").textContent;