Merge pull request #22 from Cingulara/feature/add-stig-types-fully

Feature/add stig types fully

Makefile

@@ -1,4 +1,4 @@
-VERSION ?= 0.3
+VERSION ?= 0.4
 NAME ?= "openstig-web"
 AUTHOR ?= "Dale Bingham"
 PORT_EXT ?= 9000

assets/css/style.css

@@ -1238,4 +1238,11 @@ a.btn:focus {
 .vulnNotReviewed {
   background-color: silver;
   margin: 3px 0px 3px 0px;
+}
+.checklistSystemsList {
+  margin: 3px 0px 10px 0px;
+  width: 250px;
+}
+.checklistSystemsListLabel {
+  margin: 3px;
 }

charts.html

@@ -100,10 +100,10 @@ <h5><small>Help and Support</small></h5>
 					<a href="index.html"><i class="fa fa-fw fa-dashboard"></i><span> Dashboard </span> </a>
 				</li>
 				<li class="submenu">
-					<a href="checklists.html"><i class="fa fa-fw fa-bars"></i><span> Checklists </span> </a>
+					<a href="checklists.html"><i class="fa fa-fw fa-table"></i><span> Checklists </span> </a>
 				</li>
 				<li class="submenu">
-					<a href="templates.html"><i class="fa fa-fw fa-bars"></i><span> Templates </span> </a>
+					<a href="templates.html"><i class="fa fa-fw fa-list"></i><span> Templates </span> </a>
 				</li>
 				<li class="submenu">
 					<a class="active" href="charts.html"><i class="fa fa-fw fa-area-chart"></i><span> Reports </span> </a>
@@ -122,7 +122,7 @@ <h5><small>Help and Support</small></h5>
     <div class="content-page">	
 		<!-- Start content -->
         <div class="content">            
-		<div class="container-fluid">							
+		<div class="container-fluid">		
 			<div class="row">
 					<div class="col-xl-12">
 							<div class="breadcrumb-holder">
@@ -136,7 +136,26 @@ <h1 class="main-title float-left">Reports</h1>
 					</div>
 			</div>
 			<!-- end row -->
-
+			<div class="row">
+				<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+					<div class="card mb-3">
+						<div class="card-header">
+							<h3><i class="fa fa-filter"></i> Filters</h3>
+						</div>
+						<div class="card-body">
+							<div class="checklistSystemsList">
+								<form class="form-inline">
+									<label class="checklistSystemsListLabel" id="checklistSystemsListLabel" for="checklistSystemFilter">System Filter</label>
+									<select class="form-control" id="checklistSystemFilter" onchange="getReportsBySystem();">
+										<option value="All">All</option>
+									</select>
+								</form>
+							</div>
+						</div><!-- end card body -->															
+					</div><!-- end card-->					
+				</div>		
+			</div><!-- end row-->
+
 			<div class="row">
 				<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">						
 					<div class="card mb-3">
@@ -225,6 +244,7 @@ <h1 class="main-title float-left">Reports</h1>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.4.0/Chart.min.js"></script>
 
 	<script>
+		getChecklistSystemsForReportFilter();
 		getChecklistTypeBreakdown();
 	// });
 	</script>

checklists.html

@@ -98,10 +98,10 @@ <h5><small>Help and Support</small></h5>
 					<a href="index.html"><i class="fa fa-fw fa-dashboard"></i><span> Dashboard </span> </a>
 				</li>
 				<li class="submenu">
-					<a class="active" href="checklists.html"><i class="fa fa-fw fa-bars"></i><span> Checklists </span> </a>
+					<a class="active" href="checklists.html"><i class="fa fa-fw fa-table"></i><span> Checklists </span> </a>
 				</li>
 				<li class="submenu">
-					<a href="templates.html"><i class="fa fa-fw fa-bars"></i><span> Templates </span> </a>
+					<a href="templates.html"><i class="fa fa-fw fa-list"></i><span> Templates </span> </a>
 				</li>
 				<li class="submenu">
 					<a href="charts.html"><i class="fa fa-fw fa-area-chart"></i><span> Reports </span> </a>
@@ -141,8 +141,16 @@ <h1 class="main-title float-left">Checklists</h1>
 						<div class="card mb-3">
 							<div class="card-header">
 								<h3><i class="fa fa-table"></i> My Checklists</h3>
-							</div>								
-							<div class="card-body">								
+							</div>
+							<div class="card-body">
+								<div class="checklistSystemsList">
+									<form class="form-inline">
+										<label class="checklistSystemsListLabel" id="checklistSystemsListLabel" for="checklistSystemFilter">System Filter</label>
+										<select class="form-control" id="checklistSystemFilter" onchange="getChecklistsBySystem();">
+											<option value="All">All</option>
+										</select>
+									</form>
+								</div>
 								<div id="tblChecklistListing"></div>
 							</div><!-- end card body -->															
 						</div><!-- end card-->					
@@ -187,10 +195,12 @@ <h3><i class="fa fa-table"></i> My Checklists</h3>
 <!-- BEGIN Java Script for this page -->
 <script src="js/moment.min.js"></script>
 <script src="js/openstig.js"></script>
+<script src="js/jquery.blockUI.js"></script>
 <script>
 	$(document).ready(function() {
 		// calls to get the checklist data from the API
 		getChecklists(false);
+		getChecklistSystemsForChecklistFilter();
 	} );
 </script>
 <!-- END Java Script for this page -->

index.html

@@ -100,10 +100,10 @@ <h5><small>Help and Support</small></h5>
 					<a class="active" href="index.html"><i class="fa fa-fw fa-dashboard"></i><span> Dashboard </span> </a>
 				</li>
 				<li class="submenu">
-					<a href="checklists.html"><i class="fa fa-fw fa-bars"></i><span> Checklists </span> </a>
+					<a href="checklists.html"><i class="fa fa-fw fa-table"></i><span> Checklists </span> </a>
 				</li>
 				<li class="submenu">
-					<a href="templates.html"><i class="fa fa-fw fa-bars"></i><span> Templates </span> </a>
+					<a href="templates.html"><i class="fa fa-fw fa-list"></i><span> Templates </span> </a>
 				</li>
 				<li class="submenu">
 					<a href="charts.html"><i class="fa fa-fw fa-area-chart"></i><span> Reports </span> </a>
@@ -242,6 +242,7 @@ <h3><i class="fa fa-table"></i> Top 5 Latest Checklists</h3>
 
 <script src="js/moment.min.js"></script>
 <script src="./js/openstig.js"></script>
+<script src="js/jquery.blockUI.js"></script>
 
 <!-- Counter-Up-->
 <script src="assets/plugins/waypoints/lib/jquery.waypoints.min.js"></script>