Merge pull request #498 from cidilabs/497-report-ui-filtering

Fixes #497
ucfopen · Oct 2, 2020 · dd6f304 · dd6f304
2 parents 4d0edc5 + 58aa710
commit dd6f304
Show file tree

Hide file tree

Showing 8 changed files with 750 additions and 106 deletions.
diff --git a/public/assets/css/main.css b/public/assets/css/main.css
@@ -779,4 +779,4 @@ p.fix-success { margin-left: 0; }
 
 .manual-notification {
 	display: inline;
-}
+}
diff --git a/public/assets/css/results_filter.css b/public/assets/css/results_filter.css
@@ -0,0 +1,130 @@
+body {
+    min-height: 1200px;
+}
+section#result {
+    display: none !important;
+}
+
+.results-wrapper .save-pdf-wrapper {
+    text-align: right;
+    margin: 0 0 20px 20px;
+    clear: both;
+}
+.results-wrapper h1 {
+    margin: 20px 0;
+    padding: 20px;
+    border-top: 1px solid #DDD;
+    border-bottom: 1px solid #DDD;
+}
+.results-wrapper #summary .errorSummary {
+    padding: 0;
+}
+.results-wrapper .results-panes {
+    border-left: 1px solid #DDD;
+}
+.results-wrapper .results-tabs li a {
+    border-bottom: 1px solid #DDD;
+    font-size: 1.3em;
+    text-transform: capitalize;
+}
+.results-wrapper .results-tabs li.active a {
+    background-color: #555;
+    border-bottom: 0;
+}
+.results-wrapper .select-all-filter {
+    float: right;
+    margin-top: 4px;
+}
+.results-wrapper .issue-filter {
+    float: right;
+}
+.results-wrapper .switch {
+  position: relative;
+  display: inline-block;
+  width: 30px;
+  height: 17px;
+}
+
+/* Hide default HTML checkbox */
+.results-wrapper .switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+/* The slider */
+.results-wrapper .switch .slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.results-wrapper .switch .slider:before {
+  position: absolute;
+  content: "";
+  height: 13px;
+  width: 13px;
+  left: 2px;
+  bottom: 2px;
+  background-color: white;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.results-wrapper .switch input:checked + .slider {
+  background-color: #444;
+}
+
+.results-wrapper .switch input:focus + .slider {
+  box-shadow: 0 0 1px #444;
+}
+
+.results-wrapper .switch input:checked + .slider:before {
+  -webkit-transform: translateX(13px);
+  -ms-transform: translateX(13px);
+  transform: translateX(13px);
+}
+
+/* Rounded sliders */
+.results-wrapper .switch .slider.round {
+  border-radius: 17px;
+}
+
+.results-wrapper .switch .slider.round:before {
+  border-radius: 50%;
+}
+
+.results-wrapper .hiding {
+    display: none;
+}
+
+.results-wrapper .errorSummary .panel-danger {
+    margin-bottom: 20px !important;
+}
+
+/* Hiding issue counts within a content type, since they'll change as we filter */
+.results-wrapper .errorSummary .panel h4.panel-title > .badge {
+    display: none;
+}
+.results-wrapper .errorItem > .panel-heading .label {
+    margin: 0 4px;
+}
+
+.results-wrapper .results-tabs li a .badge {
+    float: right;
+    margin-top: 3px;
+    color: #FFF;
+    border: 1px solid #FFF;
+}
+.results-wrapper .results-tabs li a .count-error {
+    background-color: #d4423c;
+}
+.results-wrapper .results-tabs li a .count-suggest {
+    background-color: #31708f;
+}
diff --git a/public/assets/css/ucfaccordion.css b/public/assets/css/ucfaccordion.css
@@ -0,0 +1,55 @@
+.ucf-accordion h3 {
+  margin: 2px 0 0 0;
+  text-align: left;
+  font-size: 1.2em;
+}
+
+.ucf-accordion .ucf-accordion-control {
+  box-sizing: border-box;
+  display: block;
+  background-color: #f9f9f9;
+  width: 100%;
+  border: 1px solid #c7cdd1;
+  color: #333;
+  text-decoration: none !important;
+  padding: 10px;
+  transition: background-color 0.2s ease-in;
+  border-radius: 6px;
+}
+
+.ucf-accordion .ucf-accordion-control:focus,
+.ucf-accordion .ucf-accordion-control:hover {
+  background-color: #f6f6f6;
+  cursor: pointer;
+}
+
+.ucf-accordion .ucf-accordion-control:after {
+  float: right;
+  width: 20px;
+  text-align: center;
+  font-weight: bold;
+}
+
+.ucf-accordion .ucf-accordion-control[aria-expanded="true"] {
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.ucf-accordion .ucf-accordion-control[aria-expanded="true"]:after {
+  content:'\2013';
+}
+
+.ucf-accordion .ucf-accordion-control[aria-expanded="false"]:after {
+  content:'+';
+}
+
+.ucf-accordion .ucf-accordion-content {
+  display: none;
+  padding: 10px;
+  border: 1px solid #c7cdd1;
+  border-top: none;
+}
+
+.ucf-accordion .ucf-accordion-content[aria-hidden="false"] {
+  border-bottom-left-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
diff --git a/public/assets/js/default.js b/public/assets/js/default.js
@@ -165,6 +165,10 @@ function displayScanResults(results) {
 	});
 
 	jscolor.bind();
+
+	if (typeof ResultsFilter != 'undefined') {
+		ResultsFilter.init();
+	}
 }
 
 /* Builds up the results and adds them to the page */
@@ -768,7 +772,7 @@ $doc.ready(function() {
 		$save.find('div.circle-black').removeClass('hidden');
 		$save.find('span.glyphicon').fadeOut(200);
 
-		var $result_html = $('#result').clone();
+		var $result_html = (typeof ResultsFilter != 'undefined') ? ResultsFilter.oldHtml : $('#result').clone();
 		var context_title = $('input[name="session_context_title"]').val();
 
 		$result_html.find('button').remove();