From 792c3afe7b37c828b10682483d7aad681b81c9b9 Mon Sep 17 00:00:00 2001 From: Preston Doman Date: Sun, 24 Feb 2019 00:24:23 -0800 Subject: [PATCH] Fix collapse issue --- front/static/js/viewHistory.js | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/front/static/js/viewHistory.js b/front/static/js/viewHistory.js index 9dd0cd0..c95d733 100644 --- a/front/static/js/viewHistory.js +++ b/front/static/js/viewHistory.js @@ -1,7 +1,6 @@ const reportType = { NEW : 1, EDIT : 2, - VIEW : 3 }; // Hack to change endpoint url @@ -240,21 +239,14 @@ function createCollapsibleCardBody(form, type, sectionIdStr, sectionDescription, cardBody.classList.add("card-body"); const sectionAlert = document.createElement("div"); - if (sectionCompleted) { - if (ruleViolations.length === 0) { - collapseDiv.classList.add("collapse"); - } else { - collapseDiv.classList.add("collapse", "show"); - } + if (sectionCompleted && ruleViolations.length === 0) { + collapseDiv.classList.add("collapse"); + } else if (sectionCompleted && ruleViolations.length > 0) { + collapseDiv.classList.add("collapse", "show"); } else { sectionAlert.classList.add("alert", "alert-danger", "section-alert"); sectionAlert.innerHTML = "This section is not complete"; - } - - if (type === reportType.EDIT) { - collapseDiv.setAttribute("data-parent", "#editReportAccordion"); - } else { - collapseDiv.setAttribute("data-parent", "#newReportAccordion"); + collapseDiv.classList.add("collapse", "show"); } // Create card body. Append form to body, body to wrapper div