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

Clean up code

Browse source
This commit is contained in:
Preston Doman 2019-02-19 22:42:30 -08:00
parent 0a5241e5f3
commit 02f27c2247
3 changed files with 27 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
front/static/css/signup.css
View file

@ -1,13 +0,0 @@
.signup
{
height: 200px;
width: 400px;
position: fixed;
left: 50%;
margin-left: -150px;
width:60%;
}
.border
{
border-color:black;
}

2
front/static/css/style.css
View file

@ -5,5 +5,5 @@
.fa-exclamation-triangle { .fa-exclamation-triangle {
float: right; float: right;
color: red; color: orange;
} }

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

@ -9,31 +9,6 @@ function getEndpointDomain() {
return "https://" + window.location.hostname + ":8444/"; return "https://" + window.location.hostname + ":8444/";
} }
function saveSectionCallback(parsedData, saveButton) {
alert(JSON.stringify(parsedData));
saveButton.innerHTML = "Save";
saveButton.disabled = false;
const sectionState = document.querySelector("#section-" + parsedData.id + "-state");
if (sectionState && parsedData.completed) {
sectionState.classList = "fas fa-check-square";
} else {
sectionState.classList = "fas fa-exclamation-triangle";
}
const collapseDiv = document.querySelector("#section-" + parsedData.id + "-collapse");
const cardFooter = createCardFooter(parsedData.rule_violations);
if (collapseDiv.lastElementChild.classList.contains("card-footer")) {
collapseDiv.removeChild(collapseDiv.lastElementChild);
if (cardFooter) {
collapseDiv.appendChild(cardFooter);
}
} else {
if (cardFooter) {
collapseDiv.appendChild(cardFooter);
}
}
}
function makeAjaxRequest(method, url, callback, optional, payload) { function makeAjaxRequest(method, url, callback, optional, payload) {
const token = localStorage.getItem("token"); const token = localStorage.getItem("token");
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
@ -76,6 +51,31 @@ function makeAjaxRequest(method, url, callback, optional, payload) {
xhr.send(payload); xhr.send(payload);
} }
function updateSection(parsedData, saveButton) {
saveButton.innerHTML = "Save";
saveButton.disabled = false;
const sectionState = document.querySelector("#section-" + parsedData.id + "-state");
if (parsedData.completed) {
sectionState.classList = "fas fa-check-square";
} else {
sectionState.classList = "fas fa-exclamation-triangle";
}
const collapseDiv = document.querySelector("#section-" + parsedData.id + "-collapse");
const cardFooter = createCardFooter(parsedData.rule_violations);
if (collapseDiv.lastElementChild.classList.contains("card-footer")) {
collapseDiv.removeChild(collapseDiv.lastElementChild);
if (cardFooter) {
collapseDiv.appendChild(cardFooter);
}
} else {
if (cardFooter) {
collapseDiv.appendChild(cardFooter);
}
}
}
// Wraps a Bootstrap form group around a field // Wraps a Bootstrap form group around a field
function createFormGroup(sectionIdStr, field) { function createFormGroup(sectionIdStr, field) {
const inputId = sectionIdStr + field.field_name; const inputId = sectionIdStr + field.field_name;
@ -527,7 +527,6 @@ if (newReportForm) {
console.log("Payload:\n" + payload); console.log("Payload:\n" + payload);
const type = reportType.NEW; const type = reportType.NEW;
makeAjaxRequest("POST", url, createReportForm, type, payload); makeAjaxRequest("POST", url, createReportForm, type, payload);
this.reset();
}); });
} }
@ -553,7 +552,7 @@ document.addEventListener("submit", function(event) {
saveButton.appendChild(document.createTextNode(" Saving...")); saveButton.appendChild(document.createTextNode(" Saving..."));
const formData = new FormData(event.target); const formData = new FormData(event.target);
const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid + "/section/" + event.target.dataset.sid; const url = getEndpointDomain() + "api/v1/report/" + event.target.dataset.rid + "/section/" + event.target.dataset.sid;
makeAjaxRequest("PUT", url, saveSectionCallback, saveButton, formData); makeAjaxRequest("PUT", url, updateSection, saveButton, formData);
} }
}); });